Fixing up imports (I've been falling down on my job).

Note:  I didn't touch routerconsole since it isn't done (I believe)
-- Love, shendaras

core/java/src/net/i2p/client/I2CPMessageProducer.java

@@ -9,7 +9,6 @@ package net.i2p.client;
  *
  */
 
-import java.util.HashSet;
 import java.util.Set;
 
 import net.i2p.I2PAppContext;

core/java/src/net/i2p/stat/Rate.java

@@ -1,7 +1,6 @@
 package net.i2p.stat;
 
 import java.io.IOException;
-import java.io.OutputStream;
 import java.util.Properties;
 
 import net.i2p.util.Clock;

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

@@ -19,7 +19,6 @@ 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;
 

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

@@ -8,19 +8,16 @@ package net.i2p.data.i2np;
  *
  */
 
-import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 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;
 
 /**

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

@@ -17,9 +17,9 @@ 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.data.SessionKey;
 import net.i2p.data.SessionTag;
+import net.i2p.data.TunnelId;
 import net.i2p.util.Log;
 
 /**

router/java/src/net/i2p/router/CommSystemFacade.java

@@ -10,7 +10,6 @@ package net.i2p.router;
 
 import java.io.IOException;
 import java.io.OutputStream;
-
 import java.util.HashSet;
 import java.util.Set;
 

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

@@ -10,7 +10,6 @@ package net.i2p.router;
 
 import java.io.IOException;
 import java.io.OutputStream;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;

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

@@ -10,7 +10,6 @@ package net.i2p.router;
 
 import java.io.IOException;
 import java.io.OutputStream;
-
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;

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

@@ -9,16 +9,16 @@ import net.i2p.data.Hash;
 import net.i2p.router.client.ClientManagerFacadeImpl;
 import net.i2p.router.networkdb.kademlia.KademliaNetworkDatabaseFacade;
 import net.i2p.router.peermanager.Calculator;
+import net.i2p.router.peermanager.CapacityCalculator;
 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.ProfileOrganizer;
 import net.i2p.router.peermanager.ReliabilityCalculator;
-import net.i2p.router.peermanager.CapacityCalculator;
 import net.i2p.router.peermanager.SpeedCalculator;
-import net.i2p.router.transport.FIFOBandwidthLimiter;
 import net.i2p.router.transport.CommSystemFacadeImpl;
+import net.i2p.router.transport.FIFOBandwidthLimiter;
 import net.i2p.router.transport.OutboundMessageRegistry;
 import net.i2p.router.transport.VMCommSystem;
 import net.i2p.router.tunnelmanager.PoolingTunnelManagerFacade;

router/java/src/net/i2p/router/RouterThrottleImpl.java

@@ -2,8 +2,8 @@ package net.i2p.router;
 
 import net.i2p.data.Hash;
 import net.i2p.data.i2np.TunnelCreateMessage;
-import net.i2p.stat.RateStat;
 import net.i2p.stat.Rate;
+import net.i2p.stat.RateStat;
 import net.i2p.util.Log;
 
 /**

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

@@ -10,7 +10,6 @@ package net.i2p.router;
 
 import java.io.IOException;
 import java.io.OutputStream;
-
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;

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

@@ -8,9 +8,7 @@ package net.i2p.router;
  *
  */
 
-import java.io.IOException;
 import java.io.OutputStream;
-
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.util.Locale;

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

@@ -1,6 +1,5 @@
 package net.i2p.router.admin;
 
-import java.io.IOException;
 import java.io.OutputStream;
 
 import net.i2p.router.RouterContext;

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

@@ -1,9 +1,7 @@
 package net.i2p.router.admin;
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.io.PrintWriter;
 import java.text.DecimalFormat;
 import java.util.Arrays;
 import java.util.Iterator;

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

@@ -10,7 +10,6 @@ package net.i2p.router.client;
 
 import java.io.IOException;
 import java.io.OutputStream;
-
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;

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

@@ -1,10 +1,11 @@
 package net.i2p.router.client;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
+
+import net.i2p.data.i2cp.I2CPMessage;
 import net.i2p.router.RouterContext;
 import net.i2p.util.Log;
-import net.i2p.data.i2cp.I2CPMessage;
 
 /**
  * Async writer class so that if a client app hangs, they wont take down the

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

@@ -20,7 +20,6 @@ import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.data.i2np.TunnelMessage;
 import net.i2p.router.ClientMessage;
 import net.i2p.router.InNetMessage;
-import net.i2p.router.Job;
 import net.i2p.router.MessageReceptionInfo;
 import net.i2p.router.RouterContext;
 import net.i2p.util.Log;

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

@@ -32,7 +32,6 @@ import net.i2p.router.MessageReceptionInfo;
 import net.i2p.router.MessageSelector;
 import net.i2p.router.OutNetMessage;
 import net.i2p.router.ReplyJob;
-import net.i2p.router.Router;
 import net.i2p.router.RouterContext;
 import net.i2p.router.TunnelInfo;
 import net.i2p.util.Log;

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

@@ -29,7 +29,6 @@ import net.i2p.data.LeaseSet;
 import net.i2p.data.RouterAddress;
 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.Job;
 import net.i2p.router.NetworkDatabaseFacade;

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

@@ -1,8 +1,8 @@
 package net.i2p.router.peermanager;
 
 import net.i2p.router.RouterContext;
-import net.i2p.stat.RateStat;
 import net.i2p.stat.Rate;
+import net.i2p.stat.RateStat;
 import net.i2p.util.Log;
 
 /**

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

@@ -10,7 +10,6 @@ package net.i2p.router.peermanager;
 
 import java.io.IOException;
 import java.io.OutputStream;
-
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;

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

@@ -10,7 +10,6 @@ package net.i2p.router.peermanager;
 
 import java.io.IOException;
 import java.io.OutputStream;
-
 import java.util.ArrayList;
 import java.util.List;
 

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

@@ -1,7 +1,6 @@
 package net.i2p.router.peermanager;
 
 import java.io.File;
-
 import java.text.DecimalFormat;
 
 import net.i2p.data.Hash;

router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java

@@ -10,7 +10,6 @@ package net.i2p.router.transport;
 
 import java.io.IOException;
 import java.io.OutputStream;
-
 import java.util.HashSet;
 import java.util.List;
 import java.util.Properties;

router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java

@@ -2,9 +2,8 @@ package net.i2p.router.transport;
 
 import java.io.IOException;
 import java.io.OutputStream;
-
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 import net.i2p.I2PAppContext;
 import net.i2p.util.I2PThread;

router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java

@@ -1,7 +1,7 @@
 package net.i2p.router.transport;
 
-import net.i2p.util.Log;
 import net.i2p.I2PAppContext;
+import net.i2p.util.Log;
 
 class FIFOBandwidthRefiller implements Runnable {
     private Log _log;

router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java

@@ -10,7 +10,6 @@ package net.i2p.router.transport;
 
 import java.io.IOException;
 import java.io.OutputStream;
-
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;

router/java/src/net/i2p/router/transport/TransportImpl.java

@@ -8,10 +8,10 @@ package net.i2p.router.transport;
  *
  */
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 

router/java/src/net/i2p/router/transport/TransportManager.java

@@ -10,7 +10,6 @@ package net.i2p.router.transport;
 
 import java.io.IOException;
 import java.io.OutputStream;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;

router/java/src/net/i2p/router/transport/VMCommSystem.java

@@ -1,7 +1,6 @@
 package net.i2p.router.transport;
 
 import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Collections;
 import java.util.HashMap;

router/java/src/net/i2p/router/transport/tcp/RestrictiveTCPConnection.java

@@ -8,10 +8,9 @@ package net.i2p.router.transport.tcp;
  *
  */
 
+import java.io.BufferedOutputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.BufferedOutputStream;
-import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.math.BigInteger;
 import java.net.Socket;

router/java/src/net/i2p/router/tunnelmanager/HandleTunnelCreateMessageJob.java

@@ -16,11 +16,10 @@ import net.i2p.data.Hash;
 import net.i2p.data.RouterIdentity;
 import net.i2p.data.RouterInfo;
 import net.i2p.data.TunnelId;
-import net.i2p.data.i2np.TunnelCreateMessage;
 import net.i2p.data.i2np.DeliveryInstructions;
-import net.i2p.data.i2np.GarlicClove;
 import net.i2p.data.i2np.GarlicMessage;
 import net.i2p.data.i2np.I2NPMessage;
+import net.i2p.data.i2np.TunnelCreateMessage;
 import net.i2p.data.i2np.TunnelCreateStatusMessage;
 import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
@@ -28,8 +27,8 @@ import net.i2p.router.MessageSelector;
 import net.i2p.router.ReplyJob;
 import net.i2p.router.RouterContext;
 import net.i2p.router.TunnelInfo;
-import net.i2p.router.TunnelSettings;
 import net.i2p.router.TunnelSelectionCriteria;
+import net.i2p.router.TunnelSettings;
 import net.i2p.router.message.BuildTestMessageJob;
 import net.i2p.router.message.GarlicConfig;
 import net.i2p.router.message.GarlicMessageBuilder;

router/java/src/net/i2p/router/tunnelmanager/PoolingTunnelManagerFacade.java

@@ -2,7 +2,6 @@ package net.i2p.router.tunnelmanager;
 
 import java.io.IOException;
 import java.io.OutputStream;
-
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;

router/java/src/net/i2p/router/tunnelmanager/PoolingTunnelSelector.java

@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.Iterator;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 

router/java/src/net/i2p/router/tunnelmanager/RequestTunnelJob.java

@@ -17,8 +17,6 @@ import java.util.List;
 import java.util.Set;
 
 import net.i2p.data.Certificate;
-import net.i2p.data.DataFormatException;
-import net.i2p.data.Hash;
 import net.i2p.data.PublicKey;
 import net.i2p.data.RouterInfo;
 import net.i2p.data.SessionKey;
@@ -34,7 +32,6 @@ import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
 import net.i2p.router.MessageHistory;
 import net.i2p.router.MessageSelector;
-import net.i2p.router.PeerSelectionCriteria;
 import net.i2p.router.ReplyJob;
 import net.i2p.router.RouterContext;
 import net.i2p.router.TunnelInfo;

router/java/src/net/i2p/router/tunnelmanager/TunnelPool.java

@@ -2,7 +2,6 @@ package net.i2p.router.tunnelmanager;
 
 import java.io.IOException;
 import java.io.OutputStream;
-
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;