imports (sorry, includes alphabetizing, wee)

(shendaras)

apps/heartbeat/java/src/net/i2p/heartbeat/PeerData.java

@@ -2,11 +2,11 @@ package net.i2p.heartbeat;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
-import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import java.util.TreeMap;
 
 import net.i2p.stat.Rate;

apps/heartbeat/java/src/net/i2p/heartbeat/gui/PeerPlotConfig.java

@@ -11,8 +11,8 @@ import java.util.Set;
 import java.util.TreeMap;
 
 import net.i2p.data.Destination;
-import net.i2p.util.Log;
 import net.i2p.heartbeat.ClientConfig;
+import net.i2p.util.Log;
 
 /**
  * Configure how we want to render a particular clientConfig in the GUI

apps/httptunnel/java/src/net/i2p/httptunnel/handler/EepHandler.java

@@ -7,8 +7,8 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.SocketException;
 
+import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
-import net.i2p.client.naming.NamingService;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.client.streaming.I2PSocketManager;
 import net.i2p.client.streaming.I2PSocketOptions;
@@ -19,7 +19,6 @@ import net.i2p.httptunnel.SocketManagerProducer;
 import net.i2p.httptunnel.filter.Filter;
 import net.i2p.httptunnel.filter.NullFilter;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Handler for browsing Eepsites.

apps/httptunnel/java/src/net/i2p/httptunnel/handler/ProxyHandler.java

@@ -3,7 +3,7 @@ package net.i2p.httptunnel.handler;
 import java.io.IOException;
 import java.io.OutputStream;
 
-import net.i2p.client.naming.NamingService;
+import net.i2p.I2PAppContext;
 import net.i2p.client.streaming.I2PSocketManager;
 import net.i2p.data.Destination;
 import net.i2p.httptunnel.HTTPListener;
@@ -12,7 +12,6 @@ import net.i2p.httptunnel.SocketManagerProducer;
 import net.i2p.httptunnel.filter.Filter;
 import net.i2p.httptunnel.filter.NullFilter;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Handler for proxying "normal" HTTP requests.

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClient.java

@@ -5,7 +5,6 @@ package net.i2p.i2ptunnel;
 
 import java.net.Socket;
 
-import net.i2p.I2PException;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java

@@ -10,9 +10,6 @@ import java.io.OutputStream;
 import java.net.Socket;
 import java.net.SocketException;
 import java.util.Date;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.StringTokenizer;
 
 import net.i2p.I2PException;
 import net.i2p.client.streaming.I2PSocket;

apps/ministreaming/java/src/net/i2p/client/streaming/I2PServerSocketImpl.java

@@ -1,15 +1,14 @@
 package net.i2p.client.streaming;
 
 import java.net.ConnectException;
-
-import net.i2p.I2PException;
-import net.i2p.util.Log;
-import net.i2p.util.Clock;
-import net.i2p.I2PAppContext;
-
-import java.util.List;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
+
+import net.i2p.I2PAppContext;
+import net.i2p.I2PException;
+import net.i2p.util.Clock;
+import net.i2p.util.Log;
 
 /**
  * Server socket implementation, allowing multiple threads to accept I2PSockets 

apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java

@@ -4,7 +4,6 @@
  */
 package net.i2p.client.streaming;
 
-import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InterruptedIOException;
@@ -21,8 +20,8 @@ import net.i2p.client.I2PSession;
 import net.i2p.client.I2PSessionException;
 import net.i2p.client.I2PSessionListener;
 import net.i2p.data.Base64;
-import net.i2p.data.Destination;
 import net.i2p.data.DataFormatException;
+import net.i2p.data.Destination;
 import net.i2p.util.Log;
 
 /**

apps/netmonitor/java/src/net/i2p/netmonitor/DataHarvester.java

@@ -1,17 +1,18 @@
 package net.i2p.netmonitor;
 
-import net.i2p.data.RouterInfo;
-import net.i2p.util.Log;
-import net.i2p.util.Clock;
-import java.util.Properties;
-import java.util.Iterator;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-import java.util.Locale;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Properties;
+import java.util.StringTokenizer;
+
+import net.i2p.data.RouterInfo;
+import net.i2p.util.Clock;
+import net.i2p.util.Log;
 
 /**
  * Pull out important data from the published routerInfo and stash it away

apps/netmonitor/java/src/net/i2p/netmonitor/NetMonitor.java

@@ -1,18 +1,18 @@
 package net.i2p.netmonitor;
 
-import net.i2p.util.Log;
-import net.i2p.util.I2PThread;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-import java.util.Map;
-import java.util.HashMap;
-import java.io.IOException;
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.FilenameFilter;
-import java.io.File;
+import java.io.IOException;
+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 net.i2p.util.I2PThread;
+import net.i2p.util.Log;
 
 /**
  * Main driver for the app that harvests data about the performance of the network,

apps/netmonitor/java/src/net/i2p/netmonitor/NetMonitorRunner.java

@@ -1,19 +1,17 @@
 package net.i2p.netmonitor;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import java.io.IOException;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.FilenameFilter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.RouterInfo;
+import net.i2p.util.Clock;
+import net.i2p.util.Log;
 
 /**
  * Active process that drives the monitoring by periodically rading the 

apps/netmonitor/java/src/net/i2p/netmonitor/PeerSummary.java

@@ -1,16 +1,16 @@
 package net.i2p.netmonitor;
 
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
-
 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.TreeMap;
 import java.util.Set;
+import java.util.TreeMap;
+
+import net.i2p.util.Clock;
+import net.i2p.util.Log;
 
 /** 
  * coordinate the data points summarizing the performance of a particular peer 

apps/netmonitor/java/src/net/i2p/netmonitor/PeerSummaryReader.java

@@ -1,20 +1,17 @@
 package net.i2p.netmonitor;
 
-import net.i2p.util.Log;
+import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.BufferedReader;
 import java.io.InputStreamReader;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.TreeSet;
-import java.util.Set;
-import java.util.Locale;
-import java.util.Date;
-import java.util.StringTokenizer;
-import java.text.SimpleDateFormat;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.StringTokenizer;
+
+import net.i2p.util.Log;
 
 /**
  * Load up the peer summary 

apps/netmonitor/java/src/net/i2p/netmonitor/PeerSummaryWriter.java

@@ -1,15 +1,15 @@
 package net.i2p.netmonitor;
 
-import net.i2p.util.Log;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
-import java.util.TreeSet;
-import java.util.Set;
 import java.util.Locale;
-import java.util.Date;
-import java.text.SimpleDateFormat;
+import java.util.TreeSet;
+
+import net.i2p.util.Log;
 
 /**
  * Dump various peer summaries to disk (so external apps (or good ol' vi) can

apps/netmonitor/java/src/net/i2p/netmonitor/StatGroupLoader.java

@@ -1,14 +1,15 @@
 package net.i2p.netmonitor;
 
 
-import net.i2p.util.Log;
-import java.io.IOException;
 import java.io.File;
 import java.io.FileInputStream;
-import java.util.List;
+import java.io.IOException;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Properties;
 
+import net.i2p.util.Log;
+
 /**
  * Load up the StatGroups from the location specified to configure the data harvester.
  * The stat groups are formatted in a simple properties file style, e.g.: <pre>

apps/netmonitor/java/src/net/i2p/netmonitor/gui/JFreeChartAdapter.java

@@ -1,28 +1,24 @@
 package net.i2p.netmonitor.gui;
 
-import net.i2p.netmonitor.PeerSummary;
-import net.i2p.netmonitor.PeerStat;
-import net.i2p.util.Log;
-
-import org.jfree.data.XYSeries;
-import org.jfree.data.XYSeriesCollection;
-import org.jfree.data.MovingAverage;
-import org.jfree.chart.JFreeChart;
-import org.jfree.chart.ChartPanel;
-import org.jfree.chart.plot.Plot;
-import org.jfree.chart.plot.XYPlot;
-import org.jfree.chart.axis.DateAxis;
-import org.jfree.chart.axis.NumberAxis;
-import org.jfree.chart.renderer.XYLineAndShapeRenderer;
-import org.jfree.chart.renderer.XYItemRenderer;
-import org.jfree.chart.renderer.XYDotRenderer;
+import java.awt.Color;
+import java.awt.Font;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
-import java.util.Iterator;
 
-import javax.swing.JPanel;
-import java.awt.Font;
-import java.awt.Color;
+import org.jfree.chart.ChartPanel;
+import org.jfree.chart.JFreeChart;
+import org.jfree.chart.axis.DateAxis;
+import org.jfree.chart.axis.NumberAxis;
+import org.jfree.chart.plot.Plot;
+import org.jfree.chart.plot.XYPlot;
+import org.jfree.chart.renderer.XYItemRenderer;
+import org.jfree.chart.renderer.XYLineAndShapeRenderer;
+import org.jfree.data.XYSeries;
+import org.jfree.data.XYSeriesCollection;
+
+import net.i2p.netmonitor.PeerStat;
+import net.i2p.util.Log;
 
 class JFreeChartAdapter {
     private final static Log _log = new Log(JFreeChartAdapter.class);

apps/netmonitor/java/src/net/i2p/netmonitor/gui/JFreeChartHeartbeatPlotPane.java

@@ -1,20 +1,15 @@
 package net.i2p.netmonitor.gui;
 
-import javax.swing.JPanel;
-import javax.swing.JTextArea;
-import javax.swing.JScrollPane;
-import javax.swing.JLabel;
 import java.awt.BorderLayout;
-import java.awt.Color;
 import java.awt.Dimension;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import net.i2p.util.Log;
+import javax.swing.JLabel;
+import javax.swing.JScrollPane;
 
 import org.jfree.chart.ChartPanel;
 
+import net.i2p.util.Log;
+
 /**
  * Render the graph and legend
  *

apps/netmonitor/java/src/net/i2p/netmonitor/gui/NetViewer.java

@@ -1,14 +1,13 @@
 package net.i2p.netmonitor.gui;
 
-import net.i2p.netmonitor.NetMonitor;
-import net.i2p.netmonitor.PeerSummary;
-import net.i2p.netmonitor.PeerStat;
-import net.i2p.util.Log;
-import net.i2p.util.I2PThread;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.HashMap;
+
+import net.i2p.netmonitor.NetMonitor;
+import net.i2p.util.I2PThread;
+import net.i2p.util.Log;
 
 /**
  * Coordinate the visualization of the network monitor. <p />

apps/netmonitor/java/src/net/i2p/netmonitor/gui/NetViewerControlPane.java

@@ -5,7 +5,6 @@ import java.awt.Color;
 import java.util.ArrayList;
 import java.util.List;
 
-import java.awt.Dimension;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTabbedPane;

apps/netmonitor/java/src/net/i2p/netmonitor/gui/NetViewerPlotPane.java

@@ -1,9 +1,5 @@
 package net.i2p.netmonitor.gui;
 
-import java.awt.Color;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
 import javax.swing.JPanel;
 import javax.swing.JTextArea;
 

apps/netmonitor/java/src/net/i2p/netmonitor/gui/PeerPlotConfig.java

@@ -1,20 +1,15 @@
 package net.i2p.netmonitor.gui;
 
 import java.awt.Color;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeMap;
 import java.util.Map;
-import java.util.HashMap;
+import java.util.Set;
 
-import net.i2p.data.Destination;
-import net.i2p.util.Log;
 import net.i2p.netmonitor.PeerSummary;
+import net.i2p.util.Log;
 
 /**
  * Configure how we want to render a particular peerSummary in the GUI

apps/netmonitor/java/src/net/i2p/netmonitor/gui/PeerPlotConfigPane.java

@@ -5,25 +5,21 @@ import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.TreeMap;
-import java.util.List;
 import java.util.ArrayList;
-import java.util.Set;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Random;
+import java.util.Set;
+import java.util.TreeMap;
 
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
-import javax.swing.JColorChooser;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
 import javax.swing.JTextField;
 
-import net.i2p.util.Log;
 import net.i2p.netmonitor.PeerStat;
-import net.i2p.netmonitor.PeerSummary;
+import net.i2p.util.Log;
 
 class PeerPlotConfigPane extends JPanel implements PeerPlotConfig.UpdateListener {
     private final static Log _log = new Log(PeerPlotConfigPane.class);

apps/sam/java/src/net/i2p/sam/SAMBridge.java

@@ -8,29 +8,25 @@ package net.i2p.sam;
  *
  */
 
-import java.io.IOException;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.BufferedReader;
-import java.io.InputStreamReader;
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
-import java.util.Properties;
-import java.util.Map;
-import java.util.HashMap;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
 
-import net.i2p.data.Destination;
 import net.i2p.data.DataFormatException;
-import net.i2p.data.PrivateKey;
-import net.i2p.data.SigningPrivateKey;
-
+import net.i2p.data.Destination;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * SAM bridge implementation.

apps/sam/java/src/net/i2p/sam/SAMDatagramSession.java

@@ -8,16 +8,14 @@ package net.i2p.sam;
  *
  */
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.Properties;
 
+import net.i2p.client.I2PSessionException;
 import net.i2p.client.datagram.I2PDatagramDissector;
 import net.i2p.client.datagram.I2PDatagramMaker;
 import net.i2p.client.datagram.I2PInvalidDatagramException;
-import net.i2p.client.I2PSessionException;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
 import net.i2p.util.Log;

apps/sam/java/src/net/i2p/sam/SAMHandler.java

@@ -12,7 +12,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.Socket;
-
 import java.util.Properties;
 
 import net.i2p.util.I2PThread;

apps/sam/java/src/net/i2p/sam/SAMHandlerFactory.java

@@ -9,8 +9,8 @@ package net.i2p.sam;
  */
 
 import java.io.BufferedReader;
-import java.io.InputStreamReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.Socket;

apps/sam/java/src/net/i2p/sam/SAMMessageSession.java

@@ -9,9 +9,8 @@ package net.i2p.sam;
  */
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.Properties;
 
 import net.i2p.client.I2PClient;

apps/sam/java/src/net/i2p/sam/SAMRawSession.java

@@ -8,10 +8,8 @@ package net.i2p.sam;
  *
  */
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.Properties;
 
 import net.i2p.client.I2PSessionException;

apps/sam/java/src/net/i2p/sam/SAMStreamSession.java

@@ -9,29 +9,27 @@ package net.i2p.sam;
  */
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InterruptedIOException;
-import java.util.HashMap;
 import java.io.OutputStream;
 import java.net.ConnectException;
 import java.net.NoRouteToHostException;
+import java.util.HashMap;
 import java.util.Iterator;
 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.client.I2PClient;
 import net.i2p.data.Base64;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
-import net.i2p.I2PException;
-import net.i2p.util.HexDump;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
 

apps/sam/java/src/net/i2p/sam/SAMUtils.java

@@ -8,22 +8,20 @@ package net.i2p.sam;
  *
  */
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Enumeration;
 import java.util.Properties;
 import java.util.StringTokenizer;
 
+import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
 import net.i2p.client.I2PClient;
 import net.i2p.client.I2PClientFactory;
 import net.i2p.client.naming.NamingService;
-import net.i2p.data.Base64;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Miscellaneous utility methods used by SAM protocol handlers.

apps/sam/java/src/net/i2p/sam/SAMv1Handler.java

@@ -8,27 +8,24 @@ package net.i2p.sam;
  *
  */
 
-import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.EOFException;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InterruptedIOException;
-import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
-import java.net.Socket;
 import java.net.ConnectException;
 import java.net.NoRouteToHostException;
-import java.util.Enumeration;
+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.Destination;
-import net.i2p.I2PException;
 import net.i2p.util.Log;
 
 /**

apps/time/java/src/net/i2p/time/NtpClient.java

@@ -5,7 +5,6 @@ import java.io.InterruptedIOException;
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
 import java.net.InetAddress;
-import java.text.DecimalFormat;
 
 
 /**

apps/time/java/src/net/i2p/time/Timestamper.java

@@ -1,15 +1,14 @@
 package net.i2p.time;
 
-import net.i2p.util.Log;
-import net.i2p.util.I2PThread;
-
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 
-import java.net.URL;
-import java.net.MalformedURLException;
-import java.io.IOException;
+import net.i2p.util.I2PThread;
+import net.i2p.util.Log;
 
 /**
  * Periodically query a series of NTP servers and post the offset 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -12,10 +12,10 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines a message containing arbitrary bytes of data

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

@@ -15,13 +15,13 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.data.RouterInfo;
 import net.i2p.data.TunnelId;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines the message a router sends to another router to search for a

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

@@ -16,12 +16,12 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.data.RouterInfo;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines the message a router sends to another router in response to a

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

@@ -13,13 +13,13 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.data.LeaseSet;
 import net.i2p.data.RouterInfo;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines the message a router sends to another router to test the network

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

@@ -13,10 +13,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Date;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines the message sent back in reply to a message when requested, containing

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

@@ -17,8 +17,8 @@ import net.i2p.data.Certificate;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.DataStructureImpl;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Contains one deliverable message encrypted to a router along with instructions

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

@@ -12,10 +12,10 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines the wrapped garlic message

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

@@ -12,11 +12,10 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Handle messages from router to router

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

@@ -13,13 +13,11 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Date;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.DataStructureImpl;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
-import net.i2p.util.RandomSource;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines the base message implementation.

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

@@ -11,9 +11,9 @@ package net.i2p.data.i2np;
 import java.io.IOException;
 import java.io.InputStream;
 
+import net.i2p.router.RouterContext;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 /**
  * The I2NPMessageReader reads an InputStream (using

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

@@ -14,9 +14,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Date;
 
-import net.i2p.crypto.ElGamalAESEngine;
-import net.i2p.crypto.KeyGenerator;
-import net.i2p.crypto.SessionKeyManager;
+import net.i2p.I2PAppContext;
 import net.i2p.data.Certificate;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
@@ -26,7 +24,6 @@ import net.i2p.data.PublicKey;
 import net.i2p.data.SessionKey;
 import net.i2p.data.SessionTag;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 
 /**

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

@@ -13,13 +13,12 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import net.i2p.crypto.ElGamalAESEngine;
+import net.i2p.I2PAppContext;
 import net.i2p.data.Certificate;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.PrivateKey;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines a message directed by a source route block to deliver a message to an

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

@@ -12,13 +12,13 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.Certificate;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.data.TunnelId;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines the message sent to a router to request that it participate in a

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

@@ -12,12 +12,12 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.data.TunnelId;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines the message a router sends to another router in reply to a

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

@@ -12,11 +12,11 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.TunnelId;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines the message sent between routers for tunnel delivery

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

@@ -12,7 +12,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import net.i2p.crypto.DSAEngine;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.DataStructureImpl;
@@ -20,7 +19,6 @@ import net.i2p.data.Hash;
 import net.i2p.data.Signature;
 import net.i2p.data.SigningPrivateKey;
 import net.i2p.data.SigningPublicKey;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
 
 /**

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

@@ -13,7 +13,6 @@ import net.i2p.data.Hash;
 import net.i2p.data.LeaseSet;
 import net.i2p.data.i2cp.MessageId;
 import net.i2p.data.i2cp.SessionConfig;
-import net.i2p.router.client.ClientManagerFacadeImpl;
 
 /**
  * Manage all interactions with clients 

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

@@ -9,10 +9,6 @@ package net.i2p.router;
  */
 
 //import net.i2p.router.message.ProcessOutboundClientMessageJob;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
 import net.i2p.router.message.OutboundClientMessageJob;
 import net.i2p.util.Log;
 

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

@@ -11,12 +11,9 @@ package net.i2p.router;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import net.i2p.router.transport.OutboundMessageRegistry;
-import net.i2p.stat.StatManager;
 import net.i2p.util.Log;
 
 /**

router/java/src/net/i2p/router/JobImpl.java

@@ -8,7 +8,6 @@ package net.i2p.router;
  *
  */
 
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
 /**
  * Base implementation of a Job

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

@@ -8,19 +8,18 @@ package net.i2p.router;
  *
  */
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.ArrayList;
-import java.util.TreeMap;
 import java.util.SortedMap;
-import java.util.Collections;
+import java.util.TreeMap;
 
 import net.i2p.router.message.HandleSourceRouteReplyMessageJob;
 import net.i2p.router.networkdb.HandleDatabaseLookupMessageJob;
 import net.i2p.router.tunnelmanager.HandleTunnelCreateMessageJob;
 import net.i2p.router.tunnelmanager.RequestTunnelJob;
-import net.i2p.stat.StatManager;
 import net.i2p.util.Clock;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;

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

@@ -1,7 +1,5 @@
 package net.i2p.router;
 
-import net.i2p.stat.StatManager;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
 
 /** a do run run run a do run run */

router/java/src/net/i2p/router/KeyManager.java

@@ -24,7 +24,6 @@ import net.i2p.data.PrivateKey;
 import net.i2p.data.PublicKey;
 import net.i2p.data.SigningPrivateKey;
 import net.i2p.data.SigningPublicKey;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
 
 /**

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

@@ -3,16 +3,15 @@ package net.i2p.router;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.TimeZone;
 
 import net.i2p.data.Hash;
 import net.i2p.data.TunnelId;
 import net.i2p.data.i2np.I2NPMessage;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
 
 /**

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

@@ -5,7 +5,6 @@ import java.util.Iterator;
 import java.util.Set;
 import java.util.TreeMap;
 
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
 
 /**