Skip to content

Commit e1676f5

Browse files
committed
Added method onFragment to replace onWebsocketMessageFragment and let
the main examples overload it.
1 parent 7ea8526 commit e1676f5

File tree

3 files changed

+35
-4
lines changed

3 files changed

+35
-4
lines changed

src/main/example/ChatServer.java

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import org.java_websocket.WebSocket;
99
import org.java_websocket.WebSocketImpl;
10+
import org.java_websocket.framing.Framedata;
1011
import org.java_websocket.handshake.ClientHandshake;
1112
import org.java_websocket.server.WebSocketServer;
1213

@@ -41,6 +42,11 @@ public void onMessage( WebSocket conn, String message ) {
4142
System.out.println( conn + ": " + message );
4243
}
4344

45+
@Override
46+
public void onFragment( WebSocket conn, Framedata fragment ) {
47+
System.out.println( "received fragment: " + fragment );
48+
}
49+
4450
public static void main( String[] args ) throws InterruptedException , IOException {
4551
WebSocketImpl.DEBUG = true;
4652
int port = 8887; // 843 flash policy port
@@ -56,9 +62,16 @@ public static void main( String[] args ) throws InterruptedException , IOExcepti
5662
while ( true ) {
5763
String in = sysin.readLine();
5864
s.sendToAll( in );
65+
if( in.equals( "exit" ) ) {
66+
s.stop();
67+
break;
68+
} else if( in.equals( "restart" ) ) {
69+
s.stop();
70+
s.start();
71+
break;
72+
}
5973
}
6074
}
61-
6275
@Override
6376
public void onError( WebSocket conn, Exception ex ) {
6477
ex.printStackTrace();

src/main/example/ExampleClient.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import org.java_websocket.client.WebSocketClient;
55
import org.java_websocket.drafts.Draft;
66
import org.java_websocket.drafts.Draft_10;
7+
import org.java_websocket.framing.Framedata;
78
import org.java_websocket.handshake.ServerHandshake;
89

910
/** 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 ) {
2021
@Override
2122
public void onOpen( ServerHandshake handshakedata ) {
2223
System.out.println( "opened connection" );
23-
// if you pan to refuse connection based on ip or httpfields overload: onWebsocketHandshakeReceivedAsClient
24+
// if you plan to refuse connection based on ip or httpfields overload: onWebsocketHandshakeReceivedAsClient
2425
}
2526

2627
@Override
2728
public void onMessage( String message ) {
2829
System.out.println( "received: " + message );
29-
// send( "you said: " + message );
30+
}
31+
32+
@Override
33+
public void onFragment( Framedata fragment ) {
34+
System.out.println( "received fragment: " + fragment );
3035
}
3136

3237
@Override

src/main/java/org/java_websocket/server/WebSocketServer.java

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import org.java_websocket.WrappedByteChannel;
3737
import org.java_websocket.drafts.Draft;
3838
import org.java_websocket.framing.CloseFrame;
39+
import org.java_websocket.framing.Framedata;
3940
import org.java_websocket.handshake.ClientHandshake;
4041
import org.java_websocket.handshake.Handshakedata;
4142

@@ -472,6 +473,12 @@ public final void onWebsocketMessage( WebSocket conn, String message ) {
472473
onMessage( conn, message );
473474
}
474475

476+
@Override
477+
@Deprecated
478+
public/*final*/void onWebsocketMessageFragment( WebSocket conn, Framedata frame ) {// onFragment should be overloaded instead
479+
onFragment( conn, frame );
480+
}
481+
475482
@Override
476483
public final void onWebsocketMessage( WebSocket conn, ByteBuffer blob ) {
477484
onMessage( conn, blob );
@@ -626,7 +633,13 @@ public InetSocketAddress getRemoteSocketAddress( WebSocket conn ) {
626633
* @see #onMessage(WebSocket, String)
627634
**/
628635
public void onMessage( WebSocket conn, ByteBuffer message ) {
629-
};
636+
}
637+
638+
/**
639+
* @see WebSocket#sendFragmentedFrame(org.java_websocket.framing.Framedata.Opcode, ByteBuffer, boolean)
640+
*/
641+
public void onFragment( WebSocket conn, Framedata fragment ) {
642+
}
630643

631644
public class WebSocketWorker extends Thread {
632645

0 commit comments

Comments
 (0)