Added method onFragment to replace onWebsocketMessageFragment and let

Davidiusdadi · Davidiusdadi · commit e1676f53c885 · 2013-08-08T22:49:52.000+02:00
the main examples overload it.
diff --git a/src/main/example/ChatServer.java b/src/main/example/ChatServer.java
@@ -7,6 +7,7 @@
 
 import org.java_websocket.WebSocket;
 import org.java_websocket.WebSocketImpl;
+import org.java_websocket.framing.Framedata;
 import org.java_websocket.handshake.ClientHandshake;
 import org.java_websocket.server.WebSocketServer;
 
@@ -41,6 +42,11 @@ public void onMessage( WebSocket conn, String message ) {
 		System.out.println( conn + ": " + message );
 	}
 
+	@Override
+	public void onFragment( WebSocket conn, Framedata fragment ) {
+		System.out.println( "received fragment: " + fragment );
+	}
+
 	public static void main( String[] args ) throws InterruptedException , IOException {
 		WebSocketImpl.DEBUG = true;
 		int port = 8887; // 843 flash policy port
@@ -56,9 +62,16 @@ public static void main( String[] args ) throws InterruptedException , IOExcepti
 		while ( true ) {
 			String in = sysin.readLine();
 			s.sendToAll( in );
+			if( in.equals( "exit" ) ) {
+				s.stop();
+				break;
+			} else if( in.equals( "restart" ) ) {
+				s.stop();
+				s.start();
+				break;
+			}
 		}
 	}
-
 	@Override
 	public void onError( WebSocket conn, Exception ex ) {
 		ex.printStackTrace();
diff --git a/src/main/example/ExampleClient.java b/src/main/example/ExampleClient.java
@@ -4,6 +4,7 @@
 import org.java_websocket.client.WebSocketClient;
 import org.java_websocket.drafts.Draft;
 import org.java_websocket.drafts.Draft_10;
+import org.java_websocket.framing.Framedata;
 import org.java_websocket.handshake.ServerHandshake;
 
 /** This example demonstrates how to create a websocket connection to a server. Only the most important callbacks are overloaded. */
@@ -20,13 +21,17 @@ public ExampleClient( URI serverURI ) {
 	@Override
 	public void onOpen( ServerHandshake handshakedata ) {
 		System.out.println( "opened connection" );
-		// if you pan to refuse connection based on ip or httpfields overload: onWebsocketHandshakeReceivedAsClient
+		// if you plan to refuse connection based on ip or httpfields overload: onWebsocketHandshakeReceivedAsClient
 	}
 
 	@Override
 	public void onMessage( String message ) {
 		System.out.println( "received: " + message );
-		// send( "you said: " + message );
+	}
+
+	@Override
+	public void onFragment( Framedata fragment ) {
+		System.out.println( "received fragment: " + fragment );
 	}
 
 	@Override
diff --git a/src/main/java/org/java_websocket/server/WebSocketServer.java b/src/main/java/org/java_websocket/server/WebSocketServer.java
@@ -36,6 +36,7 @@
 import org.java_websocket.WrappedByteChannel;
 import org.java_websocket.drafts.Draft;
 import org.java_websocket.framing.CloseFrame;
+import org.java_websocket.framing.Framedata;
 import org.java_websocket.handshake.ClientHandshake;
 import org.java_websocket.handshake.Handshakedata;
 
@@ -472,6 +473,12 @@ public final void onWebsocketMessage( WebSocket conn, String message ) {
 		onMessage( conn, message );
 	}
 
+	@Override
+	@Deprecated
+	public/*final*/void onWebsocketMessageFragment( WebSocket conn, Framedata frame ) {// onFragment should be overloaded instead
+		onFragment( conn, frame );
+	}
+
 	@Override
 	public final void onWebsocketMessage( WebSocket conn, ByteBuffer blob ) {
 		onMessage( conn, blob );
@@ -626,7 +633,13 @@ public InetSocketAddress getRemoteSocketAddress( WebSocket conn ) {
 	 * @see #onMessage(WebSocket, String)
 	 **/
 	public void onMessage( WebSocket conn, ByteBuffer message ) {
-	};
+	}
+
+	/**
+	 * @see WebSocket#sendFragmentedFrame(org.java_websocket.framing.Framedata.Opcode, ByteBuffer, boolean)
+	 */
+	public void onFragment( WebSocket conn, Framedata fragment ) {
+	}
 
 	public class WebSocketWorker extends Thread {
 
