#1069: Replaced SimpleScheduler with SimpleTimer2 in a few places

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

@@ -38,7 +38,6 @@ import net.i2p.I2PAppContext;
 import net.i2p.app.*;
 import net.i2p.client.I2PClient;
 import net.i2p.util.I2PAppThread;
-import net.i2p.util.SimpleScheduler;
 import net.i2p.util.SimpleTimer2;
 
 /**
@@ -214,9 +213,7 @@ public class BOB implements Runnable, ClientApp {
 		// Re-reading the config file in each thread is pretty damn stupid.
 		String configLocation = System.getProperty(PROP_CONFIG_LOCATION, "bob.config");
 		// This is here just to ensure there is no interference with our threadgroups.
-		SimpleScheduler Y1 = SimpleScheduler.getInstance();
 		SimpleTimer2 Y2 = SimpleTimer2.getInstance();
-		i = Y1.hashCode();
 		i = Y2.hashCode();
 		{
 			File cfg = new File(configLocation);

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

@@ -15,7 +15,6 @@
  */
 package net.i2p.BOB;
 
-import net.i2p.util.SimpleScheduler;
 import net.i2p.util.SimpleTimer2;
 
 /**
@@ -31,12 +30,10 @@ public class Main {
 	 */
 	public static void main(String[] args) {
 		// THINK THINK THINK THINK THINK THINK
-		SimpleScheduler Y1 = SimpleScheduler.getInstance();
 		SimpleTimer2 Y2 = SimpleTimer2.getInstance();
 
 		BOB.main(args);
 
 		Y2.stop();
-		Y1.stop();
 	}
 }

apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java

@@ -30,7 +30,6 @@ import java.util.concurrent.atomic.AtomicLong;
 import net.i2p.I2PAppContext;
 import net.i2p.util.I2PAppThread;
 import net.i2p.util.Log;
-//import net.i2p.util.SimpleScheduler;
 //import net.i2p.util.SimpleTimer;
 
 class PeerConnectionOut implements Runnable
@@ -480,7 +479,6 @@ class PeerConnectionOut implements Runnable
     m.len = length;
     // since we have the data already loaded, queue a timeout to remove it
     // no longer prefetched
-    //SimpleScheduler.getInstance().addEvent(new RemoveTooSlow(m), SEND_TIMEOUT);
     addMessage(m);
   }
 

apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java

@@ -2241,7 +2241,7 @@ public class SnarkManager implements CompleteListener {
      * Stop all running torrents, and close the tunnel after a delay
      * to allow for announces.
      * If called at router shutdown via Jetty shutdown hook -> webapp destroy() -> stop(),
-     * the tunnel won't actually be closed as the SimpleScheduler is already shutdown
+     * the tunnel won't actually be closed as the SimpleTimer2 is already shutdown
      * or will be soon, so we delay a few seconds inline.
      * @param finalShutdown if true, sleep at the end if any torrents were running
      * @since 0.9.1

apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionHandler.java

@@ -96,7 +96,7 @@ class ConnectionHandler {
         // also check if expiration of the head is long past for overload detection with peek() ?
         boolean success = _synQueue.offer(packet); // fail immediately if full
         if (success) {
-            _context.simpleScheduler().addEvent(new TimeoutSyn(packet), _acceptTimeout);
+            _context.simpleTimer2().addEvent(new TimeoutSyn(packet), _acceptTimeout);
         } else {
             if (_log.shouldLog(Log.WARN))
                 _log.warn("Dropping new SYN request, as the queue is full");

apps/streaming/java/src/net/i2p/client/streaming/impl/MessageOutputStream.java

@@ -233,7 +233,7 @@ class MessageOutputStream extends OutputStream {
             // no need to be overly worried about duplicates - it would just 
             // push it further out
             if (!_enqueued) {
-                // Maybe we could just use schedule() here - or even SimpleScheduler - not sure...
+                // Maybe we could just use schedule() here - or even SimpleTimer2 - not sure...
                 // To be safe, use forceReschedule() so we don't get lots of duplicates
                 // We've seen the queue blow up before, maybe it was this before the rewrite...
                 // So perhaps it IS wise to be "overly worried" ...