beginning of format, updated imports. (shendaras)

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

@@ -8,8 +8,8 @@ package net.i2p.data.i2np;
  *
  */
 
-import java.io.ByteArrayOutputStream;
 import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;

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

@@ -8,19 +8,18 @@ package net.i2p.data.i2np;
  *
  */
 
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 
-import net.i2p.util.Log;
-
+import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.DataStructureImpl;
-import net.i2p.data.DataFormatException;
 import net.i2p.data.Hash;
 import net.i2p.data.SessionKey;
 import net.i2p.data.TunnelId;
+import net.i2p.util.Log;
 
 
 /**

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

@@ -8,16 +8,15 @@ package net.i2p.data.i2np;
  *
  */
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.IOException;
-
-import net.i2p.util.Log;
 
+import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.DataStructureImpl;
-import net.i2p.data.DataFormatException;
 import net.i2p.data.PrivateKey;
+import net.i2p.util.Log;
 
 /**
  * Contains the private key which matches the EndPointPublicKey which, in turn,

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

@@ -8,16 +8,15 @@ package net.i2p.data.i2np;
  *
  */
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.IOException;
-
-import net.i2p.util.Log;
 
+import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.DataStructureImpl;
-import net.i2p.data.DataFormatException;
 import net.i2p.data.PublicKey;
+import net.i2p.util.Log;
 
 /**
  * Contains the public key which matches the EndPointPrivateKey.  This is 

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

@@ -8,18 +8,16 @@ package net.i2p.data.i2np;
  *
  */
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.IOException;
-
-import net.i2p.util.Log;
+import java.util.Date;
 
+import net.i2p.data.Certificate;
+import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.DataStructureImpl;
-import net.i2p.data.DataFormatException;
-import net.i2p.data.Certificate;
-
-import java.util.Date;
+import net.i2p.util.Log;
 
 /**
  * Contains one deliverable message encrypted to a router along with instructions

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

@@ -8,15 +8,14 @@ package net.i2p.data.i2np;
  *
  */
 
-import java.io.InputStream;
-import java.io.IOException;
 import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 
-import net.i2p.data.DataHelper;
 import net.i2p.data.DataFormatException;
-
-import net.i2p.util.Log;
+import net.i2p.data.DataHelper;
 import net.i2p.util.Clock;
+import net.i2p.util.Log;
 
 /**
  * Handle messages from router to router

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

@@ -16,8 +16,8 @@ import java.util.Date;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.DataStructureImpl;
-import net.i2p.util.Log;
 import net.i2p.util.Clock;
+import net.i2p.util.Log;
 import net.i2p.util.RandomSource;
 
 /**

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

@@ -8,16 +8,15 @@ package net.i2p.data.i2np;
  *
  */
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.IOException;
-
-import net.i2p.util.Log;
 
+import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.DataStructureImpl;
-import net.i2p.data.DataFormatException;
 import net.i2p.data.SessionKey;
+import net.i2p.util.Log;
 
 /**
  * Contains the session key used by the owner/creator of the tunnel to modify

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

@@ -8,16 +8,15 @@ package net.i2p.data.i2np;
  *
  */
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.IOException;
-
-import net.i2p.util.Log;
 
+import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.DataStructureImpl;
-import net.i2p.data.DataFormatException;
 import net.i2p.data.SessionKey;
+import net.i2p.util.Log;
 
 /**
  * Contains the session key used by the tunnel gateway to encrypt the DeliveryInstructions

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

@@ -8,16 +8,15 @@ package net.i2p.data.i2np;
  *
  */
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.IOException;
-
-import net.i2p.util.Log;
 
+import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.DataStructureImpl;
-import net.i2p.data.DataFormatException;
 import net.i2p.data.SigningPrivateKey;
+import net.i2p.util.Log;
 
 /**
  * Contains the private key which constructs a signature for the TunnelMessage 

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

@@ -8,16 +8,15 @@ package net.i2p.data.i2np;
  *
  */
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.IOException;
-
-import net.i2p.util.Log;
 
+import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.DataStructureImpl;
-import net.i2p.data.DataFormatException;
 import net.i2p.data.SigningPublicKey;
+import net.i2p.util.Log;
 
 /**
  * Contains the public key which every participant in a tunnel uses to verify

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

@@ -8,20 +8,19 @@ package net.i2p.data.i2np;
  *
  */
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.IOException;
-
-import net.i2p.util.Log;
 
+import net.i2p.crypto.DSAEngine;
+import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.DataStructureImpl;
-import net.i2p.data.DataFormatException;
 import net.i2p.data.Hash;
 import net.i2p.data.Signature;
 import net.i2p.data.SigningPrivateKey;
 import net.i2p.data.SigningPublicKey;
-import net.i2p.crypto.DSAEngine;
+import net.i2p.util.Log;
 
 /**
  *

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

@@ -8,14 +8,12 @@ package net.i2p.router;
  *
  */
 
-import net.i2p.router.client.ClientManagerFacadeImpl;
-
+import net.i2p.data.Destination;
+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.data.Destination;
-import net.i2p.data.LeaseSet;
-import net.i2p.data.Hash;
+import net.i2p.router.client.ClientManagerFacadeImpl;
 
 /**
  * Manage all interactions with clients 

router/java/src/net/i2p/router/ClientMessage.java

@@ -8,11 +8,11 @@ package net.i2p.router;
  *
  */
 
-import net.i2p.data.Payload;
 import net.i2p.data.Destination;
 import net.i2p.data.Hash;
-import net.i2p.data.i2cp.SessionConfig;
+import net.i2p.data.Payload;
 import net.i2p.data.i2cp.MessageId;
+import net.i2p.data.i2cp.SessionConfig;
 
 /**
  * Wrap a message either destined for a local client or received from one.

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

@@ -9,12 +9,11 @@ package net.i2p.router;
  */
 
 //import net.i2p.router.message.ProcessOutboundClientMessageJob;
-import net.i2p.router.message.OutboundClientMessageJob;
-
-import java.util.List;
 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/ClientTunnelSettings.java

@@ -8,8 +8,8 @@ package net.i2p.router;
  *
  */
 
-import java.util.Properties;
 import java.util.Iterator;
+import java.util.Properties;
 
 /**
  * Wrap up the client settings specifying their tunnel criteria

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

@@ -8,11 +8,11 @@ package net.i2p.router;
  *
  */
 
-import net.i2p.router.transport.CommSystemFacadeImpl;
-
 import java.util.HashSet;
 import java.util.Set;
 
+import net.i2p.router.transport.CommSystemFacadeImpl;
+
 /**
  * Manages the communication subsystem between peers, including connections, 
  * listeners, transports, connection keys, etc.

router/java/src/net/i2p/router/GenerateStatusConsoleJob.java

@@ -8,11 +8,11 @@ package net.i2p.router;
  *
  */
 
-import net.i2p.util.Log;
-
 import java.io.FileOutputStream;
 import java.io.IOException;
 
+import net.i2p.util.Log;
+
 public class GenerateStatusConsoleJob extends JobImpl {
     private final static Log _log = new Log(GenerateStatusConsoleJob.class);
     

router/java/src/net/i2p/router/HandlerJobBuilder.java

@@ -8,10 +8,10 @@ package net.i2p.router;
  *
  */
 
+import net.i2p.data.Hash;
+import net.i2p.data.RouterIdentity;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.data.i2np.SourceRouteBlock;
-import net.i2p.data.RouterIdentity;
-import net.i2p.data.Hash;
 
 /**
  * Defines a class that builds jobs to handle a particular message - these

router/java/src/net/i2p/router/InNetMessage.java

@@ -8,10 +8,10 @@ package net.i2p.router;
  *
  */
 
-import net.i2p.data.i2np.I2NPMessage;
-import net.i2p.data.i2np.SourceRouteBlock;
 import net.i2p.data.Hash;
 import net.i2p.data.RouterIdentity;
+import net.i2p.data.i2np.I2NPMessage;
+import net.i2p.data.i2np.SourceRouteBlock;
 
 /**
  * Wrap an I2NP message received from the network prior to handling and processing.

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

@@ -16,8 +16,8 @@ import java.util.List;
 import java.util.Map;
 
 import net.i2p.router.transport.OutboundMessageRegistry;
-import net.i2p.util.Log;
 import net.i2p.stat.StatManager;
+import net.i2p.util.Log;
 
 /**
  * Manage a pool of inbound InNetMessages.  This pool is filled by the 

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

@@ -1,9 +1,8 @@
 package net.i2p.router;
 
-import net.i2p.util.Log;
-import net.i2p.util.Clock;
-
 import net.i2p.stat.StatManager;
+import net.i2p.util.Clock;
+import net.i2p.util.Log;
 
 /** a do run run run a do run run */
 class JobQueueRunner implements Runnable {

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

@@ -1,21 +1,19 @@
 package net.i2p.router;
 
-import java.util.List;
-import java.util.LinkedList;
-import java.util.Iterator;
-
-import java.util.Date;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.TimeZone;
 
-import net.i2p.data.TunnelId;
 import net.i2p.data.Hash;
+import net.i2p.data.TunnelId;
 import net.i2p.data.i2np.I2NPMessage;
-import net.i2p.util.Log;
 import net.i2p.util.Clock;
-
-import java.io.IOException;
-import java.io.FileOutputStream;
+import net.i2p.util.Log;
 
 /**
  * Simply act as a pen register of messages sent in and out of the router.

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

@@ -1,12 +1,12 @@
 package net.i2p.router;
 
-import net.i2p.util.Log;
-import net.i2p.util.Clock;
-
-import java.util.TreeMap;
-import java.util.Set;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.Set;
+import java.util.TreeMap;
+
+import net.i2p.util.Clock;
+import net.i2p.util.Log;
 
 /**
  * Singleton to manage the logic (and historical data) to determine whether a message

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

@@ -8,15 +8,15 @@ package net.i2p.router;
  *
  */
 
-import java.util.List;
 import java.util.ArrayList;
-import java.util.TreeMap;
-import java.util.Iterator;
 import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.TreeMap;
 
-import net.i2p.util.Log;
-import net.i2p.util.Clock;
 import net.i2p.router.transport.OutboundMessageRegistry;
+import net.i2p.util.Clock;
+import net.i2p.util.Log;
 
 /**
  * Maintain a pool of OutNetMessages destined for other routers, organized by

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

@@ -26,28 +26,28 @@ import java.util.TimeZone;
 import net.i2p.CoreVersion;
 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.DataHelper;
 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;
-import net.i2p.stat.StatManager;
-import net.i2p.stat.Rate;
-import net.i2p.stat.RateStat;
-import net.i2p.router.admin.StatsGenerator;
 
 /**
  * Main driver for the router.

router/java/src/net/i2p/router/SessionKeyPersistenceHelper.java

@@ -1,14 +1,14 @@
 package net.i2p.router;
 
-import net.i2p.util.Log;
-import net.i2p.crypto.SessionKeyManager;
-import net.i2p.crypto.PersistentSessionKeyManager;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 
+import net.i2p.crypto.PersistentSessionKeyManager;
+import net.i2p.crypto.SessionKeyManager;
+import net.i2p.util.Log;
+
 /**
  * Centralize the sessionKeyManager persistence (rather than leave it to a private
  * job in the startup job)

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

@@ -8,14 +8,14 @@ package net.i2p.router;
  *
  */
 
-import net.i2p.data.Hash;
-import net.i2p.util.Log;
-import net.i2p.util.Clock;
-
-import java.util.Map;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.Date;
+import java.util.Map;
+
+import net.i2p.data.Hash;
+import net.i2p.util.Clock;
+import net.i2p.util.Log;
 
 /**
  * Manage in memory the routers we are oh so fond of.

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

@@ -1,16 +1,15 @@
 package net.i2p.router;
 
-import net.i2p.util.Log;
-import net.i2p.util.Clock;
-import net.i2p.util.HTTPSendData;
-import net.i2p.util.I2PThread;
-
-import net.i2p.router.transport.BandwidthLimiter;
-
 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;
+
 /**
  * Job that, if its allowed to, will submit the data gathered by the MessageHistory
  * component to some URL so that the network can be debugged more easily.  By default

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

@@ -8,13 +8,12 @@ package net.i2p.router.admin;
  *
  */
 
+import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
 
-import java.io.IOException;
-
-import net.i2p.util.Log;
 import net.i2p.util.I2PThread;
+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/admin/AdminManager.java

@@ -1,10 +1,9 @@
 package net.i2p.router.admin;
 
-import net.i2p.util.Log;
-import net.i2p.util.I2PThread;
-
-import net.i2p.router.Service;
 import net.i2p.router.Router;
+import net.i2p.router.Service;
+import net.i2p.util.I2PThread;
+import net.i2p.util.Log;
 
 public class AdminManager implements Service {
     private final static Log _log = new Log(AdminManager.class);

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

@@ -6,11 +6,11 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.net.Socket;
-import java.util.Set;
 import java.util.Iterator;
+import java.util.Set;
 
-import net.i2p.router.Router;
 import net.i2p.data.Hash;
+import net.i2p.router.Router;
 import net.i2p.router.peermanager.ProfileOrganizer;
 import net.i2p.util.Log;
 

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

@@ -1,25 +1,23 @@
 package net.i2p.router.admin;
 
-import net.i2p.util.Log;
-import net.i2p.stat.StatManager;
+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;
+import java.util.Map;
+import java.util.Set;
+
+import net.i2p.data.DataHelper;
+import net.i2p.router.Router;
 import net.i2p.stat.Frequency;
 import net.i2p.stat.FrequencyStat;
 import net.i2p.stat.Rate;
 import net.i2p.stat.RateStat;
-import net.i2p.router.Router;
-import net.i2p.data.DataHelper;
-
-import java.util.Set;
-import java.util.Map;
-import java.util.Iterator;
-import java.util.Arrays;
-
-import java.text.DecimalFormat;
-
-import java.io.OutputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintWriter;
-import java.io.IOException;
+import net.i2p.stat.StatManager;
+import net.i2p.util.Log;
 
 /**
  * Dump the stats to the web admin interface

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

@@ -8,11 +8,10 @@ package net.i2p.router.client;
  *
  */
 
+import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
 
-import java.io.IOException;
-
 import net.i2p.client.I2PClient;
 import net.i2p.util.Log;
 

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

@@ -25,11 +25,10 @@ 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.util.I2PThread;
 import net.i2p.util.Log;
-import net.i2p.util.Clock;
-
-import net.i2p.stat.StatManager;
 
 /**
  * Coordinate connections and various tasks

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

@@ -10,10 +10,10 @@ package net.i2p.router.client;
 
 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.data.i2cp.SessionConfig;
 import net.i2p.util.Log;
 
 /**

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

@@ -8,17 +8,16 @@ package net.i2p.router.client;
  *
  */
 
-import net.i2p.router.JobImpl;
-import net.i2p.data.Payload;
+import java.io.IOException;
+
 import net.i2p.data.Destination;
+import net.i2p.data.Payload;
+import net.i2p.data.i2cp.I2CPMessageException;
 import net.i2p.data.i2cp.MessageId;
 import net.i2p.data.i2cp.MessageStatusMessage;
-import net.i2p.data.i2cp.I2CPMessageException;
-
+import net.i2p.router.JobImpl;
 import net.i2p.util.Log;
 
-import java.io.IOException;
-
 /**
  * Async job to notify the client that a new message is available for them
  *

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

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

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

@@ -8,18 +8,17 @@ package net.i2p.router.client;
  *
  */
 
+import java.io.IOException;
+import java.util.Date;
+
+import net.i2p.data.LeaseSet;
+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.data.LeaseSet;
-import net.i2p.data.i2cp.RequestLeaseSetMessage;
-import net.i2p.data.i2cp.I2CPMessageException;
-
 import net.i2p.util.Clock;
 import net.i2p.util.Log;
-import java.io.IOException;
-import java.util.Date;
 
 /**
  * Async job to walk the client through generating a lease set.  First sends it

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

@@ -8,32 +8,29 @@ package net.i2p.router.message;
  *
  */
 
-import net.i2p.router.Job;
-import net.i2p.router.ReplyJob;
-import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.Router;
-import net.i2p.router.MessageSelector;
-
-import net.i2p.data.RouterInfo;
-import net.i2p.data.Certificate;
-import net.i2p.data.PublicKey;
-import net.i2p.data.SessionKey;
-import net.i2p.data.Hash;
-import net.i2p.data.i2np.I2NPMessage;
-import net.i2p.data.i2np.DeliveryInstructions;
-import net.i2p.data.i2np.DeliveryStatusMessage;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
 
 import net.i2p.crypto.SessionKeyManager;
-
-import net.i2p.util.Log;
+import net.i2p.data.Certificate;
+import net.i2p.data.Hash;
+import net.i2p.data.PublicKey;
+import net.i2p.data.RouterInfo;
+import net.i2p.data.SessionKey;
+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.ReplyJob;
+import net.i2p.router.Router;
 import net.i2p.util.Clock;
+import net.i2p.util.Log;
 import net.i2p.util.RandomSource;
 
-import java.util.Date;
-import java.util.Set;
-import java.util.HashSet;
-
 /**
  * Build a test message that will be sent to the target to make sure they're alive.
  * Once that is verified, onSendJob is enqueued.  If their reachability isn't 

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

@@ -24,8 +24,8 @@ import net.i2p.data.SessionKey;
 import net.i2p.data.SessionTag;
 import net.i2p.data.i2np.GarlicClove;
 import net.i2p.data.i2np.GarlicMessage;
-import net.i2p.data.i2np.SourceRouteBlock;
 import net.i2p.data.i2np.I2NPMessage;
+import net.i2p.data.i2np.SourceRouteBlock;
 import net.i2p.router.MessageHistory;
 import net.i2p.util.Log;
 

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

@@ -8,15 +8,14 @@ package net.i2p.router.message;
  *
  */
 
+import net.i2p.data.Hash;
+import net.i2p.data.RouterIdentity;
+import net.i2p.data.i2np.GarlicMessage;
+import net.i2p.data.i2np.I2NPMessage;
+import net.i2p.data.i2np.SourceRouteBlock;
 import net.i2p.router.HandlerJobBuilder;
 import net.i2p.router.Job;
 
-import net.i2p.data.RouterIdentity;
-import net.i2p.data.Hash;
-import net.i2p.data.i2np.I2NPMessage;
-import net.i2p.data.i2np.GarlicMessage;
-import net.i2p.data.i2np.SourceRouteBlock;
-
 /**
  * HandlerJobBuilder to build jobs to handle GarlicMessages
  *

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

@@ -23,10 +23,10 @@ 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.Router;
 import net.i2p.router.MessageHistory;
-import net.i2p.util.Log;
+import net.i2p.router.Router;
 import net.i2p.util.Clock;
+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

@@ -22,10 +22,10 @@ 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.Router;
 import net.i2p.router.MessageHistory;
-import net.i2p.util.Log;
+import net.i2p.router.Router;
 import net.i2p.util.Clock;
+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

@@ -36,16 +36,15 @@ 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.router.MessageHistory;
-import net.i2p.router.MessageValidator;
-import net.i2p.util.Log;
-import net.i2p.util.Clock;
-
 import net.i2p.stat.StatManager;
+import net.i2p.util.Clock;
+import net.i2p.util.Log;
 
 public class HandleTunnelMessageJob extends JobImpl {
     private final static Log _log = new Log(HandleTunnelMessageJob.class);

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

@@ -30,8 +30,8 @@ import net.i2p.router.MessageHistory;
 import net.i2p.router.MessageReceptionInfo;
 import net.i2p.router.MessageValidator;
 import net.i2p.router.Router;
-import net.i2p.util.Log;
 import net.i2p.util.Clock;
+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

@@ -35,12 +35,11 @@ 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.stat.StatManager;
-
 /**
  * Send a client message, taking into consideration the fact that there may be
  * multiple inbound tunnels that the target provides.  This job sends it to one

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

@@ -27,8 +27,8 @@ import net.i2p.router.Router;
 import net.i2p.router.TunnelInfo;
 import net.i2p.router.TunnelManagerFacade;
 import net.i2p.router.TunnelSelectionCriteria;
-import net.i2p.util.Log;
 import net.i2p.util.Clock;
+import net.i2p.util.Log;
 import net.i2p.util.RandomSource;
 
 /**

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

@@ -21,8 +21,8 @@ import net.i2p.router.OutNetMessage;
 import net.i2p.router.OutNetMessagePool;
 import net.i2p.router.ReplyJob;
 import net.i2p.router.Router;
-import net.i2p.util.Log;
 import net.i2p.util.Clock;
+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/SendMessageDirectJob.java

@@ -8,27 +8,25 @@ package net.i2p.router.message;
  *
  */
 
-import net.i2p.router.JobImpl;
+import java.util.Date;
+
+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.ReplyJob;
+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.transport.OutboundMessageRegistry;
-import net.i2p.router.InNetMessage;
-import net.i2p.router.InNetMessagePool;
+import net.i2p.router.ReplyJob;
 import net.i2p.router.Router;
-
-import net.i2p.data.i2np.I2NPMessage;
-import net.i2p.data.Hash;
-import net.i2p.data.RouterInfo;
-
-import net.i2p.util.Log;
+import net.i2p.router.transport.OutboundMessageRegistry;
 import net.i2p.util.Clock;
-
-import java.util.Date;
+import net.i2p.util.Log;
 
 public class SendMessageDirectJob extends JobImpl {
     private final static Log _log = new Log(SendMessageDirectJob.class);

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

@@ -10,6 +10,7 @@ package net.i2p.router.message;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.util.Date;
 
 import net.i2p.crypto.AESEngine;
 import net.i2p.crypto.KeyGenerator;
@@ -43,10 +44,8 @@ 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.Log;
 import net.i2p.util.Clock;
-
-import java.util.Date;
+import net.i2p.util.Log;
 
 /**
  * Send a message down a tunnel that we are the gateway for

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

@@ -8,15 +8,14 @@ package net.i2p.router.message;
  *
  */
 
+import net.i2p.data.Hash;
+import net.i2p.data.RouterIdentity;
+import net.i2p.data.i2np.I2NPMessage;
+import net.i2p.data.i2np.SourceRouteBlock;
+import net.i2p.data.i2np.SourceRouteReplyMessage;
 import net.i2p.router.HandlerJobBuilder;
 import net.i2p.router.Job;
 
-import net.i2p.data.RouterIdentity;
-import net.i2p.data.Hash;
-import net.i2p.data.i2np.I2NPMessage;
-import net.i2p.data.i2np.SourceRouteReplyMessage;
-import net.i2p.data.i2np.SourceRouteBlock;
-
 /**
  * HandlerJobBuilder to build jobs to handle SourceRouteReplyMessages
  *

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

@@ -8,15 +8,14 @@ package net.i2p.router.message;
  *
  */
 
+import net.i2p.data.Hash;
+import net.i2p.data.RouterIdentity;
+import net.i2p.data.i2np.I2NPMessage;
+import net.i2p.data.i2np.SourceRouteBlock;
+import net.i2p.data.i2np.TunnelMessage;
 import net.i2p.router.HandlerJobBuilder;
 import net.i2p.router.Job;
 
-import net.i2p.data.RouterIdentity;
-import net.i2p.data.Hash;
-import net.i2p.data.i2np.I2NPMessage;
-import net.i2p.data.i2np.TunnelMessage;
-import net.i2p.data.i2np.SourceRouteBlock;
-
 /**
  * HandlerJobBuilder to build jobs to handle TunnelMessages
  *

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

@@ -8,13 +8,13 @@ package net.i2p.router.networkdb;
  *
  */
 
+import net.i2p.data.Hash;
+import net.i2p.data.RouterIdentity;
+import net.i2p.data.i2np.DatabaseLookupMessage;
+import net.i2p.data.i2np.I2NPMessage;
+import net.i2p.data.i2np.SourceRouteBlock;
 import net.i2p.router.HandlerJobBuilder;
 import net.i2p.router.Job;
-import net.i2p.data.RouterIdentity;
-import net.i2p.data.Hash;
-import net.i2p.data.i2np.I2NPMessage;
-import net.i2p.data.i2np.DatabaseLookupMessage;
-import net.i2p.data.i2np.SourceRouteBlock;
 
 /**
  * Build a HandleDatabaseLookupMessageJob whenever a DatabaseLookupMessage arrives

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

@@ -8,13 +8,13 @@ package net.i2p.router.networkdb;
  *
  */
 
+import net.i2p.data.Hash;
+import net.i2p.data.RouterIdentity;
+import net.i2p.data.i2np.DatabaseSearchReplyMessage;
+import net.i2p.data.i2np.I2NPMessage;
+import net.i2p.data.i2np.SourceRouteBlock;
 import net.i2p.router.HandlerJobBuilder;
 import net.i2p.router.Job;
-import net.i2p.data.RouterIdentity;
-import net.i2p.data.Hash;
-import net.i2p.data.i2np.I2NPMessage;
-import net.i2p.data.i2np.DatabaseSearchReplyMessage;
-import net.i2p.data.i2np.SourceRouteBlock;
 
 /**
  * Build a HandleDatabaseSearchReplyMessageJob whenever a DatabaseSearchReplyMessage arrives

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

@@ -8,13 +8,13 @@ package net.i2p.router.networkdb;
  *
  */
 
+import net.i2p.data.Hash;
+import net.i2p.data.RouterIdentity;
+import net.i2p.data.i2np.DatabaseStoreMessage;
+import net.i2p.data.i2np.I2NPMessage;
+import net.i2p.data.i2np.SourceRouteBlock;
 import net.i2p.router.HandlerJobBuilder;
 import net.i2p.router.Job;
-import net.i2p.data.RouterIdentity;
-import net.i2p.data.Hash;
-import net.i2p.data.i2np.I2NPMessage;
-import net.i2p.data.i2np.DatabaseStoreMessage;
-import net.i2p.data.i2np.SourceRouteBlock;
 
 /**
  * Create a HandleDatabaseStoreMessageJob whenever a DatabaseStoreMessage arrives

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

@@ -8,24 +8,26 @@ package net.i2p.router.networkdb;
  *
  */
 
-import java.util.Set;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.util.Date;
+import java.util.Set;
 
+import net.i2p.data.DataFormatException;
 import net.i2p.data.DataStructure;
 import net.i2p.data.Hash;
 import net.i2p.data.LeaseSet;
 import net.i2p.data.RouterIdentity;
 import net.i2p.data.RouterInfo;
 import net.i2p.data.TunnelId;
-import net.i2p.data.DataFormatException;
 import net.i2p.data.i2np.DatabaseLookupMessage;
 import net.i2p.data.i2np.DatabaseSearchReplyMessage;
 import net.i2p.data.i2np.DatabaseStoreMessage;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.data.i2np.TunnelMessage;
 import net.i2p.router.Job;
-import net.i2p.router.JobQueue;
 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;
@@ -33,11 +35,8 @@ 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.Log;
 import net.i2p.util.Clock;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
+import net.i2p.util.Log;
 
 /**
  * Handle a lookup for a key received from a remote peer.  Needs to be implemented

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

@@ -13,14 +13,14 @@ 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.CommSystemFacade;
 import net.i2p.router.StatisticsManager;
-import net.i2p.util.Log;
 import net.i2p.util.Clock;
+import net.i2p.util.Log;
 import net.i2p.util.RandomSource;
 
 /**

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

@@ -8,19 +8,18 @@ package net.i2p.router.networkdb.kademlia;
  *
  */
 
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import net.i2p.data.DataStructure;
 import net.i2p.data.Hash;
 import net.i2p.data.LeaseSet;
-import net.i2p.data.DataStructure;
 import net.i2p.router.JobImpl;
 import net.i2p.router.JobQueue;
 import net.i2p.router.Router;
-
-import net.i2p.util.Log;
 import net.i2p.util.Clock;
-
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Iterator;
+import net.i2p.util.Log;
 
 class DataPublisherJob extends JobImpl {
     private final static Log _log = new Log(DataPublisherJob.class);

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

@@ -18,8 +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.Log;
 import net.i2p.util.Clock;
+import net.i2p.util.Log;
 import net.i2p.util.RandomSource;
 
 class DataRepublishingSelectorJob extends JobImpl {

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

@@ -8,11 +8,11 @@ package net.i2p.router.networkdb.kademlia;
  *
  */
 
-import net.i2p.data.Hash;
-import net.i2p.data.DataStructure;
-
 import java.util.Set;
 
+import net.i2p.data.DataStructure;
+import net.i2p.data.Hash;
+
 public interface DataStore {
     public boolean isKnown(Hash key);
     public DataStructure get(Hash key);

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

@@ -10,10 +10,10 @@ package net.i2p.router.networkdb.kademlia;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
-import java.io.FileNotFoundException;
 
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataStructure;

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

@@ -8,19 +8,17 @@ 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.Log;
 import net.i2p.util.Clock;
-
-import java.util.Set;
-import java.util.HashSet;
+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

@@ -29,8 +29,8 @@ 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.SendTunnelMessageJob;
 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;

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

@@ -1,15 +1,15 @@
 package net.i2p.router.networkdb.kademlia;
 
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
 import net.i2p.data.Hash;
 import net.i2p.util.Clock;
 
-import java.util.Set;
-import java.util.HashSet;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Collection;
-import java.util.Date;
-
 /**
  * Data related to a particular search
  *

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

@@ -45,8 +45,8 @@ 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.Log;
 import net.i2p.util.Clock;
+import net.i2p.util.Log;
 import net.i2p.util.RandomSource;
 
 class StoreJob extends JobImpl {

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

@@ -8,22 +8,21 @@ package net.i2p.router.networkdb.kademlia;
  *
  */
 
-import net.i2p.data.DataHelper;
-import net.i2p.data.Hash;
-import net.i2p.data.DataStructure;
-import net.i2p.data.RouterInfo;
-import net.i2p.data.LeaseSet;
-import net.i2p.util.Log;
-import net.i2p.util.Clock;
-
-import net.i2p.router.ProfileManager;
-
-import java.util.Map;
+import java.util.Date;
 import java.util.HashMap;
-import java.util.Set;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.Date;
+import java.util.Map;
+import java.util.Set;
+
+import net.i2p.data.DataHelper;
+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;
 
 class TransientDataStore implements DataStore {
     private final static Log _log = new Log(TransientDataStore.class);

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

@@ -3,6 +3,7 @@ package net.i2p.router.peermanager;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Properties;
+
 import net.i2p.stat.RateStat;
 import net.i2p.util.Clock;
 import net.i2p.util.Log;

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

@@ -1,7 +1,7 @@
 package net.i2p.router.peermanager;
 
-import net.i2p.util.Log;
 import net.i2p.util.Clock;
+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

@@ -8,15 +8,15 @@ package net.i2p.router.peermanager;
  *
  */
 
-import java.util.Set;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.Set;
 
 import net.i2p.data.Hash;
-import net.i2p.router.PeerSelectionCriteria;
-import net.i2p.router.Router;
 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;
 
 /**

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

@@ -8,8 +8,8 @@ package net.i2p.router.peermanager;
  *
  */
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 import net.i2p.router.PeerManagerFacade;
 import net.i2p.router.PeerSelectionCriteria;

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

@@ -1,12 +1,12 @@
 package net.i2p.router.peermanager;
 
-import java.util.Set;
 import java.util.Iterator;
+import java.util.Set;
 
 import net.i2p.data.Hash;
-import net.i2p.util.Clock;
 import net.i2p.router.JobImpl;
 import net.i2p.router.JobQueue;
+import net.i2p.util.Clock;
 
 class PersistProfilesJob extends JobImpl {
     private PeerManager _mgr;

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

@@ -15,6 +15,7 @@ import java.util.Iterator;
 import java.util.Locale;
 import java.util.Properties;
 import java.util.Set;
+
 import net.i2p.data.Hash;
 import net.i2p.router.ProfileManager;
 import net.i2p.util.Clock;

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

@@ -1,19 +1,15 @@
 package net.i2p.router.peermanager;
 
-import net.i2p.data.Hash;
-import net.i2p.data.DataHelper;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
-
+import java.io.IOException;
+import java.io.OutputStream;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
-
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -22,8 +18,10 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import java.io.IOException;
-import java.io.OutputStream;
+import net.i2p.data.DataHelper;
+import net.i2p.data.Hash;
+import net.i2p.util.Clock;
+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

@@ -6,8 +6,8 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.FilenameFilter;
-import java.io.InputStreamReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.util.HashSet;
 import java.util.Iterator;

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

@@ -1,7 +1,7 @@
 package net.i2p.router.peermanager;
 
-import net.i2p.util.Log;
 import net.i2p.util.Clock;
+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/TunnelHistory.java

@@ -3,6 +3,7 @@ package net.i2p.router.peermanager;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Properties;
+
 import net.i2p.util.Clock;
 
 /**

router/java/src/net/i2p/router/startup/LoadRouterInfoJob.java

@@ -21,8 +21,8 @@ import net.i2p.data.SigningPublicKey;
 import net.i2p.router.JobImpl;
 import net.i2p.router.JobQueue;
 import net.i2p.router.KeyManager;
-import net.i2p.router.Router;
 import net.i2p.router.MessageHistory;
+import net.i2p.router.Router;
 import net.i2p.util.Log;
 
 public class LoadRouterInfoJob extends JobImpl {

router/java/src/net/i2p/router/startup/ProcessInboundNetMessageJob.java

@@ -12,8 +12,8 @@ import net.i2p.router.InNetMessage;
 import net.i2p.router.InNetMessagePool;
 import net.i2p.router.JobImpl;
 import net.i2p.router.JobQueue;
-import net.i2p.util.Log;
 import net.i2p.util.Clock;
+import net.i2p.util.Log;
 
 /**
  * Pull a message off the inbound net message pool and begin its processing. 

router/java/src/net/i2p/router/startup/ReadConfigJob.java

@@ -8,17 +8,17 @@ package net.i2p.router.startup;
  *
  */
 
-import net.i2p.router.JobImpl;
-import net.i2p.router.Router;
-import net.i2p.router.JobQueue;
-import net.i2p.util.Log;
-import net.i2p.util.Clock;
-
-import java.util.Properties;
-import java.util.Iterator;
-import java.io.FileInputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.util.Iterator;
+import java.util.Properties;
+
+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;
 
 /**
  * Simply read the router config

router/java/src/net/i2p/router/startup/StartAcceptingClientsJob.java

@@ -9,17 +9,17 @@ package net.i2p.router.startup;
  */
 
 import java.lang.reflect.Method;
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 import net.i2p.router.ClientManagerFacade;
 import net.i2p.router.JobImpl;
 import net.i2p.router.JobQueue;
 import net.i2p.router.Router;
 import net.i2p.router.admin.AdminManager;
-import net.i2p.util.Log;
-import net.i2p.util.I2PThread;
 import net.i2p.util.Clock;
+import net.i2p.util.I2PThread;
+import net.i2p.util.Log;
 
 public class StartAcceptingClientsJob extends JobImpl {
     private static Log _log = new Log(StartAcceptingClientsJob.class);

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

@@ -8,11 +8,11 @@ package net.i2p.router.transport;
  *
  */
 
-import net.i2p.data.RouterIdentity;
-
 import java.io.FilterInputStream;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
+
+import net.i2p.data.RouterIdentity;
 
 public class BandwidthLimitedInputStream extends FilterInputStream {
     private RouterIdentity _peer;

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

@@ -8,10 +8,11 @@ package net.i2p.router.transport;
  *
  */
 
-import net.i2p.data.RouterIdentity;
 import java.io.FilterOutputStream;
-import java.io.OutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
+
+import net.i2p.data.RouterIdentity;
 
 public class BandwidthLimitedOutputStream extends FilterOutputStream {
     private RouterIdentity _peer;

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

@@ -9,7 +9,6 @@ package net.i2p.router.transport;
  */
 
 import net.i2p.data.RouterIdentity;
-
 import net.i2p.util.Log;
 
 /**

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

@@ -12,8 +12,8 @@ import net.i2p.router.JobImpl;
 import net.i2p.router.JobQueue;
 import net.i2p.router.OutNetMessage;
 import net.i2p.router.OutNetMessagePool;
-import net.i2p.util.Log;
 import net.i2p.util.Clock;
+import net.i2p.util.Log;
 
 /**
  * Fetch an outbound message from the outbound pool, check its validity, get a bid

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

@@ -10,14 +10,14 @@ package net.i2p.router.transport;
 
 import java.util.List;
 
+import net.i2p.data.Hash;
 import net.i2p.router.JobImpl;
 import net.i2p.router.JobQueue;
 import net.i2p.router.MessageSelector;
 import net.i2p.router.OutNetMessage;
 import net.i2p.router.ProfileManager;
-import net.i2p.router.Shitlist;
 import net.i2p.router.Router;
-import net.i2p.data.Hash;
+import net.i2p.router.Shitlist;
 import net.i2p.util.Log;
 
 /**

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

@@ -8,13 +8,13 @@ package net.i2p.router.transport;
  *
  */
 
-import net.i2p.data.RouterInfo;
-import net.i2p.data.RouterAddress;
-import net.i2p.router.OutNetMessage;
-
 import java.util.Properties;
 import java.util.Set;
 
+import net.i2p.data.RouterAddress;
+import net.i2p.data.RouterInfo;
+import net.i2p.router.OutNetMessage;
+
 /**
  * Defines a way to send a message to another peer and start listening for messages
  *

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

@@ -8,10 +8,10 @@ package net.i2p.router.transport;
  *
  */
 
-import net.i2p.data.RouterInfo;
-
 import java.util.Date;
 
+import net.i2p.data.RouterInfo;
+
 /**
  * Provide a bid for how much it would "cost" to transfer a message of a 
  * particular peer

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

@@ -8,10 +8,9 @@ package net.i2p.router.transport;
  *
  */
 
-import net.i2p.data.i2np.I2NPMessage;
-
-import net.i2p.data.RouterIdentity;
 import net.i2p.data.Hash;
+import net.i2p.data.RouterIdentity;
+import net.i2p.data.i2np.I2NPMessage;
 
 public interface TransportEventListener {
     public void messageReceived(I2NPMessage message, RouterIdentity fromRouter, Hash fromRouterHash);

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

@@ -8,10 +8,10 @@ package net.i2p.router.transport;
  *
  */
 
-import java.util.LinkedList;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
@@ -22,15 +22,14 @@ import net.i2p.data.RouterInfo;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.router.Job;
 import net.i2p.router.JobQueue;
+import net.i2p.router.MessageHistory;
 import net.i2p.router.MessageSelector;
 import net.i2p.router.OutNetMessage;
 import net.i2p.router.OutNetMessagePool;
 import net.i2p.router.ProfileManager;
-import net.i2p.router.MessageHistory;
-import net.i2p.util.Log;
-import net.i2p.util.Clock;
-
 import net.i2p.stat.StatManager;
+import net.i2p.util.Clock;
+import net.i2p.util.Log;
 
 /**
  * Defines a way to send a message to another peer and start listening for messages

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

@@ -12,9 +12,8 @@ import net.i2p.data.RouterIdentity;
 import net.i2p.router.JobImpl;
 import net.i2p.router.JobQueue;
 import net.i2p.router.Router;
-
-import net.i2p.util.Log;
 import net.i2p.util.Clock;
+import net.i2p.util.Log;
 
 /**
  * Coordinate the bandwidth limiting across all classes of peers.  Currently 

router/java/src/net/i2p/router/transport/phttp/PHTTPPoller.java

@@ -24,12 +24,12 @@ import net.i2p.data.Signature;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.data.i2np.I2NPMessageException;
 import net.i2p.data.i2np.I2NPMessageHandler;
-import net.i2p.util.Log;
-import net.i2p.util.RandomSource;
+import net.i2p.router.Router;
+import net.i2p.router.transport.BandwidthLimiter;
 import net.i2p.util.Clock;
 import net.i2p.util.I2PThread;
-import net.i2p.router.transport.BandwidthLimiter;
-import net.i2p.router.Router;
+import net.i2p.util.Log;
+import net.i2p.util.RandomSource;
 
 class PHTTPPoller {
     private final static Log _log = new Log(PHTTPPoller.class);

router/java/src/net/i2p/router/transport/phttp/PHTTPSender.java

@@ -22,9 +22,9 @@ import java.util.Iterator;
 import net.i2p.data.RouterAddress;
 import net.i2p.router.OutNetMessage;
 import net.i2p.router.transport.BandwidthLimiter;
-import net.i2p.util.Log;
 import net.i2p.util.Clock;
 import net.i2p.util.I2PThread;
+import net.i2p.util.Log;
 
 class PHTTPSender {
     private final static Log _log = new Log(PHTTPSender.class);

router/java/src/net/i2p/router/transport/phttp/PHTTPTransport.java

@@ -28,8 +28,8 @@ import net.i2p.router.Router;
 import net.i2p.router.transport.BandwidthLimiter;
 import net.i2p.router.transport.TransportBid;
 import net.i2p.router.transport.TransportImpl;
-import net.i2p.util.Log;
 import net.i2p.util.Clock;
+import net.i2p.util.Log;
 
 /**
  *

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

@@ -27,12 +27,11 @@ import net.i2p.router.Router;
 import net.i2p.router.Shitlist;
 import net.i2p.router.transport.BandwidthLimitedInputStream;
 import net.i2p.router.transport.BandwidthLimitedOutputStream;
+import net.i2p.stat.StatManager;
 import net.i2p.util.Clock;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
 
-import net.i2p.stat.StatManager;
-
 /**
  * TCPConnection that validates the time and protocol version, dropping connection if
  * the clocks are too skewed or the versions don't match.

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

@@ -1,10 +1,10 @@
 package net.i2p.router.transport.tcp;
 
-import net.i2p.util.Log;
-
+import java.io.IOException;
 import java.net.Socket;
 import java.net.UnknownHostException;
-import java.io.IOException;
+
+import net.i2p.util.Log;
 
 class SocketCreator implements Runnable {
     private final static Log _log = new Log(SocketCreator.class);

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

@@ -9,6 +9,7 @@ package net.i2p.router.transport.tcp;
  */
 
 import java.net.InetAddress;
+
 import net.i2p.data.DataHelper;
 import net.i2p.data.RouterAddress;
 import net.i2p.util.Log;

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

@@ -20,27 +20,26 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
+import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.data.RouterAddress;
 import net.i2p.data.RouterIdentity;
 import net.i2p.data.RouterInfo;
 import net.i2p.data.SigningPrivateKey;
-import net.i2p.data.DataHelper;
 import net.i2p.router.JobImpl;
 import net.i2p.router.JobQueue;
 import net.i2p.router.NetworkDatabaseFacade;
 import net.i2p.router.OutNetMessage;
+import net.i2p.router.ProfileManager;
 import net.i2p.router.Router;
 import net.i2p.router.Shitlist;
 import net.i2p.router.transport.TransportBid;
 import net.i2p.router.transport.TransportImpl;
-import net.i2p.router.ProfileManager;
+import net.i2p.stat.StatManager;
 import net.i2p.util.Clock;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
 
-import net.i2p.stat.StatManager;
-
 /**
  * Defines a way to send a message to another peer and start listening for messages
  *