/trunk/code/projects/colonet/ColonetGUI/ColonetServerInterface.java - Diff - Colony - Robotics Club

Revision 420

Connection detection between the server and applet works. When disconnected, the user has the option to reconnect.

     		return false;
+    	}
     	public String getLine () {
     		if (this.isReady()) {
     			try {
     				return reader.readLine();
     			} catch (IOException e) {
     				return null;
+    			}
     		} else {
     		  return null;
+    		}
     	public String getLine () throws IOException {
     		return reader.readLine();
+    	}
     	/**
-...
     		try {
     			socket = new Socket(strHost, port);
     			socket.setKeepAlive(true);
     		} catch (UnknownHostException e) {
     			log.append("Unknown host exception.\n");
     			err("Unknown Host Exception");
-...
+    	}
     	public void disconnect () {
+    	}
     	/*
     	*	sendString - only this method should actually write data to the output stream
     	*/
-...
     			String line;
     			while (true) {
     				try {
     					line = getLine();
     					if (line != null) {
     						parseData(line);
+    					}
     					line = reader.readLine();
     					if (line == null)
     					    throw new IOException();
     					parseData(line);
     					Thread.sleep(DATALISTENER_DELAY);
     				} catch (InterruptedException e) {
     					return;
+    				}
     				} catch (IOException e) {
     			        disconnect();
     				    colonet.disconnect();
     				    return;
+    				}
+    			}
+    		}
-...
+    	}
+    }
+    }

Also available in: Unified diff