FixTypo

dota17 · dota17 · commit b6435fc44c43 · 2020-06-29T12:04:41.000+08:00
diff --git a/autobahn reports/clients/index.html b/autobahn reports/clients/index.html
diff --git a/autobahn reports/servers/index.html b/autobahn reports/servers/index.html
@@ -4112,7 +4112,7 @@ <h2>Case 7.1.5</h2>
 <h2>Case 7.1.6</h2>
 <a class="up" href="#top">Up</a>
 <p class="case_text_block case_desc"><b>Case Description</b><br/><br/>Send 256K message followed by close then a ping</p>
- <p class="case_text_block case_expect"><b>Case Expectation</b><br/><br/>Case outcome depends on implementation defined close behavior. Message and close frame are sent back to back. If the close frame is processed before the text message write is complete (as can happen in asynchronous processing models) the close frame is processed first and the text message may not be received or may only be partially recieved.</p>
+ <p class="case_text_block case_expect"><b>Case Expectation</b><br/><br/>Case outcome depends on implementation defined close behavior. Message and close frame are sent back to back. If the close frame is processed before the text message write is complete (as can happen in asynchronous processing models) the close frame is processed first and the text message may not be received or may only be partially received.</p>
 <br/>
 <a name="case_desc_7_3_1"></a>
 <h2>Case 7.3.1</h2>
diff --git a/src/main/example/ChatClient.java b/src/main/example/ChatClient.java
@@ -146,7 +146,7 @@ public void onClose( int code, String reason, boolean remote ){
 
 					@Override
 					public void onError( Exception ex ){
-						ta.append( "Exception occured ...\n" + ex + "\n" );
+						ta.append( "Exception occurred ...\n" + ex + "\n" );
 						ta.setCaretPosition( ta.getDocument().getLength() );
 						ex.printStackTrace();
 						connect.setEnabled( true );
diff --git a/src/main/java/org/java_websocket/SSLSocketChannel.java b/src/main/java/org/java_websocket/SSLSocketChannel.java
@@ -61,7 +61,7 @@
 * <p>
 * Modified by marci4 to allow the usage as a ByteChannel
 * <p>
- * Permission for usage recieved at May 25, 2017 by Alex Karnezis
+ * Permission for usage received at May 25, 2017 by Alex Karnezis
 */
 public class SSLSocketChannel implements WrappedByteChannel, ByteChannel, ISSLChannel{
 
@@ -214,7 +214,7 @@ public synchronized int write( ByteBuffer output ) throws IOException{
 					myNetData = enlargePacketBuffer( myNetData );
 					break;
 				case BUFFER_UNDERFLOW:
-					throw new SSLException( "Buffer underflow occured after a wrap. I don't think we should ever get here." );
+					throw new SSLException( "Buffer underflow occurred after a wrap. I don't think we should ever get here." );
 				case CLOSED:
 					closeConnection();
 					return 0;
@@ -283,7 +283,7 @@ private boolean doHandshake() throws IOException{
 						try{
 							engine.closeInbound();
 						} catch ( SSLException e ){
-							//Ignore, cant do anything against this exception
+							//Ignore, can't do anything against this exception
 						}
 						engine.closeOutbound();
 						// After closeOutbound the engine will be set to WRAP state, in order to try to send a close message to the client.
@@ -347,7 +347,7 @@ private boolean doHandshake() throws IOException{
 							myNetData = enlargePacketBuffer( myNetData );
 							break;
 						case BUFFER_UNDERFLOW:
-							throw new SSLException( "Buffer underflow occured after a wrap. I don't think we should ever get here." );
+							throw new SSLException( "Buffer underflow occurred after a wrap. I don't think we should ever get here." );
 						case CLOSED:
 							try{
 								myNetData.flip();
diff --git a/src/main/java/org/java_websocket/SSLSocketChannel2.java b/src/main/java/org/java_websocket/SSLSocketChannel2.java
@@ -315,11 +315,11 @@ public int read(ByteBuffer dst) throws IOException{
 inCrypt.flip();
 unwrap();
 
- int transfered = transfereTo(inData, dst);
- if (transfered == 0 && isBlocking()){
+ int transferred = transfereTo(inData, dst);
+ if (transferred == 0 && isBlocking()){
 continue;
 }
- return transfered;
+ return transferred;
 }
 }
 /**
diff --git a/src/main/java/org/java_websocket/WebSocket.java b/src/main/java/org/java_websocket/WebSocket.java
@@ -59,7 +59,7 @@ public interface WebSocket{
 
 	/**
 	 * This will close the connection immediately without a proper close handshake.
-	 * The code and the message therefore won't be transfered over the wire also they will be forwarded to onClose/onWebsocketClose.
+	 * The code and the message therefore won't be transferred over the wire also they will be forwarded to onClose/onWebsocketClose.
 	 * @param code the closing code
 	 * @param message the closing message
 	 **/
diff --git a/src/main/java/org/java_websocket/WebSocketImpl.java b/src/main/java/org/java_websocket/WebSocketImpl.java
@@ -152,7 +152,7 @@ public class WebSocketImpl implements WebSocket{
 	private String resourceDescriptor = null;
 
 	/**
-	 * Attribute, when the last pong was recieved
+	 * Attribute, when the last pong was received
 	 */
 	private long lastPong = System.nanoTime();
 
@@ -483,7 +483,7 @@ public void close( int code, String message ){
 
 	/**
 	 * This will close the connection immediately without a proper close handshake.
-	 * The code and the message therefore won't be transfered over the wire also they will be forwarded to onClose/onWebsocketClose.
+	 * The code and the message therefore won't be transferred over the wire also they will be forwarded to onClose/onWebsocketClose.
 	 *
 	 * @param code the closing code
 	 * @param message the closing message
@@ -789,9 +789,9 @@ public String getResourceDescriptor(){
 	}
 
 	/**
-	 * Getter for the last pong recieved
+	 * Getter for the last pong received
 	 *
-	 * @return the timestamp for the last recieved pong
+	 * @return the timestamp for the last received pong
 	 */
 	long getLastPong(){
 		return lastPong;
diff --git a/src/main/java/org/java_websocket/WebSocketListener.java b/src/main/java/org/java_websocket/WebSocketListener.java
@@ -117,7 +117,7 @@ public interface WebSocketListener{
 	 * Indicates that a complete WebSocket connection has been established,
 	 * and we are ready to send/receive data.
 	 * 
-	 * @param conn The <tt>WebSocket</tt> instance this event is occuring on.
+	 * @param conn The <tt>WebSocket</tt> instance this event is occurring on.
 	 * @param d The handshake of the websocket instance
 	 */
 	void onWebsocketOpen( WebSocket conn, Handshakedata d );
@@ -126,7 +126,7 @@ public interface WebSocketListener{
 	 * Called after <tt>WebSocket#close</tt> is explicity called, or when the
 	 * other end of the WebSocket connection is closed.
 	 * 
-	 * @param ws The <tt>WebSocket</tt> instance this event is occuring on.
+	 * @param ws The <tt>WebSocket</tt> instance this event is occurring on.
 	 * @param code The codes can be looked up here:{@link CloseFrame}
 	 * @param reason Additional information string
 	 * @param remote Returns whether or not the closing of the connection was initiated by the remote host.
@@ -135,7 +135,7 @@ public interface WebSocketListener{
 
 	/** Called as soon as no further frames are accepted
 	 *
-	 * @param ws The <tt>WebSocket</tt> instance this event is occuring on.
+	 * @param ws The <tt>WebSocket</tt> instance this event is occurring on.
 	 * @param code The codes can be looked up here:{@link CloseFrame}
 	 * @param reason Additional information string
 	 * @param remote Returns whether or not the closing of the connection was initiated by the remote host.
@@ -144,7 +144,7 @@ public interface WebSocketListener{
 
 	/** send when this peer sends a close handshake
 	 *
-	 * @param ws The <tt>WebSocket</tt> instance this event is occuring on.
+	 * @param ws The <tt>WebSocket</tt> instance this event is occurring on.
 	 * @param code The codes can be looked up here:{@link CloseFrame}
 	 * @param reason Additional information string
 	 */
@@ -154,7 +154,7 @@ public interface WebSocketListener{
 	 * Called if an exception worth noting occurred.
 	 * If an error causes the connection to fail onClose will be called additionally afterwards.
 	 *
-	 * @param conn The <tt>WebSocket</tt> instance this event is occuring on.
+	 * @param conn The <tt>WebSocket</tt> instance this event is occurring on.
 	 * @param ex
 	 * The exception that occurred. <br>
 	 * Might be null if the exception is not related to any specific connection. For example if the server port could not be bound.
@@ -165,7 +165,7 @@ public interface WebSocketListener{
 	 * Called a ping frame has been received.
 	 * This method must send a corresponding pong by itself.
 	 *
-	 * @param conn The <tt>WebSocket</tt> instance this event is occuring on.
+	 * @param conn The <tt>WebSocket</tt> instance this event is occurring on.
 	 * @param f The ping frame. Control frames may contain payload.
 	 */
 	void onWebsocketPing( WebSocket conn, Framedata f );
@@ -181,28 +181,28 @@ public interface WebSocketListener{
 	/**
 	 * Called when a pong frame is received.
 	 *
-	 * @param conn The <tt>WebSocket</tt> instance this event is occuring on.
+	 * @param conn The <tt>WebSocket</tt> instance this event is occurring on.
 	 * @param f The pong frame. Control frames may contain payload.
 	 **/
 	void onWebsocketPong( WebSocket conn, Framedata f );
 
 	/** This method is used to inform the selector thread that there is data queued to be written to the socket.
-	 * @param conn The <tt>WebSocket</tt> instance this event is occuring on.
+	 * @param conn The <tt>WebSocket</tt> instance this event is occurring on.
 	 */
 	void onWriteDemand( WebSocket conn );
 
 	/**
 	 * @see WebSocket#getLocalSocketAddress()
 	 *
-	 * @param conn The <tt>WebSocket</tt> instance this event is occuring on.
+	 * @param conn The <tt>WebSocket</tt> instance this event is occurring on.
 	 * @return Returns the address of the endpoint this socket is bound to.
 	 */
 	InetSocketAddress getLocalSocketAddress( WebSocket conn );
 
 	/**
 	 * @see WebSocket#getRemoteSocketAddress()
 	 *
-	 * @param conn The <tt>WebSocket</tt> instance this event is occuring on.
+	 * @param conn The <tt>WebSocket</tt> instance this event is occurring on.
 	 * @return Returns the address of the endpoint this socket is connected to, or{@code null} if it is unconnected.
 	 */
 	InetSocketAddress getRemoteSocketAddress( WebSocket conn );
diff --git a/src/main/java/org/java_websocket/drafts/Draft.java b/src/main/java/org/java_websocket/drafts/Draft.java
@@ -51,7 +51,7 @@
 import org.java_websocket.util.Charsetfunctions;
 
 /**
- * Base class for everything of a websocket specification which is not common such as the way the handshake is read or frames are transfered.
+ * Base class for everything of a websocket specification which is not common such as the way the handshake is read or frames are transferred.
 **/
 public abstract class Draft{
 
diff --git a/src/main/java/org/java_websocket/exceptions/IncompleteHandshakeException.java b/src/main/java/org/java_websocket/exceptions/IncompleteHandshakeException.java
@@ -26,7 +26,7 @@
 package org.java_websocket.exceptions;
 
 /**
- * exception which indicates that a incomplete handshake was recieved
+ * exception which indicates that a incomplete handshake was received
 */
 public class IncompleteHandshakeException extends RuntimeException{
 
@@ -36,14 +36,14 @@ public class IncompleteHandshakeException extends RuntimeException{
 private static final long serialVersionUID = 7906596804233893092L;
 
 /**
- * attribut which size of handshake would have been prefered
+ * attribut which size of handshake would have been preferred
 */
 private final int preferredSize;
 
 /**
 * constructor for a IncompleteHandshakeException
 * <p>
- * @param preferredSize the prefered size
+ * @param preferredSize the preferred size
 */
 public IncompleteHandshakeException(int preferredSize){
 this.preferredSize = preferredSize;
diff --git a/src/main/java/org/java_websocket/exceptions/InvalidDataException.java b/src/main/java/org/java_websocket/exceptions/InvalidDataException.java
@@ -26,7 +26,7 @@
 package org.java_websocket.exceptions;
 
 /**
- * exception which indicates that a invalid data was recieved
+ * exception which indicates that a invalid data was received
 */
 public class InvalidDataException extends Exception{
 
diff --git a/src/main/java/org/java_websocket/exceptions/InvalidFrameException.java b/src/main/java/org/java_websocket/exceptions/InvalidFrameException.java
@@ -28,7 +28,7 @@
 import org.java_websocket.framing.CloseFrame;
 
 /**
- * exception which indicates that a invalid frame was recieved (CloseFrame.PROTOCOL_ERROR)
+ * exception which indicates that a invalid frame was received (CloseFrame.PROTOCOL_ERROR)
 */
 public class InvalidFrameException extends InvalidDataException{
 
diff --git a/src/main/java/org/java_websocket/exceptions/InvalidHandshakeException.java b/src/main/java/org/java_websocket/exceptions/InvalidHandshakeException.java
@@ -28,7 +28,7 @@
 import org.java_websocket.framing.CloseFrame;
 
 /**
- * exception which indicates that a invalid handshake was recieved (CloseFrame.PROTOCOL_ERROR)
+ * exception which indicates that a invalid handshake was received (CloseFrame.PROTOCOL_ERROR)
 */
 public class InvalidHandshakeException extends InvalidDataException{
 
diff --git a/src/main/java/org/java_websocket/framing/CloseFrame.java b/src/main/java/org/java_websocket/framing/CloseFrame.java
@@ -190,7 +190,7 @@ public CloseFrame(){
 	 */
 	public void setCode(int code){
 this.code = code;
- // CloseFrame.TLS_ERROR is not allowed to be transfered over the wire
+ // CloseFrame.TLS_ERROR is not allowed to be transferred over the wire
 if (code == CloseFrame.TLS_ERROR){
 this.code = CloseFrame.NOCODE;
 this.reason = "";
diff --git a/src/main/java/org/java_websocket/framing/ControlFrame.java b/src/main/java/org/java_websocket/framing/ControlFrame.java
@@ -45,16 +45,16 @@ public ControlFrame( Opcode opcode ){
 	@Override
 	public void isValid() throws InvalidDataException{
 		if( !isFin() ){
-			throw new InvalidFrameException( "Control frame cant have fin==false set" );
+			throw new InvalidFrameException( "Control frame can't have fin==false set" );
 		}
 		if( isRSV1() ){
-			throw new InvalidFrameException( "Control frame cant have rsv1==true set" );
+			throw new InvalidFrameException( "Control frame can't have rsv1==true set" );
 		}
 		if( isRSV2() ){
-			throw new InvalidFrameException( "Control frame cant have rsv2==true set" );
+			throw new InvalidFrameException( "Control frame can't have rsv2==true set" );
 		}
 		if( isRSV3() ){
-			throw new InvalidFrameException( "Control frame cant have rsv3==true set" );
+			throw new InvalidFrameException( "Control frame can't have rsv3==true set" );
 		}
 	}
 }
diff --git a/src/main/java/org/java_websocket/server/WebSocketServer.java b/src/main/java/org/java_websocket/server/WebSocketServer.java
@@ -718,7 +718,7 @@ protected boolean removeConnection( WebSocket ws ){
 				removed = this.connections.remove( ws );
 			} else{
 				//Don't throw an assert error if the ws is not in the list. e.g. when the other endpoint did not send any handshake. see #512
-				log.trace("Removing connection which is not in the connections collection! Possible no handshake recieved!{}", ws);
+				log.trace("Removing connection which is not in the connections collection! Possible no handshake received!{}", ws);
 			}
 		}
 		if( isclosed.get() && connections.isEmpty() ){
@@ -823,14 +823,14 @@ public InetSocketAddress getRemoteSocketAddress( WebSocket conn ){
 	}
 
 	/** Called after an opening handshake has been performed and the given websocket is ready to be written on.
-	 * @param conn The <tt>WebSocket</tt> instance this event is occuring on.
+	 * @param conn The <tt>WebSocket</tt> instance this event is occurring on.
 	 * @param handshake The handshake of the websocket instance
 	 */
 	public abstract void onOpen( WebSocket conn, ClientHandshake handshake );
 	/**
 	 * Called after the websocket connection has been closed.
 	 *
-	 * @param conn The <tt>WebSocket</tt> instance this event is occuring on.
+	 * @param conn The <tt>WebSocket</tt> instance this event is occurring on.
 	 * @param code
 	 * The codes can be looked up here:{@link CloseFrame}
 	 * @param reason
@@ -843,7 +843,7 @@ public InetSocketAddress getRemoteSocketAddress( WebSocket conn ){
 	 * Callback for string messages received from the remote host
 	 * 
 	 * @see #onMessage(WebSocket, ByteBuffer)
-	 * @param conn The <tt>WebSocket</tt> instance this event is occuring on.
+	 * @param conn The <tt>WebSocket</tt> instance this event is occurring on.
 	 * @param message The UTF-8 decoded message that was received.
 	 **/
 	public abstract void onMessage( WebSocket conn, String message );
@@ -860,7 +860,7 @@ public InetSocketAddress getRemoteSocketAddress( WebSocket conn ){
 	/**
 	 * Called when the server started up successfully.
 	 *
-	 * If any error occured, onError is called instead.
+	 * If any error occurred, onError is called instead.
 	 */
 	public abstract void onStart();
 
diff --git a/src/main/java/org/java_websocket/util/Base64.java b/src/main/java/org/java_websocket/util/Base64.java
@@ -97,7 +97,7 @@
 * <a href="http://www.faqs.org/rfcs/rfc3548.html">RFC3548</a>.</li>
 * <li><em>Throws exceptions instead of returning null values.</em> Because some operations
 * (especially those that may permit the GZIP option) use IO streams, there
- * is a possiblity of an java.io.IOException being thrown. After some discussion and
+ * is a possibility of an java.io.IOException being thrown. After some discussion and
 * thought, I've changed the behavior of the methods to throw java.io.IOExceptions
 * rather than return null if ever there's an error. I think this is more
 * appropriate, though it will require some changes to your code. Sorry,
@@ -462,15 +462,15 @@ private Base64(){}
 /**
 * Encodes up to the first three bytes of array <var>threeBytes</var>
 * and returns a four-byte array in Base64 notation.
- * The actual number of significant bytes in your array is
+ * The actual number of significan't bytes in your array is
 * given by <var>numSigBytes</var>.
 * The array <var>threeBytes</var> needs only be as big as
 * <var>numSigBytes</var>.
 * Code can reuse a byte array by passing a four-byte array as <var>b4</var>.
 *
 * @param b4 A reusable byte array to reduce array instantiation
 * @param threeBytes the array to convert
- * @param numSigBytes the number of significant bytes in your array
+ * @param numSigBytes the number of significan't bytes in your array
 * @return four byte array in Base64 notation.
 * @since 1.5.1
 */
@@ -487,17 +487,17 @@ private static byte[] encode3to4( byte[] b4, byte[] threeBytes, int numSigBytes,
 * anywhere along their length by specifying 
 * <var>srcOffset</var> and <var>destOffset</var>.
 * This method does not check to make sure your arrays
- * are large enough to accomodate <var>srcOffset</var> + 3 for
+ * are large enough to accommodate <var>srcOffset</var> + 3 for
 * the <var>source</var> array or <var>destOffset</var> + 4 for
 * the <var>destination</var> array.
- * The actual number of significant bytes in your array is
+ * The actual number of significan't bytes in your array is
 * given by <var>numSigBytes</var>.</p>
 	 * <p>This is the lowest level of the encoding methods with
 	 * all possible parameters.</p>
 *
 * @param source the array to convert
 * @param srcOffset the index where conversion begins
- * @param numSigBytes the number of significant bytes in your array
+ * @param numSigBytes the number of significan't bytes in your array
 * @param destination the array to hold the conversion
 * @param destOffset the index where output will be put
 * @return the <var>destination</var> array
@@ -517,7 +517,7 @@ private static byte[] encode3to4(
 // 0x3f 0x3f 0x3f Additional AND
 
 // Create buffer with zero-padding if there are only one or two
- // significant bytes passed in the array.
+ // significan't bytes passed in the array.
 // We have to shift left 24 in order to flush out the 1's that appear
 // when Java treats a value as negative that is cast from a byte to an int.
 int inBuff = ( numSigBytes > 0 ? ((source[ srcOffset ] << 24) >>> 8) : 0 )
@@ -762,7 +762,7 @@ public static byte[] encodeBytesToBytes( byte[] source, int off, int len, int op
 * anywhere along their length by specifying 
 * <var>srcOffset</var> and <var>destOffset</var>.
 * This method does not check to make sure your arrays
- * are large enough to accomodate <var>srcOffset</var> + 4 for
+ * are large enough to accommodate <var>srcOffset</var> + 4 for
 * the <var>source</var> array or <var>destOffset</var> + 3 for
 * the <var>destination</var> array.
 * This method returns the actual number of bytes that 
diff --git a/src/test/java/org/java_websocket/framing/BinaryFrameTest.java b/src/test/java/org/java_websocket/framing/BinaryFrameTest.java
diff --git a/src/test/java/org/java_websocket/framing/CloseFrameTest.java b/src/test/java/org/java_websocket/framing/CloseFrameTest.java
diff --git a/src/test/java/org/java_websocket/framing/ContinuousFrameTest.java b/src/test/java/org/java_websocket/framing/ContinuousFrameTest.java
diff --git a/src/test/java/org/java_websocket/framing/FramedataImpl1Test.java b/src/test/java/org/java_websocket/framing/FramedataImpl1Test.java
diff --git a/src/test/java/org/java_websocket/framing/PingFrameTest.java b/src/test/java/org/java_websocket/framing/PingFrameTest.java
diff --git a/src/test/java/org/java_websocket/framing/PongFrameTest.java b/src/test/java/org/java_websocket/framing/PongFrameTest.java
diff --git a/src/test/java/org/java_websocket/framing/TextFrameTest.java b/src/test/java/org/java_websocket/framing/TextFrameTest.java

-Original file line number
+Diff line change
 <h2>Case 7.1.6</h2>
 <aclass="up" href="#top">Up</a>
 <pclass="case_text_block case_desc"><b>Case Description</b><br/><br/>Send 256K message followed by close then a ping</p>
 -<pclass="case_text_block case_expect"><b>Case Expectation</b><br/><br/>Case outcome depends on implementation defined close behavior. Message and close frame are sent back to back. If the close frame is processed before the text message write is complete (as can happen in asynchronous processing models) the close frame is processed first and the text message may not be received or may only be partially recieved.</p>
 +<pclass="case_text_block case_expect"><b>Case Expectation</b><br/><br/>Case outcome depends on implementation defined close behavior. Message and close frame are sent back to back. If the close frame is processed before the text message write is complete (as can happen in asynchronous processing models) the close frame is processed first and the text message may not be received or may only be partially received.</p>
 <br/>
 <aname="case_desc_7_3_1"></a>
 <h2>Case 7.3.1</h2>
Original file line number	Diff line number	Diff line change
`@@ -315,11 +315,11 @@ public int read(ByteBuffer dst) throws IOException{`
`315`	`315`	`inCrypt.flip();`
`316`	`316`	`unwrap();`
`317`	`317`
`318`		`-inttransfered = transfereTo(inData, dst);`
`319`		`-if (transfered == 0 && isBlocking()){`
	`318`	`+inttransferred = transfereTo(inData, dst);`
	`319`	`+if (transferred == 0 && isBlocking()){`
`320`	`320`	`continue;`
`321`	`321`	`}`
`322`		`-returntransfered;`
	`322`	`+returntransferred;`
`323`	`323`	`}`
`324`	`324`	`}`
`325`	`325`	`/**`