From ca6884dbca3252b5dd0bf8e8234c48ed6e4188c8 Mon Sep 17 00:00:00 2001
From: shendaras <shendaras>
Date: Mon, 24 May 2004 03:21:21 +0000
Subject: [PATCH] imports (sorry, includes alphabetizing, wee) (shendaras)
---
.../java/src/net/i2p/i2ptunnel/I2PTunnelServer.java | 2 +-
router/java/src/net/i2p/router/admin/AdminRunner.java | 2 +-
.../networkdb/HandleDatabaseStoreMessageJob.java | 3 ---
.../net/i2p/router/networkdb/kademlia/StoreJob.java | 6 ------
.../networkdb/kademlia/StoreMessageSelector.java | 8 ++++----
.../net/i2p/router/networkdb/kademlia/StoreState.java | 10 +++++-----
.../tunnelmanager/ClientTunnelPoolManagerJob.java | 2 +-
7 files changed, 12 insertions(+), 21 deletions(-)
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java
index 1776571d50..4f24074672 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java
@@ -14,8 +14,8 @@ import java.net.SocketException;
import java.util.Iterator;
import java.util.Properties;
-import net.i2p.I2PException;
import net.i2p.I2PAppContext;
+import net.i2p.I2PException;
import net.i2p.client.I2PClient;
import net.i2p.client.I2PClientFactory;
import net.i2p.client.streaming.I2PServerSocket;
diff --git a/router/java/src/net/i2p/router/admin/AdminRunner.java b/router/java/src/net/i2p/router/admin/AdminRunner.java
index 6a9dbc607b..994babb213 100644
--- a/router/java/src/net/i2p/router/admin/AdminRunner.java
+++ b/router/java/src/net/i2p/router/admin/AdminRunner.java
@@ -14,8 +14,8 @@ import java.util.Set;
import net.i2p.data.Hash;
import net.i2p.router.RouterContext;
-import net.i2p.util.Log;
import net.i2p.util.I2PThread;
+import net.i2p.util.Log;
class AdminRunner implements Runnable {
private Log _log;
diff --git a/router/java/src/net/i2p/router/networkdb/HandleDatabaseStoreMessageJob.java b/router/java/src/net/i2p/router/networkdb/HandleDatabaseStoreMessageJob.java
index 3a5cbc5349..462d0e6b30 100644
--- a/router/java/src/net/i2p/router/networkdb/HandleDatabaseStoreMessageJob.java
+++ b/router/java/src/net/i2p/router/networkdb/HandleDatabaseStoreMessageJob.java
@@ -17,9 +17,6 @@ import net.i2p.data.TunnelId;
import net.i2p.data.i2np.DatabaseStoreMessage;
import net.i2p.data.i2np.DeliveryStatusMessage;
import net.i2p.router.JobImpl;
-import net.i2p.router.MessageHistory;
-import net.i2p.router.NetworkDatabaseFacade;
-import net.i2p.router.ProfileManager;
import net.i2p.router.RouterContext;
import net.i2p.router.TunnelSelectionCriteria;
import net.i2p.router.message.SendTunnelMessageJob;
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 b6d23d802a..c937d4a52f 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java
@@ -8,10 +8,7 @@ package net.i2p.router.networkdb.kademlia;
*
*/
-import java.util.Collection;
import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -22,12 +19,9 @@ 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.DeliveryStatusMessage;
import net.i2p.data.i2np.I2NPMessage;
-import net.i2p.data.i2np.GarlicMessage;
import net.i2p.router.Job;
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;
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/StoreMessageSelector.java b/router/java/src/net/i2p/router/networkdb/kademlia/StoreMessageSelector.java
index f45c55f0f9..8c2fbce5b3 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/StoreMessageSelector.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/StoreMessageSelector.java
@@ -1,12 +1,12 @@
package net.i2p.router.networkdb.kademlia;
-import net.i2p.router.RouterContext;
-import net.i2p.router.MessageSelector;
-import net.i2p.util.Log;
import net.i2p.data.Hash;
import net.i2p.data.RouterInfo;
-import net.i2p.data.i2np.I2NPMessage;
import net.i2p.data.i2np.DeliveryStatusMessage;
+import net.i2p.data.i2np.I2NPMessage;
+import net.i2p.router.MessageSelector;
+import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
/**
* Check to see the message is a reply from the peer regarding the current
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/StoreState.java b/router/java/src/net/i2p/router/networkdb/kademlia/StoreState.java
index d85082a785..584f3eb3a4 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/StoreState.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/StoreState.java
@@ -1,14 +1,14 @@
package net.i2p.router.networkdb.kademlia;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.HashMap;
-import java.util.Iterator;
import java.util.Collection;
import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
-import net.i2p.data.Hash;
import net.i2p.data.DataStructure;
+import net.i2p.data.Hash;
import net.i2p.router.RouterContext;
class StoreState {
diff --git a/router/java/src/net/i2p/router/tunnelmanager/ClientTunnelPoolManagerJob.java b/router/java/src/net/i2p/router/tunnelmanager/ClientTunnelPoolManagerJob.java
index 1e39d6ca2d..302c821410 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/ClientTunnelPoolManagerJob.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/ClientTunnelPoolManagerJob.java
@@ -1,10 +1,10 @@
package net.i2p.router.tunnelmanager;
import java.util.ArrayList;
+import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.TreeMap;
-import java.util.Date;
import net.i2p.data.TunnelId;
import net.i2p.router.JobImpl;
--
GitLab