diff --git a/apps/addressbook/java/src/addressbook/AddressBook.java b/apps/addressbook/java/src/addressbook/AddressBook.java index 7379c4460..a59091591 100644 --- a/apps/addressbook/java/src/addressbook/AddressBook.java +++ b/apps/addressbook/java/src/addressbook/AddressBook.java @@ -21,11 +21,11 @@ package addressbook; -import java.util.Map; -import java.util.HashMap; -import java.util.Iterator; import java.io.File; import java.io.IOException; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; import net.i2p.I2PAppContext; import net.i2p.util.EepGet; diff --git a/apps/addressbook/java/src/addressbook/ConfigParser.java b/apps/addressbook/java/src/addressbook/ConfigParser.java index bc8920e18..2df3f6397 100644 --- a/apps/addressbook/java/src/addressbook/ConfigParser.java +++ b/apps/addressbook/java/src/addressbook/ConfigParser.java @@ -21,12 +21,19 @@ package addressbook; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.StringReader; import java.util.HashMap; -import java.util.Map; -import java.util.List; -import java.util.LinkedList; import java.util.Iterator; -import java.io.*; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; /** * Utility class providing methods to parse and write files in config file diff --git a/apps/addressbook/java/src/addressbook/Daemon.java b/apps/addressbook/java/src/addressbook/Daemon.java index e43a02436..752e898dc 100644 --- a/apps/addressbook/java/src/addressbook/Daemon.java +++ b/apps/addressbook/java/src/addressbook/Daemon.java @@ -21,12 +21,12 @@ package addressbook; -import java.util.Iterator; -import java.util.Map; -import java.util.HashMap; -import java.util.List; -import java.util.LinkedList; import java.io.File; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; /** * Main class of addressbook. Performs updates, and runs the main loop. diff --git a/apps/addressbook/java/src/addressbook/Servlet.java b/apps/addressbook/java/src/addressbook/Servlet.java index 1fa9dee15..a6b61bcf7 100644 --- a/apps/addressbook/java/src/addressbook/Servlet.java +++ b/apps/addressbook/java/src/addressbook/Servlet.java @@ -22,10 +22,10 @@ package addressbook; import javax.servlet.GenericServlet; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; import javax.servlet.ServletConfig; import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; /** * A wrapper for addressbook to allow it to be started as a web application. diff --git a/apps/addressbook/java/src/addressbook/SubscriptionList.java b/apps/addressbook/java/src/addressbook/SubscriptionList.java index 9b20add2c..66c45829b 100644 --- a/apps/addressbook/java/src/addressbook/SubscriptionList.java +++ b/apps/addressbook/java/src/addressbook/SubscriptionList.java @@ -21,13 +21,13 @@ package addressbook; -import java.util.List; -import java.util.LinkedList; -import java.util.Map; -import java.util.HashMap; -import java.util.Iterator; import java.io.File; import java.io.IOException; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; /** * A list of Subscriptions loaded from a file. diff --git a/apps/bogobot/Bogobot.java b/apps/bogobot/Bogobot.java index 8d37ca9d3..0c0c40c92 100644 --- a/apps/bogobot/Bogobot.java +++ b/apps/bogobot/Bogobot.java @@ -10,16 +10,14 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; - +import java.util.Properties; import java.util.Timer; import java.util.TimerTask; -import java.util.Properties; import org.apache.log4j.DailyRollingFileAppender; import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.apache.log4j.PatternLayout; - import org.jibble.pircbot.IrcException; import org.jibble.pircbot.NickAlreadyInUseException; import org.jibble.pircbot.PircBot; diff --git a/apps/i2psnark/java/src/org/klomp/snark/BitField.java b/apps/i2psnark/java/src/org/klomp/snark/BitField.java index d0b347b5e..85117b93d 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/BitField.java +++ b/apps/i2psnark/java/src/org/klomp/snark/BitField.java @@ -20,9 +20,6 @@ package org.klomp.snark; -import java.util.Iterator; -import java.util.Set; -import java.util.HashSet; /** * Container of a byte array representing set and unset bits. diff --git a/apps/i2psnark/java/src/org/klomp/snark/ConnectionAcceptor.java b/apps/i2psnark/java/src/org/klomp/snark/ConnectionAcceptor.java index 5767abc56..eb2be0d54 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/ConnectionAcceptor.java +++ b/apps/i2psnark/java/src/org/klomp/snark/ConnectionAcceptor.java @@ -20,8 +20,10 @@ package org.klomp.snark; -import java.io.*; -import java.net.*; +import java.io.BufferedInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import net.i2p.I2PException; import net.i2p.client.streaming.I2PServerSocket; diff --git a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java index 8c3c4d4cf..a319954a4 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java +++ b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java @@ -1,20 +1,28 @@ package org.klomp.snark; +import java.io.File; +import java.io.IOException; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + import net.i2p.I2PAppContext; import net.i2p.I2PException; -import net.i2p.util.EepGet; import net.i2p.client.I2PSession; -import net.i2p.data.*; import net.i2p.client.streaming.I2PServerSocket; import net.i2p.client.streaming.I2PSocket; import net.i2p.client.streaming.I2PSocketManager; import net.i2p.client.streaming.I2PSocketManagerFactory; +import net.i2p.data.DataFormatException; +import net.i2p.data.Destination; +import net.i2p.data.Hash; +import net.i2p.util.EepGet; import net.i2p.util.Log; import net.i2p.util.SimpleTimer; -import java.io.*; -import java.util.*; - /** * I2P specific helpers for I2PSnark */ diff --git a/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java b/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java index 66e183720..2d882489b 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java +++ b/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java @@ -22,20 +22,22 @@ package org.klomp.snark; import java.io.IOException; import java.io.InputStream; -import java.io.File; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.ArrayList; +import java.util.HashMap; import java.util.Iterator; import java.util.List; -import java.util.ArrayList; import java.util.Map; -import java.util.HashMap; -import org.klomp.snark.bencode.*; +import net.i2p.crypto.SHA1; import net.i2p.data.Base64; import net.i2p.util.Log; -import net.i2p.crypto.SHA1; + +import org.klomp.snark.bencode.BDecoder; +import org.klomp.snark.bencode.BEValue; +import org.klomp.snark.bencode.BEncoder; +import org.klomp.snark.bencode.InvalidBEncodingException; /** * Note: this class is buggy, as it doesn't propogate custom meta fields into the bencoded diff --git a/apps/i2psnark/java/src/org/klomp/snark/Peer.java b/apps/i2psnark/java/src/org/klomp/snark/Peer.java index c297fd37a..e18be2da9 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/Peer.java +++ b/apps/i2psnark/java/src/org/klomp/snark/Peer.java @@ -20,15 +20,15 @@ package org.klomp.snark; -import java.io.*; -import java.net.*; +import java.io.BufferedInputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.util.Arrays; -import java.util.Map; - -import org.klomp.snark.bencode.*; import net.i2p.client.streaming.I2PSocket; -import net.i2p.data.DataHelper; import net.i2p.util.Log; public class Peer implements Comparable diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerAcceptor.java b/apps/i2psnark/java/src/org/klomp/snark/PeerAcceptor.java index e54d91b9c..b2015fea2 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/PeerAcceptor.java +++ b/apps/i2psnark/java/src/org/klomp/snark/PeerAcceptor.java @@ -20,8 +20,12 @@ package org.klomp.snark; -import java.io.*; -import java.net.*; +import java.io.BufferedInputStream; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.SequenceInputStream; import java.util.Iterator; import net.i2p.client.streaming.I2PSocket; diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java b/apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java index 278971a7d..f8e36fe42 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java +++ b/apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java @@ -20,7 +20,11 @@ package org.klomp.snark; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Random; +import java.util.TimerTask; /** * TimerTask that checks for good/bad up/downloader. Works together diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionIn.java b/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionIn.java index 5182114d0..3c3e6e825 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionIn.java +++ b/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionIn.java @@ -20,9 +20,8 @@ package org.klomp.snark; -import java.io.*; -import java.net.*; -import java.util.*; +import java.io.DataInputStream; +import java.io.IOException; import net.i2p.util.Log; diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java b/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java index 275a05c35..eeb6455c6 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java +++ b/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java @@ -20,9 +20,11 @@ package org.klomp.snark; -import java.io.*; -import java.net.*; -import java.util.*; +import java.io.DataOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; import net.i2p.util.I2PThread; import net.i2p.util.Log; diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java index 2304f050b..c85db3f12 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java +++ b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java @@ -20,8 +20,14 @@ package org.klomp.snark; -import java.util.*; import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Random; +import java.util.Timer; import net.i2p.util.I2PThread; import net.i2p.util.Log; diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinatorSet.java b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinatorSet.java index 8c89091ca..cf36c9378 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinatorSet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinatorSet.java @@ -1,6 +1,9 @@ package org.klomp.snark; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; /** * Hmm, any guesses as to what this is? Used by the multitorrent functionality diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerID.java b/apps/i2psnark/java/src/org/klomp/snark/PeerID.java index cbde1a33a..e9b03b391 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/PeerID.java +++ b/apps/i2psnark/java/src/org/klomp/snark/PeerID.java @@ -21,15 +21,15 @@ package org.klomp.snark; import java.io.IOException; -import java.net.InetAddress; import java.net.UnknownHostException; import java.util.Map; -import org.klomp.snark.bencode.*; - import net.i2p.data.Base64; import net.i2p.data.Destination; -import net.i2p.data.DataFormatException; + +import org.klomp.snark.bencode.BDecoder; +import org.klomp.snark.bencode.BEValue; +import org.klomp.snark.bencode.InvalidBEncodingException; public class PeerID implements Comparable { diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerMonitorTask.java b/apps/i2psnark/java/src/org/klomp/snark/PeerMonitorTask.java index b409f58c8..e36152330 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/PeerMonitorTask.java +++ b/apps/i2psnark/java/src/org/klomp/snark/PeerMonitorTask.java @@ -20,7 +20,8 @@ package org.klomp.snark; -import java.util.*; +import java.util.Iterator; +import java.util.TimerTask; /** * TimerTask that monitors the peers and total up/download speeds. diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerState.java b/apps/i2psnark/java/src/org/klomp/snark/PeerState.java index 8f8b7bbc6..469445aa3 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/PeerState.java +++ b/apps/i2psnark/java/src/org/klomp/snark/PeerState.java @@ -23,8 +23,6 @@ package org.klomp.snark; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import java.util.Set; -import java.util.HashSet; import net.i2p.util.Log; diff --git a/apps/i2psnark/java/src/org/klomp/snark/Piece.java b/apps/i2psnark/java/src/org/klomp/snark/Piece.java index 4d6f693c9..0c153262a 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/Piece.java +++ b/apps/i2psnark/java/src/org/klomp/snark/Piece.java @@ -1,8 +1,8 @@ package org.klomp.snark; -import java.util.Set; -import java.util.HashSet; import java.util.Collections; +import java.util.HashSet; +import java.util.Set; public class Piece implements Comparable { diff --git a/apps/i2psnark/java/src/org/klomp/snark/Snark.java b/apps/i2psnark/java/src/org/klomp/snark/Snark.java index f7ea7f0fa..0e4fc3da5 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/Snark.java +++ b/apps/i2psnark/java/src/org/klomp/snark/Snark.java @@ -20,17 +20,26 @@ package org.klomp.snark; -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.InputStream; +import java.io.InputStreamReader; +import java.util.Iterator; +import java.util.List; +import java.util.Properties; +import java.util.Random; +import java.util.StringTokenizer; +import java.util.Timer; +import java.util.TimerTask; -import org.klomp.snark.bencode.*; - -import net.i2p.data.Destination; -import net.i2p.client.streaming.I2PSocket; import net.i2p.client.streaming.I2PServerSocket; +import net.i2p.data.Destination; import net.i2p.util.I2PThread; +import org.klomp.snark.bencode.BDecoder; + /** * Main Snark program startup class. * diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index 771fdb410..e45e64e70 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -1,7 +1,20 @@ package org.klomp.snark; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FilenameFilter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import java.util.StringTokenizer; +import java.util.TreeMap; + import net.i2p.I2PAppContext; import net.i2p.data.Base64; import net.i2p.data.DataHelper; diff --git a/apps/i2psnark/java/src/org/klomp/snark/StaticSnark.java b/apps/i2psnark/java/src/org/klomp/snark/StaticSnark.java index 22ef1c2a4..38b470a7c 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/StaticSnark.java +++ b/apps/i2psnark/java/src/org/klomp/snark/StaticSnark.java @@ -20,10 +20,6 @@ package org.klomp.snark; -import java.security.Provider; -import java.security.Security; - -import org.klomp.snark.bencode.*; /** * Main snark startup class for staticly linking with gcj. diff --git a/apps/i2psnark/java/src/org/klomp/snark/Storage.java b/apps/i2psnark/java/src/org/klomp/snark/Storage.java index 47f65e7ff..6b49819b1 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/Storage.java +++ b/apps/i2psnark/java/src/org/klomp/snark/Storage.java @@ -20,10 +20,13 @@ package org.klomp.snark; -import java.io.*; -import java.util.*; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.StringTokenizer; import net.i2p.crypto.SHA1; diff --git a/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java b/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java index 466cccd09..66217f30a 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java +++ b/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java @@ -20,11 +20,17 @@ package org.klomp.snark; -import java.io.*; -import java.net.*; -import java.util.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Random; +import java.util.Set; -import org.klomp.snark.bencode.*; import net.i2p.util.I2PThread; import net.i2p.util.Log; diff --git a/apps/i2psnark/java/src/org/klomp/snark/TrackerInfo.java b/apps/i2psnark/java/src/org/klomp/snark/TrackerInfo.java index 765598fab..4319a6310 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/TrackerInfo.java +++ b/apps/i2psnark/java/src/org/klomp/snark/TrackerInfo.java @@ -22,14 +22,15 @@ package org.klomp.snark; import java.io.IOException; import java.io.InputStream; -import java.math.BigInteger; +import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.HashSet; -import org.klomp.snark.bencode.*; +import org.klomp.snark.bencode.BDecoder; +import org.klomp.snark.bencode.BEValue; +import org.klomp.snark.bencode.InvalidBEncodingException; public class TrackerInfo { diff --git a/apps/i2psnark/java/src/org/klomp/snark/bencode/BDecoder.java b/apps/i2psnark/java/src/org/klomp/snark/bencode/BDecoder.java index 87b3bf4c5..9fb675c26 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/bencode/BDecoder.java +++ b/apps/i2psnark/java/src/org/klomp/snark/bencode/BDecoder.java @@ -20,20 +20,16 @@ package org.klomp.snark.bencode; +import java.io.EOFException; import java.io.IOException; import java.io.InputStream; -import java.io.EOFException; -import java.io.UnsupportedEncodingException; - import java.math.BigInteger; - -import java.util.ArrayList; -import java.util.List; -import java.util.HashMap; -import java.util.Map; - import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * Decodes a bencoded stream to BEValues. diff --git a/apps/i2psnark/java/src/org/klomp/snark/bencode/BEValue.java b/apps/i2psnark/java/src/org/klomp/snark/bencode/BEValue.java index 7a8ef02b8..47814df34 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/bencode/BEValue.java +++ b/apps/i2psnark/java/src/org/klomp/snark/bencode/BEValue.java @@ -21,7 +21,6 @@ package org.klomp.snark.bencode; import java.io.UnsupportedEncodingException; - import java.util.List; import java.util.Map; diff --git a/apps/i2psnark/java/src/org/klomp/snark/bencode/BEncoder.java b/apps/i2psnark/java/src/org/klomp/snark/bencode/BEncoder.java index fa6e874d3..b8129f477 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/bencode/BEncoder.java +++ b/apps/i2psnark/java/src/org/klomp/snark/bencode/BEncoder.java @@ -20,11 +20,9 @@ package org.klomp.snark.bencode; +import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; -import java.io.ByteArrayOutputStream; -import java.io.UnsupportedEncodingException; - import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java index 8c190fb1c..3c00a7e31 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -1,12 +1,23 @@ package org.klomp.snark.web; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; +import java.util.TreeSet; + import javax.servlet.ServletConfig; import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServlet; import net.i2p.I2PAppContext; import net.i2p.data.Base64; @@ -14,7 +25,14 @@ import net.i2p.data.DataHelper; import net.i2p.util.FileUtil; import net.i2p.util.I2PThread; import net.i2p.util.Log; -import org.klomp.snark.*; + +import org.klomp.snark.I2PSnarkUtil; +import org.klomp.snark.MetaInfo; +import org.klomp.snark.Peer; +import org.klomp.snark.Snark; +import org.klomp.snark.SnarkManager; +import org.klomp.snark.Storage; +import org.klomp.snark.TrackerClient; /** * diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/RunStandalone.java b/apps/i2psnark/java/src/org/klomp/snark/web/RunStandalone.java index c3d4548ed..05795b861 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/RunStandalone.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/RunStandalone.java @@ -3,6 +3,7 @@ package org.klomp.snark.web; import java.io.File; import net.i2p.util.FileUtil; + import org.mortbay.jetty.Server; public class RunStandalone { diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java index 05ca1d852..2b5cc2c5e 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java @@ -8,11 +8,15 @@ package net.i2p.i2ptunnel; * */ -import java.io.*; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; +import java.io.ByteArrayOutputStream; +import java.io.FilterOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.PipedInputStream; +import java.io.PipedOutputStream; import java.util.zip.GZIPInputStream; + import net.i2p.I2PAppContext; import net.i2p.data.ByteArray; import net.i2p.util.ByteCache; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java index 1426e481e..7ac922a59 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java @@ -16,8 +16,8 @@ import java.util.Iterator; import java.util.List; import java.util.Properties; -import net.i2p.I2PException; import net.i2p.I2PAppContext; +import net.i2p.I2PException; import net.i2p.client.I2PSession; import net.i2p.client.streaming.I2PSocket; import net.i2p.client.streaming.I2PSocketManager; @@ -26,8 +26,8 @@ import net.i2p.client.streaming.I2PSocketOptions; import net.i2p.data.Destination; import net.i2p.util.EventDispatcher; import net.i2p.util.I2PThread; -import net.i2p.util.SimpleTimer; import net.i2p.util.Log; +import net.i2p.util.SimpleTimer; public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runnable { diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java index 9aca9c161..e64af04aa 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java @@ -11,10 +11,10 @@ import java.net.Socket; import java.net.SocketException; import java.util.ArrayList; import java.util.Date; -import java.util.List; -import java.util.StringTokenizer; import java.util.HashMap; +import java.util.List; import java.util.Properties; +import java.util.StringTokenizer; import net.i2p.I2PAppContext; import net.i2p.I2PException; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientRunner.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientRunner.java index 8c442bcc6..9ade9021f 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientRunner.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientRunner.java @@ -3,17 +3,14 @@ */ package net.i2p.i2ptunnel; -import java.io.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.net.Socket; -import java.util.Iterator; import java.util.List; -import java.util.Properties; import net.i2p.I2PAppContext; import net.i2p.client.streaming.I2PSocket; -import net.i2p.data.ByteArray; -import net.i2p.data.DataHelper; -import net.i2p.util.ByteCache; import net.i2p.util.Log; /** diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java index 5d9c162c0..794e5c05f 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java @@ -3,18 +3,17 @@ */ package net.i2p.i2ptunnel; -import java.io.*; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.net.InetAddress; import java.net.Socket; import java.net.SocketException; import java.util.Iterator; import java.util.Properties; import java.util.zip.GZIPOutputStream; -import java.util.zip.Deflater; -import net.i2p.I2PAppContext; -import net.i2p.I2PException; -import net.i2p.client.streaming.I2PServerSocket; import net.i2p.client.streaming.I2PSocket; import net.i2p.data.DataHelper; import net.i2p.util.EventDispatcher; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java index ad2f55b2b..e6708aa21 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java @@ -1,16 +1,17 @@ package net.i2p.i2ptunnel; -import java.io.*; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStream; import java.net.Socket; import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; -import java.lang.IndexOutOfBoundsException; import net.i2p.I2PAppContext; import net.i2p.client.streaming.I2PSocket; import net.i2p.data.DataFormatException; -import net.i2p.data.DataHelper; import net.i2p.data.Destination; import net.i2p.util.EventDispatcher; import net.i2p.util.I2PThread; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java index f6d1c2ea0..014d91e9b 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java @@ -8,10 +8,10 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; +import java.net.ConnectException; import java.net.InetAddress; import java.net.Socket; import java.net.SocketException; -import java.net.ConnectException; import java.util.Iterator; import java.util.Properties; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java index 6a3b228b0..614bc1f74 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java @@ -1,9 +1,8 @@ package net.i2p.i2ptunnel; -import java.io.IOException; import java.io.File; import java.io.FileOutputStream; - +import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java index 5ed8e26af..eb7de9cf1 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java @@ -13,10 +13,8 @@ import java.util.List; import java.util.Properties; import java.util.StringTokenizer; -import net.i2p.I2PAppContext; import net.i2p.i2ptunnel.TunnelController; import net.i2p.i2ptunnel.TunnelControllerGroup; -import net.i2p.util.Log; /** * Ugly little accessor for the edit page diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkClient.java b/apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkClient.java index 74365b2ff..fb0e006fa 100644 --- a/apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkClient.java +++ b/apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkClient.java @@ -4,17 +4,15 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InterruptedIOException; import java.io.OutputStream; - import java.net.ConnectException; import java.net.NoRouteToHostException; - import java.util.Properties; import java.util.Random; import net.i2p.I2PAppContext; import net.i2p.I2PException; -import net.i2p.data.Destination; import net.i2p.data.DataFormatException; +import net.i2p.data.Destination; import net.i2p.util.I2PThread; import net.i2p.util.Log; diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkSend.java b/apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkSend.java index 82c51b43d..1470e76e0 100644 --- a/apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkSend.java +++ b/apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkSend.java @@ -4,14 +4,13 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InterruptedIOException; import java.io.OutputStream; - import java.net.ConnectException; import java.net.NoRouteToHostException; import net.i2p.I2PAppContext; import net.i2p.I2PException; -import net.i2p.data.Destination; import net.i2p.data.DataFormatException; +import net.i2p.data.Destination; import net.i2p.util.Log; /** diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkServer.java b/apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkServer.java index 7651cb5ef..c8b566190 100644 --- a/apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkServer.java +++ b/apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkServer.java @@ -4,10 +4,7 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; - import java.net.ConnectException; -import java.util.ArrayList; -import java.util.List; import java.util.Properties; import net.i2p.I2PAppContext; diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/TestSwarm.java b/apps/ministreaming/java/src/net/i2p/client/streaming/TestSwarm.java index f8a3c7351..f9ccadf83 100644 --- a/apps/ministreaming/java/src/net/i2p/client/streaming/TestSwarm.java +++ b/apps/ministreaming/java/src/net/i2p/client/streaming/TestSwarm.java @@ -1,15 +1,16 @@ package net.i2p.client.streaming; -import java.io.InputStream; import java.io.File; -import java.io.FileOutputStream; import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.InputStream; import java.io.OutputStream; + import net.i2p.I2PAppContext; import net.i2p.client.I2PClientFactory; import net.i2p.data.Destination; -import net.i2p.util.Log; import net.i2p.util.I2PThread; +import net.i2p.util.Log; /** * Sit around on a destination, receiving lots of data and sending lots of diff --git a/apps/q/java/src/HTML/Template.java b/apps/q/java/src/HTML/Template.java index 5baf9c425..6b6ce914a 100644 --- a/apps/q/java/src/HTML/Template.java +++ b/apps/q/java/src/HTML/Template.java @@ -34,13 +34,28 @@ */ package HTML; -import java.util.*; -import java.io.*; +import java.io.BufferedReader; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.Reader; +import java.util.EmptyStackException; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.NoSuchElementException; +import java.util.Properties; +import java.util.Stack; +import java.util.StringTokenizer; +import java.util.Vector; -import HTML.Tmpl.Element.*; -import HTML.Tmpl.Parsers.*; -import HTML.Tmpl.Util; import HTML.Tmpl.Filter; +import HTML.Tmpl.Util; +import HTML.Tmpl.Element.Conditional; +import HTML.Tmpl.Element.Element; +import HTML.Tmpl.Element.If; +import HTML.Tmpl.Element.Var; +import HTML.Tmpl.Parsers.Parser; /** * Use HTML Templates with java. diff --git a/apps/q/java/src/HTML/Tmpl/Element/Conditional.java b/apps/q/java/src/HTML/Tmpl/Element/Conditional.java index 32b1832e6..25a8d4e6d 100644 --- a/apps/q/java/src/HTML/Tmpl/Element/Conditional.java +++ b/apps/q/java/src/HTML/Tmpl/Element/Conditional.java @@ -35,12 +35,12 @@ package HTML.Tmpl.Element; -import java.util.Vector; -import java.util.Hashtable; import java.util.Enumeration; +import java.util.Hashtable; import java.util.NoSuchElementException; +import java.util.Vector; -import HTML.*; +import HTML.Template; public class Conditional extends Element { diff --git a/apps/q/java/src/HTML/Tmpl/Element/Loop.java b/apps/q/java/src/HTML/Tmpl/Element/Loop.java index ffd13dafd..cb1911a87 100644 --- a/apps/q/java/src/HTML/Tmpl/Element/Loop.java +++ b/apps/q/java/src/HTML/Tmpl/Element/Loop.java @@ -29,10 +29,10 @@ */ package HTML.Tmpl.Element; -import java.util.Vector; -import java.util.Hashtable; import java.util.Enumeration; +import java.util.Hashtable; import java.util.NoSuchElementException; +import java.util.Vector; public class Loop extends Element { diff --git a/apps/q/java/src/HTML/Tmpl/Element/Var.java b/apps/q/java/src/HTML/Tmpl/Element/Var.java index 7aee9b165..bf761b9c0 100644 --- a/apps/q/java/src/HTML/Tmpl/Element/Var.java +++ b/apps/q/java/src/HTML/Tmpl/Element/Var.java @@ -35,8 +35,9 @@ package HTML.Tmpl.Element; import java.util.Hashtable; import java.util.NoSuchElementException; -import HTML.Tmpl.Util; + import HTML.Template; +import HTML.Tmpl.Util; public class Var extends Element { diff --git a/apps/q/java/src/HTML/Tmpl/Parsers/Parser.java b/apps/q/java/src/HTML/Tmpl/Parsers/Parser.java index dd6fd439c..78b9ceff9 100644 --- a/apps/q/java/src/HTML/Tmpl/Parsers/Parser.java +++ b/apps/q/java/src/HTML/Tmpl/Parsers/Parser.java @@ -30,9 +30,16 @@ package HTML.Tmpl.Parsers; -import java.util.*; -import HTML.Tmpl.Element.*; +import java.util.NoSuchElementException; +import java.util.Properties; +import java.util.StringTokenizer; +import java.util.Vector; + import HTML.Tmpl.Util; +import HTML.Tmpl.Element.Element; +import HTML.Tmpl.Element.If; +import HTML.Tmpl.Element.Loop; +import HTML.Tmpl.Element.Unless; public class Parser { diff --git a/apps/q/java/src/net/i2p/aum/DupHashtable.java b/apps/q/java/src/net/i2p/aum/DupHashtable.java index 57df10d35..6184337f2 100644 --- a/apps/q/java/src/net/i2p/aum/DupHashtable.java +++ b/apps/q/java/src/net/i2p/aum/DupHashtable.java @@ -6,8 +6,8 @@ package net.i2p.aum; -import java.*; -import java.util.*; +import java.util.Hashtable; +import java.util.Vector; /** * similar in some ways to Properties, except that duplicate keys diff --git a/apps/q/java/src/net/i2p/aum/EchoClient.java b/apps/q/java/src/net/i2p/aum/EchoClient.java index 1552c38ee..9647084c1 100644 --- a/apps/q/java/src/net/i2p/aum/EchoClient.java +++ b/apps/q/java/src/net/i2p/aum/EchoClient.java @@ -4,16 +4,22 @@ package net.i2p.aum; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.net.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.InterruptedIOException; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.net.ConnectException; +import java.net.NoRouteToHostException; -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; -import net.i2p.data.*; -import net.i2p.util.*; +import net.i2p.I2PException; +import net.i2p.client.streaming.I2PSocket; +import net.i2p.client.streaming.I2PSocketManager; +import net.i2p.client.streaming.I2PSocketManagerFactory; +import net.i2p.data.DataFormatException; +import net.i2p.data.DataHelper; +import net.i2p.data.Destination; +import net.i2p.util.Log; /** * a simple program which illustrates the use of I2P stream diff --git a/apps/q/java/src/net/i2p/aum/EchoServer.java b/apps/q/java/src/net/i2p/aum/EchoServer.java index a9c2d4ecd..0e77d8e44 100644 --- a/apps/q/java/src/net/i2p/aum/EchoServer.java +++ b/apps/q/java/src/net/i2p/aum/EchoServer.java @@ -1,17 +1,21 @@ package net.i2p.aum; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.net.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.net.ConnectException; +import java.util.Properties; -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; -import net.i2p.data.*; - -import net.i2p.util.*; +import net.i2p.I2PException; +import net.i2p.client.streaming.I2PServerSocket; +import net.i2p.client.streaming.I2PSocket; +import net.i2p.client.streaming.I2PSocketManager; +import net.i2p.client.streaming.I2PSocketManagerFactory; +import net.i2p.data.DataFormatException; +import net.i2p.data.DataHelper; +import net.i2p.data.Destination; +import net.i2p.util.Log; /** * a simple program which illustrates the use of I2P stream diff --git a/apps/q/java/src/net/i2p/aum/EchoTest.java b/apps/q/java/src/net/i2p/aum/EchoTest.java index e3e009b0e..5ba4cf56f 100644 --- a/apps/q/java/src/net/i2p/aum/EchoTest.java +++ b/apps/q/java/src/net/i2p/aum/EchoTest.java @@ -2,15 +2,10 @@ package net.i2p.aum; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.net.*; +import java.io.IOException; -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; -import net.i2p.data.*; +import net.i2p.I2PException; +import net.i2p.data.Destination; /** * A simple program which runs the EchoServer and EchoClient diff --git a/apps/q/java/src/net/i2p/aum/EmbargoedQueue.java b/apps/q/java/src/net/i2p/aum/EmbargoedQueue.java index 39ca901f3..384224f7b 100644 --- a/apps/q/java/src/net/i2p/aum/EmbargoedQueue.java +++ b/apps/q/java/src/net/i2p/aum/EmbargoedQueue.java @@ -6,9 +6,9 @@ package net.i2p.aum; -import java.*; -import java.lang.*; -import java.util.*; +import java.util.Date; +import java.util.Random; +import java.util.Vector; /** *

Implements a queue of objects, where each object is 'embargoed' diff --git a/apps/q/java/src/net/i2p/aum/I2PCat.java b/apps/q/java/src/net/i2p/aum/I2PCat.java index ad76e546f..35be1ad12 100644 --- a/apps/q/java/src/net/i2p/aum/I2PCat.java +++ b/apps/q/java/src/net/i2p/aum/I2PCat.java @@ -3,18 +3,26 @@ package net.i2p.aum; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.net.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.InterruptedIOException; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.net.ConnectException; +import java.net.NoRouteToHostException; +import java.util.Properties; -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.naming.*; -import net.i2p.client.streaming.*; -import net.i2p.data.*; - -import net.i2p.util.*; +import net.i2p.I2PAppContext; +import net.i2p.I2PException; +import net.i2p.client.naming.HostsTxtNamingService; +import net.i2p.client.streaming.I2PServerSocket; +import net.i2p.client.streaming.I2PSocket; +import net.i2p.client.streaming.I2PSocketManager; +import net.i2p.client.streaming.I2PSocketManagerFactory; +import net.i2p.data.DataFormatException; +import net.i2p.data.DataHelper; +import net.i2p.data.Destination; +import net.i2p.util.Log; /** * A I2P equivalent of the much-beloved 'netcat' utility. diff --git a/apps/q/java/src/net/i2p/aum/I2PSocketHelper.java b/apps/q/java/src/net/i2p/aum/I2PSocketHelper.java index 90a73d5ee..bc3570c5b 100644 --- a/apps/q/java/src/net/i2p/aum/I2PSocketHelper.java +++ b/apps/q/java/src/net/i2p/aum/I2PSocketHelper.java @@ -1,16 +1,6 @@ package net.i2p.aum; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.net.*; - -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; -import net.i2p.util.*; -import net.i2p.data.*; /** * Class which wraps an I2PSocket object with convenient methods. diff --git a/apps/q/java/src/net/i2p/aum/I2PTunnelXMLObject.java b/apps/q/java/src/net/i2p/aum/I2PTunnelXMLObject.java index 0f92c8615..7fa823734 100644 --- a/apps/q/java/src/net/i2p/aum/I2PTunnelXMLObject.java +++ b/apps/q/java/src/net/i2p/aum/I2PTunnelXMLObject.java @@ -1,15 +1,7 @@ package net.i2p.aum; -import org.apache.xmlrpc.*; -import java.lang.*; -import java.io.*; -import java.util.*; +import java.util.Hashtable; -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; -import net.i2p.util.*; -import net.i2p.data.*; import net.i2p.i2ptunnel.I2PTunnelXMLWrapper; /** diff --git a/apps/q/java/src/net/i2p/aum/I2PTunnelXMLServer.java b/apps/q/java/src/net/i2p/aum/I2PTunnelXMLServer.java index 2d9c54459..7c9ebbd0d 100644 --- a/apps/q/java/src/net/i2p/aum/I2PTunnelXMLServer.java +++ b/apps/q/java/src/net/i2p/aum/I2PTunnelXMLServer.java @@ -1,15 +1,7 @@ package net.i2p.aum; -import org.apache.xmlrpc.*; -import java.lang.*; -import java.io.*; - -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; -import net.i2p.util.*; -import net.i2p.data.*; +import org.apache.xmlrpc.WebServer; /** * Provides a means for programs in any language to dynamically manage diff --git a/apps/q/java/src/net/i2p/aum/I2PXmlRpcClient.java b/apps/q/java/src/net/i2p/aum/I2PXmlRpcClient.java index 2358afc10..fdf650897 100644 --- a/apps/q/java/src/net/i2p/aum/I2PXmlRpcClient.java +++ b/apps/q/java/src/net/i2p/aum/I2PXmlRpcClient.java @@ -1,19 +1,13 @@ package net.i2p.aum; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.net.*; +import java.net.MalformedURLException; +import java.net.URL; -import org.apache.xmlrpc.*; +import net.i2p.data.Destination; +import net.i2p.util.Log; -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; -import net.i2p.data.Base64; -import net.i2p.util.*; -import net.i2p.data.*; +import org.apache.xmlrpc.XmlRpcClient; /** diff --git a/apps/q/java/src/net/i2p/aum/I2PXmlRpcClientFactory.java b/apps/q/java/src/net/i2p/aum/I2PXmlRpcClientFactory.java index 425ec02d1..16edc157e 100644 --- a/apps/q/java/src/net/i2p/aum/I2PXmlRpcClientFactory.java +++ b/apps/q/java/src/net/i2p/aum/I2PXmlRpcClientFactory.java @@ -1,19 +1,16 @@ package net.i2p.aum; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.net.*; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Properties; +import java.util.Vector; -import org.apache.xmlrpc.*; +import net.i2p.data.DataFormatException; +import net.i2p.data.Destination; +import net.i2p.util.Log; -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; -import net.i2p.data.Base64; -import net.i2p.util.*; -import net.i2p.data.*; +import org.apache.xmlrpc.XmlRpcClient; /** diff --git a/apps/q/java/src/net/i2p/aum/I2PXmlRpcDemoClass.java b/apps/q/java/src/net/i2p/aum/I2PXmlRpcDemoClass.java index e7909f459..a8de8e791 100644 --- a/apps/q/java/src/net/i2p/aum/I2PXmlRpcDemoClass.java +++ b/apps/q/java/src/net/i2p/aum/I2PXmlRpcDemoClass.java @@ -1,19 +1,6 @@ package net.i2p.aum; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.net.*; - -import org.apache.xmlrpc.*; - -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; -import net.i2p.data.Base64; -import net.i2p.util.*; -import net.i2p.data.*; /** * A simple class providing callable xmlrpc server methods, gets linked in to diff --git a/apps/q/java/src/net/i2p/aum/I2PXmlRpcServer.java b/apps/q/java/src/net/i2p/aum/I2PXmlRpcServer.java index 1aca5fbaf..82854b00f 100644 --- a/apps/q/java/src/net/i2p/aum/I2PXmlRpcServer.java +++ b/apps/q/java/src/net/i2p/aum/I2PXmlRpcServer.java @@ -1,18 +1,23 @@ package net.i2p.aum; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.net.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.util.Date; +import java.util.Properties; -import org.apache.xmlrpc.*; +import net.i2p.I2PAppContext; +import net.i2p.I2PException; +import net.i2p.client.streaming.I2PServerSocket; +import net.i2p.client.streaming.I2PSocket; +import net.i2p.client.streaming.I2PSocketManager; +import net.i2p.client.streaming.I2PSocketManagerFactory; +import net.i2p.data.DataFormatException; +import net.i2p.data.Destination; -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; -import net.i2p.data.Base64; -import net.i2p.util.*; -import net.i2p.data.*; +import org.apache.xmlrpc.XmlRpcServer; /** diff --git a/apps/q/java/src/net/i2p/aum/I2PXmlRpcServerFactory.java b/apps/q/java/src/net/i2p/aum/I2PXmlRpcServerFactory.java index ef7ca42a8..14fd092b5 100644 --- a/apps/q/java/src/net/i2p/aum/I2PXmlRpcServerFactory.java +++ b/apps/q/java/src/net/i2p/aum/I2PXmlRpcServerFactory.java @@ -1,18 +1,13 @@ package net.i2p.aum; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.net.*; +import java.io.IOException; +import java.util.Properties; -import org.apache.xmlrpc.*; - -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; -import net.i2p.data.Base64; -import net.i2p.util.*; -import net.i2p.data.*; +import net.i2p.I2PAppContext; +import net.i2p.I2PException; +import net.i2p.client.streaming.I2PSocketManager; +import net.i2p.data.DataFormatException; +import net.i2p.util.Log; /** diff --git a/apps/q/java/src/net/i2p/aum/PrivDestination.java b/apps/q/java/src/net/i2p/aum/PrivDestination.java index f54077416..2d09bb0af 100644 --- a/apps/q/java/src/net/i2p/aum/PrivDestination.java +++ b/apps/q/java/src/net/i2p/aum/PrivDestination.java @@ -1,19 +1,23 @@ package net.i2p.aum; -import java.lang.*; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.FileNotFoundException; +import java.io.IOException; -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.data.*; - -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; +import net.i2p.I2PException; +import net.i2p.client.I2PClient; +import net.i2p.client.I2PClientFactory; import net.i2p.data.Base64; -import net.i2p.util.*; -import net.i2p.data.*; +import net.i2p.data.DataFormatException; +import net.i2p.data.DataStructureImpl; +import net.i2p.data.Destination; +import net.i2p.data.PrivateKey; +import net.i2p.data.PublicKey; +import net.i2p.data.SigningPrivateKey; +import net.i2p.data.SigningPublicKey; +import net.i2p.util.Log; /** * A convenience class for encapsulating and manipulating I2P private keys diff --git a/apps/q/java/src/net/i2p/aum/PropertiesFile.java b/apps/q/java/src/net/i2p/aum/PropertiesFile.java index 77c7c2c41..2d1891549 100644 --- a/apps/q/java/src/net/i2p/aum/PropertiesFile.java +++ b/apps/q/java/src/net/i2p/aum/PropertiesFile.java @@ -6,9 +6,17 @@ package net.i2p.aum; -import java.lang.*; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.NoSuchElementException; +import java.util.Properties; /** * builds on Properties with methods to load/save directly to/from file diff --git a/apps/q/java/src/net/i2p/aum/SimpleFile.java b/apps/q/java/src/net/i2p/aum/SimpleFile.java index 281948aa3..a6f0438de 100644 --- a/apps/q/java/src/net/i2p/aum/SimpleFile.java +++ b/apps/q/java/src/net/i2p/aum/SimpleFile.java @@ -1,11 +1,9 @@ package net.i2p.aum; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.net.*; - -import net.i2p.data.*; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.RandomAccessFile; /** * SimpleFile - subclass of File which adds some python-like diff --git a/apps/q/java/src/net/i2p/aum/SimpleFile_old.java b/apps/q/java/src/net/i2p/aum/SimpleFile_old.java index 4afa7f783..ac74b58ac 100644 --- a/apps/q/java/src/net/i2p/aum/SimpleFile_old.java +++ b/apps/q/java/src/net/i2p/aum/SimpleFile_old.java @@ -1,11 +1,9 @@ package net.i2p.aum; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.net.*; - -import net.i2p.data.*; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; /** * SimpleFile - subclass of File which adds some python-like diff --git a/apps/q/java/src/net/i2p/aum/SimpleQueue.java b/apps/q/java/src/net/i2p/aum/SimpleQueue.java index 835100ec0..15da498ec 100644 --- a/apps/q/java/src/net/i2p/aum/SimpleQueue.java +++ b/apps/q/java/src/net/i2p/aum/SimpleQueue.java @@ -6,9 +6,7 @@ package net.i2p.aum; -import java.*; -import java.lang.*; -import java.util.*; +import java.util.Vector; /** * Implements simething similar to python's 'Queue' class diff --git a/apps/q/java/src/net/i2p/aum/http/HtmlPage.java b/apps/q/java/src/net/i2p/aum/http/HtmlPage.java index 5e9749e59..67ede7207 100644 --- a/apps/q/java/src/net/i2p/aum/http/HtmlPage.java +++ b/apps/q/java/src/net/i2p/aum/http/HtmlPage.java @@ -6,9 +6,9 @@ package net.i2p.aum.http; -import java.util.*; +import java.util.Enumeration; -import net.i2p.aum.*; +import net.i2p.aum.DupHashtable; /** * Framework for building up a page of HTML by method calls alone, breaking diff --git a/apps/q/java/src/net/i2p/aum/http/I2PHttpRequestHandler.java b/apps/q/java/src/net/i2p/aum/http/I2PHttpRequestHandler.java index f2671d762..5ab1911be 100644 --- a/apps/q/java/src/net/i2p/aum/http/I2PHttpRequestHandler.java +++ b/apps/q/java/src/net/i2p/aum/http/I2PHttpRequestHandler.java @@ -6,15 +6,12 @@ package net.i2p.aum.http; -import java.lang.*; -import java.lang.reflect.*; -import java.util.*; -import java.io.*; -import java.net.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.Socket; -import net.i2p.data.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; +import net.i2p.client.streaming.I2PSocket; /** * diff --git a/apps/q/java/src/net/i2p/aum/http/I2PHttpServer.java b/apps/q/java/src/net/i2p/aum/http/I2PHttpServer.java index 2027ec768..0e693dac0 100644 --- a/apps/q/java/src/net/i2p/aum/http/I2PHttpServer.java +++ b/apps/q/java/src/net/i2p/aum/http/I2PHttpServer.java @@ -6,15 +6,16 @@ package net.i2p.aum.http; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.util.Properties; -import net.i2p.*; -import net.i2p.data.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; - -import net.i2p.aum.*; +import net.i2p.I2PException; +import net.i2p.aum.PrivDestination; +import net.i2p.client.streaming.I2PServerSocket; +import net.i2p.client.streaming.I2PSocket; +import net.i2p.client.streaming.I2PSocketManager; +import net.i2p.client.streaming.I2PSocketManagerFactory; +import net.i2p.data.DataFormatException; /** * diff --git a/apps/q/java/src/net/i2p/aum/http/MiniHttpRequestHandler.java b/apps/q/java/src/net/i2p/aum/http/MiniHttpRequestHandler.java index fe0786e64..42317a39a 100644 --- a/apps/q/java/src/net/i2p/aum/http/MiniHttpRequestHandler.java +++ b/apps/q/java/src/net/i2p/aum/http/MiniHttpRequestHandler.java @@ -7,12 +7,19 @@ package net.i2p.aum.http; -import java.net.*; -import java.io.*; -import java.util.*; -import java.lang.*; +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.net.Socket; +import java.net.URLDecoder; +import java.util.Enumeration; +import java.util.Vector; -import net.i2p.aum.*; +import net.i2p.aum.DupHashtable; +import net.i2p.aum.Mimetypes; public abstract class MiniHttpRequestHandler implements Runnable { final static String CRLF = "\r\n"; diff --git a/apps/q/java/src/net/i2p/aum/http/MiniHttpServer.java b/apps/q/java/src/net/i2p/aum/http/MiniHttpServer.java index 150e7442f..434b6a05c 100644 --- a/apps/q/java/src/net/i2p/aum/http/MiniHttpServer.java +++ b/apps/q/java/src/net/i2p/aum/http/MiniHttpServer.java @@ -13,13 +13,13 @@ package net.i2p.aum.http; // server implements HTTP GET method //*************************************** -import java.net.*; -import java.io.*; -import java.util.*; -import java.lang.*; -import java.lang.reflect.*; +import java.io.IOException; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.net.ServerSocket; +import java.net.Socket; -import org.apache.xmlrpc.*; +import org.apache.xmlrpc.XmlRpcServer; public class MiniHttpServer extends Thread { diff --git a/apps/q/java/src/net/i2p/aum/http/Tag.java b/apps/q/java/src/net/i2p/aum/http/Tag.java index bb196f372..6370d1339 100644 --- a/apps/q/java/src/net/i2p/aum/http/Tag.java +++ b/apps/q/java/src/net/i2p/aum/http/Tag.java @@ -6,9 +6,11 @@ package net.i2p.aum.http; -import java.lang.*; -import java.util.*; -import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.Enumeration; +import java.util.Vector; /** * Base class for building up quick-n-dirty HTML by code alone; diff --git a/apps/q/java/src/net/i2p/aum/q/QClientAPI.java b/apps/q/java/src/net/i2p/aum/q/QClientAPI.java index 1f7f1f86f..a431283df 100644 --- a/apps/q/java/src/net/i2p/aum/q/QClientAPI.java +++ b/apps/q/java/src/net/i2p/aum/q/QClientAPI.java @@ -6,13 +6,13 @@ package net.i2p.aum.q; -import java.*; -import java.io.*; -import java.util.*; -import java.lang.*; -import java.net.*; +import java.io.IOException; +import java.net.MalformedURLException; +import java.util.Hashtable; +import java.util.Vector; -import org.apache.xmlrpc.*; +import org.apache.xmlrpc.XmlRpcClient; +import org.apache.xmlrpc.XmlRpcException; /** *

The official Java API for client applications wishing to access the Q diff --git a/apps/q/java/src/net/i2p/aum/q/QClientNode.java b/apps/q/java/src/net/i2p/aum/q/QClientNode.java index cd8bff090..4cd7b37c3 100644 --- a/apps/q/java/src/net/i2p/aum/q/QClientNode.java +++ b/apps/q/java/src/net/i2p/aum/q/QClientNode.java @@ -6,20 +6,18 @@ package net.i2p.aum.q; -import java.*; -import java.io.*; -import java.util.*; -import java.lang.*; +import java.io.File; +import java.io.IOException; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.Properties; +import java.util.Vector; -import org.apache.xmlrpc.*; - -import net.i2p.*; -import net.i2p.data.*; - -import net.i2p.aum.*; -import net.i2p.aum.http.*; - -import HTML.Template; +import net.i2p.I2PException; +import net.i2p.aum.Mimetypes; +import net.i2p.aum.http.I2PHttpServer; +import net.i2p.aum.http.MiniHttpServer; +import net.i2p.data.DataFormatException; /** * Implements Q client nodes. diff --git a/apps/q/java/src/net/i2p/aum/q/QClientWebInterface.java b/apps/q/java/src/net/i2p/aum/q/QClientWebInterface.java index 4d02d46de..72b5bd857 100644 --- a/apps/q/java/src/net/i2p/aum/q/QClientWebInterface.java +++ b/apps/q/java/src/net/i2p/aum/q/QClientWebInterface.java @@ -6,16 +6,20 @@ package net.i2p.aum.q; -import java.lang.*; -import java.lang.reflect.*; -import java.io.*; -import java.net.*; -import java.util.*; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.net.Socket; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; +import net.i2p.aum.http.HtmlPage; +import net.i2p.aum.http.I2PHttpRequestHandler; +import net.i2p.aum.http.MiniHttpServer; import HTML.Template; -import net.i2p.aum.http.*; - /** * Request handler for Q Client nodes that listens within I2P diff --git a/apps/q/java/src/net/i2p/aum/q/QConsole.java b/apps/q/java/src/net/i2p/aum/q/QConsole.java index ed3b80e18..b2fbec0f8 100644 --- a/apps/q/java/src/net/i2p/aum/q/QConsole.java +++ b/apps/q/java/src/net/i2p/aum/q/QConsole.java @@ -6,16 +6,23 @@ package net.i2p.aum.q; -import java.io.*; -import java.net.*; -import java.util.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.PrintWriter; +import java.net.URLDecoder; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Properties; +import java.util.Vector; -import javax.servlet.*; -import javax.servlet.http.*; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -import org.apache.xmlrpc.*; - -import HTML.*; +import org.apache.xmlrpc.XmlRpcClient; /** * diff --git a/apps/q/java/src/net/i2p/aum/q/QDataItem.java b/apps/q/java/src/net/i2p/aum/q/QDataItem.java index 68dba414e..de3ed060d 100644 --- a/apps/q/java/src/net/i2p/aum/q/QDataItem.java +++ b/apps/q/java/src/net/i2p/aum/q/QDataItem.java @@ -6,20 +6,17 @@ package net.i2p.aum.q; -import java.*; -import java.lang.*; -import java.util.*; -import java.io.*; -import java.net.*; +import java.io.Serializable; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.TreeSet; -import net.i2p.*; -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; -import net.i2p.data.*; -import net.i2p.crypto.*; - -import net.i2p.aum.*; +import net.i2p.aum.Mimetypes; +import net.i2p.crypto.DSAEngine; +import net.i2p.data.DataFormatException; +import net.i2p.data.Signature; +import net.i2p.data.SigningPrivateKey; +import net.i2p.data.SigningPublicKey; /** diff --git a/apps/q/java/src/net/i2p/aum/q/QIndexFile.java b/apps/q/java/src/net/i2p/aum/q/QIndexFile.java index c14e1192c..0df2411a4 100644 --- a/apps/q/java/src/net/i2p/aum/q/QIndexFile.java +++ b/apps/q/java/src/net/i2p/aum/q/QIndexFile.java @@ -6,10 +6,13 @@ package net.i2p.aum.q; -import java.*; -import java.lang.*; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.RandomAccessFile; +import java.util.Date; +import java.util.Iterator; /** *

Implements a binary-searchable file for storing (time, hash) records. diff --git a/apps/q/java/src/net/i2p/aum/q/QIndexFileIterator.java b/apps/q/java/src/net/i2p/aum/q/QIndexFileIterator.java index d96676c7d..95a7df845 100644 --- a/apps/q/java/src/net/i2p/aum/q/QIndexFileIterator.java +++ b/apps/q/java/src/net/i2p/aum/q/QIndexFileIterator.java @@ -6,8 +6,8 @@ package net.i2p.aum.q; -import java.*; -import java.util.*; +import java.util.Iterator; +import java.util.NoSuchElementException; /** * Implements an Iterator for index files diff --git a/apps/q/java/src/net/i2p/aum/q/QKademliaComparator.java b/apps/q/java/src/net/i2p/aum/q/QKademliaComparator.java index 6b3955248..2b949b08d 100644 --- a/apps/q/java/src/net/i2p/aum/q/QKademliaComparator.java +++ b/apps/q/java/src/net/i2p/aum/q/QKademliaComparator.java @@ -6,8 +6,8 @@ package net.i2p.aum.q; -import java.util.*; -import java.math.*; +import java.math.BigInteger; +import java.util.Comparator; /** * implements a Comparator class which compares two QPeerRec objects diff --git a/apps/q/java/src/net/i2p/aum/q/QMgr.java b/apps/q/java/src/net/i2p/aum/q/QMgr.java index 62554a17d..a9e048a64 100644 --- a/apps/q/java/src/net/i2p/aum/q/QMgr.java +++ b/apps/q/java/src/net/i2p/aum/q/QMgr.java @@ -6,16 +6,22 @@ package net.i2p.aum.q; -import java.*; -import java.lang.*; -import java.io.*; -import java.util.*; +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Properties; +import java.util.Vector; -import org.apache.xmlrpc.*; +import net.i2p.aum.I2PXmlRpcClientFactory; +import net.i2p.aum.PropertiesFile; +import net.i2p.aum.SimpleFile; +import net.i2p.data.Destination; -import net.i2p.data.*; - -import net.i2p.aum.*; +import org.apache.xmlrpc.XmlRpcClient; /** *

Command Line Interface (CLI) for starting/stopping Q nodes, diff --git a/apps/q/java/src/net/i2p/aum/q/QNode.java b/apps/q/java/src/net/i2p/aum/q/QNode.java index a64807733..bb4a29c2a 100644 --- a/apps/q/java/src/net/i2p/aum/q/QNode.java +++ b/apps/q/java/src/net/i2p/aum/q/QNode.java @@ -6,21 +6,46 @@ package net.i2p.aum.q; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.util.jar.*; -import java.net.*; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.RandomAccessFile; +import java.util.Calendar; +import java.util.Collections; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.List; +import java.util.NoSuchElementException; +import java.util.Properties; +import java.util.Vector; +import java.util.jar.JarEntry; +import java.util.jar.JarFile; -import org.apache.xmlrpc.*; +import net.i2p.I2PAppContext; +import net.i2p.I2PException; +import net.i2p.aum.EmbargoedQueue; +import net.i2p.aum.I2PXmlRpcClient; +import net.i2p.aum.I2PXmlRpcClientFactory; +import net.i2p.aum.I2PXmlRpcServer; +import net.i2p.aum.PrivDestination; +import net.i2p.aum.PropertiesFile; +import net.i2p.aum.SimpleFile; +import net.i2p.aum.SimpleSemaphore; +import net.i2p.client.I2PClient; +import net.i2p.client.I2PClientFactory; +import net.i2p.data.DataFormatException; +import net.i2p.data.Destination; -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; -import net.i2p.data.*; -import net.i2p.crypto.*; - -import net.i2p.aum.*; +import org.apache.xmlrpc.XmlRpcException; //import gnu.crypto.hash.*; diff --git a/apps/q/java/src/net/i2p/aum/q/QPeer.java b/apps/q/java/src/net/i2p/aum/q/QPeer.java index 4b03e9a67..83fe2311a 100644 --- a/apps/q/java/src/net/i2p/aum/q/QPeer.java +++ b/apps/q/java/src/net/i2p/aum/q/QPeer.java @@ -6,12 +6,12 @@ package net.i2p.aum.q; -import java.io.*; +import java.io.IOException; +import java.io.Serializable; -import net.i2p.*; -import net.i2p.data.*; -import net.i2p.util.*; -import net.i2p.aum.*; +import net.i2p.aum.PropertiesFile; +import net.i2p.data.DataFormatException; +import net.i2p.data.Destination; /** * Wrapper for a peer record file. diff --git a/apps/q/java/src/net/i2p/aum/q/QServerMethods.java b/apps/q/java/src/net/i2p/aum/q/QServerMethods.java index 3ed226b8d..b06c22817 100644 --- a/apps/q/java/src/net/i2p/aum/q/QServerMethods.java +++ b/apps/q/java/src/net/i2p/aum/q/QServerMethods.java @@ -6,9 +6,9 @@ package net.i2p.aum.q; -import java.lang.*; -import java.util.*; -import java.io.*; +import java.io.IOException; +import java.util.Hashtable; +import java.util.Vector; /** diff --git a/apps/q/java/src/net/i2p/aum/q/QServerNode.java b/apps/q/java/src/net/i2p/aum/q/QServerNode.java index 2729ba350..1b91e652d 100644 --- a/apps/q/java/src/net/i2p/aum/q/QServerNode.java +++ b/apps/q/java/src/net/i2p/aum/q/QServerNode.java @@ -6,17 +6,14 @@ package net.i2p.aum.q; -import java.*; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.util.Properties; -import org.apache.xmlrpc.*; - -import net.i2p.*; -import net.i2p.data.*; - -import net.i2p.aum.*; -import net.i2p.aum.http.*; +import net.i2p.I2PException; +import net.i2p.aum.I2PXmlRpcServerFactory; +import net.i2p.aum.http.I2PHttpServer; +import net.i2p.aum.http.MiniHttpServer; +import net.i2p.data.DataFormatException; /** * diff --git a/apps/q/java/src/net/i2p/aum/q/QTest.java b/apps/q/java/src/net/i2p/aum/q/QTest.java index 72bf3f577..0c5dbfd63 100644 --- a/apps/q/java/src/net/i2p/aum/q/QTest.java +++ b/apps/q/java/src/net/i2p/aum/q/QTest.java @@ -6,15 +6,11 @@ package net.i2p.aum.q; -import java.*; -import java.lang.*; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.util.Hashtable; -import net.i2p.*; -import net.i2p.data.*; - -import net.i2p.aum.*; +import net.i2p.I2PException; +import net.i2p.data.DataFormatException; /** diff --git a/apps/q/java/src/net/i2p/aum/q/QUtil.java b/apps/q/java/src/net/i2p/aum/q/QUtil.java index 65ca76d24..5b1ccec2c 100644 --- a/apps/q/java/src/net/i2p/aum/q/QUtil.java +++ b/apps/q/java/src/net/i2p/aum/q/QUtil.java @@ -6,10 +6,11 @@ package net.i2p.aum.q; -import java.*; - -import net.i2p.*; -import net.i2p.data.*; +import net.i2p.I2PAppContext; +import net.i2p.data.Base64; +import net.i2p.data.DataFormatException; +import net.i2p.data.SigningPrivateKey; +import net.i2p.data.SigningPublicKey; /** * A general collection of static utility methods diff --git a/apps/q/java/src/net/i2p/aum/q/QWorkerThread.java b/apps/q/java/src/net/i2p/aum/q/QWorkerThread.java index 2123ad78d..502de342e 100644 --- a/apps/q/java/src/net/i2p/aum/q/QWorkerThread.java +++ b/apps/q/java/src/net/i2p/aum/q/QWorkerThread.java @@ -6,10 +6,12 @@ package net.i2p.aum.q; -import java.util.*; -import java.io.*; +import java.io.File; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; -import net.i2p.aum.*; +import net.i2p.aum.SimpleFile; /** * Thread which performs a single background job for a nod diff --git a/apps/q/java/src/net/i2p/aum/test/HttpServerTest.java b/apps/q/java/src/net/i2p/aum/test/HttpServerTest.java index 25e96ff16..797982d97 100644 --- a/apps/q/java/src/net/i2p/aum/test/HttpServerTest.java +++ b/apps/q/java/src/net/i2p/aum/test/HttpServerTest.java @@ -4,8 +4,8 @@ */ package net.i2p.aum.test; -import java.util.*; -import net.i2p.aum.http.*; +import net.i2p.aum.http.MiniHttpRequestPage; +import net.i2p.aum.http.MiniHttpServer; public class HttpServerTest extends MiniHttpRequestPage { diff --git a/apps/q/java/src/net/i2p/aum/util/Ico2Java.java b/apps/q/java/src/net/i2p/aum/util/Ico2Java.java index e82a92c99..fa6fe9c73 100644 --- a/apps/q/java/src/net/i2p/aum/util/Ico2Java.java +++ b/apps/q/java/src/net/i2p/aum/util/Ico2Java.java @@ -1,9 +1,9 @@ package net.i2p.aum.util; -import java.*; -import java.io.*; -import java.util.*; -import java.lang.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileWriter; +import java.io.InputStream; /** * development utility - converts Favicon.ico to diff --git a/apps/q/java/src/net/i2p/i2ptunnel/I2PTunnelXMLWrapper.java b/apps/q/java/src/net/i2p/i2ptunnel/I2PTunnelXMLWrapper.java index 4c2c53b3e..725ef67e6 100644 --- a/apps/q/java/src/net/i2p/i2ptunnel/I2PTunnelXMLWrapper.java +++ b/apps/q/java/src/net/i2p/i2ptunnel/I2PTunnelXMLWrapper.java @@ -1,20 +1,12 @@ package net.i2p.i2ptunnel; -import org.apache.xmlrpc.*; -import java.lang.*; -import java.util.*; -import java.io.*; -import java.lang.reflect.*; - - -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; -import net.i2p.data.Base64; -import net.i2p.util.*; -import net.i2p.util.*; -import net.i2p.data.*; -import net.i2p.i2ptunnel.*; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.lang.reflect.Array; +import java.util.Hashtable; +import java.util.Vector; /** diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHandler.java index 78f66fbf9..3f60e57a9 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHandler.java @@ -1,7 +1,7 @@ package net.i2p.router.web; -import java.io.ByteArrayInputStream; import java.io.BufferedReader; +import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStreamReader; import java.util.HashSet; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java index d6f46ae8e..69c910b4a 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java @@ -8,7 +8,6 @@ import java.util.Map; import java.util.Properties; import java.util.Set; -import net.i2p.data.DataFormatException; import net.i2p.router.startup.ClientAppConfig; import net.i2p.router.startup.LoadClientAppsJob; import net.i2p.util.Log; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java index a678b48a5..ac10ed6a1 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.Properties; import java.util.Set; import java.util.TreeSet; + import net.i2p.router.RouterContext; import net.i2p.router.startup.ClientAppConfig; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java index 51cd53292..38d9b2074 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java @@ -1,27 +1,11 @@ package net.i2p.router.web; -import java.io.BufferedReader; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.File; -import java.io.FileOutputStream; - -import java.net.URL; -import java.net.URLConnection; - -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; - -import net.i2p.time.Timestamper; -import net.i2p.router.transport.udp.UDPTransport; -import net.i2p.router.Router; -import net.i2p.router.LoadTestManager; import net.i2p.data.RouterInfo; -import net.i2p.router.web.ConfigServiceHandler.UpdateWrapperManagerTask; +import net.i2p.router.LoadTestManager; +import net.i2p.router.Router; +import net.i2p.router.transport.udp.UDPTransport; import net.i2p.router.web.ConfigServiceHandler.UpdateWrapperManagerAndRekeyTask; +import net.i2p.time.Timestamper; /** * Handler to deal with form submissions from the main config form and act diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java index e8487542b..0b6a7b65d 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java @@ -1,13 +1,13 @@ package net.i2p.router.web; -import net.i2p.time.Timestamper; -import net.i2p.router.RouterContext; -import net.i2p.router.CommSystemFacade; import net.i2p.data.RouterAddress; +import net.i2p.router.CommSystemFacade; import net.i2p.router.LoadTestManager; +import net.i2p.router.Router; +import net.i2p.router.RouterContext; import net.i2p.router.transport.udp.UDPAddress; import net.i2p.router.transport.udp.UDPTransport; -import net.i2p.router.Router; +import net.i2p.time.Timestamper; public class ConfigNetHelper { private RouterContext _context; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java index 93244f890..b8c1f3ca2 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java @@ -3,8 +3,6 @@ package net.i2p.router.web; import net.i2p.data.DataHelper; import net.i2p.router.Router; import net.i2p.router.RouterContext; -import net.i2p.router.web.ConfigServiceHandler.UpdateWrapperManagerTask; -import net.i2p.router.web.ConfigServiceHandler.UpdateWrapperManagerAndRekeyTask; /** * simple helper to control restarts/shutdowns in the left hand nav diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java index aa26406a6..a72ac9286 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java @@ -7,10 +7,11 @@ import java.util.Iterator; import java.util.Properties; import java.util.TreeMap; -import net.i2p.data.DataHelper; -import net.i2p.router.Router; import net.i2p.apps.systray.SysTray; import net.i2p.apps.systray.UrlLauncher; +import net.i2p.data.DataHelper; +import net.i2p.router.Router; + import org.tanukisoftware.wrapper.WrapperManager; /** diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHandler.java index 5e4b436d6..00d2f509d 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHandler.java @@ -1,13 +1,11 @@ package net.i2p.router.web; -import java.io.ByteArrayInputStream; -import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; -import net.i2p.util.Log; import net.i2p.stat.StatManager; +import net.i2p.util.Log; /** * Handler to deal with form submissions from the stats config form and act diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHelper.java index 8297a05ca..925fce79a 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHelper.java @@ -7,11 +7,12 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.StringTokenizer; + +import net.i2p.router.RouterContext; +import net.i2p.stat.FrequencyStat; import net.i2p.stat.Rate; import net.i2p.stat.RateStat; -import net.i2p.stat.FrequencyStat; import net.i2p.stat.StatManager; -import net.i2p.router.RouterContext; import net.i2p.util.Log; public class ConfigStatsHelper { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHandler.java index c64fbc4e9..60d30e6ea 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHandler.java @@ -2,10 +2,11 @@ package net.i2p.router.web; import java.util.HashMap; import java.util.Map; -import net.i2p.data.Hash; + import net.i2p.data.DataFormatException; -import net.i2p.util.Log; +import net.i2p.data.Hash; import net.i2p.router.TunnelPoolSettings; +import net.i2p.util.Log; /** * Handler to deal with form submissions from the tunnel config form and act diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java index 1e5e60b4f..8c5474d62 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java @@ -1,8 +1,9 @@ package net.i2p.router.web; import java.util.Iterator; -import java.util.Set; import java.util.Properties; +import java.util.Set; + import net.i2p.data.Destination; import net.i2p.router.RouterContext; import net.i2p.router.TunnelPoolSettings; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java index 3ba4a93c8..d11a6a918 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java @@ -1,11 +1,8 @@ package net.i2p.router.web; import net.i2p.I2PAppContext; -import net.i2p.data.DataHelper; import net.i2p.crypto.TrustedUpdate; -import net.i2p.router.Router; -import net.i2p.router.web.ConfigServiceHandler.UpdateWrapperManagerTask; -import net.i2p.util.Log; +import net.i2p.data.DataHelper; /** * diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java index bcd090268..e0027e510 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java @@ -1,7 +1,7 @@ package net.i2p.router.web; -import net.i2p.data.DataHelper; import net.i2p.crypto.TrustedUpdate; +import net.i2p.data.DataHelper; import net.i2p.router.RouterContext; public class ConfigUpdateHelper { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ContextHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ContextHelper.java index 2cdd0ba32..d78e7c031 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ContextHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ContextHelper.java @@ -1,6 +1,7 @@ package net.i2p.router.web; import java.util.List; + import net.i2p.data.Hash; import net.i2p.router.RouterContext; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java index 8f2b39cb2..69a39c28c 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java @@ -1,7 +1,7 @@ package net.i2p.router.web; -import java.util.List; import java.util.ArrayList; +import java.util.List; import net.i2p.router.RouterContext; import net.i2p.util.Log; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java index 4a96f6d6f..658caa1a3 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java @@ -2,11 +2,14 @@ package net.i2p.router.web; import java.io.IOException; import java.io.Writer; -import java.util.*; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; +import java.util.TreeSet; import net.i2p.data.DataHelper; -import net.i2p.stat.Rate; import net.i2p.router.RouterContext; +import net.i2p.stat.Rate; public class GraphHelper { private RouterContext _context; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NewsFetcher.java b/apps/routerconsole/java/src/net/i2p/router/web/NewsFetcher.java index 31c1565eb..c9527093f 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NewsFetcher.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NewsFetcher.java @@ -4,7 +4,6 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.util.List; -import java.util.StringTokenizer; import net.i2p.I2PAppContext; import net.i2p.crypto.TrustedUpdate; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/OldConsoleHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/OldConsoleHelper.java index 4dade47ce..556367e27 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/OldConsoleHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/OldConsoleHelper.java @@ -4,6 +4,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; import java.io.Writer; + import net.i2p.router.RouterContext; import net.i2p.router.admin.StatsGenerator; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ReseedHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ReseedHandler.java index 2f953df40..e8641fb3e 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ReseedHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ReseedHandler.java @@ -3,9 +3,6 @@ package net.i2p.router.web; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileOutputStream; -import java.io.OutputStream; - -import java.net.Socket; import java.net.URL; import java.util.ArrayList; import java.util.Collections; @@ -17,9 +14,9 @@ import java.util.StringTokenizer; import net.i2p.I2PAppContext; import net.i2p.router.RouterContext; -import net.i2p.util.Log; -import net.i2p.util.I2PThread; import net.i2p.util.EepGet; +import net.i2p.util.I2PThread; +import net.i2p.util.Log; /** * Handler to deal with reseed requests. This will reseed from the URL diff --git a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java index 937f8116d..ae11e55fb 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java @@ -7,18 +7,18 @@ import java.util.List; import java.util.Properties; import net.i2p.I2PAppContext; -import net.i2p.router.RouterContext; import net.i2p.apps.systray.SysTray; import net.i2p.data.DataHelper; +import net.i2p.router.RouterContext; import net.i2p.util.FileUtil; import net.i2p.util.I2PThread; -import org.mortbay.jetty.Server; -import org.mortbay.jetty.servlet.WebApplicationContext; import org.mortbay.http.DigestAuthenticator; -import org.mortbay.http.handler.SecurityHandler; import org.mortbay.http.HashUserRealm; import org.mortbay.http.SecurityConstraint; +import org.mortbay.http.handler.SecurityHandler; +import org.mortbay.jetty.Server; +import org.mortbay.jetty.servlet.WebApplicationContext; public class RouterConsoleRunner { private Server _server; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/StatHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/StatHelper.java index 3cdebdf92..8b67d2622 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/StatHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/StatHelper.java @@ -1,10 +1,9 @@ package net.i2p.router.web; +import java.io.Writer; import java.util.Iterator; import java.util.Set; -import java.io.Writer; - import net.i2p.data.Hash; import net.i2p.router.RouterContext; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java b/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java index bd3676ae9..6fc982386 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java @@ -1,17 +1,20 @@ package net.i2p.router.web; -import java.io.*; -import java.util.*; +import java.awt.Color; +import java.io.IOException; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.StringTokenizer; -import net.i2p.stat.*; -import net.i2p.router.*; +import net.i2p.router.RouterContext; +import net.i2p.stat.Rate; +import net.i2p.stat.RateStat; import net.i2p.util.Log; -import java.awt.Color; +import org.jrobin.core.RrdException; import org.jrobin.graph.RrdGraph; import org.jrobin.graph.RrdGraphDef; -import org.jrobin.graph.RrdGraphDefTemplate; -import org.jrobin.core.RrdException; /** * diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java index dec2d7891..38451cdd1 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java @@ -11,14 +11,14 @@ import net.i2p.data.DataHelper; import net.i2p.data.Destination; import net.i2p.data.LeaseSet; import net.i2p.data.RouterAddress; -import net.i2p.stat.Rate; -import net.i2p.stat.RateStat; import net.i2p.router.CommSystemFacade; import net.i2p.router.Router; import net.i2p.router.RouterContext; import net.i2p.router.RouterVersion; import net.i2p.router.TunnelPoolSettings; import net.i2p.router.transport.ntcp.NTCPAddress; +import net.i2p.stat.Rate; +import net.i2p.stat.RateStat; /** * Simple helper to query the appropriate router for data necessary to render diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java index 1179b19fb..c6e629b52 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java @@ -1,6 +1,8 @@ package net.i2p.router.web; -import java.io.*; +import java.awt.Color; +import java.io.IOException; +import java.io.OutputStream; import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; @@ -9,17 +11,15 @@ import net.i2p.stat.RateStat; import net.i2p.stat.RateSummaryListener; import net.i2p.util.Log; +import org.jrobin.core.RrdBackendFactory; import org.jrobin.core.RrdDb; import org.jrobin.core.RrdDef; -import org.jrobin.core.RrdBackendFactory; +import org.jrobin.core.RrdException; import org.jrobin.core.RrdMemoryBackendFactory; import org.jrobin.core.Sample; - -import java.awt.Color; import org.jrobin.graph.RrdGraph; import org.jrobin.graph.RrdGraphDef; import org.jrobin.graph.RrdGraphDefTemplate; -import org.jrobin.core.RrdException; class SummaryListener implements RateSummaryListener { private I2PAppContext _context; diff --git a/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java b/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java index 0c946471d..7729aa18c 100644 --- a/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java +++ b/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java @@ -31,8 +31,8 @@ import net.i2p.client.streaming.I2PSocketManagerFactory; import net.i2p.client.streaming.I2PSocketOptions; import net.i2p.data.Base64; import net.i2p.data.ByteArray; -import net.i2p.data.DataHelper; import net.i2p.data.DataFormatException; +import net.i2p.data.DataHelper; import net.i2p.data.Destination; import net.i2p.util.ByteCache; import net.i2p.util.I2PThread; diff --git a/apps/sam/java/src/net/i2p/sam/SAMv2Handler.java b/apps/sam/java/src/net/i2p/sam/SAMv2Handler.java index 5d52b7fce..75f1bd4b4 100644 --- a/apps/sam/java/src/net/i2p/sam/SAMv2Handler.java +++ b/apps/sam/java/src/net/i2p/sam/SAMv2Handler.java @@ -8,25 +8,11 @@ package net.i2p.sam; * */ -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.EOFException; import java.io.IOException; -import java.io.InputStream; -import java.io.InterruptedIOException; -import java.io.OutputStream; -import java.net.ConnectException; -import java.net.NoRouteToHostException; import java.net.Socket; import java.util.Properties; -import java.util.StringTokenizer; -import net.i2p.I2PException; -import net.i2p.client.I2PSessionException; -import net.i2p.data.Base64; import net.i2p.data.DataFormatException; -import net.i2p.data.DataHelper; -import net.i2p.data.Destination; import net.i2p.util.Log; /** diff --git a/apps/sam/java/src/net/i2p/sam/SAMv2StreamSession.java b/apps/sam/java/src/net/i2p/sam/SAMv2StreamSession.java index 198b79fe2..5e7497424 100644 --- a/apps/sam/java/src/net/i2p/sam/SAMv2StreamSession.java +++ b/apps/sam/java/src/net/i2p/sam/SAMv2StreamSession.java @@ -8,7 +8,6 @@ package net.i2p.sam; * */ -import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.io.InterruptedIOException; @@ -16,23 +15,15 @@ import java.io.OutputStream; import java.net.ConnectException; import java.net.NoRouteToHostException; import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Properties; -import java.util.Set; import net.i2p.I2PException; -import net.i2p.client.I2PClient; -import net.i2p.client.streaming.I2PServerSocket; import net.i2p.client.streaming.I2PSocket; -import net.i2p.client.streaming.I2PSocketManager; -import net.i2p.client.streaming.I2PSocketManagerFactory; import net.i2p.client.streaming.I2PSocketOptions; -import net.i2p.data.Base64; import net.i2p.data.ByteArray; -import net.i2p.data.DataHelper; import net.i2p.data.DataFormatException; +import net.i2p.data.DataHelper; import net.i2p.data.Destination; import net.i2p.util.ByteCache; import net.i2p.util.I2PThread; diff --git a/apps/sam/java/src/net/i2p/sam/client/SAMReader.java b/apps/sam/java/src/net/i2p/sam/client/SAMReader.java index c002fb6af..e3736d362 100644 --- a/apps/sam/java/src/net/i2p/sam/client/SAMReader.java +++ b/apps/sam/java/src/net/i2p/sam/client/SAMReader.java @@ -1,16 +1,15 @@ package net.i2p.sam.client; import java.io.ByteArrayOutputStream; -import java.io.InputStream; import java.io.IOException; - +import java.io.InputStream; import java.util.Properties; import java.util.StringTokenizer; import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; -import net.i2p.util.Log; import net.i2p.util.I2PThread; +import net.i2p.util.Log; /** * Read from a socket, producing events for any SAM message read diff --git a/apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java b/apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java index 2de4836c5..b14795fef 100644 --- a/apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java +++ b/apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java @@ -1,20 +1,17 @@ package net.i2p.sam.client; +import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import java.io.FileInputStream; import java.io.OutputStream; import java.net.Socket; - -import java.util.Map; import java.util.HashMap; +import java.util.Map; + import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; -import net.i2p.util.Log; import net.i2p.util.I2PThread; - -import net.i2p.sam.client.SAMEventHandler; -import net.i2p.sam.client.SAMReader; +import net.i2p.util.Log; /** * Send a file to a peer diff --git a/apps/sam/java/src/net/i2p/sam/client/SAMStreamSink.java b/apps/sam/java/src/net/i2p/sam/client/SAMStreamSink.java index c3d634e93..d0328d210 100644 --- a/apps/sam/java/src/net/i2p/sam/client/SAMStreamSink.java +++ b/apps/sam/java/src/net/i2p/sam/client/SAMStreamSink.java @@ -1,18 +1,16 @@ package net.i2p.sam.client; +import java.io.File; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.io.FileOutputStream; -import java.io.File; import java.io.OutputStream; import java.net.Socket; - -import java.util.Map; import java.util.HashMap; +import java.util.Map; + import net.i2p.I2PAppContext; import net.i2p.util.Log; -import net.i2p.sam.client.SAMEventHandler; -import net.i2p.sam.client.SAMReader; /** * Sit around on a SAM destination, receiving lots of data and diff --git a/apps/sam/java/test/net/i2p/sam/TestCreateSessionDatagram.java b/apps/sam/java/test/net/i2p/sam/TestCreateSessionDatagram.java index 6bfbd0c36..80772755e 100644 --- a/apps/sam/java/test/net/i2p/sam/TestCreateSessionDatagram.java +++ b/apps/sam/java/test/net/i2p/sam/TestCreateSessionDatagram.java @@ -1,6 +1,5 @@ package net.i2p.sam; -import java.io.IOException; import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.OutputStream; diff --git a/apps/sam/java/test/net/i2p/sam/TestCreateSessionRaw.java b/apps/sam/java/test/net/i2p/sam/TestCreateSessionRaw.java index 974b6cd4f..246ca615d 100644 --- a/apps/sam/java/test/net/i2p/sam/TestCreateSessionRaw.java +++ b/apps/sam/java/test/net/i2p/sam/TestCreateSessionRaw.java @@ -1,13 +1,12 @@ package net.i2p.sam; -import java.io.IOException; import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.OutputStream; import java.net.Socket; -import net.i2p.util.Log; import net.i2p.util.Clock; +import net.i2p.util.Log; public class TestCreateSessionRaw { private static Log _log = new Log(TestCreateSessionRaw.class); diff --git a/apps/sam/java/test/net/i2p/sam/TestCreateSessionStream.java b/apps/sam/java/test/net/i2p/sam/TestCreateSessionStream.java index 0d2e07399..13a16a932 100644 --- a/apps/sam/java/test/net/i2p/sam/TestCreateSessionStream.java +++ b/apps/sam/java/test/net/i2p/sam/TestCreateSessionStream.java @@ -1,6 +1,5 @@ package net.i2p.sam; -import java.io.IOException; import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.OutputStream; diff --git a/apps/sam/java/test/net/i2p/sam/TestDatagramTransfer.java b/apps/sam/java/test/net/i2p/sam/TestDatagramTransfer.java index 9c180f59e..845093bfc 100644 --- a/apps/sam/java/test/net/i2p/sam/TestDatagramTransfer.java +++ b/apps/sam/java/test/net/i2p/sam/TestDatagramTransfer.java @@ -1,15 +1,13 @@ package net.i2p.sam; -import java.io.IOException; import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.OutputStream; import java.net.Socket; -import java.util.StringTokenizer; import java.util.Properties; +import java.util.StringTokenizer; import net.i2p.util.Log; -import net.i2p.sam.SAMUtils; public class TestDatagramTransfer { private static Log _log = new Log(TestCreateSessionDatagram.class); diff --git a/apps/sam/java/test/net/i2p/sam/TestDest.java b/apps/sam/java/test/net/i2p/sam/TestDest.java index 9dbd8e73a..f5d8cdff4 100644 --- a/apps/sam/java/test/net/i2p/sam/TestDest.java +++ b/apps/sam/java/test/net/i2p/sam/TestDest.java @@ -1,6 +1,5 @@ package net.i2p.sam; -import java.io.IOException; import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.OutputStream; diff --git a/apps/sam/java/test/net/i2p/sam/TestHello.java b/apps/sam/java/test/net/i2p/sam/TestHello.java index 1e1417699..d2e1da68f 100644 --- a/apps/sam/java/test/net/i2p/sam/TestHello.java +++ b/apps/sam/java/test/net/i2p/sam/TestHello.java @@ -1,6 +1,5 @@ package net.i2p.sam; -import java.io.IOException; import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.OutputStream; diff --git a/apps/sam/java/test/net/i2p/sam/TestNaming.java b/apps/sam/java/test/net/i2p/sam/TestNaming.java index 32af88baa..61c0364c3 100644 --- a/apps/sam/java/test/net/i2p/sam/TestNaming.java +++ b/apps/sam/java/test/net/i2p/sam/TestNaming.java @@ -1,6 +1,5 @@ package net.i2p.sam; -import java.io.IOException; import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.OutputStream; diff --git a/apps/sam/java/test/net/i2p/sam/TestRawTransfer.java b/apps/sam/java/test/net/i2p/sam/TestRawTransfer.java index 6f2e55f54..3e9a76924 100644 --- a/apps/sam/java/test/net/i2p/sam/TestRawTransfer.java +++ b/apps/sam/java/test/net/i2p/sam/TestRawTransfer.java @@ -1,15 +1,13 @@ package net.i2p.sam; -import java.io.IOException; import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.OutputStream; import java.net.Socket; -import java.util.StringTokenizer; import java.util.Properties; +import java.util.StringTokenizer; import net.i2p.util.Log; -import net.i2p.sam.SAMUtils; public class TestRawTransfer { private static Log _log = new Log(TestCreateSessionDatagram.class); diff --git a/apps/sam/java/test/net/i2p/sam/TestStreamTransfer.java b/apps/sam/java/test/net/i2p/sam/TestStreamTransfer.java index 43d7875e0..2ebb09afc 100644 --- a/apps/sam/java/test/net/i2p/sam/TestStreamTransfer.java +++ b/apps/sam/java/test/net/i2p/sam/TestStreamTransfer.java @@ -1,19 +1,18 @@ package net.i2p.sam; -import java.io.IOException; import java.io.BufferedReader; +import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStream; import java.net.Socket; - -import java.util.Map; import java.util.Collections; import java.util.HashMap; +import java.util.Map; import java.util.Properties; import java.util.StringTokenizer; -import net.i2p.util.Log; import net.i2p.util.I2PThread; +import net.i2p.util.Log; /** *

    diff --git a/apps/sam/java/test/net/i2p/sam/TestSwarm.java b/apps/sam/java/test/net/i2p/sam/TestSwarm.java index 7561e5c73..01f5a22a5 100644 --- a/apps/sam/java/test/net/i2p/sam/TestSwarm.java +++ b/apps/sam/java/test/net/i2p/sam/TestSwarm.java @@ -1,28 +1,20 @@ package net.i2p.sam; -import java.io.BufferedReader; +import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.FileOutputStream; -import java.io.FileInputStream; import java.io.OutputStream; import java.net.Socket; - -import java.util.Map; -import java.util.Collections; import java.util.HashMap; -import java.util.Properties; -import java.util.StringTokenizer; +import java.util.Map; import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; -import net.i2p.util.Log; -import net.i2p.util.I2PThread; - import net.i2p.sam.client.SAMEventHandler; -import net.i2p.sam.client.SAMClientEventListenerImpl; import net.i2p.sam.client.SAMReader; +import net.i2p.util.I2PThread; +import net.i2p.util.Log; /** * Sit around on a SAM destination, receiving lots of data and sending lots of diff --git a/apps/streaming/java/src/net/i2p/client/streaming/Connection.java b/apps/streaming/java/src/net/i2p/client/streaming/Connection.java index 343e74159..62bfe4a83 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/Connection.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/Connection.java @@ -6,9 +6,9 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.TreeMap; + import net.i2p.I2PAppContext; import net.i2p.client.I2PSession; -import net.i2p.data.Base64; import net.i2p.data.DataHelper; import net.i2p.data.Destination; import net.i2p.util.Log; diff --git a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionManager.java b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionManager.java index 4670033be..dcc93c5ec 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionManager.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionManager.java @@ -9,12 +9,11 @@ import java.util.Set; import net.i2p.I2PAppContext; import net.i2p.I2PException; import net.i2p.client.I2PSession; -import net.i2p.data.ByteArray; import net.i2p.data.DataHelper; import net.i2p.data.Destination; import net.i2p.data.SessionKey; -import net.i2p.util.SimpleTimer; import net.i2p.util.Log; +import net.i2p.util.SimpleTimer; /** * Coordinate all of the connections for a single local destination. diff --git a/apps/streaming/java/src/net/i2p/client/streaming/MessageHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/MessageHandler.java index 74daeb9ab..30365762e 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/MessageHandler.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/MessageHandler.java @@ -5,8 +5,8 @@ import java.util.List; import net.i2p.I2PAppContext; import net.i2p.client.I2PSession; -import net.i2p.client.I2PSessionListener; import net.i2p.client.I2PSessionException; +import net.i2p.client.I2PSessionListener; import net.i2p.util.Log; /** diff --git a/apps/streaming/java/src/net/i2p/client/streaming/Packet.java b/apps/streaming/java/src/net/i2p/client/streaming/Packet.java index 593863564..d95df7d8c 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/Packet.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/Packet.java @@ -1,6 +1,7 @@ package net.i2p.client.streaming; import java.util.Arrays; + import net.i2p.I2PAppContext; import net.i2p.data.Base64; import net.i2p.data.ByteArray; @@ -9,7 +10,6 @@ import net.i2p.data.DataHelper; import net.i2p.data.Destination; import net.i2p.data.Signature; import net.i2p.data.SigningPrivateKey; -import net.i2p.util.ByteCache; import net.i2p.util.Log; /** diff --git a/apps/streaming/java/src/net/i2p/client/streaming/PacketHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/PacketHandler.java index c7c0f0836..529eb7894 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/PacketHandler.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/PacketHandler.java @@ -1,13 +1,12 @@ package net.i2p.client.streaming; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.Iterator; import java.util.Set; -import java.text.SimpleDateFormat; import net.i2p.I2PAppContext; import net.i2p.I2PException; -import net.i2p.data.Base64; import net.i2p.data.DataHelper; import net.i2p.util.Log; import net.i2p.util.SimpleTimer; diff --git a/apps/streaming/java/src/net/i2p/client/streaming/PacketQueue.java b/apps/streaming/java/src/net/i2p/client/streaming/PacketQueue.java index 9ce96071d..2d22226d3 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/PacketQueue.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/PacketQueue.java @@ -1,7 +1,7 @@ package net.i2p.client.streaming; -import java.util.Set; import java.util.HashSet; +import java.util.Set; import net.i2p.I2PAppContext; import net.i2p.client.I2PSession; diff --git a/apps/streaming/java/src/net/i2p/client/streaming/SchedulerImpl.java b/apps/streaming/java/src/net/i2p/client/streaming/SchedulerImpl.java index 4ee5440a8..3d29880f0 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/SchedulerImpl.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/SchedulerImpl.java @@ -1,8 +1,8 @@ package net.i2p.client.streaming; import net.i2p.I2PAppContext; -import net.i2p.util.SimpleTimer; import net.i2p.util.Log; +import net.i2p.util.SimpleTimer; /** * Base scheduler diff --git a/apps/streaming/java/test/net/i2p/client/streaming/EchoLargeTest.java b/apps/streaming/java/test/net/i2p/client/streaming/EchoLargeTest.java index 5ff344daa..dc1b0dbb6 100644 --- a/apps/streaming/java/test/net/i2p/client/streaming/EchoLargeTest.java +++ b/apps/streaming/java/test/net/i2p/client/streaming/EchoLargeTest.java @@ -1,10 +1,9 @@ package net.i2p.client.streaming; -import java.io.InputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.InputStream; import java.io.OutputStream; -import java.util.Date; import java.util.Properties; import net.i2p.I2PAppContext; @@ -12,7 +11,6 @@ import net.i2p.client.I2PClient; import net.i2p.client.I2PClientFactory; import net.i2p.client.I2PSession; import net.i2p.data.Base64; -import net.i2p.data.DataHelper; import net.i2p.data.Destination; import net.i2p.util.Log; diff --git a/apps/streaming/java/test/net/i2p/client/streaming/EchoTest.java b/apps/streaming/java/test/net/i2p/client/streaming/EchoTest.java index 70ebf899c..1946aa4f6 100644 --- a/apps/streaming/java/test/net/i2p/client/streaming/EchoTest.java +++ b/apps/streaming/java/test/net/i2p/client/streaming/EchoTest.java @@ -1,10 +1,9 @@ package net.i2p.client.streaming; -import java.io.InputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.InputStream; import java.io.OutputStream; -import java.util.Date; import java.util.Properties; import net.i2p.I2PAppContext; diff --git a/apps/streaming/java/test/net/i2p/client/streaming/MessageInputStreamTest.java b/apps/streaming/java/test/net/i2p/client/streaming/MessageInputStreamTest.java index dcfa0f611..564bfb005 100644 --- a/apps/streaming/java/test/net/i2p/client/streaming/MessageInputStreamTest.java +++ b/apps/streaming/java/test/net/i2p/client/streaming/MessageInputStreamTest.java @@ -1,6 +1,5 @@ package net.i2p.client.streaming; -import java.io.InputStream; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; diff --git a/apps/streaming/java/test/net/i2p/client/streaming/MessageOutputStreamTest.java b/apps/streaming/java/test/net/i2p/client/streaming/MessageOutputStreamTest.java index 4748440ac..8a1bcf5be 100644 --- a/apps/streaming/java/test/net/i2p/client/streaming/MessageOutputStreamTest.java +++ b/apps/streaming/java/test/net/i2p/client/streaming/MessageOutputStreamTest.java @@ -2,11 +2,9 @@ package net.i2p.client.streaming; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.OutputStream; import net.i2p.I2PAppContext; import net.i2p.data.Base64; -import net.i2p.data.DataHelper; import net.i2p.util.Log; /** diff --git a/apps/streaming/java/test/net/i2p/client/streaming/StreamSinkTestClient.java b/apps/streaming/java/test/net/i2p/client/streaming/StreamSinkTestClient.java index c44af7a25..48ab0bd94 100644 --- a/apps/streaming/java/test/net/i2p/client/streaming/StreamSinkTestClient.java +++ b/apps/streaming/java/test/net/i2p/client/streaming/StreamSinkTestClient.java @@ -1,6 +1,5 @@ package net.i2p.client.streaming; -import net.i2p.client.I2PClient; /** * diff --git a/apps/streaming/java/test/net/i2p/client/streaming/StreamSinkTestServer.java b/apps/streaming/java/test/net/i2p/client/streaming/StreamSinkTestServer.java index ff2544e88..725a36791 100644 --- a/apps/streaming/java/test/net/i2p/client/streaming/StreamSinkTestServer.java +++ b/apps/streaming/java/test/net/i2p/client/streaming/StreamSinkTestServer.java @@ -1,6 +1,5 @@ package net.i2p.client.streaming; -import net.i2p.client.I2PClient; /** * diff --git a/apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java b/apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java index 2fb04b00a..45dd0fd6c 100644 --- a/apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java +++ b/apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java @@ -32,8 +32,6 @@ import java.io.FileOutputStream; import java.io.FileReader; import java.io.IOException; import java.io.PrintWriter; -import java.util.Iterator; -import java.util.LinkedList; import java.util.Properties; public class SubscriptionsBean diff --git a/apps/susimail/src/src/i2p/susi/webmail/MailCache.java b/apps/susimail/src/src/i2p/susi/webmail/MailCache.java index 9455639c5..8052b4c44 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/MailCache.java +++ b/apps/susimail/src/src/i2p/susi/webmail/MailCache.java @@ -23,10 +23,10 @@ */ package i2p.susi.webmail; -import java.util.Hashtable; - import i2p.susi.webmail.pop3.POP3MailBox; +import java.util.Hashtable; + /** * @author user */ diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java index 38e9ffc81..015659ecd 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java +++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java @@ -43,10 +43,10 @@ import java.io.PrintWriter; import java.io.StringWriter; import java.io.UnsupportedEncodingException; import java.util.ArrayList; +import java.util.Comparator; import java.util.Enumeration; import java.util.Iterator; import java.util.ListIterator; -import java.util.Comparator; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; diff --git a/apps/susimail/src/src/i2p/susi/webmail/encoding/Base64.java b/apps/susimail/src/src/i2p/susi/webmail/encoding/Base64.java index b847a2e8b..078e130d3 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/encoding/Base64.java +++ b/apps/susimail/src/src/i2p/susi/webmail/encoding/Base64.java @@ -23,13 +23,13 @@ */ package i2p.susi.webmail.encoding; +import i2p.susi.util.ReadBuffer; + import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.io.StringBufferInputStream; -import i2p.susi.util.ReadBuffer; - /** * @author susi */ diff --git a/apps/susimail/src/src/i2p/susi/webmail/encoding/HeaderLine.java b/apps/susimail/src/src/i2p/susi/webmail/encoding/HeaderLine.java index 1b4b7d983..0b0d67424 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/encoding/HeaderLine.java +++ b/apps/susimail/src/src/i2p/susi/webmail/encoding/HeaderLine.java @@ -23,14 +23,14 @@ */ package i2p.susi.webmail.encoding; +import i2p.susi.util.HexTable; +import i2p.susi.util.ReadBuffer; + import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.io.StringBufferInputStream; -import i2p.susi.util.HexTable; -import i2p.susi.util.ReadBuffer; - /** * @author susi */ @@ -294,10 +294,10 @@ public class HeaderLine implements Encoding { } public static void main( String[] args ) throws EncodingException { String text = "Subject: test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test \r\n" + - "From: Smörebröd \r\n" + - "To: äüöß \r\n"; + "From: Sm�rebr�d \r\n" + + "To: ���� \r\n"; HeaderLine hl = new HeaderLine(); System.out.println( hl.encode( text ) ); - System.out.println( hl.encode( "test äöü" ) ); + System.out.println( hl.encode( "test ���" ) ); } } \ No newline at end of file diff --git a/apps/susimail/src/src/i2p/susi/webmail/encoding/QuotedPrintable.java b/apps/susimail/src/src/i2p/susi/webmail/encoding/QuotedPrintable.java index 52d525304..f42d3ecea 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/encoding/QuotedPrintable.java +++ b/apps/susimail/src/src/i2p/susi/webmail/encoding/QuotedPrintable.java @@ -23,14 +23,14 @@ */ package i2p.susi.webmail.encoding; +import i2p.susi.util.HexTable; +import i2p.susi.util.ReadBuffer; + import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.io.StringBufferInputStream; -import i2p.susi.util.HexTable; -import i2p.susi.util.ReadBuffer; - /** * @author susi */ diff --git a/apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java b/apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java index 68f89cf3a..a8a1b05a6 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java +++ b/apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java @@ -23,6 +23,9 @@ */ package i2p.susi.webmail.pop3; +import i2p.susi.debug.Debug; +import i2p.susi.util.ReadBuffer; + import java.io.IOException; import java.io.InputStream; import java.net.Socket; @@ -30,9 +33,6 @@ import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Hashtable; -import i2p.susi.debug.Debug; -import i2p.susi.util.*; - /** * @author susi23 */ diff --git a/apps/syndie/java/src/net/i2p/syndie/Archive.java b/apps/syndie/java/src/net/i2p/syndie/Archive.java index cb4392548..d44d3dfd0 100644 --- a/apps/syndie/java/src/net/i2p/syndie/Archive.java +++ b/apps/syndie/java/src/net/i2p/syndie/Archive.java @@ -1,11 +1,29 @@ package net.i2p.syndie; -import java.io.*; -import java.util.*; -import java.text.*; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.FilenameFilter; +import java.io.IOException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; + import net.i2p.I2PAppContext; -import net.i2p.data.*; -import net.i2p.syndie.data.*; +import net.i2p.data.Base64; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; +import net.i2p.data.SessionKey; +import net.i2p.syndie.data.ArchiveIndex; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; import net.i2p.util.FileUtil; import net.i2p.util.Log; diff --git a/apps/syndie/java/src/net/i2p/syndie/ArchiveIndexer.java b/apps/syndie/java/src/net/i2p/syndie/ArchiveIndexer.java index 25bcfac9a..9a39f70a0 100644 --- a/apps/syndie/java/src/net/i2p/syndie/ArchiveIndexer.java +++ b/apps/syndie/java/src/net/i2p/syndie/ArchiveIndexer.java @@ -1,12 +1,27 @@ package net.i2p.syndie; -import java.io.*; -import java.text.*; -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.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.StringTokenizer; +import java.util.TreeMap; + import net.i2p.I2PAppContext; -import net.i2p.data.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.data.Base64; +import net.i2p.data.Hash; +import net.i2p.syndie.data.ArchiveIndex; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; +import net.i2p.syndie.data.LocalArchiveIndex; +import net.i2p.syndie.sml.HTMLRenderer; +import net.i2p.syndie.sml.SMLParser; import net.i2p.util.Log; /** diff --git a/apps/syndie/java/src/net/i2p/syndie/BlogManager.java b/apps/syndie/java/src/net/i2p/syndie/BlogManager.java index 2fb05eaf0..2eefba784 100644 --- a/apps/syndie/java/src/net/i2p/syndie/BlogManager.java +++ b/apps/syndie/java/src/net/i2p/syndie/BlogManager.java @@ -1,15 +1,45 @@ package net.i2p.syndie; -import java.io.*; -import java.text.*; -import java.util.*; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.io.UnsupportedEncodingException; +import java.io.Writer; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Properties; +import java.util.StringTokenizer; +import java.util.TimeZone; import net.i2p.I2PAppContext; import net.i2p.client.naming.PetName; import net.i2p.client.naming.PetNameDB; -import net.i2p.data.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.data.Base64; +import net.i2p.data.DataFormatException; +import net.i2p.data.DataHelper; +import net.i2p.data.Destination; +import net.i2p.data.Hash; +import net.i2p.data.SessionKey; +import net.i2p.data.SigningPrivateKey; +import net.i2p.data.SigningPublicKey; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; +import net.i2p.syndie.sml.HTMLRenderer; import net.i2p.util.Log; /** diff --git a/apps/syndie/java/src/net/i2p/syndie/CLI.java b/apps/syndie/java/src/net/i2p/syndie/CLI.java index b51a94593..556886d89 100644 --- a/apps/syndie/java/src/net/i2p/syndie/CLI.java +++ b/apps/syndie/java/src/net/i2p/syndie/CLI.java @@ -1,11 +1,26 @@ package net.i2p.syndie; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.Writer; +import java.util.ArrayList; +import java.util.List; +import java.util.StringTokenizer; + import net.i2p.I2PAppContext; -import net.i2p.data.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.data.Base64; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; +import net.i2p.data.SessionKey; +import net.i2p.data.SigningPrivateKey; +import net.i2p.syndie.data.Attachment; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; +import net.i2p.syndie.sml.HTMLRenderer; /** */ diff --git a/apps/syndie/java/src/net/i2p/syndie/CLIPost.java b/apps/syndie/java/src/net/i2p/syndie/CLIPost.java index 0b2dfe886..59f0bb6a7 100644 --- a/apps/syndie/java/src/net/i2p/syndie/CLIPost.java +++ b/apps/syndie/java/src/net/i2p/syndie/CLIPost.java @@ -1,10 +1,20 @@ package net.i2p.syndie; -import java.io.*; -import java.util.*; -import net.i2p.*; -import net.i2p.data.*; -import net.i2p.syndie.data.*; +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.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.StringTokenizer; + +import net.i2p.I2PAppContext; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.EntryContainer; import net.i2p.util.EepPost; /** diff --git a/apps/syndie/java/src/net/i2p/syndie/CachedEntry.java b/apps/syndie/java/src/net/i2p/syndie/CachedEntry.java index 9e05c66da..b1fdaa811 100644 --- a/apps/syndie/java/src/net/i2p/syndie/CachedEntry.java +++ b/apps/syndie/java/src/net/i2p/syndie/CachedEntry.java @@ -1,10 +1,28 @@ package net.i2p.syndie; -import java.io.*; -import java.util.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Properties; + import net.i2p.I2PAppContext; -import net.i2p.data.*; -import net.i2p.syndie.data.*; +import net.i2p.data.Base64; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; +import net.i2p.data.SessionKey; +import net.i2p.data.Signature; +import net.i2p.syndie.data.Attachment; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.Entry; +import net.i2p.syndie.data.EntryContainer; /** * Lazy loading wrapper for an entry, pulling data out of a cached & extracted dir, diff --git a/apps/syndie/java/src/net/i2p/syndie/EntryExtractor.java b/apps/syndie/java/src/net/i2p/syndie/EntryExtractor.java index c89ed7b5c..179a35f9e 100644 --- a/apps/syndie/java/src/net/i2p/syndie/EntryExtractor.java +++ b/apps/syndie/java/src/net/i2p/syndie/EntryExtractor.java @@ -1,12 +1,20 @@ package net.i2p.syndie; -import java.io.*; -import java.util.*; -import java.util.zip.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Iterator; +import java.util.Map; -import net.i2p.data.*; -import net.i2p.syndie.data.*; import net.i2p.I2PAppContext; +import net.i2p.data.DataHelper; +import net.i2p.data.SessionKey; +import net.i2p.syndie.data.Attachment; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.Entry; +import net.i2p.syndie.data.EntryContainer; /** * To cut down on unnecessary IO/cpu load, extract entries onto the disk for diff --git a/apps/syndie/java/src/net/i2p/syndie/HeaderReceiver.java b/apps/syndie/java/src/net/i2p/syndie/HeaderReceiver.java index 8b6bfe0ec..69c1ce1f8 100644 --- a/apps/syndie/java/src/net/i2p/syndie/HeaderReceiver.java +++ b/apps/syndie/java/src/net/i2p/syndie/HeaderReceiver.java @@ -1,6 +1,8 @@ package net.i2p.syndie; -import java.util.*; +import java.util.List; +import java.util.Properties; + import net.i2p.syndie.sml.SMLParser; public class HeaderReceiver implements SMLParser.EventReceiver { diff --git a/apps/syndie/java/src/net/i2p/syndie/NewestEntryFirstComparator.java b/apps/syndie/java/src/net/i2p/syndie/NewestEntryFirstComparator.java index 21304ef7a..aeb7ccf45 100644 --- a/apps/syndie/java/src/net/i2p/syndie/NewestEntryFirstComparator.java +++ b/apps/syndie/java/src/net/i2p/syndie/NewestEntryFirstComparator.java @@ -1,8 +1,9 @@ package net.i2p.syndie; -import java.util.*; -import net.i2p.data.*; -import net.i2p.syndie.data.*; +import java.util.Comparator; + +import net.i2p.data.DataHelper; +import net.i2p.syndie.data.BlogURI; /** sort BlogURI instances with the highest entryId first */ public class NewestEntryFirstComparator implements Comparator { diff --git a/apps/syndie/java/src/net/i2p/syndie/NewestNodeFirstComparator.java b/apps/syndie/java/src/net/i2p/syndie/NewestNodeFirstComparator.java index 6046bf0c7..50ba5bac0 100644 --- a/apps/syndie/java/src/net/i2p/syndie/NewestNodeFirstComparator.java +++ b/apps/syndie/java/src/net/i2p/syndie/NewestNodeFirstComparator.java @@ -1,7 +1,8 @@ package net.i2p.syndie; -import java.util.*; -import net.i2p.data.*; +import java.util.Comparator; + +import net.i2p.data.DataHelper; /** sort ThreadNodeImpl instances with the highest entryId first */ public class NewestNodeFirstComparator implements Comparator { diff --git a/apps/syndie/java/src/net/i2p/syndie/Sucker.java b/apps/syndie/java/src/net/i2p/syndie/Sucker.java index a62175b47..e399392a8 100644 --- a/apps/syndie/java/src/net/i2p/syndie/Sucker.java +++ b/apps/syndie/java/src/net/i2p/syndie/Sucker.java @@ -1,6 +1,5 @@ package net.i2p.syndie; -import java.io.DataInputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -15,15 +14,6 @@ import java.util.Date; import java.util.Iterator; import java.util.List; -import com.sun.syndication.feed.synd.SyndCategory; -import com.sun.syndication.feed.synd.SyndContent; -import com.sun.syndication.feed.synd.SyndEntry; -import com.sun.syndication.feed.synd.SyndEnclosure; -import com.sun.syndication.feed.synd.SyndFeed; -import com.sun.syndication.io.FeedException; -import com.sun.syndication.io.SyndFeedInput; -import com.sun.syndication.io.XmlReader; - import net.i2p.I2PAppContext; import net.i2p.data.Base64; import net.i2p.data.DataFormatException; @@ -33,6 +23,15 @@ import net.i2p.syndie.data.BlogURI; import net.i2p.util.EepGet; import net.i2p.util.Log; +import com.sun.syndication.feed.synd.SyndCategory; +import com.sun.syndication.feed.synd.SyndContent; +import com.sun.syndication.feed.synd.SyndEnclosure; +import com.sun.syndication.feed.synd.SyndEntry; +import com.sun.syndication.feed.synd.SyndFeed; +import com.sun.syndication.io.FeedException; +import com.sun.syndication.io.SyndFeedInput; +import com.sun.syndication.io.XmlReader; + /** * * todo: diff --git a/apps/syndie/java/src/net/i2p/syndie/ThreadNodeImpl.java b/apps/syndie/java/src/net/i2p/syndie/ThreadNodeImpl.java index 406ca10e4..67ede7fb2 100644 --- a/apps/syndie/java/src/net/i2p/syndie/ThreadNodeImpl.java +++ b/apps/syndie/java/src/net/i2p/syndie/ThreadNodeImpl.java @@ -1,6 +1,12 @@ package net.i2p.syndie; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.TreeSet; + import net.i2p.data.Hash; import net.i2p.syndie.data.BlogURI; import net.i2p.syndie.data.ThreadNode; diff --git a/apps/syndie/java/src/net/i2p/syndie/Updater.java b/apps/syndie/java/src/net/i2p/syndie/Updater.java index ae5d1d32a..72a13e603 100644 --- a/apps/syndie/java/src/net/i2p/syndie/Updater.java +++ b/apps/syndie/java/src/net/i2p/syndie/Updater.java @@ -1,12 +1,15 @@ package net.i2p.syndie; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; import net.i2p.I2PAppContext; import net.i2p.client.naming.PetName; import net.i2p.client.naming.PetNameDB; -import net.i2p.util.Log; import net.i2p.syndie.web.RemoteArchiveBean; +import net.i2p.util.Log; public class Updater { public static final String VERSION = "1.0"; diff --git a/apps/syndie/java/src/net/i2p/syndie/UpdaterServlet.java b/apps/syndie/java/src/net/i2p/syndie/UpdaterServlet.java index b30b8d867..8ade5e9cb 100644 --- a/apps/syndie/java/src/net/i2p/syndie/UpdaterServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/UpdaterServlet.java @@ -1,10 +1,10 @@ package net.i2p.syndie; import javax.servlet.GenericServlet; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; import javax.servlet.ServletConfig; import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; /** * A wrapper for syndie updater to allow it to be started as a web application. diff --git a/apps/syndie/java/src/net/i2p/syndie/User.java b/apps/syndie/java/src/net/i2p/syndie/User.java index b469908cf..fd386685a 100644 --- a/apps/syndie/java/src/net/i2p/syndie/User.java +++ b/apps/syndie/java/src/net/i2p/syndie/User.java @@ -1,12 +1,20 @@ package net.i2p.syndie; -import java.io.UnsupportedEncodingException; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.StringTokenizer; + import net.i2p.I2PAppContext; -import net.i2p.client.naming.PetNameDB; import net.i2p.client.naming.PetName; -import net.i2p.data.*; +import net.i2p.client.naming.PetNameDB; +import net.i2p.data.Base64; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; import net.i2p.syndie.web.AddressesServlet; /** diff --git a/apps/syndie/java/src/net/i2p/syndie/WritableThreadIndex.java b/apps/syndie/java/src/net/i2p/syndie/WritableThreadIndex.java index 06ffc8e35..996148bdf 100644 --- a/apps/syndie/java/src/net/i2p/syndie/WritableThreadIndex.java +++ b/apps/syndie/java/src/net/i2p/syndie/WritableThreadIndex.java @@ -1,12 +1,18 @@ package net.i2p.syndie; -import java.util.*; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.TreeMap; +import java.util.TreeSet; + import net.i2p.I2PAppContext; -import net.i2p.data.DataHelper; -import net.i2p.data.Hash; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.SMLParser; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; +import net.i2p.syndie.data.ThreadIndex; +import net.i2p.syndie.data.ThreadNode; import net.i2p.syndie.sml.HTMLRenderer; +import net.i2p.syndie.sml.SMLParser; /** * diff --git a/apps/syndie/java/src/net/i2p/syndie/data/ArchiveIndex.java b/apps/syndie/java/src/net/i2p/syndie/data/ArchiveIndex.java index ea194c716..4e92ce2c8 100644 --- a/apps/syndie/java/src/net/i2p/syndie/data/ArchiveIndex.java +++ b/apps/syndie/java/src/net/i2p/syndie/data/ArchiveIndex.java @@ -1,10 +1,30 @@ package net.i2p.syndie.data; -import java.io.*; -import java.text.*; -import java.util.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import java.util.StringTokenizer; +import java.util.TreeMap; + import net.i2p.I2PAppContext; -import net.i2p.data.*; +import net.i2p.data.Base64; +import net.i2p.data.Hash; import net.i2p.syndie.Archive; import net.i2p.syndie.BlogManager; import net.i2p.util.Log; diff --git a/apps/syndie/java/src/net/i2p/syndie/data/Attachment.java b/apps/syndie/java/src/net/i2p/syndie/data/Attachment.java index 1d5cd5297..f3efa2396 100644 --- a/apps/syndie/java/src/net/i2p/syndie/data/Attachment.java +++ b/apps/syndie/java/src/net/i2p/syndie/data/Attachment.java @@ -1,7 +1,13 @@ package net.i2p.syndie.data; -import java.io.*; -import java.util.*; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import net.i2p.data.DataHelper; /** diff --git a/apps/syndie/java/src/net/i2p/syndie/data/BlogInfo.java b/apps/syndie/java/src/net/i2p/syndie/data/BlogInfo.java index 41839f227..82613096c 100644 --- a/apps/syndie/java/src/net/i2p/syndie/data/BlogInfo.java +++ b/apps/syndie/java/src/net/i2p/syndie/data/BlogInfo.java @@ -1,9 +1,26 @@ package net.i2p.syndie.data; -import java.io.*; -import java.util.*; -import net.i2p.data.*; +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Properties; +import java.util.StringTokenizer; + import net.i2p.I2PAppContext; +import net.i2p.data.Base64; +import net.i2p.data.DataHelper; +import net.i2p.data.Signature; +import net.i2p.data.SigningPrivateKey; +import net.i2p.data.SigningPublicKey; import net.i2p.util.Log; /** diff --git a/apps/syndie/java/src/net/i2p/syndie/data/BlogInfoData.java b/apps/syndie/java/src/net/i2p/syndie/data/BlogInfoData.java index 673dd0825..8cda08be3 100644 --- a/apps/syndie/java/src/net/i2p/syndie/data/BlogInfoData.java +++ b/apps/syndie/java/src/net/i2p/syndie/data/BlogInfoData.java @@ -1,7 +1,12 @@ package net.i2p.syndie.data; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; + import net.i2p.client.naming.PetName; import net.i2p.data.DataHelper; diff --git a/apps/syndie/java/src/net/i2p/syndie/data/BlogURI.java b/apps/syndie/java/src/net/i2p/syndie/data/BlogURI.java index b2b7a814f..a164cb32c 100644 --- a/apps/syndie/java/src/net/i2p/syndie/data/BlogURI.java +++ b/apps/syndie/java/src/net/i2p/syndie/data/BlogURI.java @@ -1,7 +1,10 @@ package net.i2p.syndie.data; -import java.util.*; -import net.i2p.data.*; +import java.util.Comparator; + +import net.i2p.data.Base64; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; /** * diff --git a/apps/syndie/java/src/net/i2p/syndie/data/EncodingTestGenerator.java b/apps/syndie/java/src/net/i2p/syndie/data/EncodingTestGenerator.java index 90743cd3c..7bc0cae36 100644 --- a/apps/syndie/java/src/net/i2p/syndie/data/EncodingTestGenerator.java +++ b/apps/syndie/java/src/net/i2p/syndie/data/EncodingTestGenerator.java @@ -1,9 +1,15 @@ package net.i2p.syndie.data; -import java.io.*; -import java.util.*; -import net.i2p.data.*; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.util.Properties; + import net.i2p.I2PAppContext; +import net.i2p.data.DataHelper; +import net.i2p.data.SigningPrivateKey; +import net.i2p.data.SigningPublicKey; /** * Create a new blog metadata & set of entries using some crazy UTF8 encoded chars, diff --git a/apps/syndie/java/src/net/i2p/syndie/data/EntryContainer.java b/apps/syndie/java/src/net/i2p/syndie/data/EntryContainer.java index 0743bd6d4..892d58ade 100644 --- a/apps/syndie/java/src/net/i2p/syndie/data/EntryContainer.java +++ b/apps/syndie/java/src/net/i2p/syndie/data/EntryContainer.java @@ -1,11 +1,26 @@ package net.i2p.syndie.data; -import java.io.*; -import java.util.*; -import java.util.zip.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.StringTokenizer; +import java.util.zip.ZipEntry; +import java.util.zip.ZipInputStream; +import java.util.zip.ZipOutputStream; -import net.i2p.data.*; 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.data.Signature; +import net.i2p.data.SigningPrivateKey; import net.i2p.util.Log; /** diff --git a/apps/syndie/java/src/net/i2p/syndie/data/FilteredThreadIndex.java b/apps/syndie/java/src/net/i2p/syndie/data/FilteredThreadIndex.java index c8684be87..8cf4a66e9 100644 --- a/apps/syndie/java/src/net/i2p/syndie/data/FilteredThreadIndex.java +++ b/apps/syndie/java/src/net/i2p/syndie/data/FilteredThreadIndex.java @@ -1,9 +1,16 @@ package net.i2p.syndie.data; -import java.util.*; -import net.i2p.syndie.*; -import net.i2p.data.*; -import net.i2p.client.naming.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; + +import net.i2p.client.naming.PetName; +import net.i2p.data.DataFormatException; +import net.i2p.data.Hash; +import net.i2p.syndie.Archive; +import net.i2p.syndie.User; /** * diff --git a/apps/syndie/java/src/net/i2p/syndie/data/LocalArchiveIndex.java b/apps/syndie/java/src/net/i2p/syndie/data/LocalArchiveIndex.java index cb791fcdd..b14f6156a 100644 --- a/apps/syndie/java/src/net/i2p/syndie/data/LocalArchiveIndex.java +++ b/apps/syndie/java/src/net/i2p/syndie/data/LocalArchiveIndex.java @@ -1,8 +1,14 @@ package net.i2p.syndie.data; -import java.util.*; +import java.util.Collections; +import java.util.Comparator; +import java.util.Properties; +import java.util.Set; +import java.util.TreeSet; + import net.i2p.I2PAppContext; -import net.i2p.data.*; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; import net.i2p.syndie.Archive; import net.i2p.util.Log; diff --git a/apps/syndie/java/src/net/i2p/syndie/data/ThreadIndex.java b/apps/syndie/java/src/net/i2p/syndie/data/ThreadIndex.java index 3ba3b2833..810dceb1e 100644 --- a/apps/syndie/java/src/net/i2p/syndie/data/ThreadIndex.java +++ b/apps/syndie/java/src/net/i2p/syndie/data/ThreadIndex.java @@ -1,6 +1,9 @@ package net.i2p.syndie.data; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * List of threads, ordered with the most recently updated thread first. diff --git a/apps/syndie/java/src/net/i2p/syndie/data/ThreadNode.java b/apps/syndie/java/src/net/i2p/syndie/data/ThreadNode.java index 7ab3f8aa6..437772d71 100644 --- a/apps/syndie/java/src/net/i2p/syndie/data/ThreadNode.java +++ b/apps/syndie/java/src/net/i2p/syndie/data/ThreadNode.java @@ -1,6 +1,8 @@ package net.i2p.syndie.data; -import java.util.*; +import java.util.Collection; +import java.util.Iterator; + import net.i2p.data.Hash; /** diff --git a/apps/syndie/java/src/net/i2p/syndie/data/TransparentArchiveIndex.java b/apps/syndie/java/src/net/i2p/syndie/data/TransparentArchiveIndex.java index 49d9c45e7..85d15996d 100644 --- a/apps/syndie/java/src/net/i2p/syndie/data/TransparentArchiveIndex.java +++ b/apps/syndie/java/src/net/i2p/syndie/data/TransparentArchiveIndex.java @@ -1,11 +1,14 @@ package net.i2p.syndie.data; -import java.io.*; -import java.text.*; -import java.util.*; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.util.List; +import java.util.Properties; +import java.util.Set; + import net.i2p.I2PAppContext; -import net.i2p.data.*; -import net.i2p.syndie.Archive; +import net.i2p.data.Hash; import net.i2p.syndie.BlogManager; /** diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/Address.java b/apps/syndie/java/src/net/i2p/syndie/sml/Address.java index ef2d1cc5c..c8caac56d 100644 --- a/apps/syndie/java/src/net/i2p/syndie/sml/Address.java +++ b/apps/syndie/java/src/net/i2p/syndie/sml/Address.java @@ -1,6 +1,5 @@ package net.i2p.syndie.sml; -import java.util.*; import net.i2p.data.DataHelper; /** contains intermediary rendering state */ diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/ArchiveRef.java b/apps/syndie/java/src/net/i2p/syndie/sml/ArchiveRef.java index 650b7b36e..1b3df20e4 100644 --- a/apps/syndie/java/src/net/i2p/syndie/sml/ArchiveRef.java +++ b/apps/syndie/java/src/net/i2p/syndie/sml/ArchiveRef.java @@ -1,6 +1,5 @@ package net.i2p.syndie.sml; -import java.util.*; import net.i2p.data.DataHelper; /** contains intermediary rendering state */ diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/Blog.java b/apps/syndie/java/src/net/i2p/syndie/sml/Blog.java index 325a0db11..0eb4c14b0 100644 --- a/apps/syndie/java/src/net/i2p/syndie/sml/Blog.java +++ b/apps/syndie/java/src/net/i2p/syndie/sml/Blog.java @@ -1,6 +1,7 @@ package net.i2p.syndie.sml; -import java.util.*; +import java.util.List; + import net.i2p.data.DataHelper; /** contains intermediary rendering state */ diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/BlogPostInfoRenderer.java b/apps/syndie/java/src/net/i2p/syndie/sml/BlogPostInfoRenderer.java index 6d52dff04..98a1a3ea5 100644 --- a/apps/syndie/java/src/net/i2p/syndie/sml/BlogPostInfoRenderer.java +++ b/apps/syndie/java/src/net/i2p/syndie/sml/BlogPostInfoRenderer.java @@ -1,15 +1,31 @@ package net.i2p.syndie.sml; -import java.io.*; -import java.text.*; -import java.util.*; +import java.io.IOException; +import java.io.Writer; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.StringTokenizer; + import net.i2p.I2PAppContext; import net.i2p.client.naming.PetName; import net.i2p.client.naming.PetNameDB; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.web.*; +import net.i2p.data.Base64; +import net.i2p.data.Hash; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.Attachment; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; +import net.i2p.syndie.data.SafeURL; +import net.i2p.syndie.web.AddressesServlet; +import net.i2p.syndie.web.ViewBlogServlet; import net.i2p.util.Log; /** diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/BlogRenderer.java b/apps/syndie/java/src/net/i2p/syndie/sml/BlogRenderer.java index 467ebd43c..55b19f5f4 100644 --- a/apps/syndie/java/src/net/i2p/syndie/sml/BlogRenderer.java +++ b/apps/syndie/java/src/net/i2p/syndie/sml/BlogRenderer.java @@ -1,13 +1,22 @@ package net.i2p.syndie.sml; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.Writer; + import net.i2p.I2PAppContext; import net.i2p.client.naming.PetName; -import net.i2p.data.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.web.*; -import net.i2p.syndie.*; +import net.i2p.data.Base64; +import net.i2p.data.Hash; +import net.i2p.syndie.Archive; +import net.i2p.syndie.User; +import net.i2p.syndie.data.Attachment; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogInfoData; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; +import net.i2p.syndie.data.ThreadNode; +import net.i2p.syndie.web.PostServlet; +import net.i2p.syndie.web.ViewBlogServlet; /** * Renders posts for display within the blog view diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/EventReceiverImpl.java b/apps/syndie/java/src/net/i2p/syndie/sml/EventReceiverImpl.java index 854882aa9..515f80b86 100644 --- a/apps/syndie/java/src/net/i2p/syndie/sml/EventReceiverImpl.java +++ b/apps/syndie/java/src/net/i2p/syndie/sml/EventReceiverImpl.java @@ -1,6 +1,7 @@ package net.i2p.syndie.sml; import java.util.List; + import net.i2p.I2PAppContext; import net.i2p.util.Log; diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/HTMLPreviewRenderer.java b/apps/syndie/java/src/net/i2p/syndie/sml/HTMLPreviewRenderer.java index 6d67e1408..603842304 100644 --- a/apps/syndie/java/src/net/i2p/syndie/sml/HTMLPreviewRenderer.java +++ b/apps/syndie/java/src/net/i2p/syndie/sml/HTMLPreviewRenderer.java @@ -1,14 +1,15 @@ package net.i2p.syndie.sml; -import java.io.*; -import java.text.*; -import java.util.*; +import java.io.File; +import java.util.List; + import net.i2p.I2PAppContext; import net.i2p.client.naming.PetName; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.web.*; +import net.i2p.data.Base64; +import net.i2p.data.Hash; +import net.i2p.syndie.data.SafeURL; +import net.i2p.syndie.web.AddressesServlet; +import net.i2p.syndie.web.ArchiveViewerBean; /** * diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java b/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java index b676322a8..3c0346ab9 100644 --- a/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java +++ b/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java @@ -1,14 +1,38 @@ package net.i2p.syndie.sml; -import java.io.*; -import java.text.*; -import java.util.*; +import java.io.ByteArrayOutputStream; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.Writer; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.StringTokenizer; + import net.i2p.I2PAppContext; import net.i2p.client.naming.PetName; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.web.*; +import net.i2p.data.Base64; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.Attachment; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; +import net.i2p.syndie.data.SafeURL; +import net.i2p.syndie.web.AddressesServlet; +import net.i2p.syndie.web.ArchiveViewerBean; +import net.i2p.syndie.web.PostServlet; +import net.i2p.syndie.web.SyndicateServlet; import net.i2p.util.Log; /** diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/Link.java b/apps/syndie/java/src/net/i2p/syndie/sml/Link.java index 291c83c4b..c343216f7 100644 --- a/apps/syndie/java/src/net/i2p/syndie/sml/Link.java +++ b/apps/syndie/java/src/net/i2p/syndie/sml/Link.java @@ -1,6 +1,5 @@ package net.i2p.syndie.sml; -import java.util.*; import net.i2p.data.DataHelper; /** contains intermediary rendering state */ diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/RSSRenderer.java b/apps/syndie/java/src/net/i2p/syndie/sml/RSSRenderer.java index 442ebb687..8e99a50bf 100644 --- a/apps/syndie/java/src/net/i2p/syndie/sml/RSSRenderer.java +++ b/apps/syndie/java/src/net/i2p/syndie/sml/RSSRenderer.java @@ -1,14 +1,20 @@ package net.i2p.syndie.sml; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.Writer; import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; + import net.i2p.I2PAppContext; import net.i2p.client.naming.PetName; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.web.AddressesServlet; +import net.i2p.data.Base64; +import net.i2p.data.Hash; +import net.i2p.syndie.Archive; +import net.i2p.syndie.User; +import net.i2p.syndie.data.Attachment; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.EntryContainer; /** * diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/SMLParser.java b/apps/syndie/java/src/net/i2p/syndie/sml/SMLParser.java index 6a965ed24..fd9d64387 100644 --- a/apps/syndie/java/src/net/i2p/syndie/sml/SMLParser.java +++ b/apps/syndie/java/src/net/i2p/syndie/sml/SMLParser.java @@ -1,9 +1,12 @@ package net.i2p.syndie.sml; -import java.lang.String; -import java.util.*; -import net.i2p.syndie.data.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import net.i2p.I2PAppContext; +import net.i2p.syndie.data.SafeURL; import net.i2p.util.Log; /** diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/ThreadedHTMLRenderer.java b/apps/syndie/java/src/net/i2p/syndie/sml/ThreadedHTMLRenderer.java index c63307b5f..70137b6f6 100644 --- a/apps/syndie/java/src/net/i2p/syndie/sml/ThreadedHTMLRenderer.java +++ b/apps/syndie/java/src/net/i2p/syndie/sml/ThreadedHTMLRenderer.java @@ -1,14 +1,31 @@ package net.i2p.syndie.sml; -import java.io.*; -import java.text.*; -import java.util.*; +import java.io.IOException; +import java.io.Writer; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; + import net.i2p.I2PAppContext; import net.i2p.client.naming.PetName; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.web.*; +import net.i2p.data.Base64; +import net.i2p.data.Hash; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.Attachment; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; +import net.i2p.syndie.data.SafeURL; +import net.i2p.syndie.data.ThreadIndex; +import net.i2p.syndie.data.ThreadNode; +import net.i2p.syndie.web.AddressesServlet; +import net.i2p.syndie.web.ArchiveViewerBean; +import net.i2p.syndie.web.BaseServlet; +import net.i2p.syndie.web.PostServlet; import net.i2p.util.Log; /** diff --git a/apps/syndie/java/src/net/i2p/syndie/web/AddressesServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/AddressesServlet.java index 628344479..ff1a49ccc 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/AddressesServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/AddressesServlet.java @@ -1,19 +1,21 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Iterator; +import java.util.TreeSet; -import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; -import net.i2p.I2PAppContext; -import net.i2p.client.naming.*; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.client.naming.PetName; +import net.i2p.client.naming.PetNameDB; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.FilteredThreadIndex; +import net.i2p.syndie.data.ThreadIndex; +import net.i2p.syndie.sml.ThreadedHTMLRenderer; /** * Show the user's addressbook diff --git a/apps/syndie/java/src/net/i2p/syndie/web/AdminServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/AdminServlet.java index e452cbe9e..fa9b852ba 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/AdminServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/AdminServlet.java @@ -1,19 +1,15 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.PrintWriter; -import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; -import net.i2p.I2PAppContext; -import net.i2p.client.naming.*; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.ThreadIndex; /** * Admin form diff --git a/apps/syndie/java/src/net/i2p/syndie/web/ArchiveServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/ArchiveServlet.java index cb45ed73c..afd701b9c 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/ArchiveServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/ArchiveServlet.java @@ -1,17 +1,28 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; import net.i2p.I2PAppContext; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; +import net.i2p.data.Base64; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.data.ArchiveIndex; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; /** * diff --git a/apps/syndie/java/src/net/i2p/syndie/web/ArchiveViewerBean.java b/apps/syndie/java/src/net/i2p/syndie/web/ArchiveViewerBean.java index 19af7e9a4..56ed1b60b 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/ArchiveViewerBean.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/ArchiveViewerBean.java @@ -1,15 +1,35 @@ package net.i2p.syndie.web; -import java.io.*; -import java.text.*; -import java.util.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.Writer; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import java.util.TreeMap; + import net.i2p.I2PAppContext; import net.i2p.client.naming.PetName; import net.i2p.client.naming.PetNameDB; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.data.Base64; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; +import net.i2p.data.SigningPublicKey; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.ArchiveIndex; +import net.i2p.syndie.data.Attachment; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; +import net.i2p.syndie.sml.HTMLRenderer; +import net.i2p.syndie.sml.ThreadedHTMLRenderer; /** * diff --git a/apps/syndie/java/src/net/i2p/syndie/web/BaseServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/BaseServlet.java index 2c06521a2..aba868a15 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/BaseServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/BaseServlet.java @@ -1,19 +1,43 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.PrintWriter; +import java.io.Reader; +import java.io.Writer; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Enumeration; +import java.util.Iterator; +import java.util.List; +import java.util.Properties; +import java.util.Set; +import java.util.StringTokenizer; +import java.util.TreeSet; +import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; import net.i2p.I2PAppContext; -import net.i2p.client.naming.*; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.client.naming.PetName; +import net.i2p.client.naming.PetNameDB; +import net.i2p.data.Base64; +import net.i2p.data.DataFormatException; +import net.i2p.data.Hash; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.FilteredThreadIndex; +import net.i2p.syndie.data.ThreadIndex; +import net.i2p.syndie.data.ThreadNode; +import net.i2p.syndie.sml.HTMLRenderer; +import net.i2p.syndie.sml.ThreadedHTMLRenderer; import net.i2p.util.FileUtil; import net.i2p.util.Log; diff --git a/apps/syndie/java/src/net/i2p/syndie/web/BlogConfigBean.java b/apps/syndie/java/src/net/i2p/syndie/web/BlogConfigBean.java index a568ab383..1652a525a 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/BlogConfigBean.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/BlogConfigBean.java @@ -1,12 +1,26 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Properties; + import net.i2p.I2PAppContext; import net.i2p.client.naming.PetName; import net.i2p.data.DataHelper; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogInfoData; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; import net.i2p.util.Log; /** diff --git a/apps/syndie/java/src/net/i2p/syndie/web/BlogConfigServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/BlogConfigServlet.java index 98b06483e..c2cfc5d14 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/BlogConfigServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/BlogConfigServlet.java @@ -1,19 +1,28 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import java.util.TreeSet; -import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; -import net.i2p.I2PAppContext; -import net.i2p.client.naming.*; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.client.naming.PetName; +import net.i2p.client.naming.PetNameDB; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.BlogInfoData; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.ThreadIndex; +import net.i2p.syndie.sml.HTMLRenderer; /** * Display our blog config, and let us edit it through several screens diff --git a/apps/syndie/java/src/net/i2p/syndie/web/ExportServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/ExportServlet.java index 51179a789..5bcd2f2c6 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/ExportServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/ExportServlet.java @@ -1,18 +1,25 @@ package net.i2p.syndie.web; -import java.io.*; -import java.io.*; -import java.util.*; -import java.util.zip.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; +import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; +import net.i2p.data.Base64; +import net.i2p.data.Hash; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.data.BlogURI; /** * Dump out a whole series of blog metadata and entries as a zip stream. All metadata diff --git a/apps/syndie/java/src/net/i2p/syndie/web/ExternalLinkServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/ExternalLinkServlet.java index fab84f769..f89e58079 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/ExternalLinkServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/ExternalLinkServlet.java @@ -1,19 +1,17 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.PrintWriter; -import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; -import net.i2p.I2PAppContext; -import net.i2p.client.naming.*; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.data.Base64; +import net.i2p.data.DataHelper; +import net.i2p.syndie.Archive; +import net.i2p.syndie.User; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.ThreadIndex; +import net.i2p.syndie.sml.HTMLRenderer; /** * Confirm page before hitting a remote site diff --git a/apps/syndie/java/src/net/i2p/syndie/web/ImportFeedServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/ImportFeedServlet.java index 1a454e4ac..9b603bbbf 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/ImportFeedServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/ImportFeedServlet.java @@ -1,19 +1,17 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Iterator; +import java.util.List; -import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; -import net.i2p.I2PAppContext; -import net.i2p.client.naming.*; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.ThreadIndex; /** * Schedule the import of atom/rss feeds diff --git a/apps/syndie/java/src/net/i2p/syndie/web/MultiPartRequest.java b/apps/syndie/java/src/net/i2p/syndie/web/MultiPartRequest.java index 780070aa5..22f73b40a 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/MultiPartRequest.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/MultiPartRequest.java @@ -1,8 +1,6 @@ // see below for license info package net.i2p.syndie.web; -import org.mortbay.servlet.*; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/apps/syndie/java/src/net/i2p/syndie/web/PostBean.java b/apps/syndie/java/src/net/i2p/syndie/web/PostBean.java index 6cd475b2d..7e653587d 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/PostBean.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/PostBean.java @@ -1,11 +1,26 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.Writer; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.StringTokenizer; + import net.i2p.I2PAppContext; import net.i2p.client.naming.PetName; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; import net.i2p.syndie.sml.HTMLPreviewRenderer; import net.i2p.syndie.sml.HTMLRenderer; import net.i2p.util.Log; diff --git a/apps/syndie/java/src/net/i2p/syndie/web/PostServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/PostServlet.java index 4cc2127b4..8d7ce3814 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/PostServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/PostServlet.java @@ -1,22 +1,24 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.TreeSet; -import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; -// temporarily, we use our overwride, until jetty applies our patches -//import org.mortbay.servlet.MultiPartRequest; - -import net.i2p.I2PAppContext; -import net.i2p.client.naming.*; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.client.naming.PetName; +import net.i2p.client.naming.PetNameDB; +import net.i2p.data.Base64; +import net.i2p.data.DataHelper; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.ThreadIndex; +import net.i2p.syndie.sml.HTMLRenderer; +import net.i2p.syndie.sml.ThreadedHTMLRenderer; /** * Post and preview form diff --git a/apps/syndie/java/src/net/i2p/syndie/web/ProfileServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/ProfileServlet.java index ebebc4914..1c961a768 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/ProfileServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/ProfileServlet.java @@ -1,19 +1,22 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.PrintWriter; -import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; -import net.i2p.I2PAppContext; -import net.i2p.client.naming.*; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.client.naming.PetName; +import net.i2p.data.DataFormatException; +import net.i2p.data.Hash; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.FilteredThreadIndex; +import net.i2p.syndie.data.ThreadIndex; +import net.i2p.syndie.sml.HTMLRenderer; +import net.i2p.syndie.sml.ThreadedHTMLRenderer; /** * Render the requested profile diff --git a/apps/syndie/java/src/net/i2p/syndie/web/RSSServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/RSSServlet.java index da6cfc117..2d6c2b8f1 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/RSSServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/RSSServlet.java @@ -1,18 +1,31 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.Writer; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.StringTokenizer; +import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; import net.i2p.I2PAppContext; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.data.Base64; +import net.i2p.data.Hash; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; +import net.i2p.syndie.data.FilteredThreadIndex; +import net.i2p.syndie.data.ThreadNode; +import net.i2p.syndie.sml.HTMLRenderer; +import net.i2p.syndie.sml.RSSRenderer; +import net.i2p.syndie.sml.ThreadedHTMLRenderer; /** * diff --git a/apps/syndie/java/src/net/i2p/syndie/web/RemoteArchiveBean.java b/apps/syndie/java/src/net/i2p/syndie/web/RemoteArchiveBean.java index fbe73ff4f..3601d4b24 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/RemoteArchiveBean.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/RemoteArchiveBean.java @@ -1,19 +1,45 @@ package net.i2p.syndie.web; -import java.io.*; -import java.text.*; -import java.util.*; -import java.util.zip.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.Writer; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import java.util.TreeSet; +import java.util.zip.ZipEntry; +import java.util.zip.ZipInputStream; + import net.i2p.I2PAppContext; -import net.i2p.client.naming.PetNameDB; import net.i2p.client.naming.PetName; -import net.i2p.data.*; +import net.i2p.client.naming.PetNameDB; +import net.i2p.data.Base64; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.ArchiveIndex; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; +import net.i2p.syndie.sml.HTMLRenderer; +import net.i2p.syndie.sml.ThreadedHTMLRenderer; import net.i2p.util.EepGet; import net.i2p.util.EepGetScheduler; import net.i2p.util.EepPost; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; -import net.i2p.syndie.*; import net.i2p.util.I2PThread; import net.i2p.util.Log; diff --git a/apps/syndie/java/src/net/i2p/syndie/web/RunStandalone.java b/apps/syndie/java/src/net/i2p/syndie/web/RunStandalone.java index ffef2957d..778d3e41a 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/RunStandalone.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/RunStandalone.java @@ -3,6 +3,7 @@ package net.i2p.syndie.web; import java.io.File; import net.i2p.util.FileUtil; + import org.mortbay.jetty.Server; public class RunStandalone { diff --git a/apps/syndie/java/src/net/i2p/syndie/web/SwitchServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/SwitchServlet.java index 97949dbbe..44fd4e970 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/SwitchServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/SwitchServlet.java @@ -1,19 +1,15 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.PrintWriter; -import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; -import net.i2p.I2PAppContext; -import net.i2p.client.naming.*; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.syndie.Archive; +import net.i2p.syndie.User; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.ThreadIndex; +import net.i2p.syndie.sml.ThreadedHTMLRenderer; /** * Login/register form diff --git a/apps/syndie/java/src/net/i2p/syndie/web/SyndicateServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/SyndicateServlet.java index 0705dc93f..337ac5aa1 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/SyndicateServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/SyndicateServlet.java @@ -1,19 +1,18 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Iterator; -import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; -import net.i2p.I2PAppContext; -import net.i2p.client.naming.*; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.client.naming.PetName; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.ThreadIndex; +import net.i2p.syndie.sml.HTMLRenderer; /** * Syndicate with another remote Syndie node diff --git a/apps/syndie/java/src/net/i2p/syndie/web/ThreadNavServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/ThreadNavServlet.java index b74825366..abb6f852e 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/ThreadNavServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/ThreadNavServlet.java @@ -1,19 +1,26 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.PrintWriter; import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import net.i2p.I2PAppContext; -import net.i2p.client.naming.*; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.client.naming.PetName; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.HeaderReceiver; +import net.i2p.syndie.User; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; +import net.i2p.syndie.data.FilteredThreadIndex; +import net.i2p.syndie.data.ThreadIndex; +import net.i2p.syndie.data.ThreadNode; +import net.i2p.syndie.sml.HTMLRenderer; +import net.i2p.syndie.sml.SMLParser; /** * Export the thread nav as either RDF or XML diff --git a/apps/syndie/java/src/net/i2p/syndie/web/ViewBlogServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/ViewBlogServlet.java index daacf3010..6a254f521 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/ViewBlogServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/ViewBlogServlet.java @@ -1,19 +1,40 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.PrintWriter; +import java.io.Reader; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import net.i2p.I2PAppContext; -import net.i2p.client.naming.*; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.client.naming.PetName; +import net.i2p.data.Base64; +import net.i2p.data.Hash; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.ArchiveIndex; +import net.i2p.syndie.data.Attachment; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogInfoData; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; +import net.i2p.syndie.data.FilteredThreadIndex; +import net.i2p.syndie.data.ThreadIndex; +import net.i2p.syndie.data.ThreadNode; +import net.i2p.syndie.sml.BlogPostInfoRenderer; +import net.i2p.syndie.sml.BlogRenderer; +import net.i2p.syndie.sml.HTMLRenderer; +import net.i2p.syndie.sml.ThreadedHTMLRenderer; import net.i2p.util.FileUtil; import net.i2p.util.Log; diff --git a/apps/syndie/java/src/net/i2p/syndie/web/ViewBlogsServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/ViewBlogsServlet.java index 80f28402d..4a1d4d258 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/ViewBlogsServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/ViewBlogsServlet.java @@ -1,18 +1,27 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.TreeSet; -import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import net.i2p.I2PAppContext; -import net.i2p.client.naming.*; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.client.naming.PetName; +import net.i2p.client.naming.PetNameDB; +import net.i2p.data.Hash; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.NewestEntryFirstComparator; +import net.i2p.syndie.User; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.FilteredThreadIndex; +import net.i2p.syndie.data.ThreadIndex; +import net.i2p.syndie.data.ThreadNode; +import net.i2p.syndie.sml.HTMLRenderer; /** * List the blogs known in the archive diff --git a/apps/syndie/java/src/net/i2p/syndie/web/ViewThreadedServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/ViewThreadedServlet.java index 375733a6a..065bed377 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/ViewThreadedServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/ViewThreadedServlet.java @@ -1,18 +1,33 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; -import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import net.i2p.I2PAppContext; -import net.i2p.client.naming.*; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.client.naming.PetName; +import net.i2p.client.naming.PetNameDB; +import net.i2p.data.Base64; +import net.i2p.data.Hash; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.HeaderReceiver; +import net.i2p.syndie.User; +import net.i2p.syndie.data.ArchiveIndex; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; +import net.i2p.syndie.data.FilteredThreadIndex; +import net.i2p.syndie.data.ThreadIndex; +import net.i2p.syndie.data.ThreadNode; +import net.i2p.syndie.sml.HTMLRenderer; +import net.i2p.syndie.sml.SMLParser; +import net.i2p.syndie.sml.ThreadedHTMLRenderer; /** * Render the appropriate posts and the thread tree diff --git a/apps/systray/java/src/net/i2p/apps/systray/SysTray.java b/apps/systray/java/src/net/i2p/apps/systray/SysTray.java index 2e42de659..380c5b172 100644 --- a/apps/systray/java/src/net/i2p/apps/systray/SysTray.java +++ b/apps/systray/java/src/net/i2p/apps/systray/SysTray.java @@ -10,14 +10,14 @@ package net.i2p.apps.systray; import java.awt.Frame; + +import net.i2p.util.SimpleTimer; import snoozesoft.systray4j.SysTrayMenu; import snoozesoft.systray4j.SysTrayMenuEvent; import snoozesoft.systray4j.SysTrayMenuIcon; import snoozesoft.systray4j.SysTrayMenuItem; import snoozesoft.systray4j.SysTrayMenuListener; -import net.i2p.util.SimpleTimer; - /** * A system tray control for launching the I2P router console. * diff --git a/core/java/src/gnu/crypto/prng/AsyncFortunaStandalone.java b/core/java/src/gnu/crypto/prng/AsyncFortunaStandalone.java index c7b5c36e5..3fdffcd9e 100644 --- a/core/java/src/gnu/crypto/prng/AsyncFortunaStandalone.java +++ b/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; diff --git a/core/java/src/gnu/crypto/prng/FortunaStandalone.java b/core/java/src/gnu/crypto/prng/FortunaStandalone.java index 007d52c1e..fbe6fdc27 100644 --- a/core/java/src/gnu/crypto/prng/FortunaStandalone.java +++ b/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 diff --git a/core/java/src/net/i2p/I2PAppContext.java b/core/java/src/net/i2p/I2PAppContext.java index aca9ebdc1..403acf44b 100644 --- a/core/java/src/net/i2p/I2PAppContext.java +++ b/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; /** *

    Provide a base scope for accessing singletons that I2P exposes. Rather than diff --git a/core/java/src/net/i2p/client/I2PClientMessageHandlerMap.java b/core/java/src/net/i2p/client/I2PClientMessageHandlerMap.java index 90c111c15..50b795571 100644 --- a/core/java/src/net/i2p/client/I2PClientMessageHandlerMap.java +++ b/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; diff --git a/core/java/src/net/i2p/client/MessagePayloadMessageHandler.java b/core/java/src/net/i2p/client/MessagePayloadMessageHandler.java index eec16feea..e38927933 100644 --- a/core/java/src/net/i2p/client/MessagePayloadMessageHandler.java +++ b/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; diff --git a/core/java/src/net/i2p/client/MessageState.java b/core/java/src/net/i2p/client/MessageState.java index 4ae18c74a..28ab4bdaa 100644 --- a/core/java/src/net/i2p/client/MessageState.java +++ b/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; /** diff --git a/core/java/src/net/i2p/client/naming/AddressDB.java b/core/java/src/net/i2p/client/naming/AddressDB.java index 2ad38c3e2..29b8cf7cb 100644 --- a/core/java/src/net/i2p/client/naming/AddressDB.java +++ b/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 { diff --git a/core/java/src/net/i2p/client/naming/AddressDBNamingService.java b/core/java/src/net/i2p/client/naming/AddressDBNamingService.java index 04abba456..72cee3cda 100644 --- a/core/java/src/net/i2p/client/naming/AddressDBNamingService.java +++ b/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 { diff --git a/core/java/src/net/i2p/client/naming/EepGetNamingService.java b/core/java/src/net/i2p/client/naming/EepGetNamingService.java index 057f3d4f6..0b3c7d08e 100644 --- a/core/java/src/net/i2p/client/naming/EepGetNamingService.java +++ b/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; diff --git a/core/java/src/net/i2p/client/naming/ExecNamingService.java b/core/java/src/net/i2p/client/naming/ExecNamingService.java index 8d76f50fd..15b770ec8 100644 --- a/core/java/src/net/i2p/client/naming/ExecNamingService.java +++ b/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; /** diff --git a/core/java/src/net/i2p/client/naming/FilesystemAddressDB.java b/core/java/src/net/i2p/client/naming/FilesystemAddressDB.java index 4a2e37e27..f64467460 100644 --- a/core/java/src/net/i2p/client/naming/FilesystemAddressDB.java +++ b/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; diff --git a/core/java/src/net/i2p/client/naming/MetaNamingService.java b/core/java/src/net/i2p/client/naming/MetaNamingService.java index 00cd382ac..753b50f15 100644 --- a/core/java/src/net/i2p/client/naming/MetaNamingService.java +++ b/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; diff --git a/core/java/src/net/i2p/client/naming/PetName.java b/core/java/src/net/i2p/client/naming/PetName.java index 8b5fdda91..3642fd14e 100644 --- a/core/java/src/net/i2p/client/naming/PetName.java +++ b/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; /** diff --git a/core/java/src/net/i2p/client/naming/PetNameDB.java b/core/java/src/net/i2p/client/naming/PetNameDB.java index c335a9341..0f6fc977f 100644 --- a/core/java/src/net/i2p/client/naming/PetNameDB.java +++ b/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; /** diff --git a/core/java/src/net/i2p/client/naming/PetNameNamingService.java b/core/java/src/net/i2p/client/naming/PetNameNamingService.java index fb57a3c02..1d0294a25 100644 --- a/core/java/src/net/i2p/client/naming/PetNameNamingService.java +++ b/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 { diff --git a/core/java/src/net/i2p/crypto/AESInputStream.java b/core/java/src/net/i2p/crypto/AESInputStream.java index cdc11bbc7..f4ec8533d 100644 --- a/core/java/src/net/i2p/crypto/AESInputStream.java +++ b/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; diff --git a/core/java/src/net/i2p/crypto/DHSessionKeyBuilder.java b/core/java/src/net/i2p/crypto/DHSessionKeyBuilder.java index 949d3a70b..d00f3d1aa 100644 --- a/core/java/src/net/i2p/crypto/DHSessionKeyBuilder.java +++ b/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; diff --git a/core/java/src/net/i2p/crypto/DSAEngine.java b/core/java/src/net/i2p/crypto/DSAEngine.java index 113627caf..b083cc248 100644 --- a/core/java/src/net/i2p/crypto/DSAEngine.java +++ b/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; diff --git a/core/java/src/net/i2p/crypto/DummyPooledRandomSource.java b/core/java/src/net/i2p/crypto/DummyPooledRandomSource.java index 6b47520c4..a29d923a5 100644 --- a/core/java/src/net/i2p/crypto/DummyPooledRandomSource.java +++ b/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; /** * diff --git a/core/java/src/net/i2p/crypto/HMAC256Generator.java b/core/java/src/net/i2p/crypto/HMAC256Generator.java index 2d106298b..9ad2b55a7 100644 --- a/core/java/src/net/i2p/crypto/HMAC256Generator.java +++ b/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; diff --git a/core/java/src/net/i2p/crypto/HMACGenerator.java b/core/java/src/net/i2p/crypto/HMACGenerator.java index fa853df9b..8388590a2 100644 --- a/core/java/src/net/i2p/crypto/HMACGenerator.java +++ b/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; diff --git a/core/java/src/net/i2p/crypto/KeyGenerator.java b/core/java/src/net/i2p/crypto/KeyGenerator.java index a221f9ef1..6140b9c5d 100644 --- a/core/java/src/net/i2p/crypto/KeyGenerator.java +++ b/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; diff --git a/core/java/src/net/i2p/crypto/SHA1.java b/core/java/src/net/i2p/crypto/SHA1.java index 35d68a02f..66956ed09 100644 --- a/core/java/src/net/i2p/crypto/SHA1.java +++ b/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; /** *

    The FIPS PUB 180-2 standard specifies four secure hash algorithms (SHA-1, diff --git a/core/java/src/net/i2p/crypto/SHA1Test.java b/core/java/src/net/i2p/crypto/SHA1Test.java index 69ad3be14..de1bf1b81 100644 --- a/core/java/src/net/i2p/crypto/SHA1Test.java +++ b/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 { diff --git a/core/java/src/net/i2p/crypto/SHA256Generator.java b/core/java/src/net/i2p/crypto/SHA256Generator.java index 96d533a1d..d77ac84c6 100644 --- a/core/java/src/net/i2p/crypto/SHA256Generator.java +++ b/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} diff --git a/core/java/src/net/i2p/data/ByteArray.java b/core/java/src/net/i2p/data/ByteArray.java index 5dbed1298..90bcc43ec 100644 --- a/core/java/src/net/i2p/data/ByteArray.java +++ b/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, diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java index 359b27498..b3aad342a 100644 --- a/core/java/src/net/i2p/data/DataHelper.java +++ b/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; diff --git a/core/java/src/net/i2p/data/Destination.java b/core/java/src/net/i2p/data/Destination.java index 7f190e354..cc647877b 100644 --- a/core/java/src/net/i2p/data/Destination.java +++ b/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; diff --git a/core/java/src/net/i2p/data/PrivateKey.java b/core/java/src/net/i2p/data/PrivateKey.java index 6b4f923f8..23ba1d673 100644 --- a/core/java/src/net/i2p/data/PrivateKey.java +++ b/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. diff --git a/core/java/src/net/i2p/data/PrivateKeyFile.java b/core/java/src/net/i2p/data/PrivateKeyFile.java index 572adce17..85e761450 100644 --- a/core/java/src/net/i2p/data/PrivateKeyFile.java +++ b/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; diff --git a/core/java/src/net/i2p/data/SigningPrivateKey.java b/core/java/src/net/i2p/data/SigningPrivateKey.java index 9fd65e37a..2035c7b0a 100644 --- a/core/java/src/net/i2p/data/SigningPrivateKey.java +++ b/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. diff --git a/core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java b/core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java index 378837439..4462fdf5d 100644 --- a/core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java +++ b/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; diff --git a/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java b/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java index 917b53ba0..6c410cf33 100644 --- a/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java +++ b/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; diff --git a/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java b/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java index 473dd4f8c..f314ad213 100644 --- a/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java +++ b/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; diff --git a/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java b/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java index 9ecb016a0..bb43441a9 100644 --- a/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java +++ b/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; diff --git a/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java b/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java index cb97c0ff1..9d8fe81c4 100644 --- a/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java +++ b/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; /** diff --git a/core/java/src/net/i2p/stat/BufferedStatLog.java b/core/java/src/net/i2p/stat/BufferedStatLog.java index 0d20737e8..7fed2d090 100644 --- a/core/java/src/net/i2p/stat/BufferedStatLog.java +++ b/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; diff --git a/core/java/src/net/i2p/stat/Rate.java b/core/java/src/net/i2p/stat/Rate.java index 54ac391d4..6d4fed17a 100644 --- a/core/java/src/net/i2p/stat/Rate.java +++ b/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; /** diff --git a/core/java/src/net/i2p/stat/StatLogSplitter.java b/core/java/src/net/i2p/stat/StatLogSplitter.java index ca9c35790..c1b202fc6 100644 --- a/core/java/src/net/i2p/stat/StatLogSplitter.java +++ b/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; diff --git a/core/java/src/net/i2p/util/BufferedRandomSource.java b/core/java/src/net/i2p/util/BufferedRandomSource.java index e344b5a2a..3c0082565 100644 --- a/core/java/src/net/i2p/util/BufferedRandomSource.java +++ b/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; /** diff --git a/core/java/src/net/i2p/util/DecayingBloomFilter.java b/core/java/src/net/i2p/util/DecayingBloomFilter.java index d2d7fd722..164c8e453 100644 --- a/core/java/src/net/i2p/util/DecayingBloomFilter.java +++ b/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 diff --git a/core/java/src/net/i2p/util/EepGet.java b/core/java/src/net/i2p/util/EepGet.java index 15fa4c28e..448774454 100644 --- a/core/java/src/net/i2p/util/EepGet.java +++ b/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] diff --git a/core/java/src/net/i2p/util/EepGetScheduler.java b/core/java/src/net/i2p/util/EepGetScheduler.java index 9c09d0ada..c295196b3 100644 --- a/core/java/src/net/i2p/util/EepGetScheduler.java +++ b/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; /** diff --git a/core/java/src/net/i2p/util/EepPost.java b/core/java/src/net/i2p/util/EepPost.java index 3b4528052..7f5bd2ca3 100644 --- a/core/java/src/net/i2p/util/EepPost.java +++ b/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) diff --git a/core/java/src/net/i2p/util/Executor.java b/core/java/src/net/i2p/util/Executor.java index dfb72cb5f..e3c1b6fbf 100644 --- a/core/java/src/net/i2p/util/Executor.java +++ b/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; diff --git a/core/java/src/net/i2p/util/FileUtil.java b/core/java/src/net/i2p/util/FileUtil.java index e168ccbb5..677c50086 100644 --- a/core/java/src/net/i2p/util/FileUtil.java +++ b/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; diff --git a/core/java/src/net/i2p/util/FortunaRandomSource.java b/core/java/src/net/i2p/util/FortunaRandomSource.java index 865cc0bb4..04d4305a3 100644 --- a/core/java/src/net/i2p/util/FortunaRandomSource.java +++ b/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 diff --git a/core/java/src/net/i2p/util/LookaheadInputStream.java b/core/java/src/net/i2p/util/LookaheadInputStream.java index 774f09be4..cdce06df2 100644 --- a/core/java/src/net/i2p/util/LookaheadInputStream.java +++ b/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; /** diff --git a/core/java/src/net/i2p/util/NativeBigInteger.java b/core/java/src/net/i2p/util/NativeBigInteger.java index 8803b684b..713208695 100644 --- a/core/java/src/net/i2p/util/NativeBigInteger.java +++ b/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; diff --git a/core/java/src/net/i2p/util/RandomSource.java b/core/java/src/net/i2p/util/RandomSource.java index 51e340a57..e8a0a31e7 100644 --- a/core/java/src/net/i2p/util/RandomSource.java +++ b/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. * diff --git a/core/java/src/net/i2p/util/ResettableGZIPInputStream.java b/core/java/src/net/i2p/util/ResettableGZIPInputStream.java index 2896fa587..5832a8174 100644 --- a/core/java/src/net/i2p/util/ResettableGZIPInputStream.java +++ b/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 diff --git a/core/java/src/net/i2p/util/ResettableGZIPOutputStream.java b/core/java/src/net/i2p/util/ResettableGZIPOutputStream.java index 3d5184fb5..d7f578da7 100644 --- a/core/java/src/net/i2p/util/ResettableGZIPOutputStream.java +++ b/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; /** diff --git a/core/java/src/net/i2p/util/ReusableGZIPInputStream.java b/core/java/src/net/i2p/util/ReusableGZIPInputStream.java index 832d242a5..d3dcb5261 100644 --- a/core/java/src/net/i2p/util/ReusableGZIPInputStream.java +++ b/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; /** diff --git a/core/java/src/net/i2p/util/ReusableGZIPOutputStream.java b/core/java/src/net/i2p/util/ReusableGZIPOutputStream.java index ebdd1f391..49cf34084 100644 --- a/core/java/src/net/i2p/util/ReusableGZIPOutputStream.java +++ b/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; /** diff --git a/core/java/src/net/i2p/util/SimpleTimer.java b/core/java/src/net/i2p/util/SimpleTimer.java index 3114e4dbd..a4e352497 100644 --- a/core/java/src/net/i2p/util/SimpleTimer.java +++ b/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; diff --git a/core/java/src/org/bouncycastle/crypto/macs/HMac.java b/core/java/src/org/bouncycastle/crypto/macs/HMac.java index e43e80c1e..7176c8aca 100644 --- a/core/java/src/org/bouncycastle/crypto/macs/HMac.java +++ b/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 diff --git a/core/java/test/net/i2p/client/I2PClientTest.java b/core/java/test/net/i2p/client/I2PClientTest.java index 4d4bc1aa2..c9f908989 100644 --- a/core/java/test/net/i2p/client/I2PClientTest.java +++ b/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; diff --git a/core/java/test/net/i2p/client/I2PClientTestSuite.java b/core/java/test/net/i2p/client/I2PClientTestSuite.java index 35678e3a5..208ddf351 100644 --- a/core/java/test/net/i2p/client/I2PClientTestSuite.java +++ b/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 diff --git a/core/java/test/net/i2p/client/I2PSessionTest.java b/core/java/test/net/i2p/client/I2PSessionTest.java index 616dd3ab0..7f06a4234 100644 --- a/core/java/test/net/i2p/client/I2PSessionTest.java +++ b/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; /** diff --git a/core/java/test/net/i2p/client/datagram/DatagramTest.java b/core/java/test/net/i2p/client/datagram/DatagramTest.java index 2136fd2ca..c521bc48e 100644 --- a/core/java/test/net/i2p/client/datagram/DatagramTest.java +++ b/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; /** diff --git a/core/java/test/net/i2p/crypto/AES256Bench.java b/core/java/test/net/i2p/crypto/AES256Bench.java index f4adb3281..c5e718d47 100644 --- a/core/java/test/net/i2p/crypto/AES256Bench.java +++ b/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(); diff --git a/core/java/test/net/i2p/crypto/AES256Test.java b/core/java/test/net/i2p/crypto/AES256Test.java index 4464a1d82..eddf1cb01 100644 --- a/core/java/test/net/i2p/crypto/AES256Test.java +++ b/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 diff --git a/core/java/test/net/i2p/crypto/AESInputStreamTest.java b/core/java/test/net/i2p/crypto/AESInputStreamTest.java index ea18106b7..961dad91c 100644 --- a/core/java/test/net/i2p/crypto/AESInputStreamTest.java +++ b/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 */ diff --git a/core/java/test/net/i2p/crypto/CryptixAESEngineTest.java b/core/java/test/net/i2p/crypto/CryptixAESEngineTest.java index 2110b6667..eaf664734 100644 --- a/core/java/test/net/i2p/crypto/CryptixAESEngineTest.java +++ b/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() { diff --git a/core/java/test/net/i2p/crypto/CryptixRijndael_AlgorithmTest.java b/core/java/test/net/i2p/crypto/CryptixRijndael_AlgorithmTest.java index bbc579d6b..451dfb04d 100644 --- a/core/java/test/net/i2p/crypto/CryptixRijndael_AlgorithmTest.java +++ b/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{ diff --git a/core/java/test/net/i2p/crypto/DHSessionKeyBuilderTest.java b/core/java/test/net/i2p/crypto/DHSessionKeyBuilderTest.java index c91948d55..0bf6a1f61 100644 --- a/core/java/test/net/i2p/crypto/DHSessionKeyBuilderTest.java +++ b/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(){ diff --git a/core/java/test/net/i2p/crypto/DSABench.java b/core/java/test/net/i2p/crypto/DSABench.java index cbc18fd68..363a23b8e 100644 --- a/core/java/test/net/i2p/crypto/DSABench.java +++ b/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; diff --git a/core/java/test/net/i2p/crypto/DSATest.java b/core/java/test/net/i2p/crypto/DSATest.java index 7d695d3fd..b2fbfab73 100644 --- a/core/java/test/net/i2p/crypto/DSATest.java +++ b/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; diff --git a/core/java/test/net/i2p/crypto/ElGamalBench.java b/core/java/test/net/i2p/crypto/ElGamalBench.java index 92728674e..02daf06cc 100644 --- a/core/java/test/net/i2p/crypto/ElGamalBench.java +++ b/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(); diff --git a/core/java/test/net/i2p/crypto/ElGamalTest.java b/core/java/test/net/i2p/crypto/ElGamalTest.java index 302c9621c..7789f99d9 100644 --- a/core/java/test/net/i2p/crypto/ElGamalTest.java +++ b/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; diff --git a/core/java/test/net/i2p/crypto/HMACSHA256Bench.java b/core/java/test/net/i2p/crypto/HMACSHA256Bench.java index fe03719bc..762821f15 100644 --- a/core/java/test/net/i2p/crypto/HMACSHA256Bench.java +++ b/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[]) { diff --git a/core/java/test/net/i2p/crypto/HMACSHA256Test.java b/core/java/test/net/i2p/crypto/HMACSHA256Test.java index 57e94f78e..67e4721cd 100644 --- a/core/java/test/net/i2p/crypto/HMACSHA256Test.java +++ b/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; diff --git a/core/java/test/net/i2p/crypto/KeyGeneratorTest.java b/core/java/test/net/i2p/crypto/KeyGeneratorTest.java index 3815e0763..ce644bb40 100644 --- a/core/java/test/net/i2p/crypto/KeyGeneratorTest.java +++ b/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(){ diff --git a/core/java/test/net/i2p/crypto/SHA1HashTest.java b/core/java/test/net/i2p/crypto/SHA1HashTest.java index 72e9f0aa4..140f784eb 100644 --- a/core/java/test/net/i2p/crypto/SHA1HashTest.java +++ b/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; diff --git a/core/java/test/net/i2p/crypto/SHA256Test.java b/core/java/test/net/i2p/crypto/SHA256Test.java index c800f60ee..9778887db 100644 --- a/core/java/test/net/i2p/crypto/SHA256Test.java +++ b/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 */ diff --git a/core/java/test/net/i2p/crypto/SessionEncryptionTest.java b/core/java/test/net/i2p/crypto/SessionEncryptionTest.java index d1d614a98..c6ec05326 100644 --- a/core/java/test/net/i2p/crypto/SessionEncryptionTest.java +++ b/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; /** * diff --git a/core/java/test/net/i2p/data/AbuseReasonTest.java b/core/java/test/net/i2p/data/AbuseReasonTest.java index b9a45023a..f7c93d52d 100644 --- a/core/java/test/net/i2p/data/AbuseReasonTest.java +++ b/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; /** diff --git a/core/java/test/net/i2p/data/AbuseSeverityTest.java b/core/java/test/net/i2p/data/AbuseSeverityTest.java index 7eacc7488..0f91c95a6 100644 --- a/core/java/test/net/i2p/data/AbuseSeverityTest.java +++ b/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; /** diff --git a/core/java/test/net/i2p/data/BooleanTest.java b/core/java/test/net/i2p/data/BooleanTest.java index 761ba5178..b5613afa7 100644 --- a/core/java/test/net/i2p/data/BooleanTest.java +++ b/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; diff --git a/core/java/test/net/i2p/data/CertificateTest.java b/core/java/test/net/i2p/data/CertificateTest.java index 98315667d..e865522a3 100644 --- a/core/java/test/net/i2p/data/CertificateTest.java +++ b/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 diff --git a/core/java/test/net/i2p/data/CreateLeaseSetMessageTest.java b/core/java/test/net/i2p/data/CreateLeaseSetMessageTest.java index 875f92cf9..9a37906dc 100644 --- a/core/java/test/net/i2p/data/CreateLeaseSetMessageTest.java +++ b/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; diff --git a/core/java/test/net/i2p/data/CreateSessionMessageTest.java b/core/java/test/net/i2p/data/CreateSessionMessageTest.java index 431162fe8..11704139e 100644 --- a/core/java/test/net/i2p/data/CreateSessionMessageTest.java +++ b/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; diff --git a/core/java/test/net/i2p/data/DataHelperTest.java b/core/java/test/net/i2p/data/DataHelperTest.java index 1f15276e4..b2f2e1b2d 100644 --- a/core/java/test/net/i2p/data/DataHelperTest.java +++ b/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 diff --git a/core/java/test/net/i2p/data/DataStructureImplTest.java b/core/java/test/net/i2p/data/DataStructureImplTest.java index e30602863..f0d30f5ee 100644 --- a/core/java/test/net/i2p/data/DataStructureImplTest.java +++ b/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; diff --git a/core/java/test/net/i2p/data/DateTest.java b/core/java/test/net/i2p/data/DateTest.java index a5ba6638b..b61cd3b39 100644 --- a/core/java/test/net/i2p/data/DateTest.java +++ b/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; /** diff --git a/core/java/test/net/i2p/data/DestinationTest.java b/core/java/test/net/i2p/data/DestinationTest.java index 21df5bec7..16b3a4016 100644 --- a/core/java/test/net/i2p/data/DestinationTest.java +++ b/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 diff --git a/core/java/test/net/i2p/data/DestroySessionMessageTest.java b/core/java/test/net/i2p/data/DestroySessionMessageTest.java index 74c8ee2cd..00531d8a2 100644 --- a/core/java/test/net/i2p/data/DestroySessionMessageTest.java +++ b/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; diff --git a/core/java/test/net/i2p/data/DisconnectMessageTest.java b/core/java/test/net/i2p/data/DisconnectMessageTest.java index 82e17540f..fff2ca1a1 100644 --- a/core/java/test/net/i2p/data/DisconnectMessageTest.java +++ b/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; /** diff --git a/core/java/test/net/i2p/data/HashTest.java b/core/java/test/net/i2p/data/HashTest.java index 98d60f0cb..cddfb7da1 100644 --- a/core/java/test/net/i2p/data/HashTest.java +++ b/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 diff --git a/core/java/test/net/i2p/data/LeaseSetTest.java b/core/java/test/net/i2p/data/LeaseSetTest.java index 385a4c513..61c3b73c6 100644 --- a/core/java/test/net/i2p/data/LeaseSetTest.java +++ b/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 diff --git a/core/java/test/net/i2p/data/LeaseTest.java b/core/java/test/net/i2p/data/LeaseTest.java index f508a2dff..15a9366da 100644 --- a/core/java/test/net/i2p/data/LeaseTest.java +++ b/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 diff --git a/core/java/test/net/i2p/data/MappingTest.java b/core/java/test/net/i2p/data/MappingTest.java index 80aa58219..0d2a393e6 100644 --- a/core/java/test/net/i2p/data/MappingTest.java +++ b/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; /** diff --git a/core/java/test/net/i2p/data/MessageIdTest.java b/core/java/test/net/i2p/data/MessageIdTest.java index 6c78afb91..f038798f2 100644 --- a/core/java/test/net/i2p/data/MessageIdTest.java +++ b/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; /** diff --git a/core/java/test/net/i2p/data/MessagePayloadMessageTest.java b/core/java/test/net/i2p/data/MessagePayloadMessageTest.java index f818ade52..3625796ed 100644 --- a/core/java/test/net/i2p/data/MessagePayloadMessageTest.java +++ b/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 diff --git a/core/java/test/net/i2p/data/MessageStatusMessageTest.java b/core/java/test/net/i2p/data/MessageStatusMessageTest.java index cd8aabc67..c737a2191 100644 --- a/core/java/test/net/i2p/data/MessageStatusMessageTest.java +++ b/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 diff --git a/core/java/test/net/i2p/data/PayloadTest.java b/core/java/test/net/i2p/data/PayloadTest.java index b425b0d68..fe48bee76 100644 --- a/core/java/test/net/i2p/data/PayloadTest.java +++ b/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 diff --git a/core/java/test/net/i2p/data/PrivateKeyTest.java b/core/java/test/net/i2p/data/PrivateKeyTest.java index 9aa159e03..cb3c3124d 100644 --- a/core/java/test/net/i2p/data/PrivateKeyTest.java +++ b/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 diff --git a/core/java/test/net/i2p/data/PublicKeyTest.java b/core/java/test/net/i2p/data/PublicKeyTest.java index d1300ad92..8ca6282cc 100644 --- a/core/java/test/net/i2p/data/PublicKeyTest.java +++ b/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 diff --git a/core/java/test/net/i2p/data/ReceiveMessageBeginMessageTest.java b/core/java/test/net/i2p/data/ReceiveMessageBeginMessageTest.java index 19edd8a61..b09eedc7d 100644 --- a/core/java/test/net/i2p/data/ReceiveMessageBeginMessageTest.java +++ b/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 diff --git a/core/java/test/net/i2p/data/ReceiveMessageEndMessageTest.java b/core/java/test/net/i2p/data/ReceiveMessageEndMessageTest.java index 4e33406d5..a399faefb 100644 --- a/core/java/test/net/i2p/data/ReceiveMessageEndMessageTest.java +++ b/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 diff --git a/core/java/test/net/i2p/data/ReportAbuseMessageTest.java b/core/java/test/net/i2p/data/ReportAbuseMessageTest.java index b666fb44f..3edfbec05 100644 --- a/core/java/test/net/i2p/data/ReportAbuseMessageTest.java +++ b/core/java/test/net/i2p/data/ReportAbuseMessageTest.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; import net.i2p.data.i2cp.AbuseSeverity; import net.i2p.data.i2cp.MessageId; diff --git a/core/java/test/net/i2p/data/RequestLeaseSetMessageTest.java b/core/java/test/net/i2p/data/RequestLeaseSetMessageTest.java index a3b6ba0d9..cd01d854c 100644 --- a/core/java/test/net/i2p/data/RequestLeaseSetMessageTest.java +++ b/core/java/test/net/i2p/data/RequestLeaseSetMessageTest.java @@ -10,10 +10,6 @@ package net.i2p.data; import java.util.Date; -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.Hash; -import net.i2p.data.TunnelId; import net.i2p.data.i2cp.RequestLeaseSetMessage; import net.i2p.data.i2cp.SessionId; diff --git a/core/java/test/net/i2p/data/RouterAddressTest.java b/core/java/test/net/i2p/data/RouterAddressTest.java index b4075ce8f..65a44f921 100644 --- a/core/java/test/net/i2p/data/RouterAddressTest.java +++ b/core/java/test/net/i2p/data/RouterAddressTest.java @@ -12,10 +12,6 @@ import java.io.ByteArrayOutputStream; import java.util.Date; import java.util.Properties; -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.RouterAddress; - /** * Test harness for loading / storing Hash objects * diff --git a/core/java/test/net/i2p/data/RouterIdentityTest.java b/core/java/test/net/i2p/data/RouterIdentityTest.java index 1b74dffdb..ce1978ebc 100644 --- a/core/java/test/net/i2p/data/RouterIdentityTest.java +++ b/core/java/test/net/i2p/data/RouterIdentityTest.java @@ -10,13 +10,6 @@ package net.i2p.data; import java.io.ByteArrayOutputStream; -import net.i2p.data.Certificate; -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.PublicKey; -import net.i2p.data.RouterIdentity; -import net.i2p.data.SigningPublicKey; - /** * Test harness for loading / storing Hash objects * diff --git a/core/java/test/net/i2p/data/RouterInfoTest.java b/core/java/test/net/i2p/data/RouterInfoTest.java index 4e26fbf4b..0dbba64bc 100644 --- a/core/java/test/net/i2p/data/RouterInfoTest.java +++ b/core/java/test/net/i2p/data/RouterInfoTest.java @@ -12,15 +12,6 @@ import java.util.HashSet; import java.util.Properties; import net.i2p.crypto.KeyGenerator; -import net.i2p.data.Certificate; -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.PrivateKey; -import net.i2p.data.PublicKey; -import net.i2p.data.RouterIdentity; -import net.i2p.data.RouterInfo; -import net.i2p.data.SigningPrivateKey; -import net.i2p.data.SigningPublicKey; import net.i2p.util.Log; /** diff --git a/core/java/test/net/i2p/data/SendMessageMessageTest.java b/core/java/test/net/i2p/data/SendMessageMessageTest.java index e0ff9f68a..4394e3ecb 100644 --- a/core/java/test/net/i2p/data/SendMessageMessageTest.java +++ b/core/java/test/net/i2p/data/SendMessageMessageTest.java @@ -8,18 +8,11 @@ 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.Destination; -import net.i2p.data.Payload; import net.i2p.data.i2cp.SendMessageMessage; import net.i2p.data.i2cp.SessionId; -import net.i2p.util.Log; /** * Test harness for loading / storing SendMessageMessage objects diff --git a/core/java/test/net/i2p/data/SessionConfigTest.java b/core/java/test/net/i2p/data/SessionConfigTest.java index ecd24dc3f..8b1fc829c 100644 --- a/core/java/test/net/i2p/data/SessionConfigTest.java +++ b/core/java/test/net/i2p/data/SessionConfigTest.java @@ -10,11 +10,6 @@ package net.i2p.data; import java.util.Properties; -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.Destination; -import net.i2p.data.Signature; -import net.i2p.data.SigningPrivateKey; import net.i2p.data.i2cp.SessionConfig; /** diff --git a/core/java/test/net/i2p/data/SessionIdTest.java b/core/java/test/net/i2p/data/SessionIdTest.java index 36ba16d7a..de47ac10e 100644 --- a/core/java/test/net/i2p/data/SessionIdTest.java +++ b/core/java/test/net/i2p/data/SessionIdTest.java @@ -8,8 +8,6 @@ package net.i2p.data; * */ -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; import net.i2p.data.i2cp.SessionId; /** diff --git a/core/java/test/net/i2p/data/SessionKeyTest.java b/core/java/test/net/i2p/data/SessionKeyTest.java index d07bbf039..6c27d6911 100644 --- a/core/java/test/net/i2p/data/SessionKeyTest.java +++ b/core/java/test/net/i2p/data/SessionKeyTest.java @@ -8,9 +8,6 @@ package net.i2p.data; * */ -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.SessionKey; /** * Test harness for loading / storing SessionKey objects diff --git a/core/java/test/net/i2p/data/SessionStatusMessageTest.java b/core/java/test/net/i2p/data/SessionStatusMessageTest.java index 1dfa4ff47..402edf8fb 100644 --- a/core/java/test/net/i2p/data/SessionStatusMessageTest.java +++ b/core/java/test/net/i2p/data/SessionStatusMessageTest.java @@ -8,8 +8,6 @@ package net.i2p.data; * */ -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; import net.i2p.data.i2cp.SessionId; import net.i2p.data.i2cp.SessionStatusMessage; diff --git a/core/java/test/net/i2p/data/SignatureTest.java b/core/java/test/net/i2p/data/SignatureTest.java index ece90332f..3e3b227e4 100644 --- a/core/java/test/net/i2p/data/SignatureTest.java +++ b/core/java/test/net/i2p/data/SignatureTest.java @@ -8,9 +8,6 @@ package net.i2p.data; * */ -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.Signature; /** * Test harness for loading / storing Signature objects diff --git a/core/java/test/net/i2p/data/SigningPrivateKeyTest.java b/core/java/test/net/i2p/data/SigningPrivateKeyTest.java index fd7c5f922..bafc3bdac 100644 --- a/core/java/test/net/i2p/data/SigningPrivateKeyTest.java +++ b/core/java/test/net/i2p/data/SigningPrivateKeyTest.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.SigningPrivateKey; +import java.io.ByteArrayOutputStream; /** * Test harness for loading / storing SigningPrivateKey objects diff --git a/core/java/test/net/i2p/data/SigningPublicKeyTest.java b/core/java/test/net/i2p/data/SigningPublicKeyTest.java index d424c392d..f976e53da 100644 --- a/core/java/test/net/i2p/data/SigningPublicKeyTest.java +++ b/core/java/test/net/i2p/data/SigningPublicKeyTest.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.SigningPublicKey; +import java.io.ByteArrayOutputStream; /** * Test harness for loading / storing PublicKey objects diff --git a/core/java/test/net/i2p/data/StringTest.java b/core/java/test/net/i2p/data/StringTest.java index 099fa5853..f4de303d2 100644 --- a/core/java/test/net/i2p/data/StringTest.java +++ b/core/java/test/net/i2p/data/StringTest.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; diff --git a/core/java/test/net/i2p/data/StructureTest.java b/core/java/test/net/i2p/data/StructureTest.java index 8159764cb..c1de20ba3 100644 --- a/core/java/test/net/i2p/data/StructureTest.java +++ b/core/java/test/net/i2p/data/StructureTest.java @@ -8,15 +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.DataStructure; -import net.i2p.util.Log; -import net.i2p.I2PAppContext; +import java.io.ByteArrayOutputStream; import junit.framework.TestCase; diff --git a/core/java/test/net/i2p/data/TunnelIdTest.java b/core/java/test/net/i2p/data/TunnelIdTest.java index 12655f238..1926ed812 100644 --- a/core/java/test/net/i2p/data/TunnelIdTest.java +++ b/core/java/test/net/i2p/data/TunnelIdTest.java @@ -8,9 +8,6 @@ package net.i2p.data; * */ -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.TunnelId; /** * Test harness for loading / storing TunnelId objects diff --git a/core/java/test/net/i2p/data/UnsignedIntegerTest.java b/core/java/test/net/i2p/data/UnsignedIntegerTest.java index 1fbcd8f36..35a9aabdc 100644 --- a/core/java/test/net/i2p/data/UnsignedIntegerTest.java +++ b/core/java/test/net/i2p/data/UnsignedIntegerTest.java @@ -8,15 +8,8 @@ package net.i2p.data; * */ -import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.Date; - -import net.i2p.data.DataFormatException; -import net.i2p.data.DataHelper; -import net.i2p.util.Log; +import java.io.ByteArrayOutputStream; import junit.framework.TestCase; diff --git a/core/java/test/net/i2p/util/LogSettingsTest.java b/core/java/test/net/i2p/util/LogSettingsTest.java index d3194a50a..face45725 100644 --- a/core/java/test/net/i2p/util/LogSettingsTest.java +++ b/core/java/test/net/i2p/util/LogSettingsTest.java @@ -8,20 +8,19 @@ package net.i2p.util; * */ -import java.util.Properties; +import java.io.BufferedReader; import java.io.File; import java.io.FileWriter; -import java.io.PrintStream; +import java.io.IOException; +import java.io.InputStreamReader; import java.io.PipedInputStream; import java.io.PipedOutputStream; -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.io.IOException; - -import net.i2p.I2PAppContext; -import net.i2p.data.DataHelper; +import java.io.PrintStream; +import java.util.Properties; import junit.framework.TestCase; +import net.i2p.I2PAppContext; +import net.i2p.data.DataHelper; /** diff --git a/core/java/test/net/i2p/util/LookAheadInputStreamTest.java b/core/java/test/net/i2p/util/LookAheadInputStreamTest.java index cfde3cc81..408e94f76 100644 --- a/core/java/test/net/i2p/util/LookAheadInputStreamTest.java +++ b/core/java/test/net/i2p/util/LookAheadInputStreamTest.java @@ -9,7 +9,6 @@ package net.i2p.util; */ import java.io.ByteArrayInputStream; -import java.util.Properties; import junit.framework.TestCase; diff --git a/core/java/test/net/i2p/util/ResettableGZIPInputStreamTest.java b/core/java/test/net/i2p/util/ResettableGZIPInputStreamTest.java index bb3836ed2..d78166654 100644 --- a/core/java/test/net/i2p/util/ResettableGZIPInputStreamTest.java +++ b/core/java/test/net/i2p/util/ResettableGZIPInputStreamTest.java @@ -8,13 +8,12 @@ package net.i2p.util; * */ -import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.util.zip.GZIPOutputStream; -import net.i2p.data.DataHelper; - import junit.framework.TestCase; +import net.i2p.data.DataHelper; public class ResettableGZIPInputStreamTest extends TestCase { diff --git a/core/java/test/net/i2p/util/ResettableGZIPOutputStreamTest.java b/core/java/test/net/i2p/util/ResettableGZIPOutputStreamTest.java index 106f71818..58c2dd9ee 100644 --- a/core/java/test/net/i2p/util/ResettableGZIPOutputStreamTest.java +++ b/core/java/test/net/i2p/util/ResettableGZIPOutputStreamTest.java @@ -8,14 +8,12 @@ package net.i2p.util; * */ -import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; -import java.util.zip.GZIPOutputStream; +import java.io.ByteArrayOutputStream; import java.util.zip.GZIPInputStream; -import net.i2p.data.DataHelper; - import junit.framework.TestCase; +import net.i2p.data.DataHelper; public class ResettableGZIPOutputStreamTest extends TestCase { diff --git a/core/java/test/net/i2p/util/ReusableGZIPInputStreamTest.java b/core/java/test/net/i2p/util/ReusableGZIPInputStreamTest.java index e6a5dbaa2..7f10a25fa 100644 --- a/core/java/test/net/i2p/util/ReusableGZIPInputStreamTest.java +++ b/core/java/test/net/i2p/util/ReusableGZIPInputStreamTest.java @@ -8,14 +8,13 @@ package net.i2p.util; * */ -import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; -import java.util.zip.GZIPOutputStream; +import java.io.ByteArrayOutputStream; import java.util.zip.GZIPInputStream; - -import net.i2p.data.DataHelper; +import java.util.zip.GZIPOutputStream; import junit.framework.TestCase; +import net.i2p.data.DataHelper; public class ReusableGZIPInputStreamTest extends TestCase { diff --git a/core/java/test/net/i2p/util/ReusableGZIPOutputStreamTest.java b/core/java/test/net/i2p/util/ReusableGZIPOutputStreamTest.java index 4e8f16da1..b48d267fe 100644 --- a/core/java/test/net/i2p/util/ReusableGZIPOutputStreamTest.java +++ b/core/java/test/net/i2p/util/ReusableGZIPOutputStreamTest.java @@ -8,14 +8,12 @@ package net.i2p.util; * */ -import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; -import java.util.zip.GZIPOutputStream; +import java.io.ByteArrayOutputStream; import java.util.zip.GZIPInputStream; -import net.i2p.data.DataHelper; - import junit.framework.TestCase; +import net.i2p.data.DataHelper; public class ReusableGZIPOutputStreamTest extends TestCase { diff --git a/router/java/src/net/i2p/data/i2np/BuildRequestRecord.java b/router/java/src/net/i2p/data/i2np/BuildRequestRecord.java index a374c1001..7bd8352b6 100644 --- a/router/java/src/net/i2p/data/i2np/BuildRequestRecord.java +++ b/router/java/src/net/i2p/data/i2np/BuildRequestRecord.java @@ -1,7 +1,12 @@ package net.i2p.data.i2np; import net.i2p.I2PAppContext; -import net.i2p.data.*; +import net.i2p.data.ByteArray; +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; /** * Hold the tunnel request record, managing its encryption and decryption. diff --git a/router/java/src/net/i2p/data/i2np/BuildResponseRecord.java b/router/java/src/net/i2p/data/i2np/BuildResponseRecord.java index f6f97b3cc..562f082ba 100644 --- a/router/java/src/net/i2p/data/i2np/BuildResponseRecord.java +++ b/router/java/src/net/i2p/data/i2np/BuildResponseRecord.java @@ -1,7 +1,10 @@ package net.i2p.data.i2np; import net.i2p.I2PAppContext; -import net.i2p.data.*; +import net.i2p.data.Base64; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; +import net.i2p.data.SessionKey; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/data/i2np/DataMessage.java b/router/java/src/net/i2p/data/i2np/DataMessage.java index 124606cab..7e839117f 100644 --- a/router/java/src/net/i2p/data/i2np/DataMessage.java +++ b/router/java/src/net/i2p/data/i2np/DataMessage.java @@ -9,6 +9,7 @@ package net.i2p.data.i2np; */ import java.io.IOException; + import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/data/i2np/DatabaseStoreMessage.java b/router/java/src/net/i2p/data/i2np/DatabaseStoreMessage.java index 3bb22152b..cb838daca 100644 --- a/router/java/src/net/i2p/data/i2np/DatabaseStoreMessage.java +++ b/router/java/src/net/i2p/data/i2np/DatabaseStoreMessage.java @@ -10,6 +10,7 @@ package net.i2p.data.i2np; import java.io.ByteArrayInputStream; import java.io.IOException; + import net.i2p.I2PAppContext; import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; diff --git a/router/java/src/net/i2p/data/i2np/DateMessage.java b/router/java/src/net/i2p/data/i2np/DateMessage.java index 61c244cde..554c31ef2 100644 --- a/router/java/src/net/i2p/data/i2np/DateMessage.java +++ b/router/java/src/net/i2p/data/i2np/DateMessage.java @@ -9,6 +9,7 @@ package net.i2p.data.i2np; */ import java.io.IOException; + import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java b/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java index 006f77c73..3e46fc8fe 100644 --- a/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java +++ b/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java @@ -8,7 +8,6 @@ package net.i2p.data.i2np; * */ -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; diff --git a/router/java/src/net/i2p/data/i2np/DeliveryStatusMessage.java b/router/java/src/net/i2p/data/i2np/DeliveryStatusMessage.java index f0f0183df..9f1d61b45 100644 --- a/router/java/src/net/i2p/data/i2np/DeliveryStatusMessage.java +++ b/router/java/src/net/i2p/data/i2np/DeliveryStatusMessage.java @@ -9,6 +9,7 @@ package net.i2p.data.i2np; */ import java.io.IOException; + import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/data/i2np/GarlicMessage.java b/router/java/src/net/i2p/data/i2np/GarlicMessage.java index b27a20dfe..5d76a2b22 100644 --- a/router/java/src/net/i2p/data/i2np/GarlicMessage.java +++ b/router/java/src/net/i2p/data/i2np/GarlicMessage.java @@ -9,6 +9,7 @@ package net.i2p.data.i2np; */ import java.io.IOException; + import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java b/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java index ba57d3e09..8c1de62d5 100644 --- a/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java +++ b/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java @@ -11,7 +11,6 @@ package net.i2p.data.i2np; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; - import java.util.HashMap; import java.util.Map; diff --git a/router/java/src/net/i2p/data/i2np/TunnelBuildMessage.java b/router/java/src/net/i2p/data/i2np/TunnelBuildMessage.java index 859251dff..17bada1c1 100644 --- a/router/java/src/net/i2p/data/i2np/TunnelBuildMessage.java +++ b/router/java/src/net/i2p/data/i2np/TunnelBuildMessage.java @@ -1,8 +1,9 @@ package net.i2p.data.i2np; -import java.io.*; +import java.io.IOException; + import net.i2p.I2PAppContext; -import net.i2p.data.*; +import net.i2p.data.ByteArray; /** * diff --git a/router/java/src/net/i2p/data/i2np/TunnelBuildReplyMessage.java b/router/java/src/net/i2p/data/i2np/TunnelBuildReplyMessage.java index 277e425c2..737acd69a 100644 --- a/router/java/src/net/i2p/data/i2np/TunnelBuildReplyMessage.java +++ b/router/java/src/net/i2p/data/i2np/TunnelBuildReplyMessage.java @@ -1,8 +1,9 @@ package net.i2p.data.i2np; -import java.io.*; +import java.io.IOException; + import net.i2p.I2PAppContext; -import net.i2p.data.*; +import net.i2p.data.ByteArray; /** * Transmitted from the new outbound endpoint to the creator through a diff --git a/router/java/src/net/i2p/data/i2np/TunnelCreateStatusMessage.java b/router/java/src/net/i2p/data/i2np/TunnelCreateStatusMessage.java index 6e9b6568a..a5994f26d 100644 --- a/router/java/src/net/i2p/data/i2np/TunnelCreateStatusMessage.java +++ b/router/java/src/net/i2p/data/i2np/TunnelCreateStatusMessage.java @@ -9,6 +9,7 @@ package net.i2p.data.i2np; */ import java.io.IOException; + import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; import net.i2p.data.TunnelId; diff --git a/router/java/src/net/i2p/data/i2np/TunnelDataMessage.java b/router/java/src/net/i2p/data/i2np/TunnelDataMessage.java index de91a858b..a07b99069 100644 --- a/router/java/src/net/i2p/data/i2np/TunnelDataMessage.java +++ b/router/java/src/net/i2p/data/i2np/TunnelDataMessage.java @@ -9,6 +9,7 @@ package net.i2p.data.i2np; */ import java.io.IOException; + import net.i2p.I2PAppContext; import net.i2p.data.ByteArray; import net.i2p.data.DataHelper; diff --git a/router/java/src/net/i2p/data/i2np/TunnelGatewayMessage.java b/router/java/src/net/i2p/data/i2np/TunnelGatewayMessage.java index 9848d31e8..bf97dc10c 100644 --- a/router/java/src/net/i2p/data/i2np/TunnelGatewayMessage.java +++ b/router/java/src/net/i2p/data/i2np/TunnelGatewayMessage.java @@ -9,6 +9,7 @@ package net.i2p.data.i2np; */ import java.io.IOException; + import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; import net.i2p.data.TunnelId; diff --git a/router/java/src/net/i2p/router/ClientMessagePool.java b/router/java/src/net/i2p/router/ClientMessagePool.java index e2e67dc99..f4dfd0e44 100644 --- a/router/java/src/net/i2p/router/ClientMessagePool.java +++ b/router/java/src/net/i2p/router/ClientMessagePool.java @@ -11,7 +11,6 @@ package net.i2p.router; import java.util.Properties; import net.i2p.client.I2PClient; - import net.i2p.router.message.OutboundClientMessageOneShotJob; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/CommSystemFacade.java b/router/java/src/net/i2p/router/CommSystemFacade.java index 3fb141865..20de7fdad 100644 --- a/router/java/src/net/i2p/router/CommSystemFacade.java +++ b/router/java/src/net/i2p/router/CommSystemFacade.java @@ -14,6 +14,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; + import net.i2p.data.Hash; import net.i2p.data.RouterAddress; diff --git a/router/java/src/net/i2p/router/InNetMessagePool.java b/router/java/src/net/i2p/router/InNetMessagePool.java index 4a8eb6e74..9741f9d44 100644 --- a/router/java/src/net/i2p/router/InNetMessagePool.java +++ b/router/java/src/net/i2p/router/InNetMessagePool.java @@ -11,13 +11,13 @@ package net.i2p.router; import java.io.Writer; import java.util.ArrayList; import java.util.List; + import net.i2p.data.Hash; import net.i2p.data.RouterIdentity; -import net.i2p.data.i2np.DataMessage; +import net.i2p.data.i2np.DatabaseLookupMessage; +import net.i2p.data.i2np.DatabaseSearchReplyMessage; import net.i2p.data.i2np.DeliveryStatusMessage; import net.i2p.data.i2np.I2NPMessage; -import net.i2p.data.i2np.DatabaseSearchReplyMessage; -import net.i2p.data.i2np.DatabaseLookupMessage; import net.i2p.data.i2np.TunnelCreateMessage; import net.i2p.data.i2np.TunnelCreateStatusMessage; import net.i2p.data.i2np.TunnelDataMessage; diff --git a/router/java/src/net/i2p/router/LoadTestManager.java b/router/java/src/net/i2p/router/LoadTestManager.java index 0dbd9acee..55adb6138 100644 --- a/router/java/src/net/i2p/router/LoadTestManager.java +++ b/router/java/src/net/i2p/router/LoadTestManager.java @@ -1,16 +1,33 @@ package net.i2p.router; -import java.io.*; -import java.util.*; +import java.io.BufferedWriter; +import java.io.FileWriter; +import java.io.IOException; +import java.io.Writer; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import net.i2p.I2PAppContext; -import net.i2p.util.*; -import net.i2p.data.*; -import net.i2p.data.i2np.*; -import net.i2p.router.TunnelInfo; -import net.i2p.router.message.*; -import net.i2p.router.tunnel.*; -import net.i2p.router.tunnel.pool.*; -import net.i2p.router.transport.udp.UDPTransport; +import net.i2p.data.Certificate; +import net.i2p.data.Hash; +import net.i2p.data.RouterInfo; +import net.i2p.data.SessionKey; +import net.i2p.data.SessionTag; +import net.i2p.data.TunnelId; +import net.i2p.data.i2np.DataMessage; +import net.i2p.data.i2np.DeliveryInstructions; +import net.i2p.data.i2np.DeliveryStatusMessage; +import net.i2p.data.i2np.GarlicMessage; +import net.i2p.data.i2np.I2NPMessage; +import net.i2p.data.i2np.TunnelGatewayMessage; +import net.i2p.router.message.GarlicMessageBuilder; +import net.i2p.router.message.PayloadGarlicConfig; +import net.i2p.router.tunnel.TunnelCreatorConfig; +import net.i2p.util.Log; +import net.i2p.util.SimpleTimer; /** * Coordinate some tests of peers to see how much load they can handle. If diff --git a/router/java/src/net/i2p/router/NetworkDatabaseFacade.java b/router/java/src/net/i2p/router/NetworkDatabaseFacade.java index 3027b66b1..eee825177 100644 --- a/router/java/src/net/i2p/router/NetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/NetworkDatabaseFacade.java @@ -10,7 +10,11 @@ package net.i2p.router; import java.io.IOException; import java.io.Writer; -import java.util.*; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; import net.i2p.data.Hash; import net.i2p.data.LeaseSet; diff --git a/router/java/src/net/i2p/router/PeerManagerFacade.java b/router/java/src/net/i2p/router/PeerManagerFacade.java index 53a4f6bdb..bebe1a927 100644 --- a/router/java/src/net/i2p/router/PeerManagerFacade.java +++ b/router/java/src/net/i2p/router/PeerManagerFacade.java @@ -10,6 +10,7 @@ package net.i2p.router; import java.io.Writer; import java.util.List; + import net.i2p.data.Hash; /** diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java index 5abbeaf37..3b687098f 100644 --- a/router/java/src/net/i2p/router/Router.java +++ b/router/java/src/net/i2p/router/Router.java @@ -9,13 +9,12 @@ package net.i2p.router; */ import java.io.File; -import java.io.FileOutputStream; import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.IOException; import java.io.Writer; import java.text.DecimalFormat; import java.util.Calendar; -import java.util.Collection; import java.util.Date; import java.util.GregorianCalendar; import java.util.HashSet; @@ -28,11 +27,13 @@ import java.util.TreeSet; import net.i2p.CoreVersion; import net.i2p.crypto.DHSessionKeyBuilder; -import net.i2p.data.*; +import net.i2p.data.Certificate; +import net.i2p.data.DataFormatException; +import net.i2p.data.DataHelper; +import net.i2p.data.RouterInfo; +import net.i2p.data.SigningPrivateKey; import net.i2p.data.i2np.GarlicMessage; -//import net.i2p.data.i2np.TunnelMessage; import net.i2p.router.message.GarlicMessageHandler; -//import net.i2p.router.message.TunnelMessageHandler; import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade; import net.i2p.router.startup.StartupJob; import net.i2p.router.transport.FIFOBandwidthLimiter; @@ -41,8 +42,8 @@ import net.i2p.stat.RateStat; import net.i2p.stat.StatManager; import net.i2p.util.FileUtil; import net.i2p.util.I2PThread; -import net.i2p.util.SimpleTimer; import net.i2p.util.Log; +import net.i2p.util.SimpleTimer; /** * Main driver for the router. diff --git a/router/java/src/net/i2p/router/RouterClock.java b/router/java/src/net/i2p/router/RouterClock.java index 4e2a2b3bf..3174e6027 100644 --- a/router/java/src/net/i2p/router/RouterClock.java +++ b/router/java/src/net/i2p/router/RouterClock.java @@ -1,9 +1,7 @@ package net.i2p.router; -import net.i2p.util.Log; -import net.i2p.I2PAppContext; -import net.i2p.router.RouterContext; import net.i2p.util.Clock; +import net.i2p.util.Log; /** * Alternate location for determining the time which takes into account an offset. diff --git a/router/java/src/net/i2p/router/RouterContext.java b/router/java/src/net/i2p/router/RouterContext.java index 7878f613c..195db00d0 100644 --- a/router/java/src/net/i2p/router/RouterContext.java +++ b/router/java/src/net/i2p/router/RouterContext.java @@ -8,7 +8,6 @@ import net.i2p.I2PAppContext; import net.i2p.data.Hash; import net.i2p.router.admin.AdminManager; import net.i2p.router.client.ClientManagerFacadeImpl; -import net.i2p.router.networkdb.kademlia.KademliaNetworkDatabaseFacade; import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade; import net.i2p.router.peermanager.Calculator; import net.i2p.router.peermanager.CapacityCalculator; @@ -24,10 +23,9 @@ import net.i2p.router.transport.CommSystemFacadeImpl; import net.i2p.router.transport.FIFOBandwidthLimiter; import net.i2p.router.transport.OutboundMessageRegistry; import net.i2p.router.transport.VMCommSystem; -import net.i2p.router.tunnel.pool.TunnelPoolManager; import net.i2p.router.tunnel.TunnelDispatcher; +import net.i2p.router.tunnel.pool.TunnelPoolManager; import net.i2p.util.Clock; -import net.i2p.router.RouterClock; /** * Build off the core I2P context to provide a root for a router instance to diff --git a/router/java/src/net/i2p/router/RouterLaunch.java b/router/java/src/net/i2p/router/RouterLaunch.java index 531099ae5..6aab4e8ac 100644 --- a/router/java/src/net/i2p/router/RouterLaunch.java +++ b/router/java/src/net/i2p/router/RouterLaunch.java @@ -1,6 +1,8 @@ package net.i2p.router; -import java.io.*; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintStream; public class RouterLaunch { public static void main(String args[]) { diff --git a/router/java/src/net/i2p/router/RouterThrottle.java b/router/java/src/net/i2p/router/RouterThrottle.java index 2b3ffdcaf..23bac0084 100644 --- a/router/java/src/net/i2p/router/RouterThrottle.java +++ b/router/java/src/net/i2p/router/RouterThrottle.java @@ -1,7 +1,6 @@ package net.i2p.router; import net.i2p.data.Hash; -import net.i2p.data.i2np.TunnelCreateMessage; /** * Gatekeeper for deciding whether to throttle the further processing diff --git a/router/java/src/net/i2p/router/RouterThrottleImpl.java b/router/java/src/net/i2p/router/RouterThrottleImpl.java index c44e9be1b..8bae056d8 100644 --- a/router/java/src/net/i2p/router/RouterThrottleImpl.java +++ b/router/java/src/net/i2p/router/RouterThrottleImpl.java @@ -1,7 +1,6 @@ package net.i2p.router; import net.i2p.data.Hash; -import net.i2p.data.i2np.TunnelCreateMessage; import net.i2p.router.peermanager.TunnelHistory; import net.i2p.stat.Rate; import net.i2p.stat.RateStat; diff --git a/router/java/src/net/i2p/router/SSUDemo.java b/router/java/src/net/i2p/router/SSUDemo.java index 00c848e8d..b94367c56 100644 --- a/router/java/src/net/i2p/router/SSUDemo.java +++ b/router/java/src/net/i2p/router/SSUDemo.java @@ -1,11 +1,21 @@ package net.i2p.router; -import java.util.*; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.Properties; import net.i2p.I2PAppContext; -import net.i2p.data.*; -import net.i2p.data.i2np.*; +import net.i2p.data.Base64; +import net.i2p.data.DataFormatException; +import net.i2p.data.Hash; +import net.i2p.data.RouterIdentity; +import net.i2p.data.RouterInfo; +import net.i2p.data.i2np.DatabaseStoreMessage; +import net.i2p.data.i2np.I2NPMessage; +import net.i2p.data.i2np.I2NPMessageException; +import net.i2p.data.i2np.I2NPMessageImpl; /** * Demo of a stripped down router - no tunnels, no netDb, no i2cp, no peer profiling, diff --git a/router/java/src/net/i2p/router/Shitlist.java b/router/java/src/net/i2p/router/Shitlist.java index 48cadfcf4..09a3562fd 100644 --- a/router/java/src/net/i2p/router/Shitlist.java +++ b/router/java/src/net/i2p/router/Shitlist.java @@ -10,7 +10,15 @@ package net.i2p.router; import java.io.IOException; import java.io.Writer; -import java.util.*; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; import net.i2p.data.DataHelper; import net.i2p.data.Hash; diff --git a/router/java/src/net/i2p/router/StatisticsManager.java b/router/java/src/net/i2p/router/StatisticsManager.java index d00a237af..65fca1562 100644 --- a/router/java/src/net/i2p/router/StatisticsManager.java +++ b/router/java/src/net/i2p/router/StatisticsManager.java @@ -8,8 +8,6 @@ package net.i2p.router; * */ -import java.io.FileInputStream; -import java.io.IOException; import java.io.Writer; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; @@ -18,10 +16,10 @@ import java.util.Properties; import net.i2p.CoreVersion; import net.i2p.data.DataHelper; +import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade; import net.i2p.stat.Rate; import net.i2p.stat.RateStat; import net.i2p.util.Log; -import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade; /** * Maintain the statistics about the router diff --git a/router/java/src/net/i2p/router/TunnelManagerFacade.java b/router/java/src/net/i2p/router/TunnelManagerFacade.java index 1caa56c9b..be0b7e441 100644 --- a/router/java/src/net/i2p/router/TunnelManagerFacade.java +++ b/router/java/src/net/i2p/router/TunnelManagerFacade.java @@ -8,13 +8,13 @@ package net.i2p.router; * */ +import java.io.IOException; +import java.io.Writer; + import net.i2p.data.Destination; import net.i2p.data.Hash; import net.i2p.data.TunnelId; -import java.io.IOException; -import java.io.Writer; - /** * Build and maintain tunnels throughout the network. * diff --git a/router/java/src/net/i2p/router/admin/AdminRunner.java b/router/java/src/net/i2p/router/admin/AdminRunner.java index 0ded465eb..c515f8976 100644 --- a/router/java/src/net/i2p/router/admin/AdminRunner.java +++ b/router/java/src/net/i2p/router/admin/AdminRunner.java @@ -11,8 +11,8 @@ import java.util.Iterator; import java.util.Set; import net.i2p.data.Hash; -import net.i2p.router.RouterContext; import net.i2p.router.Router; +import net.i2p.router.RouterContext; import net.i2p.util.I2PThread; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java index ee455f90b..544badcad 100644 --- a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java +++ b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java @@ -19,9 +19,9 @@ import java.util.Map; import java.util.Set; import net.i2p.data.Destination; +import net.i2p.data.Hash; import net.i2p.data.LeaseSet; import net.i2p.data.Payload; -import net.i2p.data.Hash; import net.i2p.data.i2cp.DisconnectMessage; import net.i2p.data.i2cp.I2CPMessage; import net.i2p.data.i2cp.I2CPMessageException; diff --git a/router/java/src/net/i2p/router/client/ClientManager.java b/router/java/src/net/i2p/router/client/ClientManager.java index c9acbe430..d9838ef7b 100644 --- a/router/java/src/net/i2p/router/client/ClientManager.java +++ b/router/java/src/net/i2p/router/client/ClientManager.java @@ -24,8 +24,8 @@ import net.i2p.data.Payload; import net.i2p.data.TunnelId; import net.i2p.data.i2cp.MessageId; import net.i2p.data.i2cp.SessionConfig; -import net.i2p.router.ClientMessage; import net.i2p.router.ClientManagerFacade; +import net.i2p.router.ClientMessage; import net.i2p.router.Job; import net.i2p.router.JobImpl; import net.i2p.router.RouterContext; diff --git a/router/java/src/net/i2p/router/message/HandleGarlicMessageJob.java b/router/java/src/net/i2p/router/message/HandleGarlicMessageJob.java index 6d982f24c..a114764f6 100644 --- a/router/java/src/net/i2p/router/message/HandleGarlicMessageJob.java +++ b/router/java/src/net/i2p/router/message/HandleGarlicMessageJob.java @@ -10,6 +10,7 @@ package net.i2p.router.message; import java.util.HashMap; import java.util.Map; + import net.i2p.data.Hash; import net.i2p.data.RouterIdentity; import net.i2p.data.i2np.DeliveryInstructions; diff --git a/router/java/src/net/i2p/router/message/OutboundClientMessageJobHelper.java b/router/java/src/net/i2p/router/message/OutboundClientMessageJobHelper.java index 514e81ba6..efbdd90f0 100644 --- a/router/java/src/net/i2p/router/message/OutboundClientMessageJobHelper.java +++ b/router/java/src/net/i2p/router/message/OutboundClientMessageJobHelper.java @@ -24,7 +24,6 @@ import net.i2p.data.i2np.DeliveryInstructions; import net.i2p.data.i2np.DeliveryStatusMessage; import net.i2p.data.i2np.GarlicMessage; import net.i2p.data.i2np.I2NPMessage; -import net.i2p.router.Router; import net.i2p.router.RouterContext; import net.i2p.router.TunnelInfo; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java b/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java index 02e2efd40..a51153387 100644 --- a/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java +++ b/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java @@ -8,7 +8,6 @@ import java.util.Iterator; import java.util.List; import java.util.Properties; import java.util.Set; -import java.util.TreeMap; import net.i2p.data.Base64; import net.i2p.data.Certificate; @@ -16,28 +15,23 @@ import net.i2p.data.Destination; import net.i2p.data.Hash; import net.i2p.data.Lease; import net.i2p.data.LeaseSet; +import net.i2p.data.Payload; import net.i2p.data.PublicKey; import net.i2p.data.RouterInfo; import net.i2p.data.SessionKey; -import net.i2p.data.Payload; import net.i2p.data.i2cp.MessageId; - import net.i2p.data.i2np.DataMessage; -import net.i2p.data.i2np.DeliveryStatusMessage; -import net.i2p.data.i2np.I2NPMessage; -import net.i2p.data.i2np.GarlicMessage; import net.i2p.data.i2np.DeliveryInstructions; - -import net.i2p.router.message.PayloadGarlicConfig; - +import net.i2p.data.i2np.DeliveryStatusMessage; +import net.i2p.data.i2np.GarlicMessage; +import net.i2p.data.i2np.I2NPMessage; import net.i2p.router.ClientMessage; import net.i2p.router.JobImpl; +import net.i2p.router.MessageSelector; import net.i2p.router.ReplyJob; import net.i2p.router.Router; import net.i2p.router.RouterContext; import net.i2p.router.TunnelInfo; -import net.i2p.router.MessageSelector; - import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/message/OutboundClientMessageStatus.java b/router/java/src/net/i2p/router/message/OutboundClientMessageStatus.java index f309dca7d..b24154d6f 100644 --- a/router/java/src/net/i2p/router/message/OutboundClientMessageStatus.java +++ b/router/java/src/net/i2p/router/message/OutboundClientMessageStatus.java @@ -2,6 +2,7 @@ package net.i2p.router.message; import java.util.HashSet; import java.util.Set; + import net.i2p.data.Destination; import net.i2p.data.Hash; import net.i2p.data.LeaseSet; diff --git a/router/java/src/net/i2p/router/networkdb/HandleDatabaseLookupMessageJob.java b/router/java/src/net/i2p/router/networkdb/HandleDatabaseLookupMessageJob.java index f0e27d044..a61de8c05 100644 --- a/router/java/src/net/i2p/router/networkdb/HandleDatabaseLookupMessageJob.java +++ b/router/java/src/net/i2p/router/networkdb/HandleDatabaseLookupMessageJob.java @@ -8,8 +8,8 @@ package net.i2p.router.networkdb; * */ -import java.util.Iterator; import java.util.HashSet; +import java.util.Iterator; import java.util.Set; import net.i2p.data.DataStructure; @@ -25,9 +25,8 @@ import net.i2p.data.i2np.I2NPMessage; import net.i2p.data.i2np.TunnelGatewayMessage; import net.i2p.router.Job; import net.i2p.router.JobImpl; -import net.i2p.router.RouterContext; import net.i2p.router.Router; -import net.i2p.router.TunnelInfo; +import net.i2p.router.RouterContext; import net.i2p.router.message.SendMessageDirectJob; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/networkdb/HandleDatabaseStoreMessageJob.java b/router/java/src/net/i2p/router/networkdb/HandleDatabaseStoreMessageJob.java index d0fd57ad1..3a395db0a 100644 --- a/router/java/src/net/i2p/router/networkdb/HandleDatabaseStoreMessageJob.java +++ b/router/java/src/net/i2p/router/networkdb/HandleDatabaseStoreMessageJob.java @@ -9,6 +9,7 @@ package net.i2p.router.networkdb; */ import java.util.Date; + import net.i2p.data.Hash; import net.i2p.data.LeaseSet; import net.i2p.data.RouterIdentity; diff --git a/router/java/src/net/i2p/router/networkdb/PublishLocalRouterInfoJob.java b/router/java/src/net/i2p/router/networkdb/PublishLocalRouterInfoJob.java index 346cdc3fd..96dbadd6c 100644 --- a/router/java/src/net/i2p/router/networkdb/PublishLocalRouterInfoJob.java +++ b/router/java/src/net/i2p/router/networkdb/PublishLocalRouterInfoJob.java @@ -15,9 +15,8 @@ import net.i2p.data.DataFormatException; import net.i2p.data.RouterInfo; import net.i2p.data.SigningPrivateKey; import net.i2p.router.JobImpl; -import net.i2p.router.RouterContext; import net.i2p.router.Router; -import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade; +import net.i2p.router.RouterContext; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/ExploreJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/ExploreJob.java index b282f897a..a64046f6a 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/ExploreJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/ExploreJob.java @@ -9,6 +9,7 @@ package net.i2p.router.networkdb.kademlia; */ import java.util.List; + import net.i2p.data.Hash; import net.i2p.data.RouterInfo; import net.i2p.data.TunnelId; diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodOnlySearchJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodOnlySearchJob.java index f293b59ad..4f3dc3e09 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodOnlySearchJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodOnlySearchJob.java @@ -1,11 +1,23 @@ package net.i2p.router.networkdb.kademlia; -import java.util.*; -import net.i2p.router.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + import net.i2p.data.Hash; -import net.i2p.data.i2np.*; -import net.i2p.util.Log; +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.router.Job; +import net.i2p.router.JobImpl; +import net.i2p.router.MessageSelector; +import net.i2p.router.OutNetMessage; +import net.i2p.router.ReplyJob; +import net.i2p.router.RouterContext; +import net.i2p.router.TunnelInfo; import net.i2p.router.peermanager.PeerProfile; +import net.i2p.util.Log; /** * Try sending a search to some floodfill peers, failing completely if we don't get diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java index 0d4748a3a..8a5571819 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java @@ -5,12 +5,11 @@ import java.util.Properties; import net.i2p.data.Hash; import net.i2p.data.RouterAddress; -import net.i2p.data.RouterInfo; -import net.i2p.util.Log; import net.i2p.router.JobImpl; import net.i2p.router.Router; import net.i2p.router.RouterContext; import net.i2p.router.peermanager.PeerProfile; +import net.i2p.util.Log; /** * Simple job to monitor the floodfill pool. diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java index 0d0cc4706..26ef1586a 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java @@ -1,10 +1,27 @@ package net.i2p.router.networkdb.kademlia; -import java.util.*; -import net.i2p.router.*; -import net.i2p.router.networkdb.DatabaseStoreMessageHandler; -import net.i2p.data.i2np.*; -import net.i2p.data.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import net.i2p.data.DataStructure; +import net.i2p.data.Hash; +import net.i2p.data.LeaseSet; +import net.i2p.data.RouterInfo; +import net.i2p.data.i2np.DatabaseLookupMessage; +import net.i2p.data.i2np.DatabaseSearchReplyMessage; +import net.i2p.data.i2np.DatabaseStoreMessage; +import net.i2p.data.i2np.I2NPMessage; +import net.i2p.router.Job; +import net.i2p.router.JobImpl; +import net.i2p.router.MessageSelector; +import net.i2p.router.OutNetMessage; +import net.i2p.router.ReplyJob; +import net.i2p.router.RouterContext; +import net.i2p.router.TunnelInfo; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillPeerSelector.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillPeerSelector.java index 8ebdf2f45..7cc70a56f 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillPeerSelector.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillPeerSelector.java @@ -9,15 +9,16 @@ package net.i2p.router.networkdb.kademlia; */ import java.math.BigInteger; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.TreeMap; -import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.data.RouterInfo; import net.i2p.router.RouterContext; -import net.i2p.router.peermanager.PeerProfile; -import net.i2p.stat.Rate; -import net.i2p.stat.RateStat; import net.i2p.util.Log; class FloodfillPeerSelector extends PeerSelector { diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java index 8f9cf35d3..f3880597d 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java @@ -8,26 +8,12 @@ package net.i2p.router.networkdb.kademlia; * */ -import java.util.Iterator; -import java.util.List; import java.util.Set; import net.i2p.data.DataStructure; import net.i2p.data.Hash; -import net.i2p.data.LeaseSet; -import net.i2p.data.RouterInfo; -import net.i2p.data.TunnelId; -import net.i2p.data.i2np.DatabaseStoreMessage; -import net.i2p.data.i2np.I2NPMessage; import net.i2p.router.Job; -import net.i2p.router.JobImpl; -import net.i2p.router.ReplyJob; import net.i2p.router.RouterContext; -import net.i2p.router.TunnelInfo; -import net.i2p.router.peermanager.PeerProfile; -import net.i2p.stat.Rate; -import net.i2p.stat.RateStat; -import net.i2p.util.Log; class FloodfillStoreJob extends StoreJob { private FloodfillNetworkDatabaseFacade _facade; diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillVerifyStoreJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillVerifyStoreJob.java index 015294b53..f74d5f470 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillVerifyStoreJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillVerifyStoreJob.java @@ -2,9 +2,18 @@ package net.i2p.router.networkdb.kademlia; import java.util.Collections; import java.util.List; -import net.i2p.data.*; -import net.i2p.data.i2np.*; -import net.i2p.router.*; + +import net.i2p.data.DataStructure; +import net.i2p.data.Hash; +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.router.JobImpl; +import net.i2p.router.MessageSelector; +import net.i2p.router.ReplyJob; +import net.i2p.router.RouterContext; +import net.i2p.router.TunnelInfo; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseLookupMessageJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseLookupMessageJob.java index cd78c7fee..986dc2edd 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseLookupMessageJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseLookupMessageJob.java @@ -8,27 +8,11 @@ package net.i2p.router.networkdb.kademlia; * */ -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.RouterIdentity; -import net.i2p.data.RouterInfo; -import net.i2p.data.TunnelId; 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.TunnelGatewayMessage; -import net.i2p.router.Job; -import net.i2p.router.JobImpl; import net.i2p.router.RouterContext; -import net.i2p.router.TunnelInfo; -import net.i2p.router.message.SendMessageDirectJob; import net.i2p.router.networkdb.HandleDatabaseLookupMessageJob; -import net.i2p.util.Log; /** * Handle a lookup for a key received from a remote peer. Needs to be implemented diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java index e8d6e6ac3..34555b1de 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java @@ -8,10 +8,17 @@ package net.i2p.router.networkdb.kademlia; * */ -import java.util.*; -import net.i2p.data.*; -import net.i2p.data.i2np.*; -import net.i2p.router.*; +import java.util.Date; + +import net.i2p.data.Hash; +import net.i2p.data.LeaseSet; +import net.i2p.data.RouterIdentity; +import net.i2p.data.RouterInfo; +import net.i2p.data.i2np.DatabaseStoreMessage; +import net.i2p.data.i2np.DeliveryStatusMessage; +import net.i2p.router.JobImpl; +import net.i2p.router.RouterContext; +import net.i2p.router.TunnelInfo; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/HarvesterJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/HarvesterJob.java index aa23dfff5..948709d98 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/HarvesterJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/HarvesterJob.java @@ -10,11 +10,11 @@ import java.util.TreeMap; import net.i2p.data.Hash; import net.i2p.data.RouterInfo; import net.i2p.data.i2np.DatabaseLookupMessage; -import net.i2p.util.Log; import net.i2p.router.JobImpl; import net.i2p.router.RouterContext; import net.i2p.router.TunnelInfo; import net.i2p.router.message.SendMessageDirectJob; +import net.i2p.util.Log; /** * Simple job to try to keep our peer references up to date by aggressively diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java b/router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java index 8de344837..538deea43 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java @@ -9,11 +9,11 @@ package net.i2p.router.networkdb.kademlia; */ import java.math.BigInteger; +import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; -import java.util.Set; -import java.util.ArrayList; import java.util.List; +import java.util.Set; import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java index c0b124dd5..9c4f8a352 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java @@ -8,8 +8,6 @@ package net.i2p.router.networkdb.kademlia; * */ -import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; import java.io.Writer; import java.util.Collection; @@ -23,8 +21,6 @@ import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; -import net.i2p.data.Base64; -import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; import net.i2p.data.DataStructure; import net.i2p.data.Destination; @@ -39,11 +35,11 @@ import net.i2p.router.Job; import net.i2p.router.NetworkDatabaseFacade; import net.i2p.router.Router; import net.i2p.router.RouterContext; +import net.i2p.router.TunnelPoolSettings; import net.i2p.router.networkdb.DatabaseLookupMessageHandler; import net.i2p.router.networkdb.DatabaseStoreMessageHandler; import net.i2p.router.networkdb.PublishLocalRouterInfoJob; import net.i2p.router.peermanager.PeerProfile; -import net.i2p.router.TunnelPoolSettings; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/PeerSelector.java b/router/java/src/net/i2p/router/networkdb/kademlia/PeerSelector.java index 0d3aa52b7..26c1799a3 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/PeerSelector.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/PeerSelector.java @@ -18,7 +18,9 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; -import net.i2p.data.*; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; +import net.i2p.data.RouterInfo; import net.i2p.router.RouterContext; import net.i2p.router.peermanager.PeerProfile; import net.i2p.stat.Rate; diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java b/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java index 66431b85e..ec4cc66de 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java @@ -10,11 +10,13 @@ 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.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import net.i2p.data.DataFormatException; import net.i2p.data.DataStructure; diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java index 64f1a7a54..f49ca4276 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java @@ -27,8 +27,6 @@ import net.i2p.router.JobImpl; import net.i2p.router.RouterContext; import net.i2p.router.TunnelInfo; import net.i2p.router.message.SendMessageDirectJob; -import net.i2p.stat.Rate; -import net.i2p.stat.RateStat; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java index ed23bd97a..69311b62e 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java @@ -8,7 +8,10 @@ package net.i2p.router.networkdb.kademlia; * */ -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Set; import net.i2p.data.DataStructure; import net.i2p.data.Hash; diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/XORComparator.java b/router/java/src/net/i2p/router/networkdb/kademlia/XORComparator.java index d8880b525..3c2b9d2d2 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/XORComparator.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/XORComparator.java @@ -1,6 +1,7 @@ package net.i2p.router.networkdb.kademlia; import java.util.Comparator; + import net.i2p.data.DataHelper; import net.i2p.data.Hash; diff --git a/router/java/src/net/i2p/router/peermanager/InverseCapacityComparator.java b/router/java/src/net/i2p/router/peermanager/InverseCapacityComparator.java index 2cc28f864..520cee075 100644 --- a/router/java/src/net/i2p/router/peermanager/InverseCapacityComparator.java +++ b/router/java/src/net/i2p/router/peermanager/InverseCapacityComparator.java @@ -1,6 +1,7 @@ package net.i2p.router.peermanager; import java.util.Comparator; + import net.i2p.data.DataHelper; /** diff --git a/router/java/src/net/i2p/router/peermanager/PeerManager.java b/router/java/src/net/i2p/router/peermanager/PeerManager.java index 2fcebfedf..b2b16a00d 100644 --- a/router/java/src/net/i2p/router/peermanager/PeerManager.java +++ b/router/java/src/net/i2p/router/peermanager/PeerManager.java @@ -10,17 +10,21 @@ package net.i2p.router.peermanager; import java.io.IOException; import java.io.Writer; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; import net.i2p.data.Hash; +import net.i2p.data.RouterInfo; import net.i2p.router.PeerSelectionCriteria; import net.i2p.router.RouterContext; import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade; -import net.i2p.util.SimpleTimer; import net.i2p.util.Log; - -import net.i2p.data.RouterInfo; -import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade; +import net.i2p.util.SimpleTimer; /** * Manage the current state of the statistics diff --git a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java index 425c31fa5..660324dee 100644 --- a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java +++ b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java @@ -23,8 +23,8 @@ import java.util.TreeSet; import net.i2p.data.Hash; import net.i2p.data.RouterAddress; import net.i2p.data.RouterInfo; -import net.i2p.router.RouterContext; import net.i2p.router.NetworkDatabaseFacade; +import net.i2p.router.RouterContext; import net.i2p.router.tunnel.pool.TunnelPeerSelector; import net.i2p.stat.Rate; import net.i2p.stat.RateStat; diff --git a/router/java/src/net/i2p/router/peermanager/ProfileOrganizerRenderer.java b/router/java/src/net/i2p/router/peermanager/ProfileOrganizerRenderer.java index 1a5541f91..38590570d 100644 --- a/router/java/src/net/i2p/router/peermanager/ProfileOrganizerRenderer.java +++ b/router/java/src/net/i2p/router/peermanager/ProfileOrganizerRenderer.java @@ -2,12 +2,8 @@ package net.i2p.router.peermanager; import java.io.IOException; import java.io.Writer; - -import java.lang.Math; - import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; - import java.util.Comparator; import java.util.Iterator; import java.util.Locale; @@ -18,7 +14,6 @@ import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.data.RouterInfo; import net.i2p.router.RouterContext; -import net.i2p.router.peermanager.DBHistory; import net.i2p.stat.Rate; import net.i2p.stat.RateStat; diff --git a/router/java/src/net/i2p/router/peermanager/StrictSpeedCalculator.java b/router/java/src/net/i2p/router/peermanager/StrictSpeedCalculator.java index f8527e40a..99453b0ab 100644 --- a/router/java/src/net/i2p/router/peermanager/StrictSpeedCalculator.java +++ b/router/java/src/net/i2p/router/peermanager/StrictSpeedCalculator.java @@ -1,8 +1,8 @@ package net.i2p.router.peermanager; +import net.i2p.router.RouterContext; import net.i2p.stat.Rate; import net.i2p.stat.RateStat; -import net.i2p.router.RouterContext; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/startup/ClientAppConfig.java b/router/java/src/net/i2p/router/startup/ClientAppConfig.java index 0a994069f..316c0b500 100644 --- a/router/java/src/net/i2p/router/startup/ClientAppConfig.java +++ b/router/java/src/net/i2p/router/startup/ClientAppConfig.java @@ -1,8 +1,8 @@ package net.i2p.router.startup; -import java.io.IOException; import java.io.File; import java.io.FileOutputStream; +import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Properties; diff --git a/router/java/src/net/i2p/router/startup/CreateRouterInfoJob.java b/router/java/src/net/i2p/router/startup/CreateRouterInfoJob.java index 18e524d31..de84fa49b 100644 --- a/router/java/src/net/i2p/router/startup/CreateRouterInfoJob.java +++ b/router/java/src/net/i2p/router/startup/CreateRouterInfoJob.java @@ -25,7 +25,6 @@ import net.i2p.router.Job; import net.i2p.router.JobImpl; import net.i2p.router.Router; import net.i2p.router.RouterContext; -import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade; import net.i2p.util.Log; public class CreateRouterInfoJob extends JobImpl { diff --git a/router/java/src/net/i2p/router/startup/ReadConfigJob.java b/router/java/src/net/i2p/router/startup/ReadConfigJob.java index 4059822b8..04796dd46 100644 --- a/router/java/src/net/i2p/router/startup/ReadConfigJob.java +++ b/router/java/src/net/i2p/router/startup/ReadConfigJob.java @@ -9,6 +9,7 @@ package net.i2p.router.startup; */ import java.io.File; + import net.i2p.router.JobImpl; import net.i2p.router.RouterContext; diff --git a/router/java/src/net/i2p/router/startup/RebuildRouterInfoJob.java b/router/java/src/net/i2p/router/startup/RebuildRouterInfoJob.java index e80af2570..a43fc6311 100644 --- a/router/java/src/net/i2p/router/startup/RebuildRouterInfoJob.java +++ b/router/java/src/net/i2p/router/startup/RebuildRouterInfoJob.java @@ -25,7 +25,6 @@ import net.i2p.data.SigningPublicKey; import net.i2p.router.JobImpl; import net.i2p.router.Router; import net.i2p.router.RouterContext; -import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java index c2b024c05..cd1022580 100644 --- a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java +++ b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java @@ -10,6 +10,7 @@ package net.i2p.router.transport; import java.io.IOException; import java.io.Writer; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -17,7 +18,6 @@ import java.util.Map; import java.util.Properties; import java.util.Set; import java.util.Vector; -import java.util.Collections; import net.i2p.data.Hash; import net.i2p.data.RouterAddress; diff --git a/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java b/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java index b71bcf40a..6a116126e 100644 --- a/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java +++ b/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java @@ -1,6 +1,8 @@ package net.i2p.router.transport; -import java.util.*; +import java.util.ArrayList; +import java.util.List; + import net.i2p.I2PAppContext; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/transport/GetBidsJob.java b/router/java/src/net/i2p/router/transport/GetBidsJob.java index 353540e1e..a60ba6ee6 100644 --- a/router/java/src/net/i2p/router/transport/GetBidsJob.java +++ b/router/java/src/net/i2p/router/transport/GetBidsJob.java @@ -8,7 +8,6 @@ package net.i2p.router.transport; * */ -import java.util.List; import net.i2p.data.Hash; import net.i2p.router.JobImpl; import net.i2p.router.MessageSelector; diff --git a/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java b/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java index ce9673e61..4ddcd44a0 100644 --- a/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java +++ b/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java @@ -10,7 +10,13 @@ package net.i2p.router.transport; import java.io.IOException; import java.io.Writer; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import net.i2p.data.i2np.I2NPMessage; import net.i2p.router.Job; diff --git a/router/java/src/net/i2p/router/transport/Transport.java b/router/java/src/net/i2p/router/transport/Transport.java index 499e47d69..cba920b6d 100644 --- a/router/java/src/net/i2p/router/transport/Transport.java +++ b/router/java/src/net/i2p/router/transport/Transport.java @@ -11,10 +11,9 @@ package net.i2p.router.transport; import java.io.IOException; import java.io.Writer; import java.util.List; -import java.util.Set; import java.util.Vector; -import net.i2p.data.Hash; +import net.i2p.data.Hash; import net.i2p.data.RouterAddress; import net.i2p.data.RouterInfo; import net.i2p.router.OutNetMessage; diff --git a/router/java/src/net/i2p/router/transport/TransportImpl.java b/router/java/src/net/i2p/router/transport/TransportImpl.java index c00a5485e..4f91c12dd 100644 --- a/router/java/src/net/i2p/router/transport/TransportImpl.java +++ b/router/java/src/net/i2p/router/transport/TransportImpl.java @@ -10,7 +10,16 @@ package net.i2p.router.transport; import java.io.IOException; import java.io.Writer; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.Vector; import net.i2p.data.Hash; import net.i2p.data.RouterAddress; diff --git a/router/java/src/net/i2p/router/transport/TransportManager.java b/router/java/src/net/i2p/router/transport/TransportManager.java index fefbb9df8..6222e4321 100644 --- a/router/java/src/net/i2p/router/transport/TransportManager.java +++ b/router/java/src/net/i2p/router/transport/TransportManager.java @@ -10,25 +10,26 @@ package net.i2p.router.transport; import java.io.IOException; import java.io.Writer; -import java.util.Arrays; import java.util.ArrayList; -import java.util.Iterator; +import java.util.Arrays; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeMap; import java.util.Vector; + import net.i2p.data.Hash; import net.i2p.data.RouterAddress; import net.i2p.data.RouterIdentity; import net.i2p.data.i2np.I2NPMessage; -import net.i2p.router.OutNetMessage; import net.i2p.router.CommSystemFacade; +import net.i2p.router.OutNetMessage; import net.i2p.router.RouterContext; +import net.i2p.router.transport.ntcp.NTCPTransport; import net.i2p.router.transport.tcp.TCPTransport; import net.i2p.router.transport.udp.UDPTransport; -import net.i2p.router.transport.ntcp.NTCPTransport; import net.i2p.util.Log; public class TransportManager implements TransportEventListener { diff --git a/router/java/src/net/i2p/router/transport/ntcp/EstablishState.java b/router/java/src/net/i2p/router/transport/ntcp/EstablishState.java index a3e06e09a..1ecc078d1 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/EstablishState.java +++ b/router/java/src/net/i2p/router/transport/ntcp/EstablishState.java @@ -1,17 +1,33 @@ package net.i2p.router.transport.ntcp; -import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.EOFException; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.net.InetAddress; import java.net.Socket; import java.net.UnknownHostException; -import java.nio.channels.SelectionKey; +import java.nio.ByteBuffer; + import net.i2p.I2PAppContext; import net.i2p.crypto.DHSessionKeyBuilder; -import net.i2p.data.*; +import net.i2p.data.Base64; +import net.i2p.data.Certificate; +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.RouterIdentity; +import net.i2p.data.RouterInfo; +import net.i2p.data.Signature; +import net.i2p.data.SigningPrivateKey; +import net.i2p.data.SigningPublicKey; import net.i2p.router.Router; import net.i2p.router.RouterContext; import net.i2p.util.Log; -import java.nio.ByteBuffer; /* * Alice contacts Bob diff --git a/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java b/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java index f5915789a..dfb522004 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java +++ b/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java @@ -3,12 +3,21 @@ package net.i2p.router.transport.ntcp; import java.io.IOException; import java.net.InetSocketAddress; import java.nio.ByteBuffer; -import java.nio.channels.*; +import java.nio.channels.CancelledKeyException; +import java.nio.channels.ClosedChannelException; +import java.nio.channels.ClosedSelectorException; +import java.nio.channels.NoConnectionPendingException; +import java.nio.channels.NotYetConnectedException; +import java.nio.channels.SelectionKey; +import java.nio.channels.Selector; +import java.nio.channels.ServerSocketChannel; +import java.nio.channels.SocketChannel; +import java.nio.channels.UnresolvedAddressException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Set; -import net.i2p.data.DataHelper; + import net.i2p.data.RouterIdentity; import net.i2p.data.RouterInfo; import net.i2p.router.RouterContext; diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPAddress.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPAddress.java index e7ab7c3bd..71d395e5f 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/NTCPAddress.java +++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPAddress.java @@ -9,7 +9,6 @@ package net.i2p.router.transport.ntcp; */ import java.net.InetAddress; -import java.net.UnknownHostException; import java.util.Properties; import net.i2p.data.DataHelper; diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java index 593db8693..5610d62e1 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java +++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java @@ -1,14 +1,16 @@ package net.i2p.router.transport.ntcp; import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.SequenceInputStream; import java.nio.ByteBuffer; import java.nio.channels.SelectionKey; import java.nio.channels.SocketChannel; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; import java.util.zip.Adler32; + import net.i2p.data.Base64; import net.i2p.data.DataHelper; import net.i2p.data.Hash; diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java index 8ff160d78..7c7a8df21 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java +++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java @@ -1,9 +1,7 @@ package net.i2p.router.transport.ntcp; import java.io.IOException; -import java.io.Writer; import java.net.InetSocketAddress; -import java.nio.channels.Selector; import java.nio.channels.ServerSocketChannel; import java.nio.channels.SocketChannel; import java.text.DecimalFormat; @@ -16,15 +14,18 @@ import java.util.List; import java.util.Map; import java.util.TreeSet; import java.util.Vector; + 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.i2np.DatabaseStoreMessage; import net.i2p.router.OutNetMessage; import net.i2p.router.RouterContext; -import net.i2p.router.transport.*; +import net.i2p.router.transport.CommSystemFacadeImpl; +import net.i2p.router.transport.Transport; +import net.i2p.router.transport.TransportBid; +import net.i2p.router.transport.TransportImpl; import net.i2p.util.Log; import net.i2p.util.SimpleTimer; diff --git a/router/java/src/net/i2p/router/transport/ntcp/Reader.java b/router/java/src/net/i2p/router/transport/ntcp/Reader.java index 24f678d18..4b4dc3db1 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/Reader.java +++ b/router/java/src/net/i2p/router/transport/ntcp/Reader.java @@ -1,7 +1,9 @@ package net.i2p.router.transport.ntcp; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.List; + import net.i2p.router.RouterContext; import net.i2p.util.I2PThread; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/transport/ntcp/Writer.java b/router/java/src/net/i2p/router/transport/ntcp/Writer.java index 968c81376..29b725816 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/Writer.java +++ b/router/java/src/net/i2p/router/transport/ntcp/Writer.java @@ -1,7 +1,8 @@ package net.i2p.router.transport.ntcp; -import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.List; + import net.i2p.router.RouterContext; import net.i2p.util.I2PThread; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/transport/tcp/ConnectionHandler.java b/router/java/src/net/i2p/router/transport/tcp/ConnectionHandler.java index a9ba87576..892106f3d 100644 --- a/router/java/src/net/i2p/router/transport/tcp/ConnectionHandler.java +++ b/router/java/src/net/i2p/router/transport/tcp/ConnectionHandler.java @@ -9,9 +9,7 @@ import java.io.OutputStream; import java.net.InetAddress; import java.net.Socket; import java.net.SocketException; - import java.text.SimpleDateFormat; - import java.util.Date; import java.util.Properties; @@ -20,12 +18,12 @@ import net.i2p.crypto.AESOutputStream; import net.i2p.crypto.DHSessionKeyBuilder; import net.i2p.data.Base64; import net.i2p.data.ByteArray; -import net.i2p.data.DataHelper; import net.i2p.data.DataFormatException; +import net.i2p.data.DataHelper; import net.i2p.data.Hash; +import net.i2p.data.RouterInfo; import net.i2p.data.SessionKey; import net.i2p.data.Signature; -import net.i2p.data.RouterInfo; import net.i2p.router.Router; import net.i2p.router.RouterContext; import net.i2p.router.transport.BandwidthLimitedInputStream; diff --git a/router/java/src/net/i2p/router/transport/tcp/ConnectionRunner.java b/router/java/src/net/i2p/router/transport/tcp/ConnectionRunner.java index 934e7e176..a9d88b860 100644 --- a/router/java/src/net/i2p/router/transport/tcp/ConnectionRunner.java +++ b/router/java/src/net/i2p/router/transport/tcp/ConnectionRunner.java @@ -2,10 +2,11 @@ package net.i2p.router.transport.tcp; import java.io.IOException; import java.io.OutputStream; + import net.i2p.data.DataHelper; import net.i2p.data.RouterInfo; -import net.i2p.data.i2np.I2NPMessage; import net.i2p.data.i2np.DateMessage; +import net.i2p.data.i2np.I2NPMessage; import net.i2p.router.OutNetMessage; import net.i2p.router.RouterContext; import net.i2p.util.I2PThread; diff --git a/router/java/src/net/i2p/router/transport/tcp/MessageHandler.java b/router/java/src/net/i2p/router/transport/tcp/MessageHandler.java index 25daf815e..cc1c1f5d9 100644 --- a/router/java/src/net/i2p/router/transport/tcp/MessageHandler.java +++ b/router/java/src/net/i2p/router/transport/tcp/MessageHandler.java @@ -3,9 +3,9 @@ package net.i2p.router.transport.tcp; import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.data.RouterIdentity; -import net.i2p.data.i2np.I2NPMessageReader; -import net.i2p.data.i2np.I2NPMessage; import net.i2p.data.i2np.DateMessage; +import net.i2p.data.i2np.I2NPMessage; +import net.i2p.data.i2np.I2NPMessageReader; import net.i2p.router.Router; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/transport/tcp/PersistentConnectionTagManager.java b/router/java/src/net/i2p/router/transport/tcp/PersistentConnectionTagManager.java index 0c9c0d3c6..83d647611 100644 --- a/router/java/src/net/i2p/router/transport/tcp/PersistentConnectionTagManager.java +++ b/router/java/src/net/i2p/router/transport/tcp/PersistentConnectionTagManager.java @@ -5,14 +5,13 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; - import java.util.HashMap; import java.util.Iterator; import java.util.Map; import net.i2p.data.ByteArray; -import net.i2p.data.DataHelper; import net.i2p.data.DataFormatException; +import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.data.SessionKey; import net.i2p.router.RouterContext; diff --git a/router/java/src/net/i2p/router/transport/tcp/TCPConnection.java b/router/java/src/net/i2p/router/transport/tcp/TCPConnection.java index cedf13449..7758f6ffa 100644 --- a/router/java/src/net/i2p/router/transport/tcp/TCPConnection.java +++ b/router/java/src/net/i2p/router/transport/tcp/TCPConnection.java @@ -3,9 +3,7 @@ package net.i2p.router.transport.tcp; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; - import java.net.Socket; - import java.util.ArrayList; import java.util.List; @@ -15,8 +13,8 @@ import net.i2p.data.RouterIdentity; import net.i2p.data.i2np.I2NPMessageReader; import net.i2p.router.OutNetMessage; import net.i2p.router.RouterContext; -import net.i2p.stat.RateStat; import net.i2p.stat.Rate; +import net.i2p.stat.RateStat; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/transport/tcp/TCPListener.java b/router/java/src/net/i2p/router/transport/tcp/TCPListener.java index 103ecdef9..961cb5cb2 100644 --- a/router/java/src/net/i2p/router/transport/tcp/TCPListener.java +++ b/router/java/src/net/i2p/router/transport/tcp/TCPListener.java @@ -14,7 +14,6 @@ import java.net.ServerSocket; import java.net.Socket; import java.net.SocketException; import java.net.UnknownHostException; - import java.util.ArrayList; import java.util.List; diff --git a/router/java/src/net/i2p/router/transport/tcp/TCPTransport.java b/router/java/src/net/i2p/router/transport/tcp/TCPTransport.java index 3ea385916..1f61eed9d 100644 --- a/router/java/src/net/i2p/router/transport/tcp/TCPTransport.java +++ b/router/java/src/net/i2p/router/transport/tcp/TCPTransport.java @@ -2,6 +2,7 @@ package net.i2p.router.transport.tcp; import java.io.IOException; import java.io.Writer; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -11,8 +12,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import java.text.SimpleDateFormat; - import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.data.RouterAddress; @@ -20,9 +19,9 @@ import net.i2p.data.RouterIdentity; import net.i2p.data.RouterInfo; import net.i2p.router.OutNetMessage; import net.i2p.router.RouterContext; -import net.i2p.router.transport.TransportImpl; -import net.i2p.router.transport.TransportBid; import net.i2p.router.transport.Transport; +import net.i2p.router.transport.TransportBid; +import net.i2p.router.transport.TransportImpl; import net.i2p.util.I2PThread; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java b/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java index 5161f111f..bb35381ae 100644 --- a/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java +++ b/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java @@ -4,8 +4,8 @@ import java.net.InetAddress; import java.net.UnknownHostException; import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Iterator; +import java.util.List; import java.util.Map; import net.i2p.crypto.DHSessionKeyBuilder; @@ -14,11 +14,9 @@ import net.i2p.data.Hash; import net.i2p.data.RouterAddress; import net.i2p.data.RouterIdentity; import net.i2p.data.SessionKey; -import net.i2p.data.Signature; import net.i2p.data.i2np.DatabaseStoreMessage; import net.i2p.data.i2np.DeliveryStatusMessage; import net.i2p.data.i2np.I2NPMessage; -import net.i2p.router.CommSystemFacade; import net.i2p.router.OutNetMessage; import net.i2p.router.Router; import net.i2p.router.RouterContext; diff --git a/router/java/src/net/i2p/router/transport/udp/InboundEstablishState.java b/router/java/src/net/i2p/router/transport/udp/InboundEstablishState.java index 6aa5fa656..ababfa7c4 100644 --- a/router/java/src/net/i2p/router/transport/udp/InboundEstablishState.java +++ b/router/java/src/net/i2p/router/transport/udp/InboundEstablishState.java @@ -2,9 +2,6 @@ package net.i2p.router.transport.udp; import java.io.ByteArrayInputStream; import java.io.IOException; -import java.net.InetAddress; -import java.util.ArrayList; -import java.util.List; import net.i2p.crypto.DHSessionKeyBuilder; import net.i2p.data.Base64; @@ -14,7 +11,6 @@ import net.i2p.data.DataHelper; import net.i2p.data.RouterIdentity; import net.i2p.data.SessionKey; import net.i2p.data.Signature; -import net.i2p.router.OutNetMessage; import net.i2p.router.RouterContext; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/transport/udp/InboundMessageFragments.java b/router/java/src/net/i2p/router/transport/udp/InboundMessageFragments.java index a8f54c21d..cd0630a0a 100644 --- a/router/java/src/net/i2p/router/transport/udp/InboundMessageFragments.java +++ b/router/java/src/net/i2p/router/transport/udp/InboundMessageFragments.java @@ -1,15 +1,10 @@ package net.i2p.router.transport.udp; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; import java.util.Map; import net.i2p.data.Hash; import net.i2p.router.RouterContext; import net.i2p.util.DecayingBloomFilter; -import net.i2p.util.I2PThread; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java b/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java index 12fb716a6..bbbc35cab 100644 --- a/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java +++ b/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java @@ -1,11 +1,16 @@ package net.i2p.router.transport.udp; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; import net.i2p.data.Base64; -import net.i2p.data.SessionKey; -import net.i2p.data.RouterInfo; import net.i2p.data.RouterAddress; +import net.i2p.data.RouterInfo; +import net.i2p.data.SessionKey; import net.i2p.router.RouterContext; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/transport/udp/MessageReceiver.java b/router/java/src/net/i2p/router/transport/udp/MessageReceiver.java index 64e8a2d65..a6a75459e 100644 --- a/router/java/src/net/i2p/router/transport/udp/MessageReceiver.java +++ b/router/java/src/net/i2p/router/transport/udp/MessageReceiver.java @@ -5,11 +5,10 @@ import java.util.List; import net.i2p.data.Base64; import net.i2p.data.ByteArray; -import net.i2p.data.DataFormatException; import net.i2p.data.i2np.I2NPMessage; -import net.i2p.data.i2np.I2NPMessageImpl; import net.i2p.data.i2np.I2NPMessageException; import net.i2p.data.i2np.I2NPMessageHandler; +import net.i2p.data.i2np.I2NPMessageImpl; import net.i2p.router.RouterContext; import net.i2p.util.ByteCache; import net.i2p.util.I2PThread; diff --git a/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState.java b/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState.java index a7649bfb8..fc424de5b 100644 --- a/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState.java +++ b/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState.java @@ -1,7 +1,5 @@ package net.i2p.router.transport.udp; -import java.io.ByteArrayInputStream; -import java.io.IOException; import java.net.InetAddress; import java.util.ArrayList; import java.util.List; @@ -9,7 +7,6 @@ import java.util.List; import net.i2p.crypto.DHSessionKeyBuilder; import net.i2p.data.Base64; import net.i2p.data.ByteArray; -import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; import net.i2p.data.RouterIdentity; import net.i2p.data.SessionKey; diff --git a/router/java/src/net/i2p/router/transport/udp/OutboundMessageFragments.java b/router/java/src/net/i2p/router/transport/udp/OutboundMessageFragments.java index 31841ec3b..c65bb458e 100644 --- a/router/java/src/net/i2p/router/transport/udp/OutboundMessageFragments.java +++ b/router/java/src/net/i2p/router/transport/udp/OutboundMessageFragments.java @@ -1,17 +1,13 @@ package net.i2p.router.transport.udp; import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; import java.util.List; -import java.util.Map; import net.i2p.data.Hash; import net.i2p.data.RouterInfo; import net.i2p.data.i2np.I2NPMessage; import net.i2p.router.OutNetMessage; import net.i2p.router.RouterContext; -import net.i2p.util.I2PThread; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java b/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java index e170334dc..fc6896627 100644 --- a/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java +++ b/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java @@ -1,10 +1,11 @@ package net.i2p.router.transport.udp; import java.util.Arrays; + +import net.i2p.I2PAppContext; import net.i2p.data.Base64; import net.i2p.data.ByteArray; import net.i2p.data.i2np.I2NPMessage; -import net.i2p.I2PAppContext; import net.i2p.router.OutNetMessage; import net.i2p.util.ByteCache; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java b/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java index fedc403b4..f00587bcd 100644 --- a/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java +++ b/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java @@ -2,8 +2,8 @@ package net.i2p.router.transport.udp; import java.net.InetAddress; import java.net.UnknownHostException; -import java.util.Arrays; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.List; diff --git a/router/java/src/net/i2p/router/transport/udp/PacketHandler.java b/router/java/src/net/i2p/router/transport/udp/PacketHandler.java index e43ff66b3..9e9cde1d3 100644 --- a/router/java/src/net/i2p/router/transport/udp/PacketHandler.java +++ b/router/java/src/net/i2p/router/transport/udp/PacketHandler.java @@ -1,11 +1,9 @@ package net.i2p.router.transport.udp; -import java.net.InetAddress; import java.util.ArrayList; import java.util.Date; import java.util.List; -import net.i2p.data.Base64; import net.i2p.router.Router; import net.i2p.router.RouterContext; import net.i2p.util.I2PThread; diff --git a/router/java/src/net/i2p/router/transport/udp/PacketPusher.java b/router/java/src/net/i2p/router/transport/udp/PacketPusher.java index 9ba115f85..8ec9cbb0d 100644 --- a/router/java/src/net/i2p/router/transport/udp/PacketPusher.java +++ b/router/java/src/net/i2p/router/transport/udp/PacketPusher.java @@ -1,6 +1,5 @@ package net.i2p.router.transport.udp; -import net.i2p.router.OutNetMessage; import net.i2p.router.RouterContext; import net.i2p.util.I2PThread; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/transport/udp/PeerState.java b/router/java/src/net/i2p/router/transport/udp/PeerState.java index 6a61378ff..3b9973f53 100644 --- a/router/java/src/net/i2p/router/transport/udp/PeerState.java +++ b/router/java/src/net/i2p/router/transport/udp/PeerState.java @@ -1,5 +1,7 @@ package net.i2p.router.transport.udp; +import java.net.InetAddress; +import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -7,15 +9,11 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import java.net.InetAddress; -import java.net.UnknownHostException; - import net.i2p.data.Hash; import net.i2p.data.SessionKey; -import net.i2p.util.Log; -import net.i2p.router.RouterContext; import net.i2p.router.OutNetMessage; -import net.i2p.router.Job; +import net.i2p.router.RouterContext; +import net.i2p.util.Log; /** * Contain all of the state about a UDP connection to a peer. diff --git a/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java b/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java index 424b6e027..7aa3c2fa1 100644 --- a/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java +++ b/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java @@ -2,22 +2,20 @@ package net.i2p.router.transport.udp; import java.net.InetAddress; import java.net.UnknownHostException; -import java.util.Arrays; - import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import net.i2p.router.CommSystemFacade; -import net.i2p.router.RouterContext; + import net.i2p.data.Base64; import net.i2p.data.DataHelper; -import net.i2p.data.Hash; import net.i2p.data.RouterInfo; import net.i2p.data.SessionKey; -import net.i2p.util.SimpleTimer; +import net.i2p.router.CommSystemFacade; +import net.i2p.router.RouterContext; import net.i2p.util.Log; +import net.i2p.util.SimpleTimer; /** * diff --git a/router/java/src/net/i2p/router/transport/udp/PeerTestState.java b/router/java/src/net/i2p/router/transport/udp/PeerTestState.java index a9870a15d..57dc648d8 100644 --- a/router/java/src/net/i2p/router/transport/udp/PeerTestState.java +++ b/router/java/src/net/i2p/router/transport/udp/PeerTestState.java @@ -1,6 +1,7 @@ package net.i2p.router.transport.udp; import java.net.InetAddress; + import net.i2p.data.SessionKey; /** diff --git a/router/java/src/net/i2p/router/transport/udp/TimedWeightedPriorityMessageQueue.java b/router/java/src/net/i2p/router/transport/udp/TimedWeightedPriorityMessageQueue.java index 4d0834853..b28fb9101 100644 --- a/router/java/src/net/i2p/router/transport/udp/TimedWeightedPriorityMessageQueue.java +++ b/router/java/src/net/i2p/router/transport/udp/TimedWeightedPriorityMessageQueue.java @@ -1,7 +1,6 @@ package net.i2p.router.transport.udp; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.List; diff --git a/router/java/src/net/i2p/router/transport/udp/UDPEndpoint.java b/router/java/src/net/i2p/router/transport/udp/UDPEndpoint.java index aefe18b8b..14745e552 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPEndpoint.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPEndpoint.java @@ -1,6 +1,5 @@ package net.i2p.router.transport.udp; -import java.io.IOException; import java.net.DatagramSocket; import java.net.InetAddress; import java.net.SocketException; diff --git a/router/java/src/net/i2p/router/transport/udp/UDPEndpointTest.java b/router/java/src/net/i2p/router/transport/udp/UDPEndpointTest.java index 3a08ac552..756caef76 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPEndpointTest.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPEndpointTest.java @@ -1,8 +1,6 @@ package net.i2p.router.transport.udp; -import java.net.InetAddress; import java.net.SocketException; -import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/router/java/src/net/i2p/router/transport/udp/UDPFlooder.java b/router/java/src/net/i2p/router/transport/udp/UDPFlooder.java index 1f1ffe234..dbcd8dfda 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPFlooder.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPFlooder.java @@ -2,6 +2,7 @@ package net.i2p.router.transport.udp; import java.util.ArrayList; import java.util.List; + import net.i2p.data.RouterInfo; import net.i2p.data.i2np.DataMessage; import net.i2p.data.i2np.I2NPMessage; diff --git a/router/java/src/net/i2p/router/transport/udp/UDPPacket.java b/router/java/src/net/i2p/router/transport/udp/UDPPacket.java index a48fcdb8e..46d8ae3c1 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPPacket.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPPacket.java @@ -2,18 +2,13 @@ package net.i2p.router.transport.udp; import java.net.DatagramPacket; import java.net.InetAddress; - -import java.util.Arrays; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import net.i2p.I2PAppContext; -import net.i2p.data.Base64; -import net.i2p.data.ByteArray; import net.i2p.data.DataHelper; -import net.i2p.data.Hash; import net.i2p.data.SessionKey; -import net.i2p.util.ByteCache; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java b/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java index f33bc20d5..7d1305c4d 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java @@ -1,6 +1,7 @@ package net.i2p.router.transport.udp; import java.net.InetAddress; + import net.i2p.I2PAppContext; import net.i2p.data.Base64; import net.i2p.data.DataHelper; diff --git a/router/java/src/net/i2p/router/transport/udp/UDPReceiver.java b/router/java/src/net/i2p/router/transport/udp/UDPReceiver.java index 61064162e..bdb04a95a 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPReceiver.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPReceiver.java @@ -2,15 +2,14 @@ package net.i2p.router.transport.udp; import java.io.IOException; import java.net.DatagramSocket; -import java.net.DatagramPacket; - import java.util.ArrayList; import java.util.List; + import net.i2p.router.RouterContext; import net.i2p.router.transport.FIFOBandwidthLimiter; -import net.i2p.util.SimpleTimer; import net.i2p.util.I2PThread; import net.i2p.util.Log; +import net.i2p.util.SimpleTimer; /** * Lowest level component to pull raw UDP datagrams off the wire as fast diff --git a/router/java/src/net/i2p/router/transport/udp/UDPSender.java b/router/java/src/net/i2p/router/transport/udp/UDPSender.java index 8b22d180d..533958799 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPSender.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPSender.java @@ -1,12 +1,11 @@ package net.i2p.router.transport.udp; import java.io.IOException; -import java.net.DatagramSocket; import java.net.DatagramPacket; - +import java.net.DatagramSocket; import java.util.ArrayList; import java.util.List; -import net.i2p.data.Base64; + import net.i2p.router.RouterContext; import net.i2p.router.transport.FIFOBandwidthLimiter; import net.i2p.util.I2PThread; diff --git a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java index 4c051de02..6191a64ce 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java @@ -1,32 +1,37 @@ package net.i2p.router.transport.udp; -import java.net.InetAddress; -import java.net.SocketException; -import java.net.UnknownHostException; - import java.io.IOException; import java.io.Writer; - +import java.net.InetAddress; +import java.net.SocketException; +import java.net.UnknownHostException; import java.text.DecimalFormat; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.TreeSet; +import java.util.Vector; -import java.util.*; - -import net.i2p.data.Base64; import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.data.RouterAddress; -import net.i2p.data.RouterInfo; import net.i2p.data.RouterIdentity; +import net.i2p.data.RouterInfo; import net.i2p.data.SessionKey; -import net.i2p.data.i2np.I2NPMessage; import net.i2p.data.i2np.DatabaseStoreMessage; +import net.i2p.data.i2np.I2NPMessage; import net.i2p.router.CommSystemFacade; import net.i2p.router.OutNetMessage; -import net.i2p.router.RouterContext; import net.i2p.router.Router; +import net.i2p.router.RouterContext; import net.i2p.router.transport.Transport; -import net.i2p.router.transport.TransportImpl; import net.i2p.router.transport.TransportBid; +import net.i2p.router.transport.TransportImpl; import net.i2p.util.Log; import net.i2p.util.SimpleTimer; diff --git a/router/java/src/net/i2p/router/tunnel/BatchedPreprocessor.java b/router/java/src/net/i2p/router/tunnel/BatchedPreprocessor.java index 8aa6ec349..6d2e7b739 100644 --- a/router/java/src/net/i2p/router/tunnel/BatchedPreprocessor.java +++ b/router/java/src/net/i2p/router/tunnel/BatchedPreprocessor.java @@ -1,10 +1,8 @@ package net.i2p.router.tunnel; -import java.util.ArrayList; import java.util.List; import net.i2p.I2PAppContext; -import net.i2p.data.ByteArray; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/tunnel/BatchedRouterPreprocessor.java b/router/java/src/net/i2p/router/tunnel/BatchedRouterPreprocessor.java index 1f72cf47b..0be137b45 100644 --- a/router/java/src/net/i2p/router/tunnel/BatchedRouterPreprocessor.java +++ b/router/java/src/net/i2p/router/tunnel/BatchedRouterPreprocessor.java @@ -1,6 +1,8 @@ package net.i2p.router.tunnel; -import java.util.*; +import java.util.List; +import java.util.Properties; + import net.i2p.router.RouterContext; /** diff --git a/router/java/src/net/i2p/router/tunnel/BuildMessageGenerator.java b/router/java/src/net/i2p/router/tunnel/BuildMessageGenerator.java index 49a978eef..b6349ccec 100644 --- a/router/java/src/net/i2p/router/tunnel/BuildMessageGenerator.java +++ b/router/java/src/net/i2p/router/tunnel/BuildMessageGenerator.java @@ -1,9 +1,19 @@ package net.i2p.router.tunnel; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + import net.i2p.I2PAppContext; -import net.i2p.data.*; -import net.i2p.data.i2np.*; +import net.i2p.data.Base64; +import net.i2p.data.ByteArray; +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.BuildRequestRecord; +import net.i2p.data.i2np.I2NPMessage; +import net.i2p.data.i2np.TunnelBuildMessage; import net.i2p.router.RouterContext; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/tunnel/BuildMessageProcessor.java b/router/java/src/net/i2p/router/tunnel/BuildMessageProcessor.java index a21261afa..a578ee08a 100644 --- a/router/java/src/net/i2p/router/tunnel/BuildMessageProcessor.java +++ b/router/java/src/net/i2p/router/tunnel/BuildMessageProcessor.java @@ -1,9 +1,14 @@ package net.i2p.router.tunnel; import net.i2p.I2PAppContext; -import net.i2p.data.*; -import net.i2p.data.i2np.*; -import net.i2p.router.RouterContext; +import net.i2p.data.Base64; +import net.i2p.data.ByteArray; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; +import net.i2p.data.PrivateKey; +import net.i2p.data.SessionKey; +import net.i2p.data.i2np.BuildRequestRecord; +import net.i2p.data.i2np.TunnelBuildMessage; import net.i2p.util.DecayingBloomFilter; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/tunnel/BuildMessageTest.java b/router/java/src/net/i2p/router/tunnel/BuildMessageTest.java index ec8140554..6e107418a 100644 --- a/router/java/src/net/i2p/router/tunnel/BuildMessageTest.java +++ b/router/java/src/net/i2p/router/tunnel/BuildMessageTest.java @@ -1,9 +1,20 @@ package net.i2p.router.tunnel; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import net.i2p.I2PAppContext; -import net.i2p.data.*; -import net.i2p.data.i2np.*; +import net.i2p.data.Base64; +import net.i2p.data.ByteArray; +import net.i2p.data.Hash; +import net.i2p.data.PrivateKey; +import net.i2p.data.PublicKey; +import net.i2p.data.TunnelId; +import net.i2p.data.i2np.BuildRequestRecord; +import net.i2p.data.i2np.BuildResponseRecord; +import net.i2p.data.i2np.TunnelBuildMessage; +import net.i2p.data.i2np.TunnelBuildReplyMessage; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/tunnel/BuildReplyHandler.java b/router/java/src/net/i2p/router/tunnel/BuildReplyHandler.java index 7627f8069..539d2d01e 100644 --- a/router/java/src/net/i2p/router/tunnel/BuildReplyHandler.java +++ b/router/java/src/net/i2p/router/tunnel/BuildReplyHandler.java @@ -1,9 +1,14 @@ package net.i2p.router.tunnel; -import java.util.*; +import java.util.List; + import net.i2p.I2PAppContext; -import net.i2p.data.*; -import net.i2p.data.i2np.*; +import net.i2p.data.Base64; +import net.i2p.data.ByteArray; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; +import net.i2p.data.SessionKey; +import net.i2p.data.i2np.TunnelBuildReplyMessage; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/tunnel/FragmentedMessage.java b/router/java/src/net/i2p/router/tunnel/FragmentedMessage.java index 186843d81..78fba7e5b 100644 --- a/router/java/src/net/i2p/router/tunnel/FragmentedMessage.java +++ b/router/java/src/net/i2p/router/tunnel/FragmentedMessage.java @@ -1,16 +1,17 @@ package net.i2p.router.tunnel; import java.io.IOException; -import java.io.OutputStream; import java.io.InputStream; +import java.io.OutputStream; + import net.i2p.I2PAppContext; import net.i2p.data.Base64; import net.i2p.data.ByteArray; import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.data.TunnelId; -import net.i2p.data.i2np.I2NPMessage; import net.i2p.data.i2np.DataMessage; +import net.i2p.data.i2np.I2NPMessage; import net.i2p.data.i2np.I2NPMessageHandler; import net.i2p.util.ByteCache; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/tunnel/HashSetIVValidator.java b/router/java/src/net/i2p/router/tunnel/HashSetIVValidator.java index 08f71f2a4..aea18dc3f 100644 --- a/router/java/src/net/i2p/router/tunnel/HashSetIVValidator.java +++ b/router/java/src/net/i2p/router/tunnel/HashSetIVValidator.java @@ -1,6 +1,7 @@ package net.i2p.router.tunnel; import java.util.HashSet; + import net.i2p.data.ByteArray; import net.i2p.data.DataHelper; diff --git a/router/java/src/net/i2p/router/tunnel/HopProcessor.java b/router/java/src/net/i2p/router/tunnel/HopProcessor.java index 6a3201e0c..f70cc1119 100644 --- a/router/java/src/net/i2p/router/tunnel/HopProcessor.java +++ b/router/java/src/net/i2p/router/tunnel/HopProcessor.java @@ -1,7 +1,6 @@ package net.i2p.router.tunnel; import net.i2p.I2PAppContext; -import net.i2p.data.ByteArray; import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.util.ByteCache; diff --git a/router/java/src/net/i2p/router/tunnel/InboundEndpointProcessor.java b/router/java/src/net/i2p/router/tunnel/InboundEndpointProcessor.java index c0bd298ae..0635afc0e 100644 --- a/router/java/src/net/i2p/router/tunnel/InboundEndpointProcessor.java +++ b/router/java/src/net/i2p/router/tunnel/InboundEndpointProcessor.java @@ -3,9 +3,9 @@ package net.i2p.router.tunnel; import net.i2p.I2PAppContext; import net.i2p.data.ByteArray; import net.i2p.data.Hash; +import net.i2p.router.RouterContext; import net.i2p.util.ByteCache; import net.i2p.util.Log; -import net.i2p.router.RouterContext; /** * Receive the inbound tunnel message, removing all of the layers diff --git a/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java b/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java index 45db9536b..65066e133 100644 --- a/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java +++ b/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java @@ -1,16 +1,16 @@ package net.i2p.router.tunnel; import net.i2p.data.Hash; -import net.i2p.data.TunnelId; import net.i2p.data.Payload; +import net.i2p.data.TunnelId; import net.i2p.data.i2np.DataMessage; import net.i2p.data.i2np.DatabaseStoreMessage; -import net.i2p.data.i2np.DeliveryStatusMessage; import net.i2p.data.i2np.DeliveryInstructions; -import net.i2p.data.i2np.I2NPMessage; +import net.i2p.data.i2np.DeliveryStatusMessage; import net.i2p.data.i2np.GarlicMessage; -import net.i2p.data.i2np.TunnelGatewayMessage; +import net.i2p.data.i2np.I2NPMessage; import net.i2p.data.i2np.TunnelBuildReplyMessage; +import net.i2p.data.i2np.TunnelGatewayMessage; import net.i2p.router.ClientMessage; import net.i2p.router.RouterContext; import net.i2p.router.TunnelInfo; diff --git a/router/java/src/net/i2p/router/tunnel/OutboundMessageDistributor.java b/router/java/src/net/i2p/router/tunnel/OutboundMessageDistributor.java index 5bc09b883..88e4973ed 100644 --- a/router/java/src/net/i2p/router/tunnel/OutboundMessageDistributor.java +++ b/router/java/src/net/i2p/router/tunnel/OutboundMessageDistributor.java @@ -1,8 +1,8 @@ package net.i2p.router.tunnel; import net.i2p.data.Hash; -import net.i2p.data.TunnelId; import net.i2p.data.RouterInfo; +import net.i2p.data.TunnelId; import net.i2p.data.i2np.I2NPMessage; import net.i2p.data.i2np.TunnelGatewayMessage; import net.i2p.router.JobImpl; diff --git a/router/java/src/net/i2p/router/tunnel/PumpedTunnelGateway.java b/router/java/src/net/i2p/router/tunnel/PumpedTunnelGateway.java index 9335ae9ee..2356028ee 100644 --- a/router/java/src/net/i2p/router/tunnel/PumpedTunnelGateway.java +++ b/router/java/src/net/i2p/router/tunnel/PumpedTunnelGateway.java @@ -7,10 +7,8 @@ import net.i2p.I2PAppContext; import net.i2p.data.Hash; import net.i2p.data.TunnelId; import net.i2p.data.i2np.I2NPMessage; -import net.i2p.data.i2np.TunnelGatewayMessage; import net.i2p.router.Router; import net.i2p.util.Log; -import net.i2p.util.SimpleTimer; /** * Serve as the gatekeeper for a tunnel, accepting messages, coallescing and/or diff --git a/router/java/src/net/i2p/router/tunnel/TrivialRouterPreprocessor.java b/router/java/src/net/i2p/router/tunnel/TrivialRouterPreprocessor.java index 62106b531..ad7322cb6 100644 --- a/router/java/src/net/i2p/router/tunnel/TrivialRouterPreprocessor.java +++ b/router/java/src/net/i2p/router/tunnel/TrivialRouterPreprocessor.java @@ -1,6 +1,7 @@ package net.i2p.router.tunnel; import java.util.List; + import net.i2p.router.RouterContext; /** diff --git a/router/java/src/net/i2p/router/tunnel/TunnelCreatorConfig.java b/router/java/src/net/i2p/router/tunnel/TunnelCreatorConfig.java index 6eb3be068..83f5fbf94 100644 --- a/router/java/src/net/i2p/router/tunnel/TunnelCreatorConfig.java +++ b/router/java/src/net/i2p/router/tunnel/TunnelCreatorConfig.java @@ -1,13 +1,16 @@ package net.i2p.router.tunnel; -import java.util.*; import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; +import java.util.Locale; +import java.util.Properties; import net.i2p.data.Base64; import net.i2p.data.Hash; import net.i2p.data.TunnelId; -import net.i2p.router.TunnelInfo; import net.i2p.router.RouterContext; +import net.i2p.router.TunnelInfo; /** * Coordinate the info that the tunnel creator keeps track of, including what diff --git a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java index 1797b8c07..ee96c6251 100644 --- a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java +++ b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java @@ -7,17 +7,17 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import net.i2p.router.RouterContext; import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.data.TunnelId; import net.i2p.data.i2np.I2NPMessage; import net.i2p.data.i2np.TunnelDataMessage; import net.i2p.data.i2np.TunnelGatewayMessage; -import net.i2p.router.peermanager.PeerProfile; import net.i2p.router.JobImpl; import net.i2p.router.Router; +import net.i2p.router.RouterContext; import net.i2p.router.Service; +import net.i2p.router.peermanager.PeerProfile; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/tunnel/TunnelGatewayPumper.java b/router/java/src/net/i2p/router/tunnel/TunnelGatewayPumper.java index 494164726..7e808199d 100644 --- a/router/java/src/net/i2p/router/tunnel/TunnelGatewayPumper.java +++ b/router/java/src/net/i2p/router/tunnel/TunnelGatewayPumper.java @@ -1,6 +1,8 @@ package net.i2p.router.tunnel; -import java.util.*; +import java.util.ArrayList; +import java.util.List; + import net.i2p.router.RouterContext; import net.i2p.util.I2PThread; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/tunnel/pool/BuildExecutor.java b/router/java/src/net/i2p/router/tunnel/pool/BuildExecutor.java index 3f6b5ff90..0b009f7b1 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/BuildExecutor.java +++ b/router/java/src/net/i2p/router/tunnel/pool/BuildExecutor.java @@ -1,13 +1,16 @@ package net.i2p.router.tunnel.pool; -import java.util.*; -import net.i2p.data.*; -import net.i2p.data.i2np.*; -import net.i2p.router.*; -import net.i2p.router.tunnel.*; -import net.i2p.router.peermanager.TunnelHistory; -import net.i2p.util.Log; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import net.i2p.data.Hash; +import net.i2p.data.RouterInfo; +import net.i2p.router.RouterContext; +import net.i2p.router.TunnelManagerFacade; +import net.i2p.router.tunnel.TunnelCreatorConfig; import net.i2p.stat.StatManager; +import net.i2p.util.Log; /** * Single threaded controller of the tunnel creation process, spanning all tunnel pools. diff --git a/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java b/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java index 566234332..d4cf0f2df 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java +++ b/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java @@ -1,11 +1,30 @@ package net.i2p.router.tunnel.pool; -import java.util.*; -import net.i2p.data.*; -import net.i2p.data.i2np.*; -import net.i2p.router.*; -import net.i2p.router.tunnel.*; +import java.util.ArrayList; +import java.util.List; + +import net.i2p.data.Base64; +import net.i2p.data.ByteArray; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; +import net.i2p.data.RouterIdentity; +import net.i2p.data.RouterInfo; +import net.i2p.data.TunnelId; +import net.i2p.data.i2np.BuildRequestRecord; +import net.i2p.data.i2np.BuildResponseRecord; +import net.i2p.data.i2np.I2NPMessage; +import net.i2p.data.i2np.TunnelBuildMessage; +import net.i2p.data.i2np.TunnelBuildReplyMessage; +import net.i2p.data.i2np.TunnelGatewayMessage; +import net.i2p.router.HandlerJobBuilder; +import net.i2p.router.Job; +import net.i2p.router.JobImpl; +import net.i2p.router.OutNetMessage; +import net.i2p.router.RouterContext; import net.i2p.router.peermanager.TunnelHistory; +import net.i2p.router.tunnel.BuildMessageProcessor; +import net.i2p.router.tunnel.BuildReplyHandler; +import net.i2p.router.tunnel.HopConfig; import net.i2p.stat.Rate; import net.i2p.stat.RateStat; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java b/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java index d1eb1e077..c33a213de 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java +++ b/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java @@ -1,13 +1,19 @@ package net.i2p.router.tunnel.pool; -import java.util.*; -import net.i2p.data.*; -import net.i2p.data.i2np.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import net.i2p.data.ByteArray; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; +import net.i2p.data.PublicKey; +import net.i2p.data.RouterInfo; +import net.i2p.data.TunnelId; +import net.i2p.data.i2np.I2NPMessage; +import net.i2p.data.i2np.TunnelBuildMessage; import net.i2p.router.OutNetMessage; import net.i2p.router.RouterContext; -import net.i2p.router.MessageSelector; -import net.i2p.router.JobImpl; -import net.i2p.router.ReplyJob; import net.i2p.router.TunnelInfo; import net.i2p.router.tunnel.BuildMessageGenerator; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/tunnel/pool/ClientPeerSelector.java b/router/java/src/net/i2p/router/tunnel/pool/ClientPeerSelector.java index a5c905f47..a9199b690 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/ClientPeerSelector.java +++ b/router/java/src/net/i2p/router/tunnel/pool/ClientPeerSelector.java @@ -1,6 +1,10 @@ package net.i2p.router.tunnel.pool; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import net.i2p.router.RouterContext; import net.i2p.router.TunnelPoolSettings; diff --git a/router/java/src/net/i2p/router/tunnel/pool/ExploratoryPeerSelector.java b/router/java/src/net/i2p/router/tunnel/pool/ExploratoryPeerSelector.java index 4ce344ea4..629a4b524 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/ExploratoryPeerSelector.java +++ b/router/java/src/net/i2p/router/tunnel/pool/ExploratoryPeerSelector.java @@ -1,9 +1,12 @@ package net.i2p.router.tunnel.pool; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import net.i2p.router.RouterContext; import net.i2p.router.TunnelPoolSettings; -import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade; import net.i2p.stat.Rate; import net.i2p.stat.RateStat; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/tunnel/pool/HandleTunnelCreateMessageJob.java b/router/java/src/net/i2p/router/tunnel/pool/HandleTunnelCreateMessageJob.java index 9e186ea0a..34fbca63b 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/HandleTunnelCreateMessageJob.java +++ b/router/java/src/net/i2p/router/tunnel/pool/HandleTunnelCreateMessageJob.java @@ -3,8 +3,8 @@ package net.i2p.router.tunnel.pool; import net.i2p.data.Certificate; import net.i2p.data.DataHelper; import net.i2p.data.Hash; -import net.i2p.data.RouterInfo; import net.i2p.data.RouterIdentity; +import net.i2p.data.RouterInfo; import net.i2p.data.TunnelId; import net.i2p.data.i2np.DeliveryInstructions; import net.i2p.data.i2np.GarlicMessage; @@ -15,13 +15,13 @@ import net.i2p.data.i2np.TunnelGatewayMessage; import net.i2p.router.HandlerJobBuilder; import net.i2p.router.Job; import net.i2p.router.JobImpl; -import net.i2p.router.RouterContext; import net.i2p.router.Router; +import net.i2p.router.RouterContext; import net.i2p.router.message.GarlicMessageBuilder; import net.i2p.router.message.PayloadGarlicConfig; import net.i2p.router.message.SendMessageDirectJob; -import net.i2p.router.tunnel.HopConfig; import net.i2p.router.peermanager.TunnelHistory; +import net.i2p.router.tunnel.HopConfig; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/tunnel/pool/PooledTunnelCreatorConfig.java b/router/java/src/net/i2p/router/tunnel/pool/PooledTunnelCreatorConfig.java index a252e26a1..76f2c3c25 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/PooledTunnelCreatorConfig.java +++ b/router/java/src/net/i2p/router/tunnel/pool/PooledTunnelCreatorConfig.java @@ -1,6 +1,7 @@ package net.i2p.router.tunnel.pool; -import java.util.*; +import java.util.Properties; + import net.i2p.data.Hash; import net.i2p.router.Job; import net.i2p.router.RouterContext; diff --git a/router/java/src/net/i2p/router/tunnel/pool/SendGarlicMessageJob.java b/router/java/src/net/i2p/router/tunnel/pool/SendGarlicMessageJob.java index 9b8c3ebbb..b55baa2dd 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/SendGarlicMessageJob.java +++ b/router/java/src/net/i2p/router/tunnel/pool/SendGarlicMessageJob.java @@ -9,9 +9,9 @@ import net.i2p.data.TunnelId; import net.i2p.data.i2np.DeliveryInstructions; import net.i2p.data.i2np.GarlicMessage; import net.i2p.data.i2np.I2NPMessage; -import net.i2p.router.MessageSelector; import net.i2p.router.Job; import net.i2p.router.JobImpl; +import net.i2p.router.MessageSelector; import net.i2p.router.OutNetMessage; import net.i2p.router.ReplyJob; import net.i2p.router.RouterContext; diff --git a/router/java/src/net/i2p/router/tunnel/pool/TestJob.java b/router/java/src/net/i2p/router/tunnel/pool/TestJob.java index 91d8a8044..8b2332f37 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TestJob.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TestJob.java @@ -6,8 +6,8 @@ import java.util.Set; import net.i2p.data.Certificate; import net.i2p.data.SessionKey; import net.i2p.data.SessionTag; -import net.i2p.data.i2np.DeliveryStatusMessage; import net.i2p.data.i2np.DeliveryInstructions; +import net.i2p.data.i2np.DeliveryStatusMessage; import net.i2p.data.i2np.GarlicMessage; import net.i2p.data.i2np.I2NPMessage; import net.i2p.router.JobImpl; @@ -16,8 +16,8 @@ import net.i2p.router.OutNetMessage; import net.i2p.router.ReplyJob; import net.i2p.router.RouterContext; import net.i2p.router.TunnelInfo; -import net.i2p.router.message.PayloadGarlicConfig; import net.i2p.router.message.GarlicMessageBuilder; +import net.i2p.router.message.PayloadGarlicConfig; import net.i2p.util.Log; class TestJob extends JobImpl { diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelMessageHandlerBuilder.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelMessageHandlerBuilder.java index c36d31353..8b5262dbd 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelMessageHandlerBuilder.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelMessageHandlerBuilder.java @@ -3,8 +3,8 @@ package net.i2p.router.tunnel.pool; import net.i2p.data.Hash; import net.i2p.data.RouterIdentity; import net.i2p.data.i2np.I2NPMessage; -import net.i2p.data.i2np.TunnelGatewayMessage; import net.i2p.data.i2np.TunnelDataMessage; +import net.i2p.data.i2np.TunnelGatewayMessage; import net.i2p.router.HandlerJobBuilder; import net.i2p.router.Job; import net.i2p.router.JobImpl; diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java index b2012e1ad..beb52ca41 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java @@ -1,15 +1,24 @@ package net.i2p.router.tunnel.pool; -import java.util.*; import java.math.BigInteger; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashSet; +import java.util.List; +import java.util.Properties; +import java.util.Set; +import java.util.StringTokenizer; + import net.i2p.I2PAppContext; -import net.i2p.data.*; +import net.i2p.data.DataFormatException; +import net.i2p.data.Hash; +import net.i2p.data.RouterInfo; import net.i2p.router.Router; import net.i2p.router.RouterContext; import net.i2p.router.TunnelPoolSettings; import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade; import net.i2p.router.networkdb.kademlia.PeerSelector; -import net.i2p.router.peermanager.PeerProfile; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java index a1409e08f..7267b26a1 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java @@ -1,6 +1,5 @@ package net.i2p.router.tunnel.pool; -import java.util.Arrays; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -14,11 +13,9 @@ import net.i2p.data.Hash; import net.i2p.data.Lease; import net.i2p.data.LeaseSet; import net.i2p.data.TunnelId; - -import net.i2p.router.JobImpl; import net.i2p.router.RouterContext; -import net.i2p.router.TunnelPoolSettings; import net.i2p.router.TunnelInfo; +import net.i2p.router.TunnelPoolSettings; import net.i2p.router.tunnel.HopConfig; import net.i2p.stat.Rate; import net.i2p.stat.RateStat; diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java index 559b0241a..1c3e4b413 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java @@ -8,12 +8,21 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import net.i2p.data.*; -import net.i2p.data.i2np.*; -import net.i2p.stat.RateStat; -import net.i2p.router.*; +import net.i2p.data.DataHelper; +import net.i2p.data.Destination; +import net.i2p.data.Hash; +import net.i2p.data.RouterInfo; +import net.i2p.data.TunnelId; +import net.i2p.router.ClientTunnelSettings; +import net.i2p.router.JobImpl; +import net.i2p.router.LoadTestManager; +import net.i2p.router.Router; +import net.i2p.router.RouterContext; +import net.i2p.router.TunnelInfo; +import net.i2p.router.TunnelManagerFacade; +import net.i2p.router.TunnelPoolSettings; import net.i2p.router.tunnel.HopConfig; -import net.i2p.router.tunnel.TunnelCreatorConfig; +import net.i2p.stat.RateStat; import net.i2p.util.I2PThread; import net.i2p.util.Log; diff --git a/router/java/test/net/i2p/data/i2np/DatabaseStoreMessageTest.java b/router/java/test/net/i2p/data/i2np/DatabaseStoreMessageTest.java index d2d0d9fd8..9c42ee4f5 100644 --- a/router/java/test/net/i2p/data/i2np/DatabaseStoreMessageTest.java +++ b/router/java/test/net/i2p/data/i2np/DatabaseStoreMessageTest.java @@ -8,15 +8,12 @@ package net.i2p.data.i2np; * */ -import java.util.Date; - import net.i2p.I2PAppContext; import net.i2p.data.DataFormatException; import net.i2p.data.DataStructure; -import net.i2p.data.StructureTest; import net.i2p.data.RouterInfo; import net.i2p.data.RouterInfoTest; -import net.i2p.data.i2np.DatabaseStoreMessage; +import net.i2p.data.StructureTest; import net.i2p.util.Clock; /** diff --git a/router/java/test/net/i2p/data/i2np/DeliveryInstructionsTest.java b/router/java/test/net/i2p/data/i2np/DeliveryInstructionsTest.java index c8cad9fe6..3d3870649 100644 --- a/router/java/test/net/i2p/data/i2np/DeliveryInstructionsTest.java +++ b/router/java/test/net/i2p/data/i2np/DeliveryInstructionsTest.java @@ -14,8 +14,6 @@ import net.i2p.data.Hash; import net.i2p.data.SessionKey; import net.i2p.data.StructureTest; import net.i2p.data.TunnelId; -import net.i2p.data.i2np.DeliveryInstructions; -import net.i2p.util.Log; /** * Test harness for loading / storing DeliveryInstructions objects diff --git a/router/java/test/net/i2p/data/i2np/I2NPMessageReaderTest.java b/router/java/test/net/i2p/data/i2np/I2NPMessageReaderTest.java index 00e97e658..f00c67281 100644 --- a/router/java/test/net/i2p/data/i2np/I2NPMessageReaderTest.java +++ b/router/java/test/net/i2p/data/i2np/I2NPMessageReaderTest.java @@ -13,13 +13,9 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; -import net.i2p.data.DataFormatException; -import net.i2p.data.i2np.DatabaseStoreMessage; -import net.i2p.data.i2np.I2NPMessage; -import net.i2p.data.i2np.I2NPMessageReader; -import net.i2p.router.RouterContext; - import junit.framework.TestCase; +import net.i2p.data.DataFormatException; +import net.i2p.router.RouterContext; /** * Test harness for loading / storing I2NP DatabaseStore message objects diff --git a/router/java/test/net/i2p/router/networkdb/kademlia/KBucketImplTest.java b/router/java/test/net/i2p/router/networkdb/kademlia/KBucketImplTest.java index 099b441cb..25541a070 100644 --- a/router/java/test/net/i2p/router/networkdb/kademlia/KBucketImplTest.java +++ b/router/java/test/net/i2p/router/networkdb/kademlia/KBucketImplTest.java @@ -8,13 +8,11 @@ package net.i2p.router.networkdb.kademlia; * */ +import junit.framework.TestCase; import net.i2p.I2PAppContext; -import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.util.RandomSource; -import junit.framework.TestCase; - /** * Test KBucketImpl * diff --git a/router/java/test/net/i2p/router/networkdb/kademlia/KBucketSetTest.java b/router/java/test/net/i2p/router/networkdb/kademlia/KBucketSetTest.java index c43645f0c..6c9d54210 100644 --- a/router/java/test/net/i2p/router/networkdb/kademlia/KBucketSetTest.java +++ b/router/java/test/net/i2p/router/networkdb/kademlia/KBucketSetTest.java @@ -8,11 +8,9 @@ package net.i2p.router.networkdb.kademlia; * */ -import net.i2p.I2PAppContext; -import net.i2p.data.DataHelper; -import net.i2p.data.Hash; - import junit.framework.TestCase; +import net.i2p.I2PAppContext; +import net.i2p.data.Hash; /** * Test KBucketSet diff --git a/router/java/test/net/i2p/router/transport/BandwidthLimiterTest.java b/router/java/test/net/i2p/router/transport/BandwidthLimiterTest.java index 62987f8fb..30d1571f1 100644 --- a/router/java/test/net/i2p/router/transport/BandwidthLimiterTest.java +++ b/router/java/test/net/i2p/router/transport/BandwidthLimiterTest.java @@ -8,17 +8,14 @@ package net.i2p.router.transport; * */ -import net.i2p.router.RouterContext; -import net.i2p.util.Log; - import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; - -import java.util.Random; import java.util.Properties; +import java.util.Random; import junit.framework.TestCase; +import net.i2p.router.RouterContext; /** * Stress out the bandwidth limiter by running a series of push and pull tests diff --git a/router/java/test/net/i2p/router/tunnel/BatchedFragmentTest.java b/router/java/test/net/i2p/router/tunnel/BatchedFragmentTest.java index 86c26f1bc..a257d4305 100644 --- a/router/java/test/net/i2p/router/tunnel/BatchedFragmentTest.java +++ b/router/java/test/net/i2p/router/tunnel/BatchedFragmentTest.java @@ -9,13 +9,8 @@ package net.i2p.router.tunnel; */ import java.util.ArrayList; + import net.i2p.I2PAppContext; -import net.i2p.data.Base64; -import net.i2p.data.Hash; -import net.i2p.data.TunnelId; -import net.i2p.data.i2np.DataMessage; -import net.i2p.data.i2np.I2NPMessage; -import net.i2p.util.Log; /** * Test the batching behavior of the preprocessor with one, two, or three diff --git a/router/java/test/net/i2p/router/tunnel/FragmentTest.java b/router/java/test/net/i2p/router/tunnel/FragmentTest.java index 84cc5b43b..169f3a65c 100644 --- a/router/java/test/net/i2p/router/tunnel/FragmentTest.java +++ b/router/java/test/net/i2p/router/tunnel/FragmentTest.java @@ -9,16 +9,14 @@ package net.i2p.router.tunnel; */ import java.util.ArrayList; + +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.TunnelId; import net.i2p.data.i2np.DataMessage; import net.i2p.data.i2np.I2NPMessage; -import net.i2p.util.Log; - -import junit.framework.TestCase; /** * Simple test to see if the fragmentation is working, testing the preprocessor, diff --git a/router/java/test/net/i2p/router/tunnel/InboundGatewayTest.java b/router/java/test/net/i2p/router/tunnel/InboundGatewayTest.java index 54e78f238..413176b83 100644 --- a/router/java/test/net/i2p/router/tunnel/InboundGatewayTest.java +++ b/router/java/test/net/i2p/router/tunnel/InboundGatewayTest.java @@ -11,16 +11,14 @@ package net.i2p.router.tunnel; import java.util.ArrayList; import java.util.List; +import junit.framework.TestCase; import net.i2p.I2PAppContext; -import net.i2p.data.Base64; import net.i2p.data.Hash; import net.i2p.data.TunnelId; import net.i2p.data.i2np.DataMessage; import net.i2p.data.i2np.I2NPMessage; import net.i2p.util.Log; -import junit.framework.TestCase; - /** * Quick unit test for base functionality of inbound tunnel * operation diff --git a/router/java/test/net/i2p/router/tunnel/InboundTest.java b/router/java/test/net/i2p/router/tunnel/InboundTest.java index b3ed18efe..39a4ce051 100644 --- a/router/java/test/net/i2p/router/tunnel/InboundTest.java +++ b/router/java/test/net/i2p/router/tunnel/InboundTest.java @@ -8,13 +8,10 @@ package net.i2p.router.tunnel; * */ +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.util.Log; - -import junit.framework.TestCase; /** * Quick unit test for base functionality of inbound tunnel diff --git a/router/java/test/net/i2p/router/tunnel/OutboundGatewayTest.java b/router/java/test/net/i2p/router/tunnel/OutboundGatewayTest.java index f50f2c734..88e78db43 100644 --- a/router/java/test/net/i2p/router/tunnel/OutboundGatewayTest.java +++ b/router/java/test/net/i2p/router/tunnel/OutboundGatewayTest.java @@ -11,15 +11,12 @@ package net.i2p.router.tunnel; import java.util.ArrayList; import java.util.List; +import junit.framework.TestCase; import net.i2p.I2PAppContext; -import net.i2p.data.Base64; import net.i2p.data.Hash; import net.i2p.data.TunnelId; import net.i2p.data.i2np.DataMessage; import net.i2p.data.i2np.I2NPMessage; -import net.i2p.util.Log; - -import junit.framework.TestCase; /** * Quick unit test for base functionality of outbound tunnel diff --git a/router/java/test/net/i2p/router/tunnel/OutboundTest.java b/router/java/test/net/i2p/router/tunnel/OutboundTest.java index 28cb1610b..357649625 100644 --- a/router/java/test/net/i2p/router/tunnel/OutboundTest.java +++ b/router/java/test/net/i2p/router/tunnel/OutboundTest.java @@ -8,13 +8,10 @@ package net.i2p.router.tunnel; * */ +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.util.Log; - -import junit.framework.TestCase; /** * Quick unit test for base functionality of outbound tunnel