Merge pull request #571 from marci4/master

Code cleanups

Author: marci4

src/main/example/ChatServer.java

@@ -28,7 +28,7 @@
 import java.io.InputStreamReader;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
-import java.util.Collection;
+import java.nio.ByteBuffer;
 
 import org.java_websocket.WebSocket;
 import org.java_websocket.WebSocketImpl;
@@ -66,6 +66,12 @@ public void onMessage( WebSocket conn, String message ) {
 		broadcast( message );
 		System.out.println( conn + ": " + message );
 	}
+	@Override
+	public void onMessage( WebSocket conn, ByteBuffer message ) {
+		broadcast( message.array() );
+		System.out.println( conn + ": " + message );
+	}
+
 
 	@Override
 	public void onFragment( WebSocket conn, Framedata fragment ) {

src/main/example/ExampleClient.java

@@ -54,11 +54,6 @@ public void onMessage( String message ) {
 		System.out.println( "received: " + message );
 	}
 
-	@Override
-	public void onFragment( Framedata fragment ) {
-		System.out.println( "received fragment: " + new String( fragment.getPayloadData().array() ) );
-	}
-
 	@Override
 	public void onClose( int code, String reason, boolean remote ) {
 		// The codecodes are documented in class org.java_websocket.framing.CloseFrame

src/main/java/org/java_websocket/WebSocketAdapter.java

@@ -55,6 +55,7 @@ public ServerHandshakeBuilder onWebsocketHandshakeReceivedAsServer( WebSocket co
 
 	@Override
 	public void onWebsocketHandshakeReceivedAsClient( WebSocket conn, ClientHandshake request, ServerHandshake response ) throws InvalidDataException {
+		//To overwrite
 	}
 
 	/**
@@ -64,6 +65,7 @@ public void onWebsocketHandshakeReceivedAsClient( WebSocket conn, ClientHandshak
 	 */
 	@Override
 	public void onWebsocketHandshakeSentAsClient( WebSocket conn, ClientHandshake request ) throws InvalidDataException {
+		//To overwrite
 	}
 
 	/**
@@ -72,7 +74,9 @@ public void onWebsocketHandshakeSentAsClient( WebSocket conn, ClientHandshake re
 	 * @see org.java_websocket.WebSocketListener#onWebsocketMessageFragment(WebSocket, Framedata)
 	 */
 	@Override
+	@Deprecated
 	public void onWebsocketMessageFragment( WebSocket conn, Framedata frame ) {
+		//To overwrite
 	}
 
 	/**
@@ -93,6 +97,7 @@ public void onWebsocketPing( WebSocket conn, Framedata f ) {
 	 */
 	@Override
 	public void onWebsocketPong( WebSocket conn, Framedata f ) {
+		//To overwrite
 	}
 
 	/**

src/main/java/org/java_websocket/client/WebSocketClient.java

@@ -294,10 +294,10 @@ private int getPort() {
 			String scheme = uri.getScheme();
 			if( "wss".equals( scheme ) ) {
 				return WebSocket.DEFAULT_WSS_PORT;
-			} else if( scheme.equals( "ws" ) ) {
+			} else if(  "ws".equals( scheme ) ) {
 				return WebSocket.DEFAULT_PORT;
 			} else {
-				throw new RuntimeException( "unknown scheme: " + scheme );
+				throw new IllegalArgumentException( "unknown scheme: " + scheme );
 			}
 		}
 		return port;
@@ -411,6 +411,7 @@ public void onWebsocketClosing( WebSocket conn, int code, String reason, boolean
 	 * @param reason Additional information string
 	 */
 	public void onCloseInitiated( int code, String reason ) {
+		//To overwrite
 	}
 
 	/** Called as soon as no further frames are accepted
@@ -420,6 +421,7 @@ public void onCloseInitiated( int code, String reason ) {
 	 * @param remote Returns whether or not the closing of the connection was initiated by the remote host.
 	 */
 	public void onClosing( int code, String reason, boolean remote ) {
+		//To overwrite
 	}
 
 	/**
@@ -450,8 +452,11 @@ public InetSocketAddress getRemoteSocketAddress( WebSocket conn ) {
 	public abstract void onClose( int code, String reason, boolean remote );
 	public abstract void onError( Exception ex );
 	public void onMessage( ByteBuffer bytes ) {
+		//To overwrite
 	}
+	@Deprecated
 	public void onFragment( Framedata frame ) {
+		//To overwrite
 	}
 
 	private class WebsocketWriteThread implements Runnable {

src/main/java/org/java_websocket/handshake/HandshakeImpl1Client.java

@@ -28,9 +28,6 @@
 public class HandshakeImpl1Client extends HandshakedataImpl1 implements ClientHandshakeBuilder {
 	private String resourceDescriptor = "*";
 
-	public HandshakeImpl1Client() {
-	}
-
 	public void setResourceDescriptor( String resourceDescriptor ) throws IllegalArgumentException {
 		if(resourceDescriptor==null)
 			throw new IllegalArgumentException( "http resource descriptor must not be null" );

src/main/java/org/java_websocket/handshake/HandshakeImpl1Server.java

@@ -29,9 +29,6 @@ public class HandshakeImpl1Server extends HandshakedataImpl1 implements ServerHa
 	private short httpstatus;
 	private String httpstatusmessage;
 
-	public HandshakeImpl1Server() {
-	}
-
 	@Override
 	public String getHttpStatusMessage() {
 		return httpstatusmessage;