Merge with 7edc0a6f719d64025b6446921e2de87564278f58

Author: Gottox

.classpath

@@ -4,12 +4,8 @@
 	<classpathentry kind="src" path="examples"/>
 	<classpathentry kind="src" path="tests"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry exported="true" kind="lib" path="lib/json-org.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="http://www.json.org/javadoc/"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/weberknecht"/>
+	<classpathentry kind="lib" path="libs/weberknecht-0.1.1.jar"/>
+	<classpathentry kind="lib" path="libs/json-org.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

lib/json-org.jar renamed to libs/json-org.jar

@@ -25,7 +25,6 @@
 import java.util.TimerTask;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.logging.Logger;
-
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLSocketFactory;
 
@@ -39,7 +38,7 @@
 class IOConnection implements IOCallback {
 	/** Debug logger */
 	static final Logger logger = Logger.getLogger("io.socket");
-	
+
 	public static final String FRAME_DELIMITER = "\ufffd";
 
 	/** The Constant STATE_INIT. */
@@ -67,8 +66,9 @@ class IOConnection implements IOCallback {
 	public static final String SOCKET_IO_1 = "/socket.io/1/";
 
 	/** The SSL socket factory for HTTPS connections */
-	private static SSLSocketFactory sslSocketFactory = (SSLSocketFactory)SSLSocketFactory.getDefault();
-	
+	private static SSLSocketFactory sslSocketFactory = (SSLSocketFactory) SSLSocketFactory
+			.getDefault();
+
 	/** All available connections. */
 	private static HashMap<String, List<IOConnection>> connections = new HashMap<String, List<IOConnection>>();
 
@@ -177,23 +177,6 @@ public void run() {
 			}
 		}
 	}
-	
-	private IOReconnectScheduler reconnectScheduler = new IOReconnectScheduler() {
-
-		@Override
-		public void scheduleReconnect(Timer timer, TimerTask task) {
-			timer.schedule(task, 1000);
-		}
-
-		@Override
-		public void onReconnect() {
-		}
-		
-	};
-	
-	public void setReconnectScheduler(IOReconnectScheduler scheduler) {
-		reconnectScheduler = scheduler;
-	}
 
 	/**
 	 * The Class ConnectThread. Handles connecting to the server with an
@@ -218,17 +201,17 @@ public void run() {
 			connectTransport();
 		}
 
-
 	};
 
 	/**
 	 * Set the socket factory used for SSL connections.
+	 * 
 	 * @param socketFactory
 	 */
 	public static void setDefaultSSLSocketFactory(SSLSocketFactory socketFactory) {
 		sslSocketFactory = socketFactory;
 	}
-	
+
 	/**
 	 * Creates a new connection or returns the corresponding one.
 	 * 
@@ -286,7 +269,7 @@ public void unregister(SocketIO socket) {
 		sendPlain("0::" + socket.getNamespace());
 		sockets.remove(socket.getNamespace());
 		socket.getCallback().onDisconnect();
-	
+
 		if (sockets.size() == 0) {
 			cleanup();
 		}
@@ -304,18 +287,19 @@ private void handshake() {
 			setState(STATE_HANDSHAKE);
 			url = new URL(IOConnection.this.url.toString() + SOCKET_IO_1);
 			connection = url.openConnection();
-			if(connection instanceof HttpsURLConnection) {
-				((HttpsURLConnection)connection).setSSLSocketFactory(sslSocketFactory);
+			if (connection instanceof HttpsURLConnection) {
+				((HttpsURLConnection) connection)
+						.setSSLSocketFactory(sslSocketFactory);
 			}
 			connection.setConnectTimeout(connectTimeout);
 			connection.setReadTimeout(connectTimeout);
-	
+
 			/* Setting the request headers */
 			for (Entry<Object, Object> entry : headers.entrySet()) {
 				connection.setRequestProperty((String) entry.getKey(),
 						(String) entry.getValue());
 			}
-	
+
 			InputStream stream = connection.getInputStream();
 			Scanner in = new Scanner(stream);
 			response = in.nextLine();
@@ -432,7 +416,7 @@ private void cleanup() {
 		sockets.clear();
 		synchronized (connections) {
 			List<IOConnection> con = connections.get(urlStr);
-			if (con != null && con.size() > 1)
+			if (con.size() > 1)
 				con.remove(this);
 			else
 				connections.remove(urlStr);
@@ -504,15 +488,15 @@ private void resetTimeout() {
 	 * @param message
 	 *            the message
 	 * @return the iO callback
-	 * @throws SocketIOException 
+	 * @throws SocketIOException
 	 */
 	private IOCallback findCallback(IOMessage message) throws SocketIOException {
-		if("".equals(message.getEndpoint()))
+		if ("".equals(message.getEndpoint()))
 			return this;
 		SocketIO socket = sockets.get(message.getEndpoint());
 		if (socket == null) {
-			throw new SocketIOException("Cannot find socket for '" + message.getEndpoint()
-					+ "'");
+			throw new SocketIOException("Cannot find socket for '"
+					+ message.getEndpoint() + "'");
 		}
 		return socket.getCallback();
 	}
@@ -524,9 +508,7 @@ private IOCallback findCallback(IOMessage message) throws SocketIOException {
 	 */
 	public void transportConnected() {
 		setState(STATE_READY);
-		
-		boolean isReconnecting = (reconnectTask != null);
-		if (isReconnecting) {
+		if (reconnectTask != null) {
 			reconnectTask.cancel();
 			reconnectTask = null;
 		}
@@ -554,11 +536,7 @@ public void transportConnected() {
 				while ((text = outputBuffer.poll()) != null)
 					sendPlain(text);
 			}
-			
 			this.keepAliveInQueue = false;
-			if(isReconnecting) {
-				reconnectScheduler.onReconnect();
-			}
 		}
 	}
 
@@ -587,28 +565,31 @@ public void transportError(Exception error) {
 	}
 
 	/**
-	 * {@link IOTransport} should call this function if it does not support framing. If it does, transportMessage should be used
+	 * {@link IOTransport} should call this function if it does not support
+	 * framing. If it does, transportMessage should be used
 	 * 
 	 * @param text
 	 *            the text
 	 */
 	public void transportData(String text) {
-		if(!text.startsWith(FRAME_DELIMITER)) {
+		if (!text.startsWith(FRAME_DELIMITER)) {
 			transportMessage(text);
 			return;
 		}
-		
-		Iterator<String> fragments = Arrays.asList(text.split(FRAME_DELIMITER)).listIterator(1);
+
+		Iterator<String> fragments = Arrays.asList(text.split(FRAME_DELIMITER))
+				.listIterator(1);
 		while (fragments.hasNext()) {
 			int length = Integer.parseInt(fragments.next());
 			String string = (String) fragments.next();
-			// Potential BUG: it is not defined if length is in bytes or characters. Assuming characters.
-			
-			if(length != string.length()) {
+			// Potential BUG: it is not defined if length is in bytes or
+			// characters. Assuming characters.
+
+			if (length != string.length()) {
 				error(new SocketIOException("Garbage from server: " + text));
 				return;
 			}
-			
+
 			transportMessage(string);
 		}
 	}
@@ -701,8 +682,7 @@ public void transportMessage(String text) {
 						if (args.isNull(i) == false)
 							argsArray[i] = args.get(i);
 					}
-				}
-				else
+				} else
 					argsArray = new Object[0];
 				String eventName = event.getString("name");
 				try {
@@ -776,7 +756,7 @@ public void reconnect() {
 					reconnectTask.cancel();
 				}
 				reconnectTask = new ReconnectTask();
-				reconnectScheduler.scheduleReconnect(backgroundTimer, reconnectTask);
+				backgroundTimer.schedule(reconnectTask, 1000);
 			}
 		}
 	}
@@ -892,38 +872,38 @@ public IOTransport getTransport() {
 	@Override
 	public void onDisconnect() {
 		SocketIO socket = sockets.get("");
-		if(socket != null)
+		if (socket != null)
 			socket.getCallback().onConnect();
 	}
 
 	@Override
 	public void onConnect() {
 		SocketIO socket = sockets.get("");
-		if(socket != null)
+		if (socket != null)
 			socket.getCallback().onConnect();
 	}
 
 	@Override
 	public void onMessage(String data, IOAcknowledge ack) {
-		for(SocketIO socket : sockets.values())
+		for (SocketIO socket : sockets.values())
 			socket.getCallback().onMessage(data, ack);
 	}
 
 	@Override
 	public void onMessage(JSONObject json, IOAcknowledge ack) {
-		for(SocketIO socket : sockets.values())
+		for (SocketIO socket : sockets.values())
 			socket.getCallback().onMessage(json, ack);
 	}
 
 	@Override
 	public void on(String event, IOAcknowledge ack, Object... args) {
-		for(SocketIO socket : sockets.values())
+		for (SocketIO socket : sockets.values())
 			socket.getCallback().on(event, ack, args);
 	}
 
 	@Override
 	public void onError(SocketIOException socketIOException) {
-		for(SocketIO socket : sockets.values())
+		for (SocketIO socket : sockets.values())
 			socket.getCallback().onError(socketIOException);
 	}
 }

libs/weberknecht-0.1.1.jar

@@ -330,14 +330,6 @@ public void reconnect() {
 		this.connection.reconnect();
 	}
 
-	/**
-	 * Set the reconnect scheduler. By default reconnects are attempted every
-	 * second.
-	 */
-	public void setReconnectScheduler(IOReconnectScheduler scheduler) {
-		this.connection.setReconnectScheduler(scheduler);
-	}
-	
 	/**
 	 * Returns, if a connection is established at the moment
 	 *