Make WebSocketClient default to DRAFT76. Throw an exception when a Client is initialized with an AUTO draft argument.

TooTallNate · TooTallNate · commit 2f819b410f96 · 2010-10-16T12:02:50.000-07:00
diff --git a/example/ChatClient.java b/example/ChatClient.java
@@ -13,14 +13,15 @@
 import javax.swing.JTextField;
 
 import net.tootallnate.websocket.WebSocketClient;
+import net.tootallnate.websocket.WebSocketDraft;
 
 /**
  * A barebones chat client that uses the WebSocket protocol.
  */
 public class ChatClient extends WebSocketClient {
     private final JTextArea ta;
 
-    public ChatClient(URI uri, JTextArea ta, Draft draft) {
+    public ChatClient(URI uri, JTextArea ta, WebSocketDraft draft) {
         super(uri, draft);
         this.ta = ta;
     }
@@ -114,7 +115,7 @@ public void actionPerformed(ActionEvent e) {
                 connect.setEnabled(false);
                 uriField.setEditable(false);
                 try {
-                    cc = new ChatClient(new URI(uriField.getText()), area, Draft.DRAFT76);
+                    cc = new ChatClient(new URI(uriField.getText()), area, WebSocketDraft.AUTO);
                     cc.connect();
                 } catch (URISyntaxException ex) {
                     area.append(uriField.getText() + " is not a valid WebSocket URI\n");
diff --git a/example/ChatServer.java b/example/ChatServer.java
@@ -1,6 +1,7 @@
 import java.io.IOException;
 
 import net.tootallnate.websocket.WebSocket;
+import net.tootallnate.websocket.WebSocketDraft;
 import net.tootallnate.websocket.WebSocketServer;
 
 /**
@@ -9,7 +10,7 @@
 public class ChatServer extends WebSocketServer {
 
     public ChatServer(int port) {
-        super(port, Draft.AUTO);
+        super(port);
     }
 
     public void onClientOpen(WebSocket conn) {
@@ -19,7 +20,6 @@ public void onClientOpen(WebSocket conn) {
             ex.printStackTrace();
         }
         System.out.println(conn + " entered the room!");
-        
     }
 
     public void onClientClose(WebSocket conn) {
diff --git a/src/net/tootallnate/websocket/WebSocketClient.java b/src/net/tootallnate/websocket/WebSocketClient.java
@@ -67,7 +67,7 @@ public abstract class WebSocketClient implements Runnable, WebSocketListener {
 
   // CONSTRUCTORS ////////////////////////////////////////////////////////////
   public WebSocketClient(URI serverURI) {
-    this(serverURI, WebSocketDraft.AUTO);
+    this(serverURI, WebSocketDraft.DRAFT76);
   }
 
   /**
@@ -78,6 +78,9 @@ public WebSocketClient(URI serverURI) {
    */
   public WebSocketClient(URI serverUri, WebSocketDraft draft) {
     this.uri = serverUri;
+    if (draft == WebSocketDraft.AUTO) {
+      throw new IllegalArgumentException(draft + " is meant for `WebSocketServer` only!");
+    }
     this.draft = draft;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`import java.io.IOException;`
`2`	`2`
`3`	`3`	`import net.tootallnate.websocket.WebSocket;`
	`4`	`+import net.tootallnate.websocket.WebSocketDraft;`
`4`	`5`	`import net.tootallnate.websocket.WebSocketServer;`
`5`	`6`
`6`	`7`	`/**`
`@@ -9,7 +10,7 @@`
`9`	`10`	`public class ChatServer extends WebSocketServer {`
`10`	`11`
`11`	`12`	`public ChatServer(int port) {`
`12`		`- super(port, Draft.AUTO);`
	`13`	`+ super(port);`
`13`	`14`	`}`
`14`	`15`
`15`	`16`	`public void onClientOpen(WebSocket conn) {`
`@@ -19,7 +20,6 @@ public void onClientOpen(WebSocket conn) {`
`19`	`20`	`ex.printStackTrace();`
`20`	`21`	`}`
`21`	`22`	`System.out.println(conn + " entered the room!");`
`22`		`-`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public void onClientClose(WebSocket conn) {`