Cleaned up all 'imports' in all applications, core and router.

core/java/src/gnu/crypto/prng/AsyncFortunaStandalone.java

@@ -1,6 +1,7 @@
 package gnu.crypto.prng;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
 
 import net.i2p.I2PAppContext;
 

core/java/src/gnu/crypto/prng/FortunaStandalone.java

@@ -41,22 +41,19 @@ exception statement from your version.  */
 
 package gnu.crypto.prng;
 
+import gnu.crypto.hash.Sha256Standalone;
+
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
-
 import java.security.InvalidKeyException;
-
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Map;
 import java.util.HashMap;
+import java.util.Map;
 
-import gnu.crypto.hash.Sha256Standalone;
-import net.i2p.crypto.CryptixRijndael_Algorithm;
 import net.i2p.crypto.CryptixAESKeyCache;
+import net.i2p.crypto.CryptixRijndael_Algorithm;
 
 /**
  * The Fortuna continuously-seeded pseudo-random number generator. This

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

@@ -23,10 +23,10 @@ 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;
-import net.i2p.util.PooledRandomSource;
 import net.i2p.util.FortunaRandomSource;
+import net.i2p.util.LogManager;
+import net.i2p.util.PooledRandomSource;
+import net.i2p.util.RandomSource;
 
 /**
  * <p>Provide a base scope for accessing singletons that I2P exposes.  Rather than

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

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

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

@@ -13,7 +13,6 @@ 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.util.Log;

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

@@ -9,7 +9,6 @@ import net.i2p.data.Destination;
 import net.i2p.data.SessionKey;
 import net.i2p.data.i2cp.MessageId;
 import net.i2p.data.i2cp.MessageStatusMessage;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
 
 /**

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

@@ -4,8 +4,8 @@ import java.lang.reflect.Constructor;
 import java.util.Collection;
 
 import net.i2p.I2PAppContext;
-import net.i2p.util.Log;
 import net.i2p.data.Address;
+import net.i2p.util.Log;
 
 public abstract class AddressDB {
     

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

@@ -3,8 +3,8 @@ package net.i2p.client.naming;
 import java.util.Iterator;
 
 import net.i2p.I2PAppContext;
-import net.i2p.data.Destination;
 import net.i2p.data.Address;
+import net.i2p.data.Destination;
 
 public class AddressDBNamingService extends NamingService {
     

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

@@ -11,7 +11,6 @@ import java.util.Properties;
 import java.util.StringTokenizer;
 
 import net.i2p.I2PAppContext;
-import net.i2p.data.DataHelper;
 import net.i2p.data.Destination;
 import net.i2p.util.EepGet;
 import net.i2p.util.Log;

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

@@ -8,9 +8,7 @@ import java.io.InputStream;
 import java.util.Properties;
 
 import net.i2p.I2PAppContext;
-import net.i2p.data.DataHelper;
 import net.i2p.data.Destination;
-import net.i2p.util.Exec;
 import net.i2p.util.Log;
 
 /**

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

@@ -1,10 +1,14 @@
 package net.i2p.client.naming;
 
-import java.util.Collection;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.util.Arrays;
-import java.util.Properties;
+import java.util.Collection;
 import java.util.Iterator;
-import java.io.*;
+import java.util.Properties;
 
 import net.i2p.I2PAppContext;
 import net.i2p.data.Address;

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

@@ -2,8 +2,8 @@ package net.i2p.client.naming;
 
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Iterator;
+import java.util.List;
 import java.util.StringTokenizer;
 
 import net.i2p.I2PAppContext;

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

@@ -1,6 +1,9 @@
 package net.i2p.client.naming;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+
 import net.i2p.data.DataHelper;
 
 /**

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

@@ -1,7 +1,21 @@
 package net.i2p.client.naming;
 
-import java.io.*;
-import java.util.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 
 /**

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

@@ -1,12 +1,8 @@
 package net.i2p.client.naming;
 
-import java.io.File;
 import java.io.IOException;
-import java.util.Iterator;
-import java.util.Properties;
 
 import net.i2p.I2PAppContext;
-import net.i2p.data.DataHelper;
 import net.i2p.data.Destination;
 
 public class PetNameNamingService extends NamingService {

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

@@ -14,6 +14,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+
 import net.i2p.I2PAppContext;
 import net.i2p.data.Base64;
 import net.i2p.data.DataHelper;

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

@@ -9,13 +9,12 @@ package net.i2p.crypto;
  *
  */
 
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
 
 import net.i2p.I2PAppContext;
 import net.i2p.I2PException;

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

@@ -29,13 +29,11 @@ package net.i2p.crypto;
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.math.BigInteger;
-import java.util.Arrays;
 
 import net.i2p.I2PAppContext;
-import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.data.Signature;
 import net.i2p.data.SigningPrivateKey;

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

@@ -1,10 +1,10 @@
 package net.i2p.crypto;
 
 import java.util.Random;
+
 import net.i2p.I2PAppContext;
 import net.i2p.util.PooledRandomSource;
 import net.i2p.util.RandomSource;
-import net.i2p.util.Log;
 
 /**
  *

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

@@ -5,6 +5,7 @@ import net.i2p.I2PAppContext;
 import net.i2p.data.Base64;
 import net.i2p.data.Hash;
 import net.i2p.data.SessionKey;
+
 import org.bouncycastle.crypto.Digest;
 import org.bouncycastle.crypto.macs.HMac;
 

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

@@ -1,8 +1,9 @@
 package net.i2p.crypto;
 
-import java.util.Arrays;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+
 import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;

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

@@ -9,11 +9,9 @@ package net.i2p.crypto;
  *
  */
 
-import gnu.crypto.hash.Sha256Standalone;
 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;

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

@@ -15,9 +15,8 @@ package net.i2p.crypto;
  * put("MessageDigest.SHA-1", "com.bitzi.util.SHA1");
  */
 //package com.bitzi.util;
-import java.security.*;
-//--+---+1--+---+--2+---+---+3--+---+--4+---+---+5--+---+--6+---+---+7--+---+--
-//34567890123456789012345678901234567890123456789012345678901234567890123456789
+import java.security.DigestException;
+import java.security.MessageDigest;
  
 /**
  * <p>The FIPS PUB 180-2 standard specifies four secure hash algorithms (SHA-1,

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

@@ -12,7 +12,8 @@ package net.i2p.crypto;
  */
 //package com.bitzi.util;
  
-import java.security.*;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
  
 public class SHA1Test {
     

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

@@ -1,14 +1,14 @@
 package net.i2p.crypto;
 
-import java.util.Arrays;
+import gnu.crypto.hash.Sha256Standalone;
+
 import java.util.ArrayList;
 import java.util.List;
+
 import net.i2p.I2PAppContext;
 import net.i2p.data.Base64;
 import net.i2p.data.Hash;
 
-import gnu.crypto.hash.Sha256Standalone;
-
 /** 
  * Defines a wrapper for SHA-256 operation.  All the good stuff occurs
  * in the GNU-Crypto {@link gnu.crypto.hash.Sha256Standalone}

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

@@ -10,7 +10,6 @@ package net.i2p.data;
  */
 
 import java.io.Serializable;
-import net.i2p.data.Base64;
 
 /**
  * Wrap up an array of bytes so that they can be compared and placed in hashes,

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

@@ -10,6 +10,7 @@ package net.i2p.data;
  */
 
 import gnu.crypto.hash.Sha256Standalone;
+
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.ByteArrayInputStream;
@@ -32,10 +33,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 import java.util.TreeMap;
-import java.util.zip.GZIPInputStream;
 
 import net.i2p.util.ByteCache;
-import net.i2p.util.CachingByteArrayOutputStream;
 import net.i2p.util.OrderedProperties;
 import net.i2p.util.ReusableGZIPInputStream;
 import net.i2p.util.ReusableGZIPOutputStream;

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

@@ -9,10 +9,10 @@ package net.i2p.data;
  *
  */
 
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.FileInputStream;
 
 import net.i2p.util.Log;
 

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

@@ -13,8 +13,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import net.i2p.util.Log;
 import net.i2p.crypto.KeyGenerator;
+import net.i2p.util.Log;
 
 /**
  * Defines the PrivateKey as defined by the I2P data structure spec.

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

@@ -2,10 +2,10 @@ package net.i2p.data;
 
 
 import java.io.File;
-import java.io.IOException;
-import java.util.Properties;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Properties;
 
 import net.i2p.I2PException;
 import net.i2p.client.I2PClient;

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

@@ -13,8 +13,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import net.i2p.util.Log;
 import net.i2p.crypto.KeyGenerator;
+import net.i2p.util.Log;
 
 /**
  * Defines the SigningPrivateKey as defined by the I2P data structure spec.

core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java

@@ -9,7 +9,6 @@ package net.i2p.data.i2cp;
  *
  */
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;

core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java

@@ -9,7 +9,6 @@ package net.i2p.data.i2cp;
  *
  */
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;

core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java

@@ -9,7 +9,6 @@ package net.i2p.data.i2cp;
  *
  */
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;

core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java

@@ -9,7 +9,6 @@ package net.i2p.data.i2cp;
  *
  */
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 

core/java/src/net/i2p/data/i2cp/SendMessageMessage.java

@@ -17,7 +17,6 @@ import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Destination;
 import net.i2p.data.Payload;
-import net.i2p.data.i2cp.I2CPMessageException;
 import net.i2p.util.Log;
 
 /**

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

@@ -4,7 +4,6 @@ import java.io.BufferedWriter;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
-
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;

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

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

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

@@ -1,11 +1,11 @@
 package net.i2p.stat;
 
-import java.io.IOException;
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.FileWriter;
-import java.text.SimpleDateFormat;
+import java.io.IOException;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;

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

@@ -9,11 +9,7 @@ package net.i2p.util;
  *
  */
 
-import java.security.SecureRandom;
-
 import net.i2p.I2PAppContext;
-import net.i2p.crypto.EntropyHarvester;
-import net.i2p.data.Base64;
 import net.i2p.data.DataHelper;
 
 /**

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

@@ -1,10 +1,11 @@
 package net.i2p.util;
 
-import org.xlattice.crypto.filters.BloomSHA1;
+import java.util.Random;
+
 import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
 
-import java.util.Random;
+import org.xlattice.crypto.filters.BloomSHA1;
 
 /**
  * Series of bloom filters which decay over time, allowing their continual use

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

@@ -9,16 +9,13 @@ import java.net.MalformedURLException;
 import java.net.Socket;
 import java.net.URL;
 import java.text.DecimalFormat;
-import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.StringTokenizer;
-import java.util.Properties;
 
 import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
-import net.i2p.util.SocketTimeout;
 
 /**
  * EepGet [-p localhost:4444] 

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

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

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

@@ -1,10 +1,18 @@
 package net.i2p.util;
 
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
 import net.i2p.I2PAppContext;
-import net.i2p.util.Log;
 
 /**
  * Simple helper for uploading files and such via HTTP POST (rfc 1867)

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

@@ -1,11 +1,6 @@
 package net.i2p.util;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
 
 import net.i2p.I2PAppContext;
 

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

@@ -3,12 +3,12 @@ package net.i2p.util;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.io.InputStreamReader;
+import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;

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

@@ -9,16 +9,13 @@ package net.i2p.util;
  *
  */
 
+import gnu.crypto.prng.AsyncFortunaStandalone;
+
 import java.security.SecureRandom;
 
 import net.i2p.I2PAppContext;
 import net.i2p.crypto.EntropyHarvester;
 
-import gnu.crypto.prng.AsyncFortunaStandalone;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-
 /**
  * Wrapper around GNU-Crypto's Fortuna PRNG.  This seeds from /dev/urandom and
  * ./prngseed.rnd on startup (if they exist), writing a new seed to ./prngseed.rnd

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

@@ -1,9 +1,9 @@
 package net.i2p.util;
 
 import java.io.ByteArrayInputStream;
+import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.FilterInputStream;
 import java.util.Arrays;
 
 /**

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

@@ -8,15 +8,14 @@ package net.i2p.util;
  *
  */
 
-import java.math.BigInteger;
-import java.util.Random;
-import java.security.SecureRandom;
-
-import java.net.URL;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.IOException;
 import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigInteger;
+import java.net.URL;
+import java.security.SecureRandom;
+import java.util.Random;
 
 import freenet.support.CPUInformation.AMDCPUInfo;
 import freenet.support.CPUInformation.CPUID;

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

@@ -9,17 +9,16 @@ package net.i2p.util;
  *
  */
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.security.SecureRandom;
 
 import net.i2p.I2PAppContext;
 import net.i2p.crypto.EntropyHarvester;
 import net.i2p.data.Base64;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 /**
  * Singleton for whatever PRNG i2p uses.  
  *

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

@@ -3,11 +3,9 @@ package net.i2p.util;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-
 import java.util.zip.CRC32;
 import java.util.zip.Inflater;
 import java.util.zip.InflaterInputStream;
-import java.util.zip.GZIPInputStream;
 
 /**
  * GZIP implementation per 

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

@@ -1,15 +1,15 @@
 package net.i2p.util;
 
-import java.io.ByteArrayOutputStream;
 import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-
 import java.util.zip.CRC32;
 import java.util.zip.Deflater;
 import java.util.zip.DeflaterOutputStream;
-import java.util.zip.GZIPOutputStream;
 import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
+
 import net.i2p.data.DataHelper;
 
 /**

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

@@ -1,12 +1,11 @@
 package net.i2p.util;
 
-import java.io.ByteArrayOutputStream;
 import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.zip.GZIPOutputStream;
-import java.util.zip.GZIPInputStream;
+
 import net.i2p.data.DataHelper;
 
 /**

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

@@ -1,12 +1,10 @@
 package net.i2p.util;
 
-import java.io.ByteArrayOutputStream;
 import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.OutputStream;
+import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
-import java.util.zip.GZIPOutputStream;
 import java.util.zip.GZIPInputStream;
+
 import net.i2p.data.DataHelper;
 
 /**

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

@@ -1,8 +1,8 @@
 package net.i2p.util;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;

core/java/src/org/bouncycastle/crypto/macs/HMac.java

@@ -27,11 +27,11 @@ package org.bouncycastle.crypto.macs;
  */
 
 //import org.bouncycastle.crypto.CipherParameters;
+import java.util.ArrayList;
+import java.util.Arrays;
+
 import org.bouncycastle.crypto.Digest;
 import org.bouncycastle.crypto.Mac;
-//import org.bouncycastle.crypto.params.KeyParameter;
-import java.util.Arrays;
-import java.util.ArrayList;
 
 /**
  * HMAC implementation based on RFC2104

core/java/test/net/i2p/client/I2PClientTest.java

@@ -11,9 +11,6 @@ package net.i2p.client;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 
-import net.i2p.client.I2PClientFactory;
-import net.i2p.client.I2PClient;
-
 import junit.framework.TestCase;
 
 

core/java/test/net/i2p/client/I2PClientTestSuite.java

@@ -8,10 +8,9 @@ package net.i2p.client;
  *
  */
  
-import net.i2p.client.datagram.DatagramTest;
-
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import net.i2p.client.datagram.DatagramTest;
 
 /**
  * @author Comwiz

core/java/test/net/i2p/client/I2PSessionTest.java

@@ -8,22 +8,14 @@ package net.i2p.client;
  *
  */
 
-import java.util.HashSet;
-import java.util.Set;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-
-import net.i2p.client.I2PSession;
-import net.i2p.client.I2PSessionImpl;
-import net.i2p.client.I2PSessionImpl2;
-import net.i2p.client.I2PSessionException;
-import net.i2p.client.I2PClient;
-import net.i2p.client.I2PClientFactory;
-import net.i2p.client.I2PSessionListener;
-import net.i2p.data.Destination;
-import net.i2p.I2PAppContext;
+import java.util.HashSet;
+import java.util.Set;
 
 import junit.framework.TestCase;
+import net.i2p.I2PAppContext;
+import net.i2p.data.Destination;
 
 
 /**

core/java/test/net/i2p/client/datagram/DatagramTest.java

@@ -11,19 +11,14 @@ package net.i2p.client.datagram;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 
-import net.i2p.client.datagram.I2PDatagramMaker;
-import net.i2p.client.datagram.I2PDatagramDissector;
-import net.i2p.client.datagram.I2PInvalidDatagramException;
-import net.i2p.client.I2PClientFactory;
-import net.i2p.client.I2PClient;
-import net.i2p.client.I2PSession;
-import net.i2p.data.DataHelper;
-import net.i2p.data.Hash;
-import net.i2p.data.Destination;
-import net.i2p.data.DataFormatException;
-import net.i2p.crypto.DSAEngine;
-
 import junit.framework.TestCase;
+import net.i2p.client.I2PClient;
+import net.i2p.client.I2PClientFactory;
+import net.i2p.client.I2PSession;
+import net.i2p.crypto.DSAEngine;
+import net.i2p.data.DataHelper;
+import net.i2p.data.Destination;
+import net.i2p.data.Hash;
 
 
 /**

core/java/test/net/i2p/crypto/AES256Bench.java

@@ -29,9 +29,9 @@ package net.i2p.crypto;
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-import net.i2p.data.SessionKey;
-import net.i2p.data.DataHelper;
 import net.i2p.I2PAppContext;
+import net.i2p.data.DataHelper;
+import net.i2p.data.SessionKey;
 
 public class AES256Bench {
     private static I2PAppContext _context = new I2PAppContext();

core/java/test/net/i2p/crypto/AES256Test.java

@@ -8,12 +8,11 @@ package net.i2p.crypto;
  *
  */
  
-import net.i2p.data.SessionKey;
-import net.i2p.data.DataHelper;
-import net.i2p.I2PAppContext;
-import net.i2p.util.RandomSource;
-
 import junit.framework.TestCase;
+import net.i2p.I2PAppContext;
+import net.i2p.data.DataHelper;
+import net.i2p.data.SessionKey;
+import net.i2p.util.RandomSource;
 
 /**
  * @author Comwiz

core/java/test/net/i2p/crypto/AESInputStreamTest.java

@@ -10,20 +10,13 @@ package net.i2p.crypto;
  
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
 
+import junit.framework.TestCase;
 import net.i2p.I2PAppContext;
-import net.i2p.data.Base64;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.data.SessionKey;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.util.RandomSource;
-
-import junit.framework.TestCase;
 /**
  * @author Comwiz
  */

core/java/test/net/i2p/crypto/CryptixAESEngineTest.java

@@ -8,16 +8,10 @@ package net.i2p.crypto;
  *
  */
 
-import java.security.InvalidKeyException;
-
+import junit.framework.TestCase;
 import net.i2p.I2PAppContext;
-import net.i2p.data.ByteArray;
 import net.i2p.data.DataHelper;
 import net.i2p.data.SessionKey;
-import net.i2p.util.ByteCache;
-import net.i2p.crypto.CryptixAESEngine;
-
-import junit.framework.TestCase;
 
 public class CryptixAESEngineTest extends TestCase{
     public void testED() {

core/java/test/net/i2p/crypto/CryptixRijndael_AlgorithmTest.java

@@ -10,9 +10,8 @@ package net.i2p.crypto;
  */
 
 
-import net.i2p.data.DataHelper;
-
 import junit.framework.TestCase;
+import net.i2p.data.DataHelper;
 
 public class CryptixRijndael_AlgorithmTest extends TestCase {
     public void testCRA() throws Exception{

core/java/test/net/i2p/crypto/DHSessionKeyBuilderTest.java

@@ -11,12 +11,10 @@ package net.i2p.crypto;
 
 import java.math.BigInteger;
 
-import net.i2p.data.DataHelper;
-import net.i2p.data.SessionKey;
-import net.i2p.I2PAppContext;
-import net.i2p.util.RandomSource;
-
 import junit.framework.TestCase;
+import net.i2p.I2PAppContext;
+import net.i2p.data.SessionKey;
+import net.i2p.util.RandomSource;
 
 public class DHSessionKeyBuilderTest extends TestCase {
     public void testDHSessionKeyBuilder(){

core/java/test/net/i2p/crypto/DSABench.java

@@ -30,6 +30,7 @@ package net.i2p.crypto;
  */
 
 import java.io.ByteArrayInputStream;
+
 import net.i2p.data.Signature;
 import net.i2p.data.SigningPrivateKey;
 import net.i2p.data.SigningPublicKey;

core/java/test/net/i2p/crypto/DSATest.java

@@ -9,12 +9,12 @@ package net.i2p.crypto;
  */
  
 import java.io.ByteArrayInputStream;
+
+import junit.framework.TestCase;
+import net.i2p.I2PAppContext;
 import net.i2p.data.Signature;
 import net.i2p.data.SigningPrivateKey;
 import net.i2p.data.SigningPublicKey;
-import net.i2p.I2PAppContext;
-
-import junit.framework.TestCase;
 
 public class DSATest extends TestCase{
     private I2PAppContext _context;

core/java/test/net/i2p/crypto/ElGamalBench.java

@@ -29,10 +29,10 @@ package net.i2p.crypto;
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
 import net.i2p.data.PrivateKey;
 import net.i2p.data.PublicKey;
-import net.i2p.I2PAppContext;
 
 public class ElGamalBench {
     private static I2PAppContext _context = new I2PAppContext();

core/java/test/net/i2p/crypto/ElGamalTest.java

@@ -8,27 +8,23 @@ package net.i2p.crypto;
  *
  */
  
-import net.i2p.I2PAppContext;
-import net.i2p.data.Hash;
-import net.i2p.data.SessionKey;
-import net.i2p.data.Base64;
-import net.i2p.data.PublicKey;
-import net.i2p.data.PrivateKey;
-import net.i2p.data.DataHelper;
-import net.i2p.data.DataFormatException;
-import net.i2p.data.SessionTag;
-import net.i2p.util.RandomSource;
-import net.i2p.util.Log;
-import net.i2p.util.Clock;
-
-import java.io.IOException;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-
-import java.util.Set;
+import java.io.IOException;
 import java.util.HashSet;
+import java.util.Set;
 
 import junit.framework.TestCase;
+import net.i2p.I2PAppContext;
+import net.i2p.data.Base64;
+import net.i2p.data.DataFormatException;
+import net.i2p.data.DataHelper;
+import net.i2p.data.Hash;
+import net.i2p.data.PrivateKey;
+import net.i2p.data.PublicKey;
+import net.i2p.data.SessionKey;
+import net.i2p.data.SessionTag;
+import net.i2p.util.RandomSource;
 
 public class ElGamalTest extends TestCase{
     private I2PAppContext _context;

core/java/test/net/i2p/crypto/HMACSHA256Bench.java

@@ -29,10 +29,11 @@ package net.i2p.crypto;
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+import java.util.Properties;
+
 import net.i2p.I2PAppContext;
 import net.i2p.data.Hash;
 import net.i2p.data.SessionKey;
-import java.util.Properties;
 
 public class HMACSHA256Bench {
         public static void main(String args[]) {

core/java/test/net/i2p/crypto/HMACSHA256Test.java

@@ -8,11 +8,10 @@ package net.i2p.crypto;
  *
  */
 
+import junit.framework.TestCase;
 import net.i2p.I2PAppContext;
 import net.i2p.data.SessionKey;
 
-import junit.framework.TestCase;
-
 public class HMACSHA256Test extends TestCase{
     private I2PAppContext _context;
     

core/java/test/net/i2p/crypto/KeyGeneratorTest.java

@@ -8,16 +8,15 @@ package net.i2p.crypto;
  *
  */
  
+import junit.framework.TestCase;
 import net.i2p.I2PAppContext;
-import net.i2p.util.RandomSource;
+import net.i2p.data.DataHelper;
+import net.i2p.data.PrivateKey;
+import net.i2p.data.PublicKey;
+import net.i2p.data.Signature;
 import net.i2p.data.SigningPrivateKey;
 import net.i2p.data.SigningPublicKey;
-import net.i2p.data.DataHelper;
-import net.i2p.data.Signature;
-import net.i2p.data.PublicKey;
-import net.i2p.data.PrivateKey;
-
-import junit.framework.TestCase;
+import net.i2p.util.RandomSource;
 
 public class KeyGeneratorTest extends TestCase{
     public void testKeyGen(){

core/java/test/net/i2p/crypto/SHA1HashTest.java

@@ -21,7 +21,7 @@ package net.i2p.crypto;
  */
 //package com.bitzi.util;
  
-import java.security.*;
+import java.security.MessageDigest;
 
 import junit.framework.TestCase;
  

core/java/test/net/i2p/crypto/SHA256Test.java

@@ -8,13 +8,10 @@ package net.i2p.crypto;
  *
  */
  
+import junit.framework.TestCase;
 import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
-
-import org.bouncycastle.crypto.digests.SHA256Digest;
-
-import junit.framework.TestCase;
 /**
  * @author Comwiz
  */

core/java/test/net/i2p/crypto/SessionEncryptionTest.java

@@ -8,21 +8,16 @@ package net.i2p.crypto;
  *
  */
 
-import net.i2p.data.PublicKey;
-import net.i2p.data.PrivateKey;
-import net.i2p.data.SessionKey;
-import net.i2p.data.SessionTag;
-import net.i2p.data.DataHelper;
-import net.i2p.data.DataFormatException;
-
-import net.i2p.util.Log;
-import net.i2p.util.Clock;
-import net.i2p.I2PAppContext;
-
 import java.util.HashSet;
 import java.util.Set;
 
 import junit.framework.TestCase;
+import net.i2p.I2PAppContext;
+import net.i2p.data.DataHelper;
+import net.i2p.data.PrivateKey;
+import net.i2p.data.PublicKey;
+import net.i2p.data.SessionKey;
+import net.i2p.data.SessionTag;
 
 /**
  *

core/java/test/net/i2p/data/AbuseReasonTest.java

@@ -8,8 +8,6 @@ package net.i2p.data;
  *
  */
 
-import net.i2p.data.DataFormatException;
-import net.i2p.data.DataStructure;
 import net.i2p.data.i2cp.AbuseReason;
 
 /**

core/java/test/net/i2p/data/AbuseSeverityTest.java

@@ -8,8 +8,6 @@ package net.i2p.data;
  *
  */
 
-import net.i2p.data.DataFormatException;
-import net.i2p.data.DataStructure;
 import net.i2p.data.i2cp.AbuseSeverity;
 
 /**

core/java/test/net/i2p/data/BooleanTest.java

@@ -8,14 +8,8 @@ package net.i2p.data;
  *
  */
 
-import java.io.ByteArrayOutputStream;
 import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import net.i2p.data.DataFormatException;
-import net.i2p.data.DataHelper;
-import net.i2p.util.Log;
+import java.io.ByteArrayOutputStream;
 
 import junit.framework.TestCase;
 

core/java/test/net/i2p/data/CertificateTest.java

@@ -8,9 +8,6 @@ package net.i2p.data;
  *
  */
 
-import net.i2p.data.Certificate;
-import net.i2p.data.DataFormatException;
-import net.i2p.data.DataStructure;
 
 /**
  * Test harness for loading / storing Hash objects

core/java/test/net/i2p/data/CreateLeaseSetMessageTest.java

@@ -8,11 +8,6 @@ package net.i2p.data;
  *
  */
 
-import net.i2p.data.DataFormatException;
-import net.i2p.data.DataStructure;
-import net.i2p.data.LeaseSet;
-import net.i2p.data.PrivateKey;
-import net.i2p.data.SigningPrivateKey;
 import net.i2p.data.i2cp.CreateLeaseSetMessage;
 import net.i2p.data.i2cp.SessionId;
 

core/java/test/net/i2p/data/CreateSessionMessageTest.java

@@ -8,8 +8,6 @@ package net.i2p.data;
  *
  */
 
-import net.i2p.data.DataFormatException;
-import net.i2p.data.DataStructure;
 import net.i2p.data.i2cp.CreateSessionMessage;
 import net.i2p.data.i2cp.SessionConfig;
 

core/java/test/net/i2p/data/DataHelperTest.java

@@ -6,9 +6,8 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.TimeZone;
 
-import net.i2p.I2PAppContext;
-
 import junit.framework.TestCase;
+import net.i2p.I2PAppContext;
 
 /**
  * basic unit tests for the DataHelper

core/java/test/net/i2p/data/DataStructureImplTest.java

@@ -8,13 +8,9 @@ package net.i2p.data;
  *
  */
 
-import java.io.OutputStream;
-import java.io.InputStream;
 import java.io.IOException;
-
-import net.i2p.data.DataFormatException;
-import net.i2p.data.DataStructure;
-import net.i2p.data.DataStructureImpl;
+import java.io.InputStream;
+import java.io.OutputStream;
 
 import junit.framework.TestCase;
 

core/java/test/net/i2p/data/DateTest.java

@@ -8,16 +8,10 @@ package net.i2p.data;
  *
  */
 
-import java.io.ByteArrayOutputStream;
 import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.ByteArrayOutputStream;
 import java.util.Date;
 
-import net.i2p.data.DataFormatException;
-import net.i2p.data.DataHelper;
-import net.i2p.util.Log;
-
 import junit.framework.TestCase;
 
 /**

core/java/test/net/i2p/data/DestinationTest.java

@@ -8,12 +8,6 @@ package net.i2p.data;
  *
  */
 
-import net.i2p.data.Certificate;
-import net.i2p.data.DataFormatException;
-import net.i2p.data.DataStructure;
-import net.i2p.data.Destination;
-import net.i2p.data.PublicKey;
-import net.i2p.data.SigningPublicKey;
 
 /**
  * Test harness for loading / storing Hash objects

core/java/test/net/i2p/data/DestroySessionMessageTest.java

@@ -8,8 +8,6 @@ package net.i2p.data;
  *
  */
 
-import net.i2p.data.DataFormatException;
-import net.i2p.data.DataStructure;
 import net.i2p.data.i2cp.DestroySessionMessage;
 import net.i2p.data.i2cp.SessionId;
 

core/java/test/net/i2p/data/DisconnectMessageTest.java

@@ -8,8 +8,6 @@ package net.i2p.data;
  *
  */
 
-import net.i2p.data.DataFormatException;
-import net.i2p.data.DataStructure;
 import net.i2p.data.i2cp.DisconnectMessage;
 
 /**

core/java/test/net/i2p/data/HashTest.java

@@ -8,9 +8,6 @@ package net.i2p.data;
  *
  */
 
-import net.i2p.data.DataFormatException;
-import net.i2p.data.DataStructure;
-import net.i2p.data.Hash;
 
 /**
  * Test harness for loading / storing Hash objects

core/java/test/net/i2p/data/LeaseSetTest.java

@@ -8,13 +8,6 @@ package net.i2p.data;
  *
  */
 
-import net.i2p.data.DataFormatException;
-import net.i2p.data.DataStructure;
-import net.i2p.data.Destination;
-import net.i2p.data.LeaseSet;
-import net.i2p.data.PublicKey;
-import net.i2p.data.Signature;
-import net.i2p.data.SigningPublicKey;
 
 /**
  * Test harness for loading / storing Lease objects

core/java/test/net/i2p/data/LeaseTest.java

@@ -8,14 +8,8 @@ package net.i2p.data;
  *
  */
 
-import java.util.Date;
 import java.io.ByteArrayOutputStream;
-
-import net.i2p.data.DataFormatException;
-import net.i2p.data.DataStructure;
-import net.i2p.data.Lease;
-import net.i2p.data.Hash;
-import net.i2p.data.TunnelId;
+import java.util.Date;
 
 /**
  * Test harness for loading / storing Lease objects

core/java/test/net/i2p/data/MappingTest.java

@@ -8,15 +8,10 @@ package net.i2p.data;
  *
  */
 
-import java.io.ByteArrayOutputStream;
 import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.ByteArrayOutputStream;
 import java.util.Properties;
 
-import net.i2p.data.DataFormatException;
-import net.i2p.data.DataHelper;
-
 import junit.framework.TestCase;
 
 /**

core/java/test/net/i2p/data/MessageIdTest.java

@@ -8,8 +8,6 @@ package net.i2p.data;
  *
  */
 
-import net.i2p.data.DataFormatException;
-import net.i2p.data.DataStructure;
 import net.i2p.data.i2cp.MessageId;
 
 /**

core/java/test/net/i2p/data/MessagePayloadMessageTest.java

@@ -8,18 +8,10 @@ package net.i2p.data;
  *
  */
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 
-import net.i2p.data.DataFormatException;
-import net.i2p.data.DataStructure;
-import net.i2p.data.Payload;
-import net.i2p.data.i2cp.MessageId;
 import net.i2p.data.i2cp.MessagePayloadMessage;
-import net.i2p.data.i2cp.SessionId;
-import net.i2p.util.Log;
 
 /**
  * Test harness for loading / storing SendMessageMessage objects

core/java/test/net/i2p/data/MessageStatusMessageTest.java

@@ -8,11 +8,7 @@ package net.i2p.data;
  *
  */
 
-import net.i2p.data.DataFormatException;
-import net.i2p.data.DataStructure;
-import net.i2p.data.i2cp.MessageId;
 import net.i2p.data.i2cp.MessageStatusMessage;
-import net.i2p.data.i2cp.SessionId;
 
 /**
  * Test harness for loading / storing MessageStatusMessage objects

core/java/test/net/i2p/data/PayloadTest.java

@@ -8,18 +8,8 @@ package net.i2p.data;
  *
  */
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.ByteArrayInputStream;
-
-import net.i2p.data.DataFormatException;
-import net.i2p.data.DataStructure;
-import net.i2p.data.Destination;
-import net.i2p.data.Hash;
-import net.i2p.data.Payload;
-import net.i2p.data.SessionKey;
-import net.i2p.util.Log;
+import java.io.ByteArrayOutputStream;
 
 /**
  * Test harness for loading / storing Payload objects

core/java/test/net/i2p/data/PrivateKeyTest.java

@@ -8,13 +8,8 @@ package net.i2p.data;
  *
  */
  
-import java.io.ByteArrayOutputStream;
 import java.io.ByteArrayInputStream;
-
-import net.i2p.I2PAppContext;
-import net.i2p.data.DataFormatException;
-import net.i2p.data.DataStructure;
-import net.i2p.data.PrivateKey;
+import java.io.ByteArrayOutputStream;
 
 /**
  * Test harness for loading / storing PrivateKey objects

core/java/test/net/i2p/data/PublicKeyTest.java

@@ -8,12 +8,8 @@ package net.i2p.data;
  *
  */
 
-import java.io.ByteArrayOutputStream;
 import java.io.ByteArrayInputStream;
-
-import net.i2p.data.DataFormatException;
-import net.i2p.data.DataStructure;
-import net.i2p.data.PublicKey;
+import java.io.ByteArrayOutputStream;
 
 /**
  * Test harness for loading / storing PublicKey objects

core/java/test/net/i2p/data/ReceiveMessageBeginMessageTest.java

@@ -8,11 +8,7 @@ package net.i2p.data;
  *
  */
 
-import net.i2p.data.DataFormatException;
-import net.i2p.data.DataStructure;
-import net.i2p.data.i2cp.MessageId;
 import net.i2p.data.i2cp.ReceiveMessageBeginMessage;
-import net.i2p.data.i2cp.SessionId;
 
 /**
  * Test harness for loading / storing Hash objects

core/java/test/net/i2p/data/ReceiveMessageEndMessageTest.java

@@ -8,11 +8,7 @@ package net.i2p.data;
  *
  */
 
-import net.i2p.data.DataFormatException;
-import net.i2p.data.DataStructure;
-import net.i2p.data.i2cp.MessageId;
 import net.i2p.data.i2cp.ReceiveMessageEndMessage;
-import net.i2p.data.i2cp.SessionId;
 
 /**
  * Test harness for loading / storing Hash objects