imports (sorry, includes alphabetizing, wee)

(shendaras)

router/java/src/net/i2p/data/i2np/DataMessage.java

@@ -12,10 +12,10 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines a message containing arbitrary bytes of data

router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java

@@ -15,13 +15,13 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.data.RouterInfo;
 import net.i2p.data.TunnelId;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines the message a router sends to another router to search for a

router/java/src/net/i2p/data/i2np/DatabaseSearchReplyMessage.java

@@ -16,12 +16,12 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.data.RouterInfo;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines the message a router sends to another router in response to a

router/java/src/net/i2p/data/i2np/DatabaseStoreMessage.java

@@ -13,13 +13,13 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.data.LeaseSet;
 import net.i2p.data.RouterInfo;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines the message a router sends to another router to test the network

router/java/src/net/i2p/data/i2np/DeliveryStatusMessage.java

@@ -13,10 +13,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Date;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines the message sent back in reply to a message when requested, containing

router/java/src/net/i2p/data/i2np/GarlicClove.java

@@ -17,8 +17,8 @@ import net.i2p.data.Certificate;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.DataStructureImpl;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Contains one deliverable message encrypted to a router along with instructions

router/java/src/net/i2p/data/i2np/GarlicMessage.java

@@ -12,10 +12,10 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines the wrapped garlic message

router/java/src/net/i2p/data/i2np/I2NPMessageHandler.java

@@ -12,11 +12,10 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Handle messages from router to router

router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java

@@ -13,13 +13,11 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Date;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.DataStructureImpl;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
-import net.i2p.util.RandomSource;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines the base message implementation.

router/java/src/net/i2p/data/i2np/I2NPMessageReader.java

@@ -11,9 +11,9 @@ package net.i2p.data.i2np;
 import java.io.IOException;
 import java.io.InputStream;
 
+import net.i2p.router.RouterContext;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 /**
  * The I2NPMessageReader reads an InputStream (using

router/java/src/net/i2p/data/i2np/SourceRouteBlock.java

@@ -14,9 +14,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Date;
 
-import net.i2p.crypto.ElGamalAESEngine;
-import net.i2p.crypto.KeyGenerator;
-import net.i2p.crypto.SessionKeyManager;
+import net.i2p.I2PAppContext;
 import net.i2p.data.Certificate;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
@@ -26,7 +24,6 @@ import net.i2p.data.PublicKey;
 import net.i2p.data.SessionKey;
 import net.i2p.data.SessionTag;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 
 /**

router/java/src/net/i2p/data/i2np/SourceRouteReplyMessage.java

@@ -13,13 +13,12 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import net.i2p.crypto.ElGamalAESEngine;
+import net.i2p.I2PAppContext;
 import net.i2p.data.Certificate;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.PrivateKey;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines a message directed by a source route block to deliver a message to an

router/java/src/net/i2p/data/i2np/TunnelCreateMessage.java

@@ -12,13 +12,13 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.Certificate;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.data.TunnelId;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines the message sent to a router to request that it participate in a

router/java/src/net/i2p/data/i2np/TunnelCreateStatusMessage.java

@@ -12,12 +12,12 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.data.TunnelId;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines the message a router sends to another router in reply to a

router/java/src/net/i2p/data/i2np/TunnelMessage.java

@@ -12,11 +12,11 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.TunnelId;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines the message sent between routers for tunnel delivery

router/java/src/net/i2p/data/i2np/TunnelVerificationStructure.java

@@ -12,7 +12,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import net.i2p.crypto.DSAEngine;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.DataStructureImpl;
@@ -20,7 +19,6 @@ import net.i2p.data.Hash;
 import net.i2p.data.Signature;
 import net.i2p.data.SigningPrivateKey;
 import net.i2p.data.SigningPublicKey;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
 
 /**

router/java/src/net/i2p/router/ClientManagerFacade.java

@@ -13,7 +13,6 @@ import net.i2p.data.Hash;
 import net.i2p.data.LeaseSet;
 import net.i2p.data.i2cp.MessageId;
 import net.i2p.data.i2cp.SessionConfig;
-import net.i2p.router.client.ClientManagerFacadeImpl;
 
 /**
  * Manage all interactions with clients 

router/java/src/net/i2p/router/ClientMessagePool.java

@@ -9,10 +9,6 @@ package net.i2p.router;
  */
 
 //import net.i2p.router.message.ProcessOutboundClientMessageJob;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
 import net.i2p.router.message.OutboundClientMessageJob;
 import net.i2p.util.Log;
 

router/java/src/net/i2p/router/InNetMessagePool.java

@@ -11,12 +11,9 @@ package net.i2p.router;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import net.i2p.router.transport.OutboundMessageRegistry;
-import net.i2p.stat.StatManager;
 import net.i2p.util.Log;
 
 /**

router/java/src/net/i2p/router/JobImpl.java

@@ -8,7 +8,6 @@ package net.i2p.router;
  *
  */
 
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
 /**
  * Base implementation of a Job

router/java/src/net/i2p/router/JobQueue.java

@@ -8,19 +8,18 @@ package net.i2p.router;
  *
  */
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.ArrayList;
-import java.util.TreeMap;
 import java.util.SortedMap;
-import java.util.Collections;
+import java.util.TreeMap;
 
 import net.i2p.router.message.HandleSourceRouteReplyMessageJob;
 import net.i2p.router.networkdb.HandleDatabaseLookupMessageJob;
 import net.i2p.router.tunnelmanager.HandleTunnelCreateMessageJob;
 import net.i2p.router.tunnelmanager.RequestTunnelJob;
-import net.i2p.stat.StatManager;
 import net.i2p.util.Clock;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;

router/java/src/net/i2p/router/JobQueueRunner.java

@@ -1,7 +1,5 @@
 package net.i2p.router;
 
-import net.i2p.stat.StatManager;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
 
 /** a do run run run a do run run */

router/java/src/net/i2p/router/KeyManager.java

@@ -24,7 +24,6 @@ import net.i2p.data.PrivateKey;
 import net.i2p.data.PublicKey;
 import net.i2p.data.SigningPrivateKey;
 import net.i2p.data.SigningPublicKey;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
 
 /**

router/java/src/net/i2p/router/MessageHistory.java

@@ -3,16 +3,15 @@ package net.i2p.router;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.TimeZone;
 
 import net.i2p.data.Hash;
 import net.i2p.data.TunnelId;
 import net.i2p.data.i2np.I2NPMessage;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
 
 /**

router/java/src/net/i2p/router/MessageValidator.java

@@ -5,7 +5,6 @@ import java.util.Iterator;
 import java.util.Set;
 import java.util.TreeMap;
 
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
 
 /**

router/java/src/net/i2p/router/MultiRouter.java

@@ -1,9 +1,10 @@
 package net.i2p.router;
 
-import java.io.IOException;
 import java.io.FileInputStream;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Properties;
+
 import net.i2p.I2PAppContext;
 import net.i2p.util.Log;
 

router/java/src/net/i2p/router/MultiRouterBuilder.java

@@ -1,11 +1,8 @@
 package net.i2p.router;
 
-import java.io.IOException;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.InputStreamReader;
-import java.io.BufferedReader;
+import java.io.IOException;
 
 /**
  * Build a set of config files suitable for use by the multirouter as a 

router/java/src/net/i2p/router/NetworkDatabaseFacade.java

@@ -16,7 +16,6 @@ import java.util.Set;
 import net.i2p.data.Hash;
 import net.i2p.data.LeaseSet;
 import net.i2p.data.RouterInfo;
-import net.i2p.router.networkdb.kademlia.KademliaNetworkDatabaseFacade;
 
 /**
  * Defines the mechanism for interacting with I2P's network database

router/java/src/net/i2p/router/OutNetMessage.java

@@ -23,7 +23,6 @@ import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.RouterInfo;
 import net.i2p.data.i2np.I2NPMessage;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
 
 /**

router/java/src/net/i2p/router/OutNetMessagePool.java

@@ -8,14 +8,8 @@ package net.i2p.router;
  *
  */
 
-import java.util.ArrayList;
 import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.TreeMap;
 
-import net.i2p.router.transport.OutboundMessageRegistry;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
 
 /**

router/java/src/net/i2p/router/PeerManagerFacade.java

@@ -10,8 +10,6 @@ package net.i2p.router;
 
 import java.util.List;
 
-import net.i2p.router.peermanager.PeerManagerFacadeImpl;
-
 /**
  * Manage peer references and keep them up to date so that when asked for peers,
  * it can provide appropriate peers according to the criteria provided.  This 

router/java/src/net/i2p/router/Router.java

@@ -8,10 +8,8 @@ package net.i2p.router;
  *
  */
 
-import java.io.BufferedReader;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.text.DecimalFormat;
 import java.util.Calendar;
 import java.util.Date;
@@ -28,26 +26,17 @@ import net.i2p.crypto.DHSessionKeyBuilder;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.RouterInfo;
-import net.i2p.data.RoutingKeyGenerator;
 import net.i2p.data.i2np.GarlicMessage;
 import net.i2p.data.i2np.SourceRouteReplyMessage;
 import net.i2p.data.i2np.TunnelMessage;
-import net.i2p.router.admin.StatsGenerator;
 import net.i2p.router.message.GarlicMessageHandler;
 import net.i2p.router.message.SourceRouteReplyMessageHandler;
 import net.i2p.router.message.TunnelMessageHandler;
 import net.i2p.router.startup.StartupJob;
-import net.i2p.router.transport.BandwidthLimiter;
-import net.i2p.router.transport.OutboundMessageRegistry;
 import net.i2p.stat.Rate;
 import net.i2p.stat.RateStat;
-import net.i2p.stat.StatManager;
-import net.i2p.util.Clock;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
-import net.i2p.util.LogConsoleBuffer;
-import net.i2p.util.LogManager;
-import net.i2p.util.RandomSource;
 
 /**
  * Main driver for the router.

router/java/src/net/i2p/router/RouterContext.java

@@ -1,24 +1,25 @@
 package net.i2p.router;
 
+import java.util.Properties;
+
+import net.i2p.I2PAppContext;
 import net.i2p.data.Hash;
 import net.i2p.router.client.ClientManagerFacadeImpl;
-import net.i2p.router.transport.OutboundMessageRegistry;
 import net.i2p.router.networkdb.kademlia.KademliaNetworkDatabaseFacade;
-import net.i2p.router.transport.VMCommSystem;
-import net.i2p.router.transport.CommSystemFacadeImpl;
-import net.i2p.router.transport.BandwidthLimiter;
-import net.i2p.router.transport.TrivialBandwidthLimiter;
-import net.i2p.router.tunnelmanager.PoolingTunnelManagerFacade;
-import net.i2p.router.peermanager.ProfileOrganizer;
+import net.i2p.router.peermanager.Calculator;
+import net.i2p.router.peermanager.IntegrationCalculator;
+import net.i2p.router.peermanager.IsFailingCalculator;
 import net.i2p.router.peermanager.PeerManagerFacadeImpl;
 import net.i2p.router.peermanager.ProfileManagerImpl;
-import net.i2p.router.peermanager.Calculator;
-import net.i2p.router.peermanager.IsFailingCalculator;
+import net.i2p.router.peermanager.ProfileOrganizer;
 import net.i2p.router.peermanager.ReliabilityCalculator;
 import net.i2p.router.peermanager.SpeedCalculator;
-import net.i2p.router.peermanager.IntegrationCalculator;
-import net.i2p.I2PAppContext;
-import java.util.Properties;
+import net.i2p.router.transport.BandwidthLimiter;
+import net.i2p.router.transport.CommSystemFacadeImpl;
+import net.i2p.router.transport.OutboundMessageRegistry;
+import net.i2p.router.transport.TrivialBandwidthLimiter;
+import net.i2p.router.transport.VMCommSystem;
+import net.i2p.router.tunnelmanager.PoolingTunnelManagerFacade;
 
 /**
  * Build off the core I2P context to provide a root for a router instance to

router/java/src/net/i2p/router/Shitlist.java

@@ -14,7 +14,6 @@ import java.util.Iterator;
 import java.util.Map;
 
 import net.i2p.data.Hash;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
 
 /**

router/java/src/net/i2p/router/StatisticsManager.java

@@ -17,7 +17,6 @@ import net.i2p.CoreVersion;
 import net.i2p.data.DataHelper;
 import net.i2p.stat.Rate;
 import net.i2p.stat.RateStat;
-import net.i2p.stat.StatManager;
 import net.i2p.util.Log;
 
 /**

router/java/src/net/i2p/router/SubmitMessageHistoryJob.java

@@ -4,12 +4,9 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 
-import net.i2p.router.transport.BandwidthLimiter;
-import net.i2p.util.Clock;
 import net.i2p.util.HTTPSendData;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 /**
  * Job that, if its allowed to, will submit the data gathered by the MessageHistory

router/java/src/net/i2p/router/TunnelInfo.java

@@ -16,6 +16,7 @@ import java.util.HashSet;
 import java.util.Properties;
 import java.util.Set;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.DataStructureImpl;
@@ -29,7 +30,6 @@ import net.i2p.data.i2np.TunnelConfigurationSessionKey;
 import net.i2p.data.i2np.TunnelSessionKey;
 import net.i2p.data.i2np.TunnelSigningPrivateKey;
 import net.i2p.data.i2np.TunnelSigningPublicKey;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines the information associated with a tunnel

router/java/src/net/i2p/router/TunnelManagerFacade.java

@@ -13,7 +13,6 @@ import java.util.List;
 import net.i2p.data.Destination;
 import net.i2p.data.Hash;
 import net.i2p.data.TunnelId;
-import net.i2p.router.tunnelmanager.PoolingTunnelManagerFacade;
 
 /**
  * Build and maintain tunnels throughout the network.

router/java/src/net/i2p/router/TunnelSettings.java

@@ -13,10 +13,10 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Date;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.DataStructureImpl;
-import net.i2p.I2PAppContext;
 
 /**
  * Wrap up the settings specified for a particular tunnel

router/java/src/net/i2p/router/admin/AdminListener.java

@@ -12,9 +12,9 @@ import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
 
+import net.i2p.router.RouterContext;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 /**
  * Listen for connections on the specified port, and toss them onto the client manager's

router/java/src/net/i2p/router/admin/AdminManager.java

@@ -1,10 +1,9 @@
 package net.i2p.router.admin;
 
-import net.i2p.router.Router;
+import net.i2p.router.RouterContext;
 import net.i2p.router.Service;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 public class AdminManager implements Service {
     private Log _log;

router/java/src/net/i2p/router/admin/AdminRunner.java

@@ -6,17 +6,15 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.net.Socket;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.Locale;
-import java.text.SimpleDateFormat;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Set;
 
 import net.i2p.data.Hash;
-import net.i2p.router.Router;
-import net.i2p.router.peermanager.ProfileOrganizer;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 class AdminRunner implements Runnable {
     private Log _log;

router/java/src/net/i2p/router/admin/StatsGenerator.java

@@ -11,14 +11,12 @@ import java.util.Map;
 import java.util.Set;
 
 import net.i2p.data.DataHelper;
-import net.i2p.router.Router;
+import net.i2p.router.RouterContext;
 import net.i2p.stat.Frequency;
 import net.i2p.stat.FrequencyStat;
 import net.i2p.stat.Rate;
 import net.i2p.stat.RateStat;
-import net.i2p.stat.StatManager;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 /**
  * Dump the stats to the web admin interface

router/java/src/net/i2p/router/client/ClientConnectionRunner.java

@@ -32,10 +32,7 @@ import net.i2p.data.i2cp.SessionConfig;
 import net.i2p.data.i2cp.SessionId;
 import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.NetworkDatabaseFacade;
 import net.i2p.router.RouterContext;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
 import net.i2p.util.RandomSource;
 

router/java/src/net/i2p/router/client/ClientListenerRunner.java

@@ -13,8 +13,8 @@ import java.net.ServerSocket;
 import java.net.Socket;
 
 import net.i2p.client.I2PClient;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Listen for connections on the specified port, and toss them onto the client manager's

router/java/src/net/i2p/router/client/ClientManager.java

@@ -21,15 +21,11 @@ import net.i2p.data.Payload;
 import net.i2p.data.i2cp.MessageId;
 import net.i2p.data.i2cp.SessionConfig;
 import net.i2p.router.ClientMessage;
-import net.i2p.router.ClientMessagePool;
 import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.stat.StatManager;
-import net.i2p.util.Clock;
+import net.i2p.router.RouterContext;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 /**
  * Coordinate connections and various tasks

router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java

@@ -16,7 +16,6 @@ import net.i2p.data.i2cp.SessionConfig;
 import net.i2p.router.ClientManagerFacade;
 import net.i2p.router.ClientMessage;
 import net.i2p.router.Job;
-import net.i2p.router.Router;
 import net.i2p.router.RouterContext;
 import net.i2p.util.Log;
 

router/java/src/net/i2p/router/client/ClientMessageEventListener.java

@@ -26,13 +26,9 @@ import net.i2p.data.i2cp.SendMessageMessage;
 import net.i2p.data.i2cp.SessionId;
 import net.i2p.data.i2cp.SessionStatusMessage;
 import net.i2p.data.i2cp.SetDateMessage;
-import net.i2p.router.JobQueue;
-import net.i2p.router.KeyManager;
-import net.i2p.router.NetworkDatabaseFacade;
-import net.i2p.util.Clock;
+import net.i2p.router.RouterContext;
 import net.i2p.util.Log;
 import net.i2p.util.RandomSource;
-import net.i2p.router.RouterContext;
 
 /**
  * Receive events from the client and handle them accordingly (updating the runner when

router/java/src/net/i2p/router/client/CreateSessionJob.java

@@ -13,9 +13,8 @@ import java.util.Properties;
 import net.i2p.data.i2cp.SessionConfig;
 import net.i2p.router.ClientTunnelSettings;
 import net.i2p.router.JobImpl;
-import net.i2p.router.TunnelManagerFacade;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Given an established connection, walk through the process of establishing the

router/java/src/net/i2p/router/client/ReportAbuseJob.java

@@ -15,8 +15,8 @@ import net.i2p.data.i2cp.AbuseSeverity;
 import net.i2p.data.i2cp.I2CPMessageException;
 import net.i2p.data.i2cp.ReportAbuseMessage;
 import net.i2p.router.JobImpl;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Async job to send an abuse message to the client

router/java/src/net/i2p/router/client/RequestLeaseSetJob.java

@@ -16,10 +16,8 @@ import net.i2p.data.i2cp.I2CPMessageException;
 import net.i2p.data.i2cp.RequestLeaseSetMessage;
 import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Async job to walk the client through generating a lease set.  First sends it

router/java/src/net/i2p/router/message/BuildTestMessageJob.java

@@ -12,7 +12,6 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 
-import net.i2p.crypto.SessionKeyManager;
 import net.i2p.data.Certificate;
 import net.i2p.data.Hash;
 import net.i2p.data.PublicKey;
@@ -23,14 +22,11 @@ import net.i2p.data.i2np.DeliveryStatusMessage;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
 import net.i2p.router.MessageSelector;
 import net.i2p.router.ReplyJob;
 import net.i2p.router.Router;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
-import net.i2p.util.RandomSource;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Build a test message that will be sent to the target to make sure they're alive.

router/java/src/net/i2p/router/message/GarlicMessageBuilder.java

@@ -14,9 +14,6 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 
-import net.i2p.crypto.ElGamalAESEngine;
-import net.i2p.crypto.KeyGenerator;
-import net.i2p.crypto.SessionKeyManager;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.PublicKey;
@@ -26,9 +23,8 @@ import net.i2p.data.i2np.GarlicClove;
 import net.i2p.data.i2np.GarlicMessage;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.data.i2np.SourceRouteBlock;
-import net.i2p.router.MessageHistory;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Build garlic messages based on a GarlicConfig

router/java/src/net/i2p/router/message/GarlicMessageParser.java

@@ -14,15 +14,14 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 
-import net.i2p.crypto.ElGamalAESEngine;
 import net.i2p.data.Certificate;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.PrivateKey;
 import net.i2p.data.i2np.GarlicClove;
 import net.i2p.data.i2np.GarlicMessage;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Read a GarlicMessage, decrypt it, and return the resulting CloveSet

router/java/src/net/i2p/router/message/HandleGarlicMessageJob.java

@@ -21,14 +21,10 @@ import net.i2p.data.RouterIdentity;
 import net.i2p.data.i2np.GarlicClove;
 import net.i2p.data.i2np.GarlicMessage;
 import net.i2p.router.JobImpl;
-import net.i2p.router.KeyManager;
 import net.i2p.router.LeaseSetKeys;
-import net.i2p.router.MessageHistory;
 import net.i2p.router.Router;
-import net.i2p.stat.StatManager;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Unencrypt a garlic message and handle each of the cloves - locally destined

router/java/src/net/i2p/router/message/HandleSourceRouteReplyMessageJob.java

@@ -21,12 +21,9 @@ import net.i2p.data.RouterIdentity;
 import net.i2p.data.i2np.DeliveryInstructions;
 import net.i2p.data.i2np.SourceRouteReplyMessage;
 import net.i2p.router.JobImpl;
-import net.i2p.router.KeyManager;
-import net.i2p.router.MessageHistory;
 import net.i2p.router.Router;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Handle a source route reply - decrypt the instructions and forward the message 

router/java/src/net/i2p/router/message/HandleTunnelMessageJob.java

@@ -12,8 +12,6 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import net.i2p.crypto.AESEngine;
-import net.i2p.crypto.SHA256Generator;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Destination;
@@ -29,23 +27,13 @@ import net.i2p.data.i2np.I2NPMessageException;
 import net.i2p.data.i2np.I2NPMessageHandler;
 import net.i2p.data.i2np.TunnelMessage;
 import net.i2p.data.i2np.TunnelVerificationStructure;
-import net.i2p.router.ClientManagerFacade;
 import net.i2p.router.ClientMessage;
-import net.i2p.router.ClientMessagePool;
 import net.i2p.router.InNetMessage;
-import net.i2p.router.InNetMessagePool;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.MessageHistory;
 import net.i2p.router.MessageReceptionInfo;
-import net.i2p.router.MessageValidator;
-import net.i2p.router.Router;
-import net.i2p.router.TunnelInfo;
-import net.i2p.router.TunnelManagerFacade;
-import net.i2p.stat.StatManager;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.router.TunnelInfo;
+import net.i2p.util.Log;
 
 public class HandleTunnelMessageJob extends JobImpl {
     private Log _log;

router/java/src/net/i2p/router/message/MessageHandler.java

@@ -19,20 +19,12 @@ import net.i2p.data.i2np.DeliveryInstructions;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.data.i2np.SourceRouteBlock;
 import net.i2p.data.i2np.TunnelMessage;
-import net.i2p.router.ClientManagerFacade;
 import net.i2p.router.ClientMessage;
-import net.i2p.router.ClientMessagePool;
 import net.i2p.router.InNetMessage;
-import net.i2p.router.InNetMessagePool;
 import net.i2p.router.Job;
-import net.i2p.router.JobQueue;
-import net.i2p.router.MessageHistory;
 import net.i2p.router.MessageReceptionInfo;
-import net.i2p.router.MessageValidator;
-import net.i2p.router.Router;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Implement the inbound message processing logic to forward based on delivery instructions and

router/java/src/net/i2p/router/message/OutboundClientMessageJob.java

@@ -5,11 +5,10 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Properties;
 import java.util.Set;
 import java.util.TreeMap;
-import java.util.Properties;
 
-import net.i2p.crypto.SessionKeyManager;
 import net.i2p.data.Certificate;
 import net.i2p.data.Destination;
 import net.i2p.data.Hash;
@@ -25,22 +24,14 @@ import net.i2p.data.i2np.DeliveryInstructions;
 import net.i2p.data.i2np.DeliveryStatusMessage;
 import net.i2p.data.i2np.GarlicMessage;
 import net.i2p.data.i2np.I2NPMessage;
-import net.i2p.router.ClientManagerFacade;
 import net.i2p.router.ClientMessage;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.MessageHistory;
 import net.i2p.router.MessageSelector;
-import net.i2p.router.NetworkDatabaseFacade;
 import net.i2p.router.ReplyJob;
 import net.i2p.router.Router;
-import net.i2p.router.TunnelManagerFacade;
-import net.i2p.router.TunnelSelectionCriteria;
-import net.i2p.stat.StatManager;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
-import net.i2p.util.RandomSource;
 import net.i2p.router.RouterContext;
+import net.i2p.router.TunnelSelectionCriteria;
+import net.i2p.util.Log;
 
 /**
  * Send a client message, taking into consideration the fact that there may be

router/java/src/net/i2p/router/message/OutboundClientMessageJobHelper.java

@@ -15,24 +15,21 @@ import java.util.Set;
 import net.i2p.data.Certificate;
 import net.i2p.data.Destination;
 import net.i2p.data.Hash;
+import net.i2p.data.LeaseSet;
 import net.i2p.data.Payload;
 import net.i2p.data.PublicKey;
 import net.i2p.data.SessionKey;
 import net.i2p.data.TunnelId;
-import net.i2p.data.LeaseSet;
 import net.i2p.data.i2np.DataMessage;
+import net.i2p.data.i2np.DatabaseStoreMessage;
 import net.i2p.data.i2np.DeliveryInstructions;
 import net.i2p.data.i2np.DeliveryStatusMessage;
-import net.i2p.data.i2np.DatabaseStoreMessage;
 import net.i2p.data.i2np.GarlicMessage;
 import net.i2p.router.Router;
-import net.i2p.router.TunnelInfo;
-import net.i2p.router.TunnelManagerFacade;
-import net.i2p.router.TunnelSelectionCriteria;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
-import net.i2p.util.RandomSource;
 import net.i2p.router.RouterContext;
+import net.i2p.router.TunnelInfo;
+import net.i2p.router.TunnelSelectionCriteria;
+import net.i2p.util.Log;
 
 /**
  * Handle a particular client message that is destined for a remote destination.

router/java/src/net/i2p/router/message/SendGarlicJob.java

@@ -15,15 +15,12 @@ import net.i2p.data.SessionKey;
 import net.i2p.data.i2np.GarlicMessage;
 import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
 import net.i2p.router.MessageSelector;
 import net.i2p.router.OutNetMessage;
-import net.i2p.router.OutNetMessagePool;
 import net.i2p.router.ReplyJob;
 import net.i2p.router.Router;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Build a garlic message from config, encrypt it, and enqueue it for delivery.

router/java/src/net/i2p/router/message/SendMessageAckJob.java

@@ -14,8 +14,6 @@ import net.i2p.data.i2np.DeliveryStatusMessage;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.data.i2np.SourceRouteBlock;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.util.Clock;
 import net.i2p.router.RouterContext;
 
 /**

router/java/src/net/i2p/router/message/SendMessageDirectJob.java

@@ -14,20 +14,13 @@ import net.i2p.data.Hash;
 import net.i2p.data.RouterInfo;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.router.InNetMessage;
-import net.i2p.router.InNetMessagePool;
 import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
 import net.i2p.router.MessageSelector;
-import net.i2p.router.NetworkDatabaseFacade;
 import net.i2p.router.OutNetMessage;
-import net.i2p.router.OutNetMessagePool;
 import net.i2p.router.ReplyJob;
-import net.i2p.router.Router;
-import net.i2p.router.transport.OutboundMessageRegistry;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 public class SendMessageDirectJob extends JobImpl {
     private Log _log;

router/java/src/net/i2p/router/message/SendReplyMessageJob.java

@@ -12,9 +12,8 @@ import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.data.i2np.SourceRouteBlock;
 import net.i2p.data.i2np.SourceRouteReplyMessage;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Send a SourceRouteReplyMessage to the location specified in the source route block.

router/java/src/net/i2p/router/message/SendTunnelMessageJob.java

@@ -12,9 +12,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Date;
 
-import net.i2p.crypto.AESEngine;
-import net.i2p.crypto.KeyGenerator;
-import net.i2p.crypto.SHA256Generator;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataStructure;
 import net.i2p.data.Hash;
@@ -28,25 +25,17 @@ import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.data.i2np.TunnelMessage;
 import net.i2p.data.i2np.TunnelVerificationStructure;
 import net.i2p.router.ClientMessage;
-import net.i2p.router.ClientMessagePool;
 import net.i2p.router.InNetMessage;
-import net.i2p.router.InNetMessagePool;
 import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.MessageHistory;
 import net.i2p.router.MessageReceptionInfo;
 import net.i2p.router.MessageSelector;
-import net.i2p.router.MessageValidator;
 import net.i2p.router.OutNetMessage;
 import net.i2p.router.ReplyJob;
 import net.i2p.router.Router;
-import net.i2p.router.TunnelInfo;
-import net.i2p.router.TunnelManagerFacade;
-import net.i2p.router.transport.OutboundMessageRegistry;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.router.TunnelInfo;
+import net.i2p.util.Log;
 
 /**
  * Send a message down a tunnel that we are the gateway for

router/java/src/net/i2p/router/networkdb/HandleDatabaseLookupMessageJob.java

@@ -27,17 +27,11 @@ import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.data.i2np.TunnelMessage;
 import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.MessageHistory;
-import net.i2p.router.NetworkDatabaseFacade;
-import net.i2p.router.Router;
+import net.i2p.router.RouterContext;
 import net.i2p.router.TunnelInfo;
-import net.i2p.router.TunnelManagerFacade;
 import net.i2p.router.message.SendMessageDirectJob;
 import net.i2p.router.message.SendTunnelMessageJob;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 /**
  * Handle a lookup for a key received from a remote peer.  Needs to be implemented

router/java/src/net/i2p/router/networkdb/HandleDatabaseSearchReplyMessageJob.java

@@ -13,10 +13,8 @@ import net.i2p.data.RouterIdentity;
 import net.i2p.data.RouterInfo;
 import net.i2p.data.i2np.DatabaseSearchReplyMessage;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.NetworkDatabaseFacade;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Receive DatabaseSearchReplyMessage data and store it in the local net db

router/java/src/net/i2p/router/networkdb/HandleDatabaseStoreMessageJob.java

@@ -14,12 +14,8 @@ import net.i2p.data.Hash;
 import net.i2p.data.RouterIdentity;
 import net.i2p.data.i2np.DatabaseStoreMessage;
 import net.i2p.router.JobImpl;
-import net.i2p.router.MessageHistory;
-import net.i2p.router.NetworkDatabaseFacade;
-import net.i2p.router.ProfileManager;
-import net.i2p.util.Log;
-import net.i2p.stat.StatManager;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Receive DatabaseStoreMessage data and store it in the local net db

router/java/src/net/i2p/router/networkdb/PublishLocalRouterInfoJob.java

@@ -13,16 +13,9 @@ import java.util.Properties;
 
 import net.i2p.data.DataFormatException;
 import net.i2p.data.RouterInfo;
-import net.i2p.router.CommSystemFacade;
 import net.i2p.router.JobImpl;
-import net.i2p.router.KeyManager;
-import net.i2p.router.NetworkDatabaseFacade;
-import net.i2p.router.Router;
-import net.i2p.router.StatisticsManager;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
-import net.i2p.util.RandomSource;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Publish the local router's RouterInfo every 5 to 10 minutes

router/java/src/net/i2p/router/networkdb/kademlia/DataPublisherJob.java

@@ -16,11 +16,9 @@ import net.i2p.data.DataStructure;
 import net.i2p.data.Hash;
 import net.i2p.data.LeaseSet;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
 import net.i2p.router.Router;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 class DataPublisherJob extends JobImpl {
     private Log _log;

router/java/src/net/i2p/router/networkdb/kademlia/DataRepublishingSelectorJob.java

@@ -18,10 +18,8 @@ import net.i2p.data.LeaseSet;
 import net.i2p.data.RouterInfo;
 import net.i2p.router.JobImpl;
 import net.i2p.router.Router;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
-import net.i2p.util.RandomSource;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 class DataRepublishingSelectorJob extends JobImpl {
     private Log _log;

router/java/src/net/i2p/router/networkdb/kademlia/ExpireLeasesJob.java

@@ -16,8 +16,8 @@ import net.i2p.data.Hash;
 import net.i2p.data.LeaseSet;
 import net.i2p.router.JobImpl;
 import net.i2p.router.Router;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Periodically search through all leases to find expired ones, failing those

router/java/src/net/i2p/router/networkdb/kademlia/ExpireRoutersJob.java

@@ -16,10 +16,8 @@ import java.util.Set;
 import net.i2p.data.Hash;
 import net.i2p.data.RouterInfo;
 import net.i2p.router.JobImpl;
-import net.i2p.router.TunnelManagerFacade;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Go through the routing table pick routers that are performing poorly or

router/java/src/net/i2p/router/networkdb/kademlia/ExploreJob.java

@@ -17,9 +17,8 @@ import net.i2p.data.Hash;
 import net.i2p.data.RouterInfo;
 import net.i2p.data.TunnelId;
 import net.i2p.data.i2np.DatabaseLookupMessage;
-import net.i2p.router.Router;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Search for a particular key iteratively until we either find a value, we run

router/java/src/net/i2p/router/networkdb/kademlia/ExploreKeySelectorJob.java

@@ -14,8 +14,8 @@ import java.util.Set;
 
 import net.i2p.data.Hash;
 import net.i2p.router.JobImpl;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Go through the kbuckets and generate random keys for routers in buckets not

router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java

@@ -12,11 +12,11 @@ import java.math.BigInteger;
 import java.util.HashSet;
 import java.util.Set;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.util.Log;
 import net.i2p.util.RandomSource;
-import net.i2p.I2PAppContext;
 
 class KBucketImpl implements KBucket {
     private Log _log;

router/java/src/net/i2p/router/networkdb/kademlia/KBucketSet.java

@@ -12,10 +12,10 @@ import java.math.BigInteger;
 import java.util.HashSet;
 import java.util.Set;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * In memory storage of buckets sorted by the XOR metric from the local router's

router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java

@@ -24,18 +24,15 @@ import net.i2p.data.RouterInfo;
 import net.i2p.data.i2np.DatabaseLookupMessage;
 import net.i2p.data.i2np.DatabaseSearchReplyMessage;
 import net.i2p.data.i2np.DatabaseStoreMessage;
-import net.i2p.router.InNetMessagePool;
 import net.i2p.router.Job;
-import net.i2p.router.JobQueue;
 import net.i2p.router.NetworkDatabaseFacade;
 import net.i2p.router.Router;
+import net.i2p.router.RouterContext;
 import net.i2p.router.networkdb.DatabaseLookupMessageHandler;
 import net.i2p.router.networkdb.DatabaseSearchReplyMessageHandler;
 import net.i2p.router.networkdb.DatabaseStoreMessageHandler;
 import net.i2p.router.networkdb.PublishLocalRouterInfoJob;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 /**
  * Kademlia based version of the network database

router/java/src/net/i2p/router/networkdb/kademlia/PeerSelector.java

@@ -20,10 +20,8 @@ import java.util.TreeMap;
 
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
-import net.i2p.router.ProfileManager;
-import net.i2p.router.Router;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 class PeerSelector {
     private Log _log;

router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java

@@ -21,10 +21,9 @@ import net.i2p.data.Hash;
 import net.i2p.data.LeaseSet;
 import net.i2p.data.RouterInfo;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
 import net.i2p.router.Router;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Write out keys to disk when we get them and periodically read ones we don't know

router/java/src/net/i2p/router/networkdb/kademlia/RepublishLeaseSetJob.java

@@ -8,19 +8,12 @@ package net.i2p.router.networkdb.kademlia;
  *
  */
 
-import java.util.HashSet;
-import java.util.Set;
-
 import net.i2p.data.Hash;
 import net.i2p.data.LeaseSet;
-import net.i2p.router.ClientManagerFacade;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
 import net.i2p.router.Router;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
-import net.i2p.I2PException;
+import net.i2p.util.Log;
 
 /**
  * Run periodically for each locally created leaseSet to cause it to be republished

router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java

@@ -16,25 +16,17 @@ import java.util.Set;
 import net.i2p.data.DataStructure;
 import net.i2p.data.Hash;
 import net.i2p.data.RouterInfo;
-import net.i2p.data.RoutingKeyGenerator;
 import net.i2p.data.TunnelId;
 import net.i2p.data.i2np.DatabaseLookupMessage;
 import net.i2p.data.i2np.DatabaseSearchReplyMessage;
 import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.NetworkDatabaseFacade;
-import net.i2p.router.ProfileManager;
-import net.i2p.router.Router;
+import net.i2p.router.RouterContext;
 import net.i2p.router.TunnelInfo;
-import net.i2p.router.TunnelManagerFacade;
 import net.i2p.router.TunnelSelectionCriteria;
 import net.i2p.router.message.SendMessageDirectJob;
 import net.i2p.router.message.SendTunnelMessageJob;
-import net.i2p.stat.StatManager;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 /**
  * Search for a particular key iteratively until we either find a value or we 

router/java/src/net/i2p/router/networkdb/kademlia/SearchState.java

@@ -8,7 +8,6 @@ import java.util.Iterator;
 import java.util.Set;
 
 import net.i2p.data.Hash;
-import net.i2p.util.Clock;
 import net.i2p.router.RouterContext;
 
 /**

router/java/src/net/i2p/router/networkdb/kademlia/SearchUpdateReplyFoundJob.java

@@ -8,10 +8,9 @@ import net.i2p.data.i2np.DatabaseSearchReplyMessage;
 import net.i2p.data.i2np.DatabaseStoreMessage;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.router.JobImpl;
-import net.i2p.router.ProfileManager;
 import net.i2p.router.ReplyJob;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Called after a match to a db search is found

router/java/src/net/i2p/router/networkdb/kademlia/StartExplorersJob.java

@@ -14,9 +14,8 @@ import java.util.Set;
 
 import net.i2p.data.Hash;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Fire off search jobs for random keys from the explore pool, up to MAX_PER_RUN

router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java

@@ -16,40 +16,22 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import net.i2p.crypto.SessionKeyManager;
-import net.i2p.data.Certificate;
 import net.i2p.data.DataStructure;
 import net.i2p.data.Hash;
 import net.i2p.data.LeaseSet;
-import net.i2p.data.PublicKey;
 import net.i2p.data.RouterInfo;
-import net.i2p.data.RoutingKeyGenerator;
-import net.i2p.data.SessionKey;
 import net.i2p.data.TunnelId;
 import net.i2p.data.i2np.DatabaseStoreMessage;
-import net.i2p.data.i2np.DeliveryInstructions;
 import net.i2p.data.i2np.DeliveryStatusMessage;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
 import net.i2p.router.MessageSelector;
-import net.i2p.router.NetworkDatabaseFacade;
-import net.i2p.router.ProfileManager;
-import net.i2p.router.ReplyJob;
-import net.i2p.router.Router;
-import net.i2p.router.TunnelInfo;
-import net.i2p.router.TunnelManagerFacade;
-import net.i2p.router.TunnelSelectionCriteria;
-import net.i2p.router.message.GarlicConfig;
-import net.i2p.router.message.PayloadGarlicConfig;
-import net.i2p.router.message.SendGarlicJob;
-import net.i2p.router.message.SendTunnelMessageJob;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
-import net.i2p.util.RandomSource;
-import net.i2p.stat.StatManager;
 import net.i2p.router.RouterContext;
+import net.i2p.router.TunnelInfo;
+import net.i2p.router.TunnelSelectionCriteria;
+import net.i2p.router.message.SendTunnelMessageJob;
+import net.i2p.util.Log;
 
 class StoreJob extends JobImpl {
     private Log _log;

router/java/src/net/i2p/router/networkdb/kademlia/TransientDataStore.java

@@ -20,10 +20,8 @@ import net.i2p.data.DataStructure;
 import net.i2p.data.Hash;
 import net.i2p.data.LeaseSet;
 import net.i2p.data.RouterInfo;
-import net.i2p.router.ProfileManager;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 class TransientDataStore implements DataStore {
     private Log _log;

router/java/src/net/i2p/router/peermanager/DBHistory.java

@@ -4,8 +4,8 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Properties;
 
-import net.i2p.stat.RateStat;
 import net.i2p.router.RouterContext;
+import net.i2p.stat.RateStat;
 import net.i2p.util.Log;
 
 /**

router/java/src/net/i2p/router/peermanager/EvaluateProfilesJob.java

@@ -6,9 +6,8 @@ import java.util.Set;
 
 import net.i2p.data.Hash;
 import net.i2p.router.JobImpl;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Run across all of the profiles, coallescing the stats and reorganizing them

router/java/src/net/i2p/router/peermanager/IntegrationCalculator.java

@@ -1,7 +1,7 @@
 package net.i2p.router.peermanager;
 
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Determine how well integrated the peer is - how likely they will be useful

router/java/src/net/i2p/router/peermanager/IsFailingCalculator.java

@@ -1,8 +1,7 @@
 package net.i2p.router.peermanager;
 
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Simple boolean calculation to determine whether the given profile is "failing" -

router/java/src/net/i2p/router/peermanager/PeerManager.java

@@ -13,12 +13,9 @@ import java.util.Iterator;
 import java.util.Set;
 
 import net.i2p.data.Hash;
-import net.i2p.router.JobQueue;
-import net.i2p.router.NetworkDatabaseFacade;
 import net.i2p.router.PeerSelectionCriteria;
-import net.i2p.router.Router;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Manage the current state of the statistics

router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java

@@ -13,9 +13,8 @@ import java.util.List;
 
 import net.i2p.router.PeerManagerFacade;
 import net.i2p.router.PeerSelectionCriteria;
-import net.i2p.router.Router;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Base implementation that has simple algorithms and periodically saves state

router/java/src/net/i2p/router/peermanager/PeerProfile.java

@@ -1,10 +1,11 @@
 package net.i2p.router.peermanager;
 
+import java.io.File;
+
 import net.i2p.data.Hash;
+import net.i2p.router.RouterContext;
 import net.i2p.stat.RateStat;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
-import java.io.File;
 
 public class PeerProfile {
     private Log _log;

router/java/src/net/i2p/router/peermanager/PersistProfilesJob.java

@@ -5,8 +5,6 @@ import java.util.Set;
 
 import net.i2p.data.Hash;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.util.Clock;
 import net.i2p.router.RouterContext;
 
 class PersistProfilesJob extends JobImpl {

router/java/src/net/i2p/router/peermanager/ProfileManagerImpl.java

@@ -18,9 +18,8 @@ import java.util.Set;
 
 import net.i2p.data.Hash;
 import net.i2p.router.ProfileManager;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 public class ProfileManagerImpl implements ProfileManager {
     private Log _log;

router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java

@@ -20,9 +20,8 @@ import java.util.TreeSet;
 
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Keep the peer profiles organized according to the tiered model.  This does not

router/java/src/net/i2p/router/peermanager/ProfilePersistenceHelper.java

@@ -16,10 +16,8 @@ import java.util.Set;
 
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Hash;
-import net.i2p.router.Router;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 class ProfilePersistenceHelper {
     private Log _log;

router/java/src/net/i2p/router/peermanager/ReliabilityCalculator.java

@@ -1,8 +1,7 @@
 package net.i2p.router.peermanager;
 
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Determine how reliable the peer is - how likely they'll be able to respond or

router/java/src/net/i2p/router/peermanager/SpeedCalculator.java

@@ -1,9 +1,9 @@
 package net.i2p.router.peermanager;
 
+import net.i2p.router.RouterContext;
 import net.i2p.stat.Rate;
 import net.i2p.stat.RateStat;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 /**
  * Quantify how fast the peer is - how fast they respond to our requests, how fast