Skip to content

Commit f6afbfb

Browse files
DavidiusdadiDavidiusdadi
committed
fixed typos reported by Artem Karukov
1 parent 95a615e commit f6afbfb

22 files changed

Lines changed: 49 additions & 49 deletions

‎src/org/java_websocket/WebSocket.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
import org.java_websocket.drafts.Draft_17;
2020
import org.java_websocket.drafts.Draft_75;
2121
import org.java_websocket.drafts.Draft_76;
22-
import org.java_websocket.exeptions.IncompleteHandshakeException;
23-
import org.java_websocket.exeptions.InvalidDataException;
24-
import org.java_websocket.exeptions.InvalidFrameException;
25-
import org.java_websocket.exeptions.InvalidHandshakeException;
22+
import org.java_websocket.exceptions.IncompleteHandshakeException;
23+
import org.java_websocket.exceptions.InvalidDataException;
24+
import org.java_websocket.exceptions.InvalidFrameException;
25+
import org.java_websocket.exceptions.InvalidHandshakeException;
2626
import org.java_websocket.framing.CloseFrame;
2727
import org.java_websocket.framing.CloseFrameBuilder;
2828
import org.java_websocket.framing.Framedata;
@@ -166,16 +166,16 @@ private void init( WebSocketListener listener, Draft draft, SocketChannel socket
166166
socketBuffer.limit( socketBuffer.capacity() );
167167
if( sockchannel.read( socketBuffer ) == -1 ) {
168168
if( draft == null ) {
169-
closeConnection( CloseFrame.ABNROMAL_CLOSE, true );
169+
closeConnection( CloseFrame.ABNOROMAL_CLOSE, true );
170170
} else if( draft.getCloseHandshakeType() == CloseHandshakeType.NONE ) {
171171
closeConnection( CloseFrame.NORMAL, true );
172172
} else if( draft.getCloseHandshakeType() == CloseHandshakeType.ONEWAY ) {
173173
if( role == Role.SERVER )
174-
closeConnection( CloseFrame.ABNROMAL_CLOSE, true );
174+
closeConnection( CloseFrame.ABNOROMAL_CLOSE, true );
175175
else
176176
closeConnection( CloseFrame.NORMAL, true );
177177
} else {
178-
closeConnection( CloseFrame.ABNROMAL_CLOSE, true );
178+
closeConnection( CloseFrame.ABNOROMAL_CLOSE, true );
179179
}
180180

181181
}
@@ -368,14 +368,14 @@ public void close( int code, String message ) {
368368
try {
369369
closeDirect( code, message );
370370
} catch ( IOException e ) {
371-
closeConnection( CloseFrame.ABNROMAL_CLOSE, true );
371+
closeConnection( CloseFrame.ABNOROMAL_CLOSE, true );
372372
}
373373
}
374374

375375
public void closeDirect( int code, String message ) throws IOException {
376376
if( !closeHandshakeSent ) {
377377
if( handshakeComplete ) {
378-
if( code == CloseFrame.ABNROMAL_CLOSE ) {
378+
if( code == CloseFrame.ABNOROMAL_CLOSE ) {
379379
closeConnection( code, true );
380380
closeHandshakeSent = true;
381381
return;
@@ -386,7 +386,7 @@ public void closeDirect( int code, String message ) throws IOException {
386386
sendFrameDirect( new CloseFrameBuilder( code, message ) );
387387
} catch ( InvalidDataException e ) {
388388
wsl.onWebsocketError( this, e );
389-
closeConnection( CloseFrame.ABNROMAL_CLOSE, "generated frame is invalid", false );
389+
closeConnection( CloseFrame.ABNOROMAL_CLOSE, "generated frame is invalid", false );
390390
}
391391
} else {
392392
closeConnection( code, false );
@@ -574,7 +574,7 @@ private void channelWrite( ByteBuffer buf ) throws InterruptedException {
574574
flush();
575575
} catch ( IOException e ) {
576576
wsl.onWebsocketError( this, e );
577-
closeConnection( CloseFrame.ABNROMAL_CLOSE, true );
577+
closeConnection( CloseFrame.ABNOROMAL_CLOSE, true );
578578
return;
579579
}
580580
bufferQueue.put( buf );

‎src/org/java_websocket/WebSocketAdapter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.nio.ByteBuffer;
44

55
import org.java_websocket.drafts.Draft;
6-
import org.java_websocket.exeptions.InvalidDataException;
6+
import org.java_websocket.exceptions.InvalidDataException;
77
import org.java_websocket.framing.Framedata;
88
import org.java_websocket.framing.Framedata.Opcode;
99
import org.java_websocket.framing.FramedataImpl1;

‎src/org/java_websocket/WebSocketClient.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import org.java_websocket.drafts.Draft;
1919
import org.java_websocket.drafts.Draft_10;
20-
import org.java_websocket.exeptions.InvalidHandshakeException;
20+
import org.java_websocket.exceptions.InvalidHandshakeException;
2121
import org.java_websocket.framing.CloseFrame;
2222
import org.java_websocket.handshake.HandshakeImpl1Client;
2323
import org.java_websocket.handshake.Handshakedata;
@@ -212,7 +212,7 @@ protected final void interruptableRun() {
212212
}
213213
} catch ( IOException e ) {
214214
onError( e );
215-
conn.close( CloseFrame.ABNROMAL_CLOSE );
215+
conn.close( CloseFrame.ABNOROMAL_CLOSE );
216216
return;
217217
} catch ( RuntimeException e ) {
218218
// this catch case covers internal errors only and indicates a bug in this websocket implementation
@@ -258,7 +258,7 @@ public void flush() {
258258
conn.flush();
259259
} catch ( IOException e ) {
260260
onError( e );
261-
conn.closeConnection( CloseFrame.ABNROMAL_CLOSE, true );
261+
conn.closeConnection( CloseFrame.ABNOROMAL_CLOSE, true );
262262
return;
263263
}
264264
}

‎src/org/java_websocket/WebSocketListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.nio.ByteBuffer;
44

55
import org.java_websocket.drafts.Draft;
6-
import org.java_websocket.exeptions.InvalidDataException;
6+
import org.java_websocket.exceptions.InvalidDataException;
77
import org.java_websocket.framing.Framedata;
88
import org.java_websocket.handshake.ClientHandshake;
99
import org.java_websocket.handshake.Handshakedata;

‎src/org/java_websocket/WebSocketServer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ public void run() {
248248
private void handleIOException( WebSocket conn, IOException ex ) {
249249
onWebsocketError( conn, ex );// conn may be null here
250250
if( conn != null ) {
251-
conn.close( CloseFrame.ABNROMAL_CLOSE );
251+
conn.close( CloseFrame.ABNOROMAL_CLOSE );
252252
}
253253
}
254254

‎src/org/java_websocket/drafts/Draft.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import java.util.Locale;
88

99
import org.java_websocket.WebSocket.Role;
10-
import org.java_websocket.exeptions.InvalidDataException;
11-
import org.java_websocket.exeptions.InvalidHandshakeException;
12-
import org.java_websocket.exeptions.LimitExedeedException;
10+
import org.java_websocket.exceptions.InvalidDataException;
11+
import org.java_websocket.exceptions.InvalidHandshakeException;
12+
import org.java_websocket.exceptions.LimitExedeedException;
1313
import org.java_websocket.framing.CloseFrame;
1414
import org.java_websocket.framing.Framedata;
1515
import org.java_websocket.handshake.ClientHandshake;

‎src/org/java_websocket/drafts/Draft_10.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
import java.util.Random;
1010

1111
import org.java_websocket.WebSocket.Role;
12-
import org.java_websocket.exeptions.InvalidDataException;
13-
import org.java_websocket.exeptions.InvalidFrameException;
14-
import org.java_websocket.exeptions.InvalidHandshakeException;
15-
import org.java_websocket.exeptions.LimitExedeedException;
16-
import org.java_websocket.exeptions.NotSendableException;
12+
import org.java_websocket.exceptions.InvalidDataException;
13+
import org.java_websocket.exceptions.InvalidFrameException;
14+
import org.java_websocket.exceptions.InvalidHandshakeException;
15+
import org.java_websocket.exceptions.LimitExedeedException;
16+
import org.java_websocket.exceptions.NotSendableException;
1717
import org.java_websocket.framing.CloseFrameBuilder;
1818
import org.java_websocket.framing.FrameBuilder;
1919
import org.java_websocket.framing.Framedata;

‎src/org/java_websocket/drafts/Draft_17.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.java_websocket.drafts;
22

3-
import org.java_websocket.exeptions.InvalidHandshakeException;
3+
import org.java_websocket.exceptions.InvalidHandshakeException;
44
import org.java_websocket.handshake.ClientHandshake;
55
import org.java_websocket.handshake.ClientHandshakeBuilder;
66

‎src/org/java_websocket/drafts/Draft_75.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import java.util.List;
77
import java.util.Random;
88

9-
import org.java_websocket.exeptions.InvalidDataException;
10-
import org.java_websocket.exeptions.InvalidHandshakeException;
11-
import org.java_websocket.exeptions.NotSendableException;
9+
import org.java_websocket.exceptions.InvalidDataException;
10+
import org.java_websocket.exceptions.InvalidHandshakeException;
11+
import org.java_websocket.exceptions.NotSendableException;
1212
import org.java_websocket.framing.CloseFrame;
1313
import org.java_websocket.framing.FrameBuilder;
1414
import org.java_websocket.framing.Framedata;

‎src/org/java_websocket/drafts/Draft_76.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
import java.util.Random;
1111

1212
import org.java_websocket.WebSocket.Role;
13-
import org.java_websocket.exeptions.IncompleteHandshakeException;
14-
import org.java_websocket.exeptions.InvalidDataException;
15-
import org.java_websocket.exeptions.InvalidFrameException;
16-
import org.java_websocket.exeptions.InvalidHandshakeException;
13+
import org.java_websocket.exceptions.IncompleteHandshakeException;
14+
import org.java_websocket.exceptions.InvalidDataException;
15+
import org.java_websocket.exceptions.InvalidFrameException;
16+
import org.java_websocket.exceptions.InvalidHandshakeException;
1717
import org.java_websocket.framing.CloseFrame;
1818
import org.java_websocket.framing.CloseFrameBuilder;
1919
import org.java_websocket.framing.Framedata;

0 commit comments

Comments
 (0)