From 7f6b477d2ed31c2c2911ee241c310064b129884c Mon Sep 17 00:00:00 2001
From: shendaras <shendaras>
Date: Fri, 30 Jul 2004 22:19:57 +0000
Subject: [PATCH] Fixing up imports (I've been falling down on my job). Note:
I didn't touch routerconsole since it isn't done (I believe) -- Love,
shendaras
---
core/java/src/net/i2p/client/I2CPMessageProducer.java | 1 -
core/java/src/net/i2p/stat/Rate.java | 1 -
router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java | 1 -
.../src/net/i2p/data/i2np/DatabaseSearchReplyMessage.java | 3 ---
router/java/src/net/i2p/data/i2np/TunnelCreateMessage.java | 2 +-
router/java/src/net/i2p/router/CommSystemFacade.java | 1 -
router/java/src/net/i2p/router/JobQueue.java | 1 -
router/java/src/net/i2p/router/NetworkDatabaseFacade.java | 1 -
router/java/src/net/i2p/router/RouterContext.java | 4 ++--
router/java/src/net/i2p/router/RouterThrottleImpl.java | 2 +-
router/java/src/net/i2p/router/Shitlist.java | 1 -
router/java/src/net/i2p/router/StatisticsManager.java | 2 --
router/java/src/net/i2p/router/admin/AdminManager.java | 1 -
router/java/src/net/i2p/router/admin/StatsGenerator.java | 2 --
router/java/src/net/i2p/router/client/ClientManager.java | 1 -
.../java/src/net/i2p/router/client/ClientWriterRunner.java | 5 +++--
router/java/src/net/i2p/router/message/MessageHandler.java | 1 -
.../src/net/i2p/router/message/SendTunnelMessageJob.java | 1 -
.../networkdb/kademlia/KademliaNetworkDatabaseFacade.java | 1 -
.../src/net/i2p/router/peermanager/CapacityCalculator.java | 2 +-
router/java/src/net/i2p/router/peermanager/PeerManager.java | 1 -
.../net/i2p/router/peermanager/PeerManagerFacadeImpl.java | 1 -
router/java/src/net/i2p/router/peermanager/PeerProfile.java | 1 -
.../src/net/i2p/router/transport/CommSystemFacadeImpl.java | 1 -
.../src/net/i2p/router/transport/FIFOBandwidthLimiter.java | 3 +--
.../src/net/i2p/router/transport/FIFOBandwidthRefiller.java | 2 +-
.../net/i2p/router/transport/OutboundMessageRegistry.java | 1 -
router/java/src/net/i2p/router/transport/TransportImpl.java | 2 +-
.../java/src/net/i2p/router/transport/TransportManager.java | 1 -
router/java/src/net/i2p/router/transport/VMCommSystem.java | 1 -
.../i2p/router/transport/tcp/RestrictiveTCPConnection.java | 3 +--
.../router/tunnelmanager/HandleTunnelCreateMessageJob.java | 5 ++---
.../i2p/router/tunnelmanager/PoolingTunnelManagerFacade.java | 1 -
.../net/i2p/router/tunnelmanager/PoolingTunnelSelector.java | 1 -
.../src/net/i2p/router/tunnelmanager/RequestTunnelJob.java | 3 ---
router/java/src/net/i2p/router/tunnelmanager/TunnelPool.java | 1 -
36 files changed, 14 insertions(+), 48 deletions(-)
diff --git a/core/java/src/net/i2p/client/I2CPMessageProducer.java b/core/java/src/net/i2p/client/I2CPMessageProducer.java
index 574044c713..f074e6e7e3 100644
--- a/core/java/src/net/i2p/client/I2CPMessageProducer.java
+++ b/core/java/src/net/i2p/client/I2CPMessageProducer.java
@@ -9,7 +9,6 @@ package net.i2p.client;
*
*/
-import java.util.HashSet;
import java.util.Set;
import net.i2p.I2PAppContext;
diff --git a/core/java/src/net/i2p/stat/Rate.java b/core/java/src/net/i2p/stat/Rate.java
index c267860cff..c1fd5602d8 100644
--- a/core/java/src/net/i2p/stat/Rate.java
+++ b/core/java/src/net/i2p/stat/Rate.java
@@ -1,7 +1,6 @@
package net.i2p.stat;
import java.io.IOException;
-import java.io.OutputStream;
import java.util.Properties;
import net.i2p.util.Clock;
diff --git a/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java b/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java
index d2e444ceec..413e61a133 100644
--- a/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java
+++ b/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java
@@ -19,7 +19,6 @@ 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;
diff --git a/router/java/src/net/i2p/data/i2np/DatabaseSearchReplyMessage.java b/router/java/src/net/i2p/data/i2np/DatabaseSearchReplyMessage.java
index b74820eb8a..6bb332f329 100644
--- a/router/java/src/net/i2p/data/i2np/DatabaseSearchReplyMessage.java
+++ b/router/java/src/net/i2p/data/i2np/DatabaseSearchReplyMessage.java
@@ -8,19 +8,16 @@ package net.i2p.data.i2np;
*
*/
-import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
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;
/**
diff --git a/router/java/src/net/i2p/data/i2np/TunnelCreateMessage.java b/router/java/src/net/i2p/data/i2np/TunnelCreateMessage.java
index 179c028f53..b067be30c6 100644
--- a/router/java/src/net/i2p/data/i2np/TunnelCreateMessage.java
+++ b/router/java/src/net/i2p/data/i2np/TunnelCreateMessage.java
@@ -17,9 +17,9 @@ 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.data.SessionKey;
import net.i2p.data.SessionTag;
+import net.i2p.data.TunnelId;
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 6c062cd67a..32f6500e6b 100644
--- a/router/java/src/net/i2p/router/CommSystemFacade.java
+++ b/router/java/src/net/i2p/router/CommSystemFacade.java
@@ -10,7 +10,6 @@ package net.i2p.router;
import java.io.IOException;
import java.io.OutputStream;
-
import java.util.HashSet;
import java.util.Set;
diff --git a/router/java/src/net/i2p/router/JobQueue.java b/router/java/src/net/i2p/router/JobQueue.java
index f11b6170a3..61754fb483 100644
--- a/router/java/src/net/i2p/router/JobQueue.java
+++ b/router/java/src/net/i2p/router/JobQueue.java
@@ -10,7 +10,6 @@ package net.i2p.router;
import java.io.IOException;
import java.io.OutputStream;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
diff --git a/router/java/src/net/i2p/router/NetworkDatabaseFacade.java b/router/java/src/net/i2p/router/NetworkDatabaseFacade.java
index bc6621cd3a..6da53ec25f 100644
--- a/router/java/src/net/i2p/router/NetworkDatabaseFacade.java
+++ b/router/java/src/net/i2p/router/NetworkDatabaseFacade.java
@@ -10,7 +10,6 @@ package net.i2p.router;
import java.io.IOException;
import java.io.OutputStream;
-
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
diff --git a/router/java/src/net/i2p/router/RouterContext.java b/router/java/src/net/i2p/router/RouterContext.java
index 62e739fffb..bcce250bd8 100644
--- a/router/java/src/net/i2p/router/RouterContext.java
+++ b/router/java/src/net/i2p/router/RouterContext.java
@@ -9,16 +9,16 @@ import net.i2p.data.Hash;
import net.i2p.router.client.ClientManagerFacadeImpl;
import net.i2p.router.networkdb.kademlia.KademliaNetworkDatabaseFacade;
import net.i2p.router.peermanager.Calculator;
+import net.i2p.router.peermanager.CapacityCalculator;
import net.i2p.router.peermanager.IntegrationCalculator;
import net.i2p.router.peermanager.IsFailingCalculator;
import net.i2p.router.peermanager.PeerManagerFacadeImpl;
import net.i2p.router.peermanager.ProfileManagerImpl;
import net.i2p.router.peermanager.ProfileOrganizer;
import net.i2p.router.peermanager.ReliabilityCalculator;
-import net.i2p.router.peermanager.CapacityCalculator;
import net.i2p.router.peermanager.SpeedCalculator;
-import net.i2p.router.transport.FIFOBandwidthLimiter;
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.tunnelmanager.PoolingTunnelManagerFacade;
diff --git a/router/java/src/net/i2p/router/RouterThrottleImpl.java b/router/java/src/net/i2p/router/RouterThrottleImpl.java
index 2f8b092499..f5a8813a9d 100644
--- a/router/java/src/net/i2p/router/RouterThrottleImpl.java
+++ b/router/java/src/net/i2p/router/RouterThrottleImpl.java
@@ -2,8 +2,8 @@ package net.i2p.router;
import net.i2p.data.Hash;
import net.i2p.data.i2np.TunnelCreateMessage;
-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/Shitlist.java b/router/java/src/net/i2p/router/Shitlist.java
index 43c86e34df..52af0504b4 100644
--- a/router/java/src/net/i2p/router/Shitlist.java
+++ b/router/java/src/net/i2p/router/Shitlist.java
@@ -10,7 +10,6 @@ package net.i2p.router;
import java.io.IOException;
import java.io.OutputStream;
-
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
diff --git a/router/java/src/net/i2p/router/StatisticsManager.java b/router/java/src/net/i2p/router/StatisticsManager.java
index 41956a3072..ceccc526f2 100644
--- a/router/java/src/net/i2p/router/StatisticsManager.java
+++ b/router/java/src/net/i2p/router/StatisticsManager.java
@@ -8,9 +8,7 @@ package net.i2p.router;
*
*/
-import java.io.IOException;
import java.io.OutputStream;
-
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.util.Locale;
diff --git a/router/java/src/net/i2p/router/admin/AdminManager.java b/router/java/src/net/i2p/router/admin/AdminManager.java
index 007c8b02e7..7734e322a6 100644
--- a/router/java/src/net/i2p/router/admin/AdminManager.java
+++ b/router/java/src/net/i2p/router/admin/AdminManager.java
@@ -1,6 +1,5 @@
package net.i2p.router.admin;
-import java.io.IOException;
import java.io.OutputStream;
import net.i2p.router.RouterContext;
diff --git a/router/java/src/net/i2p/router/admin/StatsGenerator.java b/router/java/src/net/i2p/router/admin/StatsGenerator.java
index cdd8fbbde5..87a3ec2a81 100644
--- a/router/java/src/net/i2p/router/admin/StatsGenerator.java
+++ b/router/java/src/net/i2p/router/admin/StatsGenerator.java
@@ -1,9 +1,7 @@
package net.i2p.router.admin;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import java.io.PrintWriter;
import java.text.DecimalFormat;
import java.util.Arrays;
import java.util.Iterator;
diff --git a/router/java/src/net/i2p/router/client/ClientManager.java b/router/java/src/net/i2p/router/client/ClientManager.java
index c323042f67..18343967d4 100644
--- a/router/java/src/net/i2p/router/client/ClientManager.java
+++ b/router/java/src/net/i2p/router/client/ClientManager.java
@@ -10,7 +10,6 @@ package net.i2p.router.client;
import java.io.IOException;
import java.io.OutputStream;
-
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
diff --git a/router/java/src/net/i2p/router/client/ClientWriterRunner.java b/router/java/src/net/i2p/router/client/ClientWriterRunner.java
index 0803b28f01..b8bd8c6e82 100644
--- a/router/java/src/net/i2p/router/client/ClientWriterRunner.java
+++ b/router/java/src/net/i2p/router/client/ClientWriterRunner.java
@@ -1,10 +1,11 @@
package net.i2p.router.client;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
+
+import net.i2p.data.i2cp.I2CPMessage;
import net.i2p.router.RouterContext;
import net.i2p.util.Log;
-import net.i2p.data.i2cp.I2CPMessage;
/**
* Async writer class so that if a client app hangs, they wont take down the
diff --git a/router/java/src/net/i2p/router/message/MessageHandler.java b/router/java/src/net/i2p/router/message/MessageHandler.java
index 6798119d37..4ba497c2fa 100644
--- a/router/java/src/net/i2p/router/message/MessageHandler.java
+++ b/router/java/src/net/i2p/router/message/MessageHandler.java
@@ -20,7 +20,6 @@ import net.i2p.data.i2np.I2NPMessage;
import net.i2p.data.i2np.TunnelMessage;
import net.i2p.router.ClientMessage;
import net.i2p.router.InNetMessage;
-import net.i2p.router.Job;
import net.i2p.router.MessageReceptionInfo;
import net.i2p.router.RouterContext;
import net.i2p.util.Log;
diff --git a/router/java/src/net/i2p/router/message/SendTunnelMessageJob.java b/router/java/src/net/i2p/router/message/SendTunnelMessageJob.java
index b88ee274b1..34d64ef9c2 100644
--- a/router/java/src/net/i2p/router/message/SendTunnelMessageJob.java
+++ b/router/java/src/net/i2p/router/message/SendTunnelMessageJob.java
@@ -32,7 +32,6 @@ import net.i2p.router.MessageReceptionInfo;
import net.i2p.router.MessageSelector;
import net.i2p.router.OutNetMessage;
import net.i2p.router.ReplyJob;
-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/networkdb/kademlia/KademliaNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
index 0eff865d0f..d60c7b5cb0 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
@@ -29,7 +29,6 @@ import net.i2p.data.LeaseSet;
import net.i2p.data.RouterAddress;
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.router.Job;
import net.i2p.router.NetworkDatabaseFacade;
diff --git a/router/java/src/net/i2p/router/peermanager/CapacityCalculator.java b/router/java/src/net/i2p/router/peermanager/CapacityCalculator.java
index 35844f1b45..a6c3f74030 100644
--- a/router/java/src/net/i2p/router/peermanager/CapacityCalculator.java
+++ b/router/java/src/net/i2p/router/peermanager/CapacityCalculator.java
@@ -1,8 +1,8 @@
package net.i2p.router.peermanager;
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/peermanager/PeerManager.java b/router/java/src/net/i2p/router/peermanager/PeerManager.java
index fed203ffeb..5777848ac7 100644
--- a/router/java/src/net/i2p/router/peermanager/PeerManager.java
+++ b/router/java/src/net/i2p/router/peermanager/PeerManager.java
@@ -10,7 +10,6 @@ package net.i2p.router.peermanager;
import java.io.IOException;
import java.io.OutputStream;
-
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
diff --git a/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java b/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java
index 15285f7f14..caf32dd90e 100644
--- a/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java
+++ b/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java
@@ -10,7 +10,6 @@ package net.i2p.router.peermanager;
import java.io.IOException;
import java.io.OutputStream;
-
import java.util.ArrayList;
import java.util.List;
diff --git a/router/java/src/net/i2p/router/peermanager/PeerProfile.java b/router/java/src/net/i2p/router/peermanager/PeerProfile.java
index ab6de47775..134b518019 100644
--- a/router/java/src/net/i2p/router/peermanager/PeerProfile.java
+++ b/router/java/src/net/i2p/router/peermanager/PeerProfile.java
@@ -1,7 +1,6 @@
package net.i2p.router.peermanager;
import java.io.File;
-
import java.text.DecimalFormat;
import net.i2p.data.Hash;
diff --git a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
index afb401d151..f2fecd974f 100644
--- a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
+++ b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
@@ -10,7 +10,6 @@ package net.i2p.router.transport;
import java.io.IOException;
import java.io.OutputStream;
-
import java.util.HashSet;
import java.util.List;
import java.util.Properties;
diff --git a/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java b/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java
index 05a9027f74..dc0f33406f 100644
--- a/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java
+++ b/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java
@@ -2,9 +2,8 @@ package net.i2p.router.transport;
import java.io.IOException;
import java.io.OutputStream;
-
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
import net.i2p.I2PAppContext;
import net.i2p.util.I2PThread;
diff --git a/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java b/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java
index 6b7892b553..2c648c572f 100644
--- a/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java
+++ b/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java
@@ -1,7 +1,7 @@
package net.i2p.router.transport;
-import net.i2p.util.Log;
import net.i2p.I2PAppContext;
+import net.i2p.util.Log;
class FIFOBandwidthRefiller implements Runnable {
private Log _log;
diff --git a/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java b/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java
index fbf92fc559..98802223ca 100644
--- a/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java
+++ b/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java
@@ -10,7 +10,6 @@ package net.i2p.router.transport;
import java.io.IOException;
import java.io.OutputStream;
-
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
diff --git a/router/java/src/net/i2p/router/transport/TransportImpl.java b/router/java/src/net/i2p/router/transport/TransportImpl.java
index bcf42d42d7..24f3682193 100644
--- a/router/java/src/net/i2p/router/transport/TransportImpl.java
+++ b/router/java/src/net/i2p/router/transport/TransportImpl.java
@@ -8,10 +8,10 @@ package net.i2p.router.transport;
*
*/
+import java.util.ArrayList;
import java.util.Date;
import java.util.HashSet;
import java.util.Iterator;
-import java.util.ArrayList;
import java.util.List;
import java.util.Set;
diff --git a/router/java/src/net/i2p/router/transport/TransportManager.java b/router/java/src/net/i2p/router/transport/TransportManager.java
index c42b19a80a..9790495c80 100644
--- a/router/java/src/net/i2p/router/transport/TransportManager.java
+++ b/router/java/src/net/i2p/router/transport/TransportManager.java
@@ -10,7 +10,6 @@ package net.i2p.router.transport;
import java.io.IOException;
import java.io.OutputStream;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
diff --git a/router/java/src/net/i2p/router/transport/VMCommSystem.java b/router/java/src/net/i2p/router/transport/VMCommSystem.java
index 543d3becb3..524eeeb7f1 100644
--- a/router/java/src/net/i2p/router/transport/VMCommSystem.java
+++ b/router/java/src/net/i2p/router/transport/VMCommSystem.java
@@ -1,7 +1,6 @@
package net.i2p.router.transport;
import java.io.ByteArrayInputStream;
-import java.io.IOException;
import java.io.OutputStream;
import java.util.Collections;
import java.util.HashMap;
diff --git a/router/java/src/net/i2p/router/transport/tcp/RestrictiveTCPConnection.java b/router/java/src/net/i2p/router/transport/tcp/RestrictiveTCPConnection.java
index ad482f5232..14a0a11182 100644
--- a/router/java/src/net/i2p/router/transport/tcp/RestrictiveTCPConnection.java
+++ b/router/java/src/net/i2p/router/transport/tcp/RestrictiveTCPConnection.java
@@ -8,10 +8,9 @@ package net.i2p.router.transport.tcp;
*
*/
+import java.io.BufferedOutputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.BufferedOutputStream;
-import java.io.BufferedInputStream;
import java.io.IOException;
import java.math.BigInteger;
import java.net.Socket;
diff --git a/router/java/src/net/i2p/router/tunnelmanager/HandleTunnelCreateMessageJob.java b/router/java/src/net/i2p/router/tunnelmanager/HandleTunnelCreateMessageJob.java
index 01aacb3982..347d6bb529 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/HandleTunnelCreateMessageJob.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/HandleTunnelCreateMessageJob.java
@@ -16,11 +16,10 @@ 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.TunnelCreateMessage;
import net.i2p.data.i2np.DeliveryInstructions;
-import net.i2p.data.i2np.GarlicClove;
import net.i2p.data.i2np.GarlicMessage;
import net.i2p.data.i2np.I2NPMessage;
+import net.i2p.data.i2np.TunnelCreateMessage;
import net.i2p.data.i2np.TunnelCreateStatusMessage;
import net.i2p.router.Job;
import net.i2p.router.JobImpl;
@@ -28,8 +27,8 @@ import net.i2p.router.MessageSelector;
import net.i2p.router.ReplyJob;
import net.i2p.router.RouterContext;
import net.i2p.router.TunnelInfo;
-import net.i2p.router.TunnelSettings;
import net.i2p.router.TunnelSelectionCriteria;
+import net.i2p.router.TunnelSettings;
import net.i2p.router.message.BuildTestMessageJob;
import net.i2p.router.message.GarlicConfig;
import net.i2p.router.message.GarlicMessageBuilder;
diff --git a/router/java/src/net/i2p/router/tunnelmanager/PoolingTunnelManagerFacade.java b/router/java/src/net/i2p/router/tunnelmanager/PoolingTunnelManagerFacade.java
index 8eced3acfc..086ab95d01 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/PoolingTunnelManagerFacade.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/PoolingTunnelManagerFacade.java
@@ -2,7 +2,6 @@ package net.i2p.router.tunnelmanager;
import java.io.IOException;
import java.io.OutputStream;
-
import java.util.Date;
import java.util.Iterator;
import java.util.List;
diff --git a/router/java/src/net/i2p/router/tunnelmanager/PoolingTunnelSelector.java b/router/java/src/net/i2p/router/tunnelmanager/PoolingTunnelSelector.java
index ecdac3683b..e5266f69e2 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/PoolingTunnelSelector.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/PoolingTunnelSelector.java
@@ -4,7 +4,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.Iterator;
-import java.util.ArrayList;
import java.util.List;
import java.util.Set;
diff --git a/router/java/src/net/i2p/router/tunnelmanager/RequestTunnelJob.java b/router/java/src/net/i2p/router/tunnelmanager/RequestTunnelJob.java
index 0f09fee55e..85e3dc0cc0 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/RequestTunnelJob.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/RequestTunnelJob.java
@@ -17,8 +17,6 @@ import java.util.List;
import java.util.Set;
import net.i2p.data.Certificate;
-import net.i2p.data.DataFormatException;
-import net.i2p.data.Hash;
import net.i2p.data.PublicKey;
import net.i2p.data.RouterInfo;
import net.i2p.data.SessionKey;
@@ -34,7 +32,6 @@ import net.i2p.router.Job;
import net.i2p.router.JobImpl;
import net.i2p.router.MessageHistory;
import net.i2p.router.MessageSelector;
-import net.i2p.router.PeerSelectionCriteria;
import net.i2p.router.ReplyJob;
import net.i2p.router.RouterContext;
import net.i2p.router.TunnelInfo;
diff --git a/router/java/src/net/i2p/router/tunnelmanager/TunnelPool.java b/router/java/src/net/i2p/router/tunnelmanager/TunnelPool.java
index 0a63ab04c5..2b1971ba6b 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/TunnelPool.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/TunnelPool.java
@@ -2,7 +2,6 @@ package net.i2p.router.tunnelmanager;
import java.io.IOException;
import java.io.OutputStream;
-
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
--
GitLab