removing android imports, adding onIOError abstract method

Author: Kristijan Sedlak

src/net/tootallnate/websocket/WebSocket.java

@@ -5,7 +5,6 @@
 import java.nio.ByteBuffer;
 import java.nio.channels.NotYetConnectedException;
 import java.nio.channels.SocketChannel;
-import java.nio.charset.Charset;
 import java.security.NoSuchAlgorithmException;
 import java.util.concurrent.BlockingQueue;
 

src/net/tootallnate/websocket/WebSocketClient.java

@@ -14,8 +14,6 @@
 import java.util.Set;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import android.util.Log;
-
 /**
  * The <tt>WebSocketClient</tt> is an abstract class that expects a valid
  * "ws://" URI to connect to. When connected, an instance recieves important
@@ -133,12 +131,28 @@ public void close() throws IOException
    * @throws IOException When socket related I/O errors occur.
    */
   public void send(String text) throws IOException {
-    if (conn != null && client.isConnected()) 
+    if (conn != null) 
     {
       conn.send(text);
     }
   }
 
+  /**
+   * Reinitializes and prepares the class to be used for reconnect.
+   * @return
+   */
+  public void releaseAndInitialize()
+  {
+	  conn = null;
+	  client = null;
+	  selector = null;
+	  running = false;
+	  draft = null;
+	  number1 = 0;
+	  number2 = 0;
+	  key3 = null;
+  }
+  
   private boolean tryToConnect(InetSocketAddress remote) {
     // The WebSocket constructor expects a SocketChannel that is
     // non-blocking, and has a Selector attached to it.
@@ -154,7 +168,7 @@ private boolean tryToConnect(InetSocketAddress remote) {
       client.register(selector, SelectionKey.OP_CONNECT);
 
     } catch (IOException ex) {
-    	onIOError(ex);
+    	onIOError(conn, ex);
       return false;
     }
 
@@ -184,7 +198,7 @@ public void run() {
           }
         }
       } catch (IOException ex) {
-    	  onIOError(ex);
+    	  onIOError(conn, ex);
       } catch (NoSuchAlgorithmException ex) {
         ex.printStackTrace();
       }
@@ -354,38 +368,23 @@ public void onClose(WebSocket conn)
 	  {
 		  onClose();
 	  }
-
-	  conn = null;
-	  client = null;
-	  selector = null;
-	  running = false;
-	  draft = null;
-	  number1 = 0;
-	  number2 = 0;
-	  key3 = null;
+	  
+	  releaseAndInitialize();
   }
 
   /**
-   * Triggered on any IOException error. This method should be overridden for custom 
-   * implementation of error handling (e.g. when network is not available). 
-   * @param ex
+   * Calls subclass' implementation of <var>onIOError</var>.
+   * @param conn
    */
-   public void onIOError(IOException ex) 
-   {
- 	  ex.printStackTrace();
- 	  
- 	  try 
- 	  {
-		this.close();
- 	  } 
- 	  catch (IOException e) 
- 	  {
-		onIOError(ex);
- 	  }
-   }
+  public void onIOError(WebSocket conn, IOException ex) 
+  {
+	  releaseAndInitialize();
+	  onIOError(ex);
+  }
 
   // ABTRACT METHODS /////////////////////////////////////////////////////////
   public abstract void onMessage(String message);
   public abstract void onOpen();
   public abstract void onClose();
+  public abstract void onIOError(IOException ex);
 }

src/net/tootallnate/websocket/WebSocketListener.java

@@ -46,7 +46,14 @@ interface WebSocketListener {
    * @param conn The <tt>WebSocket</tt> instance this event is occuring on.
    */
   public void onClose(WebSocket conn);
-  
+
+  /**
+   * Triggered on any IOException error. This method should be overridden for custom 
+   * implementation of error handling (e.g. when network is not available). 
+   * @param ex
+   */
+  public void onIOError(IOException ex);
+
   /**
    * Called to retrieve the Draft of this listener.
    */

src/net/tootallnate/websocket/WebSocketServer.java

@@ -415,25 +415,6 @@ public void onClose(WebSocket conn) {
     }
   }
 
-  /**
-   * Triggered on any IOException error. This method should be overridden for custom 
-   * implementation of error handling (e.g. when network is not available). 
-   * @param ex
-   */
-  public void onIOError(IOException ex) 
-  {
-	  ex.printStackTrace();
-	  
-	  try 
-	  {
-		this.stop();
-	  } 
-	  catch (IOException e) 
-	  {
-		onIOError(ex);
-	  }
-  }
-
   private byte[] getPart(String key) {
     long keyNumber = Long.parseLong(key.replaceAll("[^0-9]",""));
     long keySpace = key.split("\u0020").length - 1;
@@ -450,4 +431,6 @@ private byte[] getPart(String key) {
   public abstract void onClientOpen(WebSocket conn);
   public abstract void onClientClose(WebSocket conn);
   public abstract void onClientMessage(WebSocket conn, String message);
+  public abstract void onIOError(IOException ex);
+
 }