Skip to content

Commit 7dc0bc3

Browse files
DavidiusdadiDavidiusdadi
committed
moved server and client specific code into own packages (TooTallNate#86)
1 parent 8ef67b4 commit 7dc0bc3

9 files changed

Lines changed: 19 additions & 9 deletions

File tree

‎example/AutobahnClientTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import java.nio.ByteBuffer;
66

77
import org.java_websocket.WebSocket;
8-
import org.java_websocket.WebSocketClient;
8+
import org.java_websocket.client.WebSocketClient;
99
import org.java_websocket.drafts.Draft;
1010
import org.java_websocket.drafts.Draft_17;
1111
import org.java_websocket.handshake.ServerHandshake;

‎example/AutobahnServerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
import java.util.Collections;
55

66
import org.java_websocket.WebSocket;
7-
import org.java_websocket.WebSocketServer;
87
import org.java_websocket.drafts.Draft;
98
import org.java_websocket.drafts.Draft_17;
109
import org.java_websocket.handshake.ClientHandshake;
10+
import org.java_websocket.server.WebSocketServer;
1111

1212
public class AutobahnServerTest extends WebSocketServer {
1313
private static int counter = 0;

‎example/ChatClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import javax.swing.JTextField;
1515

1616
import org.java_websocket.WebSocket;
17-
import org.java_websocket.WebSocketClient;
17+
import org.java_websocket.client.WebSocketClient;
1818
import org.java_websocket.drafts.Draft;
1919
import org.java_websocket.drafts.Draft_10;
2020
import org.java_websocket.drafts.Draft_17;

‎example/ChatServer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import java.util.Set;
77

88
import org.java_websocket.WebSocket;
9-
import org.java_websocket.WebSocketServer;
109
import org.java_websocket.handshake.ClientHandshake;
10+
import org.java_websocket.server.WebSocketServer;
1111

1212
/**
1313
* A simple WebSocketServer implementation. Keeps track of a "chatroom".

‎example/ExampleClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import java.net.URI;
22
import java.net.URISyntaxException;
33

4-
import org.java_websocket.WebSocketClient;
4+
import org.java_websocket.client.WebSocketClient;
55
import org.java_websocket.drafts.Draft;
66
import org.java_websocket.drafts.Draft_10;
77
import org.java_websocket.handshake.ServerHandshake;

‎example/ServerStressTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import javax.swing.event.ChangeEvent;
2222
import javax.swing.event.ChangeListener;
2323

24-
import org.java_websocket.WebSocketClient;
24+
import org.java_websocket.client.WebSocketClient;
2525

2626
public class ServerStressTest extends JFrame {
2727
private JSlider clients;

‎src/org/java_websocket/WebSocketImpl.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import java.util.concurrent.LinkedBlockingQueue;
1414
import java.util.concurrent.atomic.AtomicLong;
1515

16-
import org.java_websocket.WebSocketServer.WebSocketWorker;
16+
import org.java_websocket.client.WebSocketClient;
1717
import org.java_websocket.drafts.Draft;
1818
import org.java_websocket.drafts.Draft.CloseHandshakeType;
1919
import org.java_websocket.drafts.Draft.HandshakeState;
@@ -34,6 +34,8 @@
3434
import org.java_websocket.handshake.Handshakedata;
3535
import org.java_websocket.handshake.ServerHandshake;
3636
import org.java_websocket.handshake.ServerHandshakeBuilder;
37+
import org.java_websocket.server.WebSocketServer;
38+
import org.java_websocket.server.WebSocketServer.WebSocketWorker;
3739
import org.java_websocket.util.Charsetfunctions;
3840

3941
/**

src/org/java_websocket/WebSocketClient.java renamed to src/org/java_websocket/client/WebSocketClient.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.java_websocket;
1+
package org.java_websocket.client;
22

33
import java.io.IOException;
44
import java.net.InetSocketAddress;
@@ -17,6 +17,10 @@
1717
import java.util.concurrent.locks.Lock;
1818
import java.util.concurrent.locks.ReentrantLock;
1919

20+
import org.java_websocket.WebSocket;
21+
import org.java_websocket.WebSocketAdapter;
22+
import org.java_websocket.WebSocketFactory;
23+
import org.java_websocket.WebSocketImpl;
2024
import org.java_websocket.drafts.Draft;
2125
import org.java_websocket.drafts.Draft_10;
2226
import org.java_websocket.exceptions.InvalidHandshakeException;

src/org/java_websocket/WebSocketServer.java renamed to src/org/java_websocket/server/WebSocketServer.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.java_websocket;
1+
package org.java_websocket.server;
22

33
import java.io.IOException;
44
import java.net.InetSocketAddress;
@@ -21,6 +21,10 @@
2121
import java.util.concurrent.LinkedBlockingQueue;
2222
import java.util.concurrent.atomic.AtomicInteger;
2323

24+
import org.java_websocket.WebSocket;
25+
import org.java_websocket.WebSocketAdapter;
26+
import org.java_websocket.WebSocketFactory;
27+
import org.java_websocket.WebSocketImpl;
2428
import org.java_websocket.drafts.Draft;
2529
import org.java_websocket.framing.CloseFrame;
2630
import org.java_websocket.handshake.ClientHandshake;

0 commit comments

Comments
 (0)