Set BOB source/target to JDK 5 (AKA 1.5)

Minor bugfixes/code cleanup on BOB
Add/Cleanup some documentation to streaming lib javadocs

apps/BOB/nbproject/project.properties

@@ -40,8 +40,8 @@ javac.classpath=\
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
-javac.source=1.4
+javac.source=1.5
-javac.target=1.4
+javac.target=1.5
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\

apps/BOB/src/net/i2p/BOB/I2Plistener.java

@@ -58,16 +58,15 @@ public class I2Plistener implements Runnable {
 		this.info = info;
 		this._log = _log;
 		this.socketManager = S;
-		serverSocket = socketManager.getServerSocket();
+		serverSocket = this.socketManager.getServerSocket();
 		tgwatch = 1;
 	}
 
 	/**
 	 * Simply listen on I2P port, and thread connections
 	 *
-	 * @throws RuntimeException
 	 */
-	public void run() throws RuntimeException {
+	public void run() {
 		boolean g = false;
 		I2PSocket sessSocket = null;
 
@@ -123,6 +122,7 @@ public class I2Plistener implements Runnable {
 				// nop
 				}
 		}
+
 		//		System.out.println("STOP Thread count " + Thread.activeCount());
 		// need to kill off the socket manager too.
 		I2PSession session = socketManager.getSession();
@@ -134,7 +134,5 @@ public class I2Plistener implements Runnable {
 			}
 //			System.out.println("destroySession Thread count " + Thread.activeCount());
 		}
-
-
 	}
 }

apps/BOB/src/net/i2p/BOB/Main.java

@@ -21,7 +21,6 @@
  *
  * ...for any additional details and liscense questions.
  */
-
 package net.i2p.BOB;
 
 import net.i2p.client.streaming.RetransmissionTimer;
@@ -33,7 +32,6 @@ import net.i2p.util.SimpleTimer;
  * @author sponge
  *
  */
-
 public class Main {
 
 	/**

apps/BOB/src/net/i2p/BOB/TCPlistener.java

@@ -65,10 +65,11 @@ public class TCPlistener implements Runnable {
 
 	/**
 	 * Simply listen on TCP port, and thread connections
-	 * @throws java.lang.RuntimeException
+	 *
 	 */
-	public void run() throws RuntimeException {
+	public void run() {
 		boolean g = false;
+		boolean spin = true;
 		database.getReadLock();
 		info.getReadLock();
 		if(info.exists("OUTPORT")) {
@@ -81,7 +82,6 @@ public class TCPlistener implements Runnable {
 			listener.setSoTimeout(1000);
 			info.releaseReadLock();
 			database.releaseReadLock();
-		boolean spin = true;
 			while(spin) {
 				database.getReadLock();
 				info.getReadLock();
@@ -105,7 +105,20 @@ public class TCPlistener implements Runnable {
 			}
 			listener.close();
 		} catch(IOException ioe) {
-			// throw new RuntimeException(ioe);
+			// Fatal failure, cause a stop event
+			database.getReadLock();
+			info.getReadLock();
+			spin = info.get("RUNNING").equals(Boolean.TRUE);
+			info.releaseReadLock();
+			database.releaseReadLock();
+			if(spin) {
+				database.getWriteLock();
+				info.getWriteLock();
+				info.add("STOPPING", new Boolean(true));
+				info.add("RUNNING", new Boolean(false));
+				info.releaseWriteLock();
+				database.releaseWriteLock();
+			}
 		}
 
 //System.out.println("STOP!");

apps/BOB/src/net/i2p/BOB/UDPIOthread.java

@@ -21,7 +21,6 @@
  *
  * ...for any additional details and liscense questions.
  */
-
 package net.i2p.BOB;
 
 import java.io.DataInputStream;
@@ -34,7 +33,6 @@ import net.i2p.client.I2PSessionListener;
 import net.i2p.data.Destination;
 import net.i2p.util.Log;
 
-
 /**
  * UDP IO on I2P
  *
@@ -62,13 +60,15 @@ public class UDPIOthread implements I2PSessionListener, Runnable {
 	 * @param _log
 	 * @param socket
 	 * @param _session
- */	UDPIOthread(nickname info, Log _log, Socket socket, I2PSession _session) {
+	 */
+	UDPIOthread(nickname info, Log _log, Socket socket, I2PSession _session) {
 		this.info = info;
 		this._log = _log;
 		this.socket = socket;
 		this._session = _session;
 
 	}
+
 	/**
 	 *
 	 */
@@ -103,6 +103,7 @@ public class UDPIOthread implements I2PSessionListener, Runnable {
 			}
 		}
 	}
+
 	/**
 	 *
 	 * @param session
@@ -123,7 +124,6 @@ public class UDPIOthread implements I2PSessionListener, Runnable {
 	}
 
 	// Great, can these be used to kill ourselves.
-
 	/** required by {@link I2PSessionListener I2PSessionListener} to notify of disconnect */
 	public void disconnected(I2PSession session) {
 		_log.debug("Disconnected");

apps/BOB/src/net/i2p/BOB/doCMDS.java

@@ -70,6 +70,9 @@ public class doCMDS implements Runnable {
 	private static final String P_RUNNING = "RUNNING";
 	private static final String P_STARTING = "STARTING";
 	private static final String P_STOPPING = "STOPPING";
+//	private static final String P_INSTATE = "INSTATE";
+//	private static final String P_OUTSTATE = "OUTSTATE";
+
 	/* command strings */
 	private static final String C_help = "help";
 	private static final String C_clear = "clear";
@@ -490,6 +493,8 @@ public class doCMDS implements Runnable {
 							wlock();
 							database.add(Arg, nickinfo);
 							nickinfo.add(P_NICKNAME, Arg);
+//							nickinfo.add(P_INSTATE,new Boolean(false));
+//							nickinfo.add(P_OUTSTATE,new Boolean(false));
 							nickinfo.add(P_STARTING, Boolean.FALSE);
 							nickinfo.add(P_RUNNING, Boolean.FALSE);
 							nickinfo.add(P_STOPPING, Boolean.FALSE);

apps/BOB/src/net/i2p/BOB/nickname.java

@@ -34,6 +34,7 @@ public class nickname {
 	private volatile Object[][] data;
 	private volatile int index,  writersWaiting,  readers;
 	private volatile boolean writingInProgress;
+
 	/**
 	 * make initial NULL object
 	 *

apps/streaming/java/src/net/i2p/client/streaming/ConnectionManager.java

@@ -113,7 +113,7 @@ public class ConnectionManager {
     public void setAllowIncomingConnections(boolean allow) { 
         _connectionHandler.setActive(allow);
     }
-    /** should we acceot connections, or just reject everyone? */
+    /** @return if we should accept connections */
     public boolean getAllowIncomingConnections() {
         return _connectionHandler.getActive();
     }

apps/streaming/java/src/net/i2p/client/streaming/I2PSocketManagerFull.java

@@ -181,6 +181,7 @@ public class I2PSocketManagerFull implements I2PSocketManager {
      * @param peer Destination to connect to
      * @param options I2P socket options to be used for connecting
      *
+     * @return I2PSocket if successful
      * @throws NoRouteToHostException if the peer is not found or not reachable
      * @throws I2PException if there is some other I2P-related problem
      */
@@ -215,6 +216,7 @@ public class I2PSocketManagerFull implements I2PSocketManager {
      *
      * @param peer Destination to connect to
      *
+     * @return I2PSocket if successful
      * @throws NoRouteToHostException if the peer is not found or not reachable
      * @throws I2PException if there is some other I2P-related problem
      */