Skip to content

Commit d72326a

Browse files
DavidiusdadiDavidiusdadi
committed
updated imports
1 parent dc05941 commit d72326a

29 files changed

+103
-58
lines changed

‎src/org/java_websocket/WebSocket.java‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import java.util.concurrent.BlockingQueue;
1212
import java.util.concurrent.LinkedBlockingQueue;
1313

14-
import org.java_websocket.Draft.HandshakeState;
15-
import org.java_websocket.Framedata.Opcode;
14+
import org.java_websocket.drafts.Draft;
15+
import org.java_websocket.drafts.Draft.HandshakeState;
1616
import org.java_websocket.drafts.Draft_10;
1717
import org.java_websocket.drafts.Draft_17;
1818
import org.java_websocket.drafts.Draft_75;
@@ -21,6 +21,16 @@
2121
import org.java_websocket.exeptions.InvalidDataException;
2222
import org.java_websocket.exeptions.InvalidFrameException;
2323
import org.java_websocket.exeptions.InvalidHandshakeException;
24+
import org.java_websocket.framing.CloseFrame;
25+
import org.java_websocket.framing.CloseFrameBuilder;
26+
import org.java_websocket.framing.Framedata;
27+
import org.java_websocket.framing.Framedata.Opcode;
28+
import org.java_websocket.handshake.ClientHandshake;
29+
import org.java_websocket.handshake.ClientHandshakeBuilder;
30+
import org.java_websocket.handshake.Handshakedata;
31+
import org.java_websocket.handshake.ServerHandshake;
32+
import org.java_websocket.handshake.ServerHandshakeBuilder;
33+
import org.java_websocket.util.Charsetfunctions;
2434

2535
/**
2636
* Represents one end (client or server) of a single WebSocket connection.

‎src/org/java_websocket/WebSocketAdapter.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
package org.java_websocket;
22

3-
import org.java_websocket.Framedata.Opcode;
3+
import org.java_websocket.drafts.Draft;
44
import org.java_websocket.exeptions.InvalidDataException;
5+
import org.java_websocket.framing.Framedata;
6+
import org.java_websocket.framing.Framedata.Opcode;
7+
import org.java_websocket.framing.FramedataImpl1;
8+
import org.java_websocket.handshake.ClientHandshake;
9+
import org.java_websocket.handshake.HandshakeImpl1Server;
10+
import org.java_websocket.handshake.Handshakedata;
11+
import org.java_websocket.handshake.ServerHandshake;
12+
import org.java_websocket.handshake.ServerHandshakeBuilder;
513

614
public abstract class WebSocketAdapter implements WebSocketListener {
715

‎src/org/java_websocket/WebSocketClient.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,13 @@
1414
import java.util.concurrent.locks.Lock;
1515
import java.util.concurrent.locks.ReentrantLock;
1616

17+
import org.java_websocket.drafts.Draft;
1718
import org.java_websocket.drafts.Draft_10;
1819
import org.java_websocket.exeptions.InvalidHandshakeException;
20+
import org.java_websocket.framing.CloseFrame;
21+
import org.java_websocket.handshake.HandshakeImpl1Client;
22+
import org.java_websocket.handshake.Handshakedata;
23+
import org.java_websocket.handshake.ServerHandshake;
1924

2025
/**
2126
* The <tt>WebSocketClient</tt> is an abstract class that expects a valid

‎src/org/java_websocket/WebSocketListener.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
package org.java_websocket;
22

3+
import org.java_websocket.drafts.Draft;
34
import org.java_websocket.exeptions.InvalidDataException;
5+
import org.java_websocket.framing.Framedata;
6+
import org.java_websocket.handshake.ClientHandshake;
7+
import org.java_websocket.handshake.Handshakedata;
8+
import org.java_websocket.handshake.ServerHandshake;
9+
import org.java_websocket.handshake.ServerHandshakeBuilder;
410

511
/**
612
* Implemented by <tt>WebSocketClient</tt> and <tt>WebSocketServer</tt>.

‎src/org/java_websocket/WebSocketServer.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
import java.util.Set;
1414
import java.util.concurrent.CopyOnWriteArraySet;
1515

16+
import org.java_websocket.drafts.Draft;
17+
import org.java_websocket.framing.CloseFrame;
18+
import org.java_websocket.handshake.ClientHandshake;
19+
import org.java_websocket.handshake.Handshakedata;
20+
1621
/**
1722
* <tt>WebSocketServer</tt> is an abstract class that only takes care of the
1823
* HTTP handshake portion of WebSockets. It's up to a subclass to add

‎src/org/java_websocket/drafts/Draft.java‎

Lines changed: 12 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.drafts;
22

33
import java.nio.ByteBuffer;
44
import java.util.Collections;
@@ -11,6 +11,17 @@
1111
import org.java_websocket.exeptions.InvalidDataException;
1212
import org.java_websocket.exeptions.InvalidHandshakeException;
1313
import org.java_websocket.exeptions.LimitExedeedException;
14+
import org.java_websocket.framing.CloseFrame;
15+
import org.java_websocket.framing.Framedata;
16+
import org.java_websocket.handshake.ClientHandshake;
17+
import org.java_websocket.handshake.ClientHandshakeBuilder;
18+
import org.java_websocket.handshake.HandshakeBuilder;
19+
import org.java_websocket.handshake.HandshakeImpl1Client;
20+
import org.java_websocket.handshake.HandshakeImpl1Server;
21+
import org.java_websocket.handshake.Handshakedata;
22+
import org.java_websocket.handshake.ServerHandshake;
23+
import org.java_websocket.handshake.ServerHandshakeBuilder;
24+
import org.java_websocket.util.Charsetfunctions;
1425

1526
/**
1627
* Base class for everything of a websocket specification which is not common such as the way the handshake is read or frames are transfered.

‎src/org/java_websocket/drafts/Draft_10.java‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,25 @@
88
import java.util.List;
99
import java.util.Random;
1010

11-
import org.java_websocket.Base64;
12-
import org.java_websocket.Charsetfunctions;
13-
import org.java_websocket.ClientHandshake;
14-
import org.java_websocket.ClientHandshakeBuilder;
15-
import org.java_websocket.CloseFrameBuilder;
16-
import org.java_websocket.Draft;
17-
import org.java_websocket.FrameBuilder;
18-
import org.java_websocket.Framedata;
19-
import org.java_websocket.Framedata.Opcode;
20-
import org.java_websocket.FramedataImpl1;
21-
import org.java_websocket.HandshakeBuilder;
22-
import org.java_websocket.Handshakedata;
23-
import org.java_websocket.ServerHandshake;
24-
import org.java_websocket.ServerHandshakeBuilder;
2511
import org.java_websocket.WebSocket.Role;
2612
import org.java_websocket.exeptions.InvalidDataException;
2713
import org.java_websocket.exeptions.InvalidFrameException;
2814
import org.java_websocket.exeptions.InvalidHandshakeException;
2915
import org.java_websocket.exeptions.LimitExedeedException;
3016
import org.java_websocket.exeptions.NotSendableException;
17+
import org.java_websocket.framing.CloseFrameBuilder;
18+
import org.java_websocket.framing.FrameBuilder;
19+
import org.java_websocket.framing.Framedata;
20+
import org.java_websocket.framing.Framedata.Opcode;
21+
import org.java_websocket.framing.FramedataImpl1;
22+
import org.java_websocket.handshake.ClientHandshake;
23+
import org.java_websocket.handshake.ClientHandshakeBuilder;
24+
import org.java_websocket.handshake.HandshakeBuilder;
25+
import org.java_websocket.handshake.Handshakedata;
26+
import org.java_websocket.handshake.ServerHandshake;
27+
import org.java_websocket.handshake.ServerHandshakeBuilder;
28+
import org.java_websocket.util.Base64;
29+
import org.java_websocket.util.Charsetfunctions;
3130

3231
public class Draft_10 extends Draft {
3332

‎src/org/java_websocket/drafts/Draft_17.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package org.java_websocket.drafts;
22

3-
import org.java_websocket.ClientHandshake;
4-
import org.java_websocket.ClientHandshakeBuilder;
5-
import org.java_websocket.Draft.HandshakeState;
63
import org.java_websocket.exeptions.InvalidHandshakeException;
4+
import org.java_websocket.handshake.ClientHandshake;
5+
import org.java_websocket.handshake.ClientHandshakeBuilder;
76

87
public class Draft_17 extends Draft_10 {
98
@Override

‎src/org/java_websocket/drafts/Draft_75.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,19 @@
66
import java.util.List;
77
import java.util.Random;
88

9-
import org.java_websocket.Charsetfunctions;
10-
import org.java_websocket.ClientHandshake;
11-
import org.java_websocket.ClientHandshakeBuilder;
12-
import org.java_websocket.Draft;
13-
import org.java_websocket.FrameBuilder;
14-
import org.java_websocket.Framedata;
15-
import org.java_websocket.Framedata.Opcode;
16-
import org.java_websocket.FramedataImpl1;
17-
import org.java_websocket.HandshakeBuilder;
18-
import org.java_websocket.ServerHandshake;
19-
import org.java_websocket.ServerHandshakeBuilder;
209
import org.java_websocket.exeptions.InvalidDataException;
2110
import org.java_websocket.exeptions.InvalidHandshakeException;
2211
import org.java_websocket.exeptions.NotSendableException;
12+
import org.java_websocket.framing.FrameBuilder;
13+
import org.java_websocket.framing.Framedata;
14+
import org.java_websocket.framing.Framedata.Opcode;
15+
import org.java_websocket.framing.FramedataImpl1;
16+
import org.java_websocket.handshake.ClientHandshake;
17+
import org.java_websocket.handshake.ClientHandshakeBuilder;
18+
import org.java_websocket.handshake.HandshakeBuilder;
19+
import org.java_websocket.handshake.ServerHandshake;
20+
import org.java_websocket.handshake.ServerHandshakeBuilder;
21+
import org.java_websocket.util.Charsetfunctions;
2322

2423
public class Draft_75 extends Draft {
2524

‎src/org/java_websocket/drafts/Draft_76.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
import java.util.Arrays;
88
import java.util.Random;
99

10-
import org.java_websocket.ClientHandshake;
11-
import org.java_websocket.ClientHandshakeBuilder;
12-
import org.java_websocket.HandshakeBuilder;
13-
import org.java_websocket.Handshakedata;
14-
import org.java_websocket.ServerHandshake;
15-
import org.java_websocket.ServerHandshakeBuilder;
1610
import org.java_websocket.WebSocket.Role;
1711
import org.java_websocket.exeptions.IncompleteHandshakeException;
1812
import org.java_websocket.exeptions.InvalidHandshakeException;
13+
import org.java_websocket.handshake.ClientHandshake;
14+
import org.java_websocket.handshake.ClientHandshakeBuilder;
15+
import org.java_websocket.handshake.HandshakeBuilder;
16+
import org.java_websocket.handshake.Handshakedata;
17+
import org.java_websocket.handshake.ServerHandshake;
18+
import org.java_websocket.handshake.ServerHandshakeBuilder;
1919

2020
public class Draft_76 extends Draft_75 {
2121
private boolean failed = false;

0 commit comments

Comments
 (0)