diff --git a/core/java/src/net/i2p/client/I2CPMessageProducer.java b/core/java/src/net/i2p/client/I2CPMessageProducer.java index 574044c71..f074e6e7e 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 c267860cf..c1fd5602d 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 d2e444cee..413e61a13 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 b74820eb8..6bb332f32 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 179c028f5..b067be30c 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 6c062cd67..32f6500e6 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 f11b6170a..61754fb48 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 bc6621cd3..6da53ec25 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 62e739fff..bcce250bd 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 2f8b09249..f5a8813a9 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 43c86e34d..52af0504b 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 41956a307..ceccc526f 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 007c8b02e..7734e322a 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 cdd8fbbde..87a3ec2a8 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 c323042f6..18343967d 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 0803b28f0..b8bd8c6e8 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 6798119d3..4ba497c2f 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 b88ee274b..34d64ef9c 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 0eff865d0..d60c7b5cb 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 35844f1b4..a6c3f7403 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 fed203ffe..5777848ac 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 15285f7f1..caf32dd90 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 ab6de4777..134b51801 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 afb401d15..f2fecd974 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 05a9027f7..dc0f33406 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 6b7892b55..2c648c572 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 fbf92fc55..98802223c 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 bcf42d42d..24f368219 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 c42b19a80..9790495c8 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 543d3becb..524eeeb7f 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 ad482f523..14a0a1118 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 01aacb398..347d6bb52 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 8eced3acf..086ab95d0 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 ecdac3683..e5266f69e 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 0f09fee55..85e3dc0cc 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 0a63ab04c..2b1971ba6 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;