imports (sorry, includes alphabetizing, wee)

(shendaras)

core/java/src/net/i2p/I2PAppContext.java

@@ -1,26 +1,26 @@
 package net.i2p;
 
-import net.i2p.stat.StatManager;
-import net.i2p.crypto.SessionKeyManager;
-import net.i2p.crypto.PersistentSessionKeyManager;
-import net.i2p.crypto.ElGamalAESEngine;
-import net.i2p.crypto.ElGamalEngine;
-import net.i2p.crypto.DummyElGamalEngine;
-import net.i2p.crypto.SHA256Generator;
-import net.i2p.crypto.HMACSHA256Generator;
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.Set;
+
+import net.i2p.client.naming.NamingService;
 import net.i2p.crypto.AESEngine;
 import net.i2p.crypto.CryptixAESEngine;
 import net.i2p.crypto.DSAEngine;
-import net.i2p.client.naming.NamingService;
-import net.i2p.util.LogManager;
-import net.i2p.util.Clock;
-import net.i2p.util.RandomSource;
-import net.i2p.data.RoutingKeyGenerator;
+import net.i2p.crypto.DummyElGamalEngine;
+import net.i2p.crypto.ElGamalAESEngine;
+import net.i2p.crypto.ElGamalEngine;
+import net.i2p.crypto.HMACSHA256Generator;
 import net.i2p.crypto.KeyGenerator;
-
-import java.util.Properties;
-import java.util.HashSet;
-import java.util.Set;
+import net.i2p.crypto.PersistentSessionKeyManager;
+import net.i2p.crypto.SHA256Generator;
+import net.i2p.crypto.SessionKeyManager;
+import net.i2p.data.RoutingKeyGenerator;
+import net.i2p.stat.StatManager;
+import net.i2p.util.Clock;
+import net.i2p.util.LogManager;
+import net.i2p.util.RandomSource;
 
 /**
  * <p>Provide a base scope for accessing singletons that I2P exposes.  Rather than

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

@@ -24,14 +24,13 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Properties;
 
+import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
 import net.i2p.util.Clock;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
-import net.i2p.util.LogManager;
-import net.i2p.I2PAppContext;
 
 /**
  * ATalk - anonymous talk, demonstrating a trivial I2P usage scenario.

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

@@ -9,9 +9,9 @@ package net.i2p.client;
  *
  */
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.i2cp.DisconnectMessage;
 import net.i2p.data.i2cp.I2CPMessage;
-import net.i2p.I2PAppContext;
 
 /**
  * Handle I2CP disconnect messages from the router

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

@@ -9,8 +9,8 @@ package net.i2p.client;
  *
  */
 
-import net.i2p.util.Log;
 import net.i2p.I2PAppContext;
+import net.i2p.util.Log;
 
 /**
  * Base class for handling I2CP messages

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

@@ -12,7 +12,7 @@ package net.i2p.client;
 import java.util.HashSet;
 import java.util.Set;
 
-import net.i2p.crypto.ElGamalAESEngine;
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
 import net.i2p.data.LeaseSet;
@@ -32,7 +32,6 @@ import net.i2p.data.i2cp.SendMessageMessage;
 import net.i2p.data.i2cp.SessionConfig;
 import net.i2p.util.Log;
 import net.i2p.util.RandomSource;
-import net.i2p.I2PAppContext;
 
 /**
  * Produce the various messages the session needs to send to the router.

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

@@ -14,6 +14,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Properties;
 
+import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
 import net.i2p.crypto.KeyGenerator;
 import net.i2p.data.Certificate;
@@ -22,7 +23,6 @@ import net.i2p.data.PrivateKey;
 import net.i2p.data.PublicKey;
 import net.i2p.data.SigningPrivateKey;
 import net.i2p.data.SigningPublicKey;
-import net.i2p.I2PAppContext;
 
 /**
  * Base client implementation

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

@@ -12,6 +12,7 @@ package net.i2p.client;
 import java.util.HashMap;
 import java.util.Map;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.i2cp.DisconnectMessage;
 import net.i2p.data.i2cp.MessagePayloadMessage;
 import net.i2p.data.i2cp.MessageStatusMessage;
@@ -19,7 +20,6 @@ import net.i2p.data.i2cp.RequestLeaseSetMessage;
 import net.i2p.data.i2cp.SessionStatusMessage;
 import net.i2p.data.i2cp.SetDateMessage;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Contains a map of message handlers that a session will want to use

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

@@ -23,6 +23,7 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
 import net.i2p.data.LeaseSet;
@@ -36,10 +37,8 @@ import net.i2p.data.i2cp.I2CPMessageException;
 import net.i2p.data.i2cp.I2CPMessageReader;
 import net.i2p.data.i2cp.MessagePayloadMessage;
 import net.i2p.data.i2cp.SessionId;
-import net.i2p.util.Clock;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Implementation of an I2P session running over TCP.  This class is NOT thread safe -

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

@@ -15,18 +15,14 @@ import java.util.Iterator;
 import java.util.Properties;
 import java.util.Set;
 
-import net.i2p.crypto.KeyGenerator;
-import net.i2p.crypto.SessionKeyManager;
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Destination;
 import net.i2p.data.SessionKey;
 import net.i2p.data.SessionTag;
 import net.i2p.data.i2cp.MessageId;
 import net.i2p.data.i2cp.MessageStatusMessage;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
-import net.i2p.util.RandomSource;
-import net.i2p.I2PAppContext;
 
 /**
  * Thread safe implementation of an I2P session running over TCP.  

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

@@ -9,14 +9,13 @@ package net.i2p.client;
  *
  */
 
-import net.i2p.crypto.ElGamalAESEngine;
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Payload;
 import net.i2p.data.i2cp.I2CPMessage;
 import net.i2p.data.i2cp.MessageId;
 import net.i2p.data.i2cp.MessagePayloadMessage;
 import net.i2p.data.i2cp.ReceiveMessageEndMessage;
-import net.i2p.I2PAppContext;
 
 /**
  * Handle I2CP MessagePayloadMessages from the router delivering the contents

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

@@ -9,10 +9,10 @@ package net.i2p.client;
  *
  */
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.i2cp.I2CPMessage;
 import net.i2p.data.i2cp.MessageStatusMessage;
 import net.i2p.data.i2cp.ReceiveMessageBeginMessage;
-import net.i2p.I2PAppContext;
 
 /**
  * Handle I2CP MessageStatusMessages from the router.  This currently only takes

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

@@ -12,6 +12,7 @@ package net.i2p.client;
 import java.util.HashMap;
 import java.util.Map;
 
+import net.i2p.I2PAppContext;
 import net.i2p.crypto.KeyGenerator;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
@@ -25,7 +26,6 @@ import net.i2p.data.SigningPublicKey;
 import net.i2p.data.i2cp.I2CPMessage;
 import net.i2p.data.i2cp.RequestLeaseSetMessage;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Handle I2CP RequestLeaseSetMessage from the router by granting all leases

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

@@ -9,9 +9,9 @@ package net.i2p.client;
  *
  */
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.i2cp.I2CPMessage;
 import net.i2p.data.i2cp.SessionStatusMessage;
-import net.i2p.I2PAppContext;
 
 /**
  * Handle I2CP SessionStatusMessagese from the router, updating the session as

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

@@ -9,10 +9,10 @@ package net.i2p.client;
  *
  */
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.i2cp.I2CPMessage;
 import net.i2p.data.i2cp.SetDateMessage;
 import net.i2p.util.Clock;
-import net.i2p.I2PAppContext;
 
 /**
  * Handle I2CP time messages from the router

core/java/src/net/i2p/client/datagram/I2PDatagramDissector.java

@@ -9,7 +9,6 @@ package net.i2p.client.datagram;
  */
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
 import net.i2p.crypto.DSAEngine;
@@ -17,7 +16,6 @@ import net.i2p.crypto.SHA256Generator;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
 import net.i2p.data.Signature;
-import net.i2p.util.HexDump;
 import net.i2p.util.Log;
 
 /**

core/java/src/net/i2p/client/naming/DummyNamingService.java

@@ -7,8 +7,8 @@
  */
 package net.i2p.client.naming;
 
-import net.i2p.data.Destination;
 import net.i2p.I2PAppContext;
+import net.i2p.data.Destination;
 
 /**
  * A Dummy naming service that can only handle base64 destinations.

core/java/src/net/i2p/client/naming/HostsTxtNamingService.java

@@ -12,9 +12,9 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.Properties;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.Destination;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * A naming service based on the "hosts.txt" file.

core/java/src/net/i2p/client/naming/NamingService.java

@@ -7,12 +7,12 @@
  */
 package net.i2p.client.naming;
 
+import java.lang.reflect.Constructor;
+
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
-
-import java.lang.reflect.Constructor;
 
 /**
  * Naming services create a subclass of this class.

core/java/src/net/i2p/crypto/AESEngine.java

@@ -13,13 +13,13 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.data.SessionKey;
 import net.i2p.util.Log;
 import net.i2p.util.RandomSource;
-import net.i2p.I2PAppContext;
 
 /** 
  * Dummy wrapper for AES cipher operation.

core/java/src/net/i2p/crypto/AESInputStream.java

@@ -17,6 +17,7 @@ import java.io.InputStream;
 import java.util.LinkedList;
 import java.util.List;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.Base64;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
@@ -24,7 +25,6 @@ import net.i2p.data.SessionKey;
 import net.i2p.util.Clock;
 import net.i2p.util.Log;
 import net.i2p.util.RandomSource;
-import net.i2p.I2PAppContext;
 
 /**
  * This reads an underlying stream as written by AESOutputStream - AES256 encrypted

core/java/src/net/i2p/crypto/AESOutputStream.java

@@ -15,10 +15,10 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Arrays;
 
-import net.i2p.data.SessionKey;
-import net.i2p.data.DataHelper;
-import net.i2p.util.Log;
 import net.i2p.I2PAppContext;
+import net.i2p.data.DataHelper;
+import net.i2p.data.SessionKey;
+import net.i2p.util.Log;
 
 /**
  * This writes everything as CBC with PKCS#5 padding, but each block is padded

core/java/src/net/i2p/crypto/CryptixAESEngine.java

@@ -11,9 +11,9 @@ package net.i2p.crypto;
 
 import java.security.InvalidKeyException;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.SessionKey;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /** 
  * Wrapper for AES cypher operation using Cryptix's Rijndael implementation.  Implements

core/java/src/net/i2p/crypto/DHSessionKeyBuilder.java

@@ -13,6 +13,7 @@ import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.ByteArray;
 import net.i2p.data.SessionKey;
 import net.i2p.util.Clock;
@@ -20,7 +21,6 @@ import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
 import net.i2p.util.NativeBigInteger;
 import net.i2p.util.RandomSource;
-import net.i2p.I2PAppContext;
 
 /**
  * Generate a new session key through a diffie hellman exchange.  This uses the

core/java/src/net/i2p/crypto/DSAEngine.java

@@ -31,15 +31,13 @@ package net.i2p.crypto;
 
 import java.math.BigInteger;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.Hash;
 import net.i2p.data.Signature;
 import net.i2p.data.SigningPrivateKey;
 import net.i2p.data.SigningPublicKey;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
 import net.i2p.util.NativeBigInteger;
-import net.i2p.util.RandomSource;
-import net.i2p.I2PAppContext;
 
 public class DSAEngine {
     private Log _log;

core/java/src/net/i2p/crypto/DummyElGamalEngine.java

@@ -12,12 +12,12 @@ package net.i2p.crypto;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.data.PrivateKey;
 import net.i2p.data.PublicKey;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /** 
  * Fake ElG E and D, useful for when performance isn't being tested

core/java/src/net/i2p/crypto/ElGamalAESEngine.java

@@ -18,6 +18,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
@@ -25,11 +26,7 @@ import net.i2p.data.PrivateKey;
 import net.i2p.data.PublicKey;
 import net.i2p.data.SessionKey;
 import net.i2p.data.SessionTag;
-import net.i2p.stat.StatManager;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
-import net.i2p.util.RandomSource;
-import net.i2p.I2PAppContext;
 
 /**
  * Handles the actual ElGamal+AES encryption and decryption scenarios using the

core/java/src/net/i2p/crypto/ElGamalEngine.java

@@ -33,17 +33,16 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.math.BigInteger;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.Base64;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.data.PrivateKey;
 import net.i2p.data.PublicKey;
-import net.i2p.stat.StatManager;
 import net.i2p.util.Clock;
 import net.i2p.util.Log;
 import net.i2p.util.NativeBigInteger;
 import net.i2p.util.RandomSource;
-import net.i2p.I2PAppContext;
 
 /** 
  * Wrapper for ElGamal encryption/signature schemes.

core/java/src/net/i2p/crypto/HMACSHA256Generator.java

@@ -1,9 +1,9 @@
 package net.i2p.crypto;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.data.SessionKey;
-import net.i2p.I2PAppContext;
 
 /**
  * Calculate the HMAC-SHA256 of a key+message.  Currently FAKE - returns a stupid

core/java/src/net/i2p/crypto/KeyGenerator.java

@@ -11,6 +11,7 @@ package net.i2p.crypto;
 
 import java.math.BigInteger;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
 import net.i2p.data.PrivateKey;
 import net.i2p.data.PublicKey;
@@ -22,7 +23,6 @@ import net.i2p.util.Clock;
 import net.i2p.util.Log;
 import net.i2p.util.NativeBigInteger;
 import net.i2p.util.RandomSource;
-import net.i2p.I2PAppContext;
 
 /** Define a way of generating asymetrical key pairs as well as symetrical keys
  * @author jrandom

core/java/src/net/i2p/crypto/PersistentSessionKeyManager.java

@@ -21,13 +21,13 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.PublicKey;
 import net.i2p.data.SessionKey;
 import net.i2p.data.SessionTag;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Expose the functionality to allow people to write out and read in the 

core/java/src/net/i2p/crypto/SHA256Generator.java

@@ -29,8 +29,8 @@ package net.i2p.crypto;
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-import net.i2p.data.Hash;
 import net.i2p.I2PAppContext;
+import net.i2p.data.Hash;
 
 /** Defines a wrapper for SHA-256 operation
  *

core/java/src/net/i2p/crypto/SessionKeyManager.java

@@ -11,10 +11,10 @@ package net.i2p.crypto;
 
 import java.util.Set;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.PublicKey;
 import net.i2p.data.SessionKey;
 import net.i2p.data.SessionTag;
-import net.i2p.I2PAppContext;
 
 /**
  * Manage the session keys and session tags used for encryption and decryption.

core/java/src/net/i2p/crypto/YKGenerator.java

@@ -13,12 +13,12 @@ import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 
+import net.i2p.I2PAppContext;
 import net.i2p.util.Clock;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
 import net.i2p.util.NativeBigInteger;
 import net.i2p.util.RandomSource;
-import net.i2p.I2PAppContext;
 
 /**
  * Precalculate the Y and K for ElGamal encryption operations.

core/java/src/net/i2p/data/DataHelper.java

@@ -26,7 +26,6 @@ import java.util.TreeMap;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
-import net.i2p.util.Log;
 import net.i2p.util.OrderedProperties;
 
 /**

core/java/src/net/i2p/data/RoutingKeyGenerator.java

@@ -15,11 +15,10 @@ import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.TimeZone;
 
+import net.i2p.I2PAppContext;
 import net.i2p.crypto.SHA256Generator;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
 import net.i2p.util.RandomSource;
-import net.i2p.I2PAppContext;
 
 /**
  * Component to manage the munging of hashes into routing keys - given a hash, 

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

@@ -5,8 +5,8 @@ import java.util.Iterator;
 import java.util.Set;
 import java.util.TreeSet;
 
-import net.i2p.util.Log;
 import net.i2p.I2PAppContext;
+import net.i2p.util.Log;
 
 public class SimpleStatDumper {
     private final static Log _log = new Log(SimpleStatDumper.class);

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

@@ -9,8 +9,8 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import net.i2p.util.Log;
 import net.i2p.I2PAppContext;
+import net.i2p.util.Log;
 
 /** 
  * Coordinate the management of various frequencies and rates within I2P components,

core/java/src/net/i2p/util/I2PThread.java

@@ -10,9 +10,9 @@ package net.i2p.util;
  */
 
 
-import java.util.Set;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.Set;
 
 /**
  * In case its useful later...

core/java/src/net/i2p/util/Log.java

@@ -9,8 +9,8 @@ package net.i2p.util;
  *
  */
 
-import net.i2p.data.DataHelper;
 import net.i2p.I2PAppContext;
+import net.i2p.data.DataHelper;
 
 /**
  * Wrapper class for whatever logging system I2P uses.  This class should be 

core/java/src/net/i2p/util/LogConsoleBuffer.java

@@ -2,6 +2,7 @@ package net.i2p.util;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import net.i2p.I2PAppContext;
 
 /**

core/java/src/net/i2p/util/LogManager.java

@@ -14,13 +14,11 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.HashSet;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Properties;
-import java.util.ArrayList;
 import java.util.Map;
-import java.util.HashMap;
+import java.util.Properties;
 
 import net.i2p.I2PAppContext;
 

core/java/src/net/i2p/util/RandomSource.java

@@ -10,6 +10,7 @@ package net.i2p.util;
  */
 
 import java.security.SecureRandom;
+
 import net.i2p.I2PAppContext;
 
 /**