From f13956d380c1891bfd65f61e6c288845f7331c6c Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 25 Mar 2012 21:45:18 +0000 Subject: [PATCH] remove unused imports (eclipse) --- .../src/net/i2p/addressbook/SubscriptionIterator.java | 1 - .../java/src/org/klomp/snark/ExtensionHandler.java | 2 -- apps/i2psnark/java/src/org/klomp/snark/Message.java | 2 -- apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java | 1 - .../java/src/org/klomp/snark/PeerCheckerTask.java | 1 - apps/i2psnark/java/src/org/klomp/snark/PeerState.java | 3 --- apps/i2psnark/java/src/org/klomp/snark/Snark.java | 2 -- .../java/src/org/klomp/snark/SnarkManager.java | 1 - .../java/src/org/klomp/snark/TrackerClient.java | 2 -- .../java/src/org/klomp/snark/web/I2PSnarkServlet.java | 4 ---- .../net/i2p/i2ptunnel/HTTPResponseOutputStream.java | 3 --- .../java/src/net/i2p/i2ptunnel/I2PTunnel.java | 3 --- .../java/src/net/i2p/i2ptunnel/I2PTunnelClient.java | 1 - .../src/net/i2p/i2ptunnel/I2PTunnelClientBase.java | 4 ---- .../src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java | 3 --- .../net/i2p/i2ptunnel/I2PTunnelHTTPBidirServer.java | 1 - .../src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java | 7 ------- .../net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java | 2 -- .../net/i2p/i2ptunnel/I2PTunnelHTTPClientRunner.java | 1 - .../src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java | 1 - .../src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java | 4 ---- .../java/src/net/i2p/i2ptunnel/I2PTunnelRunner.java | 1 - .../java/src/net/i2p/i2ptunnel/I2PTunnelTask.java | 2 -- .../src/net/i2p/i2ptunnel/irc/DCCClientManager.java | 1 - .../i2p/i2ptunnel/localServer/LocalHTTPServer.java | 1 - .../net/i2p/i2ptunnel/socks/I2PSOCKSIRCTunnel.java | 2 -- .../src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java | 1 - .../src/net/i2p/i2ptunnel/socks/SOCKS4aServer.java | 1 - .../java/src/net/i2p/i2ptunnel/socks/SOCKSHeader.java | 1 - .../i2ptunnel/udpTunnel/I2PTunnelUDPClientBase.java | 2 -- .../src/net/i2p/client/streaming/I2PSocketEepGet.java | 1 - .../src/net/i2p/router/web/ConfigAdvancedHandler.java | 1 - .../src/net/i2p/router/web/ConfigServiceHandler.java | 1 - .../java/src/net/i2p/router/web/HomeHelper.java | 2 -- .../java/src/net/i2p/router/web/JobQueueHelper.java | 1 - .../java/src/net/i2p/router/web/NetDbRenderer.java | 3 --- .../java/src/net/i2p/router/web/NewsFetcher.java | 2 -- .../src/net/i2p/router/web/PluginUpdateChecker.java | 4 ---- .../src/net/i2p/router/web/RouterConsoleRunner.java | 5 ----- .../java/src/net/i2p/router/web/SearchHelper.java | 1 - .../java/src/net/i2p/router/web/SummaryHelper.java | 1 - .../java/src/net/i2p/router/web/SummaryListener.java | 3 --- .../java/src/net/i2p/router/web/SummaryRenderer.java | 3 --- .../java/src/net/i2p/router/web/TunnelRenderer.java | 8 -------- .../java/src/net/i2p/router/web/UpdateHandler.java | 1 - .../java/src/net/i2p/router/web/WebAppStarter.java | 2 -- .../java/src/net/i2p/sam/SAMv3DatagramSession.java | 1 - .../i2p/client/streaming/I2PSocketManagerFull.java | 1 - .../net/i2p/client/streaming/MessageInputStream.java | 1 - .../src/net/i2p/client/streaming/PacketQueue.java | 4 ---- .../i2p/client/streaming/SchedulerConnectedBulk.java | 1 - .../src/net/i2p/client/streaming/StandardSocket.java | 2 -- .../src/java/src/i2p/susi/dns/AddressBean.java | 1 - .../src/java/src/i2p/susi/dns/AddressbookBean.java | 1 - .../src/java/src/i2p/susi/dns/NamingServiceBean.java | 4 ---- .../src/freenet/support/CPUInformation/CPUID.java | 1 - core/java/src/net/i2p/I2PException.java | 3 +-- core/java/src/net/i2p/client/ClientWriterRunner.java | 2 -- core/java/src/net/i2p/client/I2CPMessageProducer.java | 1 - .../java/src/net/i2p/client/I2CPSSLSocketFactory.java | 4 ---- core/java/src/net/i2p/client/I2PSessionImpl.java | 5 ----- core/java/src/net/i2p/client/I2PSessionImpl2.java | 1 - core/java/src/net/i2p/client/I2PSimpleSession.java | 6 ------ .../net/i2p/client/datagram/I2PDatagramDissector.java | 1 - .../net/i2p/client/naming/BlockfileNamingService.java | 2 -- .../net/i2p/client/naming/EepGetNamingService.java | 1 - .../src/net/i2p/client/naming/ExecNamingService.java | 1 - .../src/net/i2p/client/naming/MetaNamingService.java | 1 - .../java/src/net/i2p/client/naming/NamingService.java | 2 -- .../i2p/client/naming/SingleFileNamingService.java | 3 --- core/java/src/net/i2p/crypto/AESEngine.java | 1 - core/java/src/net/i2p/crypto/ElGamalEngine.java | 2 -- core/java/src/net/i2p/crypto/HMAC256Generator.java | 5 +---- core/java/src/net/i2p/crypto/HMACGenerator.java | 1 - core/java/src/net/i2p/crypto/KeyGenerator.java | 5 ----- core/java/src/net/i2p/crypto/SHA1.java | 2 -- core/java/src/net/i2p/crypto/SHA1Hash.java | 1 - core/java/src/net/i2p/crypto/SHA256Generator.java | 1 - core/java/src/net/i2p/crypto/TrustedUpdate.java | 1 - core/java/src/net/i2p/crypto/YKGenerator.java | 2 -- core/java/src/net/i2p/data/Base32.java | 2 -- core/java/src/net/i2p/data/Base64.java | 2 -- core/java/src/net/i2p/data/DataHelper.java | 1 - core/java/src/net/i2p/data/Payload.java | 2 -- core/java/src/net/i2p/data/RouterAddress.java | 1 - core/java/src/net/i2p/data/RouterInfo.java | 1 - core/java/src/net/i2p/data/RoutingKeyGenerator.java | 1 - core/java/src/net/i2p/data/SDSCache.java | 1 - .../src/net/i2p/data/i2cp/I2CPMessageHandler.java | 1 - .../net/i2p/data/i2cp/SendMessageExpiresMessage.java | 2 -- core/java/src/net/i2p/data/i2cp/SessionConfig.java | 1 - .../src/net/i2p/internal/InternalClientManager.java | 1 - core/java/src/net/i2p/stat/Rate.java | 1 - core/java/src/net/i2p/stat/RateStat.java | 1 - core/java/src/net/i2p/stat/StatManager.java | 1 - core/java/src/net/i2p/util/BufferedRandomSource.java | 1 - core/java/src/net/i2p/util/DecayingHashSet.java | 1 - core/java/src/net/i2p/util/EepHead.java | 1 - core/java/src/net/i2p/util/EepPost.java | 1 - core/java/src/net/i2p/util/HTTPSendData.java | 1 - core/java/src/net/i2p/util/I2PProperties.java | 1 - core/java/src/net/i2p/util/InternalServerSocket.java | 5 ----- core/java/src/net/i2p/util/LogManager.java | 3 --- core/java/src/net/i2p/util/LogWriter.java | 1 - core/java/src/net/i2p/util/RandomSource.java | 1 - .../src/net/i2p/util/ResettableGZIPInputStream.java | 1 - .../src/net/i2p/util/ResettableGZIPOutputStream.java | 6 ------ .../src/net/i2p/util/ReusableGZIPInputStream.java | 6 ------ .../src/net/i2p/util/ReusableGZIPOutputStream.java | 1 - core/java/src/net/i2p/util/SSLEepGet.java | 1 - core/java/src/net/i2p/util/SimpleByteCache.java | 2 -- core/java/src/net/metanotion/io/block/BlockFile.java | 3 --- .../net/metanotion/io/block/index/BSkipLevels.java | 1 - .../src/net/metanotion/io/block/index/BSkipList.java | 2 -- .../src/net/metanotion/io/block/index/BSkipSpan.java | 1 - .../src/net/i2p/data/i2np/BuildResponseRecord.java | 1 - .../src/net/i2p/data/i2np/DatabaseLookupMessage.java | 1 - .../src/net/i2p/data/i2np/I2NPMessageHandler.java | 1 - .../java/src/net/i2p/data/i2np/TunnelDataMessage.java | 1 - router/java/src/net/i2p/router/Blocklist.java | 1 - router/java/src/net/i2p/router/ClientMessagePool.java | 3 --- router/java/src/net/i2p/router/JobImpl.java | 2 -- router/java/src/net/i2p/router/JobQueue.java | 4 ---- router/java/src/net/i2p/router/MessageHistory.java | 2 -- router/java/src/net/i2p/router/OutNetMessage.java | 1 - router/java/src/net/i2p/router/Router.java | 3 --- router/java/src/net/i2p/router/RouterContext.java | 1 - router/java/src/net/i2p/router/Shitlist.java | 1 - .../java/src/net/i2p/router/client/ClientManager.java | 4 ---- .../src/net/i2p/router/client/ClientWriterRunner.java | 4 ---- .../router/client/QueuedClientConnectionRunner.java | 3 --- .../i2p/router/client/SSLClientListenerRunner.java | 2 -- .../i2p/router/dummy/DummyClientManagerFacade.java | 1 - .../i2p/router/dummy/DummyNetworkDatabaseFacade.java | 2 -- .../java/src/net/i2p/router/dummy/VMCommSystem.java | 1 - .../i2p/router/message/HandleGarlicMessageJob.java | 3 --- .../src/net/i2p/router/message/OutboundCache.java | 1 - .../message/OutboundClientMessageOneShotJob.java | 1 - .../networkdb/HandleDatabaseLookupMessageJob.java | 1 - .../i2p/router/networkdb/kademlia/FloodSearchJob.java | 8 -------- .../networkdb/kademlia/FloodfillMonitorJob.java | 1 - .../kademlia/FloodfillNetworkDatabaseFacade.java | 7 ------- .../router/networkdb/kademlia/FloodfillStoreJob.java | 3 --- .../i2p/router/networkdb/kademlia/KBucketImpl.java | 3 --- .../kademlia/KademliaNetworkDatabaseFacade.java | 10 ---------- .../net/i2p/router/networkdb/kademlia/LocalHash.java | 1 - .../i2p/router/networkdb/kademlia/MessageWrapper.java | 1 - .../i2p/router/networkdb/kademlia/PeerSelector.java | 7 ------- .../networkdb/kademlia/PersistentDataStore.java | 3 --- .../net/i2p/router/networkdb/kademlia/StoreJob.java | 4 ---- .../router/networkdb/kademlia/TransientDataStore.java | 2 -- .../src/net/i2p/router/peermanager/PeerManager.java | 2 -- .../i2p/router/peermanager/PeerManagerFacadeImpl.java | 1 - .../i2p/router/peermanager/ProfileManagerImpl.java | 6 ------ .../net/i2p/router/peermanager/ProfileOrganizer.java | 2 -- .../router/peermanager/ProfilePersistenceHelper.java | 2 -- .../net/i2p/router/startup/CreateRouterInfoJob.java | 1 - .../java/src/net/i2p/router/startup/WorkingDir.java | 1 - router/java/src/net/i2p/router/transport/GeoIP.java | 2 -- .../i2p/router/transport/OutboundMessageRegistry.java | 2 -- .../src/net/i2p/router/transport/TransportBid.java | 2 -- .../src/net/i2p/router/transport/TransportImpl.java | 1 - .../net/i2p/router/transport/TransportManager.java | 1 - .../router/transport/crypto/DHSessionKeyBuilder.java | 1 - .../net/i2p/router/transport/ntcp/EstablishState.java | 11 ----------- .../net/i2p/router/transport/ntcp/EventPumper.java | 1 - .../net/i2p/router/transport/ntcp/NTCPConnection.java | 3 --- .../net/i2p/router/transport/ntcp/NTCPTransport.java | 2 -- .../net/i2p/router/transport/udp/DummyThrottle.java | 1 - .../router/transport/udp/EstablishmentManager.java | 2 -- .../i2p/router/transport/udp/InboundMessageState.java | 1 - .../i2p/router/transport/udp/IntroductionManager.java | 2 -- .../router/transport/udp/OutboundMessageState.java | 1 - .../src/net/i2p/router/transport/udp/UDPAddress.java | 1 - .../net/i2p/router/transport/udp/UDPPacketReader.java | 2 -- .../net/i2p/router/transport/udp/UDPTransport.java | 1 - .../net/i2p/router/tunnel/BuildMessageGenerator.java | 6 ------ .../src/net/i2p/router/tunnel/FragmentHandler.java | 1 - router/java/src/net/i2p/router/tunnel/HopConfig.java | 2 -- .../java/src/net/i2p/router/tunnel/HopProcessor.java | 1 - .../i2p/router/tunnel/OutboundGatewayProcessor.java | 1 - .../net/i2p/router/tunnel/PumpedTunnelGateway.java | 1 - .../net/i2p/router/tunnel/TrivialPreprocessor.java | 1 - .../src/net/i2p/router/tunnel/TunnelDispatcher.java | 2 -- .../src/net/i2p/router/tunnel/pool/BuildExecutor.java | 1 - .../net/i2p/router/tunnel/pool/BuildRequestor.java | 1 - .../src/net/i2p/router/tunnel/pool/TunnelPool.java | 1 - .../net/i2p/router/tunnel/pool/TunnelPoolManager.java | 8 -------- 188 files changed, 2 insertions(+), 401 deletions(-) diff --git a/apps/addressbook/java/src/net/i2p/addressbook/SubscriptionIterator.java b/apps/addressbook/java/src/net/i2p/addressbook/SubscriptionIterator.java index d4c0ee98c..22113f52e 100644 --- a/apps/addressbook/java/src/net/i2p/addressbook/SubscriptionIterator.java +++ b/apps/addressbook/java/src/net/i2p/addressbook/SubscriptionIterator.java @@ -26,7 +26,6 @@ import java.util.Iterator; import java.util.List; import net.i2p.I2PAppContext; -import net.i2p.data.DataHelper; // debug /** * An iterator over the subscriptions in a SubscriptionList. Note that this iterator diff --git a/apps/i2psnark/java/src/org/klomp/snark/ExtensionHandler.java b/apps/i2psnark/java/src/org/klomp/snark/ExtensionHandler.java index 06f818d49..4a134dee4 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/ExtensionHandler.java +++ b/apps/i2psnark/java/src/org/klomp/snark/ExtensionHandler.java @@ -1,7 +1,6 @@ package org.klomp.snark; import java.io.ByteArrayInputStream; -import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; import java.util.HashMap; @@ -15,7 +14,6 @@ import net.i2p.util.Log; import org.klomp.snark.bencode.BDecoder; import org.klomp.snark.bencode.BEncoder; import org.klomp.snark.bencode.BEValue; -import org.klomp.snark.bencode.InvalidBEncodingException; /** * REF: BEP 10 Extension Protocol diff --git a/apps/i2psnark/java/src/org/klomp/snark/Message.java b/apps/i2psnark/java/src/org/klomp/snark/Message.java index b4344f3ba..42682b5f2 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/Message.java +++ b/apps/i2psnark/java/src/org/klomp/snark/Message.java @@ -23,8 +23,6 @@ package org.klomp.snark; import java.io.DataOutputStream; import java.io.IOException; -import net.i2p.util.SimpleTimer; - // Used to queue outgoing connections // sendMessage() should be used to translate them to wire format. class Message diff --git a/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java b/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java index 4113453cb..00d0abfaf 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java +++ b/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java @@ -33,7 +33,6 @@ import java.util.Map; import net.i2p.I2PAppContext; import net.i2p.crypto.SHA1; -import net.i2p.data.Base64; import net.i2p.data.DataHelper; import net.i2p.util.Log; diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java b/apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java index f119ed751..86d129983 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java +++ b/apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java @@ -21,7 +21,6 @@ package org.klomp.snark; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Random; diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerState.java b/apps/i2psnark/java/src/org/klomp/snark/PeerState.java index c83a43b19..42a67ea7b 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/PeerState.java +++ b/apps/i2psnark/java/src/org/klomp/snark/PeerState.java @@ -20,13 +20,10 @@ package org.klomp.snark; -import java.io.ByteArrayInputStream; -import java.io.InputStream; import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Set; import net.i2p.I2PAppContext; diff --git a/apps/i2psnark/java/src/org/klomp/snark/Snark.java b/apps/i2psnark/java/src/org/klomp/snark/Snark.java index 453a68332..b586265c7 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/Snark.java +++ b/apps/i2psnark/java/src/org/klomp/snark/Snark.java @@ -20,12 +20,10 @@ package org.klomp.snark; -import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import java.io.InputStreamReader; import java.util.Collections; import java.util.Iterator; import java.util.List; diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index a6288bc8e..c8c83c6bc 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -19,7 +19,6 @@ import java.util.Properties; import java.util.Set; import java.util.StringTokenizer; import java.util.TreeMap; -import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; import net.i2p.I2PAppContext; diff --git a/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java b/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java index 9b774c133..775ad2fc2 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java +++ b/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java @@ -39,8 +39,6 @@ import net.i2p.data.Hash; import net.i2p.util.I2PAppThread; import net.i2p.util.Log; -import org.klomp.snark.dht.DHT; - /** * Informs metainfo tracker of events and gets new peers for peer * coordinator. diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java index 085fa0766..5bc584cef 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -2,7 +2,6 @@ package org.klomp.snark.web; import java.io.File; import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintWriter; import java.text.Collator; @@ -21,9 +20,7 @@ import java.util.TreeMap; import java.util.TreeSet; import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -31,7 +28,6 @@ import net.i2p.I2PAppContext; import net.i2p.data.Base32; import net.i2p.data.Base64; import net.i2p.data.DataHelper; -import net.i2p.util.FileUtil; import net.i2p.util.I2PAppThread; import net.i2p.util.Log; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java index 29c1969a0..83f8cc8ae 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java @@ -8,14 +8,12 @@ package net.i2p.i2ptunnel; * */ -import java.io.ByteArrayOutputStream; import java.io.FilterOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.io.PipedInputStream; import java.io.PipedOutputStream; -import java.util.zip.GZIPInputStream; import java.util.Locale; import java.util.concurrent.RejectedExecutionException; @@ -23,7 +21,6 @@ import net.i2p.I2PAppContext; import net.i2p.data.ByteArray; import net.i2p.util.BigPipedInputStream; import net.i2p.util.ByteCache; -import net.i2p.util.I2PAppThread; import net.i2p.util.Log; import net.i2p.util.ReusableGZIPInputStream; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java index e8e2a85e7..d7ca0c163 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java @@ -44,13 +44,11 @@ import java.net.InetAddress; import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Properties; import java.util.Set; import java.util.StringTokenizer; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArraySet; import net.i2p.I2PAppContext; @@ -67,7 +65,6 @@ import net.i2p.i2ptunnel.socks.I2PSOCKSIRCTunnel; import net.i2p.i2ptunnel.socks.I2PSOCKSTunnel; import net.i2p.i2ptunnel.streamr.StreamrConsumer; import net.i2p.i2ptunnel.streamr.StreamrProducer; -import net.i2p.util.EventDispatcher; import net.i2p.util.EventDispatcherImpl; import net.i2p.util.Log; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClient.java index 44c163532..fa3bfb94e 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClient.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClient.java @@ -9,7 +9,6 @@ import java.util.List; import java.util.StringTokenizer; import net.i2p.client.streaming.I2PSocket; -import net.i2p.data.DataFormatException; import net.i2p.data.Destination; import net.i2p.util.EventDispatcher; import net.i2p.util.Log; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java index c776c898c..32804a858 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java @@ -14,10 +14,8 @@ import java.net.ServerSocket; import java.net.Socket; import java.net.UnknownHostException; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Properties; -import java.util.concurrent.Executor; import java.util.concurrent.Executors; import java.util.concurrent.SynchronousQueue; import java.util.concurrent.RejectedExecutionException; @@ -36,8 +34,6 @@ import net.i2p.data.Destination; import net.i2p.util.EventDispatcher; import net.i2p.util.I2PAppThread; import net.i2p.util.Log; -import net.i2p.util.SimpleScheduler; -import net.i2p.util.SimpleTimer; public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runnable { diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java index 5ef49d878..e4c7c9907 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java @@ -9,13 +9,10 @@ import java.io.InputStream; import java.io.OutputStream; import java.net.Socket; import java.net.SocketException; -import java.util.ArrayList; -import java.util.List; import java.util.Locale; import java.util.Properties; import java.util.StringTokenizer; -import net.i2p.I2PAppContext; import net.i2p.I2PException; import net.i2p.client.streaming.I2PSocket; import net.i2p.client.streaming.I2PSocketOptions; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPBidirServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPBidirServer.java index ff1f37661..d97482e04 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPBidirServer.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPBidirServer.java @@ -8,7 +8,6 @@ import java.io.InputStream; import java.net.InetAddress; import net.i2p.util.EventDispatcher; -import net.i2p.util.Log; public class I2PTunnelHTTPBidirServer extends I2PTunnelHTTPServer { diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java index 624af0e11..1d1dc4758 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java @@ -9,18 +9,13 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import java.io.InputStreamReader; import java.io.OutputStream; import java.net.Socket; import java.net.SocketException; import java.net.URI; import java.net.URISyntaxException; -import java.util.ArrayList; import java.util.Date; -import java.util.HashMap; -import java.util.List; import java.util.Locale; -import java.util.Map; import java.util.Properties; import java.util.StringTokenizer; import java.util.concurrent.ConcurrentHashMap; @@ -28,14 +23,12 @@ import java.util.concurrent.ConcurrentHashMap; import net.i2p.I2PAppContext; import net.i2p.I2PException; import net.i2p.client.I2PSession; -import net.i2p.client.naming.NamingService; import net.i2p.client.streaming.I2PSocket; import net.i2p.client.streaming.I2PSocketManager; import net.i2p.client.streaming.I2PSocketOptions; import net.i2p.crypto.SHA256Generator; import net.i2p.data.Base32; import net.i2p.data.Base64; -import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; import net.i2p.data.Destination; import net.i2p.data.Hash; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java index 8bf0b6a6c..331c786f1 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java @@ -3,8 +3,6 @@ */ package net.i2p.i2ptunnel; -import java.io.IOException; -import java.io.OutputStream; import java.io.UnsupportedEncodingException; import java.net.Socket; import java.util.ArrayList; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientRunner.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientRunner.java index 1175e0114..42c0361df 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientRunner.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientRunner.java @@ -9,7 +9,6 @@ import java.io.OutputStream; import java.net.Socket; import java.util.List; -import net.i2p.I2PAppContext; import net.i2p.client.streaming.I2PSocket; import net.i2p.util.Log; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java index 74c6f0a95..62845e3c6 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java @@ -12,7 +12,6 @@ import java.net.Socket; import java.net.SocketException; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java index d2cb49cdb..60d8dc0db 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java @@ -1,9 +1,5 @@ package net.i2p.i2ptunnel; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStream; import java.net.Socket; import java.util.ArrayList; import java.util.List; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelRunner.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelRunner.java index 556465762..b9540f416 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelRunner.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelRunner.java @@ -9,7 +9,6 @@ import java.io.InterruptedIOException; import java.io.OutputStream; import java.net.Socket; import java.net.SocketException; -import java.util.HashMap; import java.util.List; import net.i2p.I2PAppContext; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelTask.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelTask.java index f3578997f..02d384850 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelTask.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelTask.java @@ -3,8 +3,6 @@ */ package net.i2p.i2ptunnel; -import java.util.Set; - import net.i2p.client.I2PSession; import net.i2p.util.EventDispatcher; import net.i2p.util.EventDispatcherImpl; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/DCCClientManager.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/DCCClientManager.java index decaa8bc1..e0383fe17 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/DCCClientManager.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/DCCClientManager.java @@ -2,7 +2,6 @@ package net.i2p.i2ptunnel.irc; import java.util.Iterator; import java.util.Locale; -import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import net.i2p.client.streaming.I2PSocketManager; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java index 7c68c4e40..bf2c6e3e7 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java @@ -17,7 +17,6 @@ import net.i2p.data.DataFormatException; import net.i2p.data.Destination; import net.i2p.i2ptunnel.I2PTunnelHTTPClient; import net.i2p.util.FileUtil; -import net.i2p.util.Log; import net.i2p.util.Translate; /** diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSIRCTunnel.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSIRCTunnel.java index ee5156f8d..566ed1731 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSIRCTunnel.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSIRCTunnel.java @@ -8,7 +8,6 @@ package net.i2p.i2ptunnel.socks; import java.net.Socket; -import net.i2p.I2PAppContext; import net.i2p.client.streaming.I2PSocket; import net.i2p.i2ptunnel.I2PTunnel; import net.i2p.i2ptunnel.irc.IrcInboundFilter; @@ -16,7 +15,6 @@ import net.i2p.i2ptunnel.irc.IrcOutboundFilter; import net.i2p.i2ptunnel.Logging; import net.i2p.util.EventDispatcher; import net.i2p.util.I2PAppThread; -import net.i2p.util.Log; /* * Pipe SOCKS IRC connections through I2PTunnelIRCClient filtering, diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java index 10d51fe2e..9d6439c37 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java @@ -22,7 +22,6 @@ import net.i2p.i2ptunnel.I2PTunnelClientBase; import net.i2p.i2ptunnel.I2PTunnelRunner; import net.i2p.i2ptunnel.Logging; import net.i2p.util.EventDispatcher; -import net.i2p.util.Log; public class I2PSOCKSTunnel extends I2PTunnelClientBase { diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS4aServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS4aServer.java index fef68f186..fa974be1b 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS4aServer.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS4aServer.java @@ -20,7 +20,6 @@ import net.i2p.I2PAppContext; import net.i2p.I2PException; import net.i2p.client.streaming.I2PSocket; import net.i2p.data.DataFormatException; -import net.i2p.i2ptunnel.I2PTunnel; import net.i2p.util.HexDump; import net.i2p.util.Log; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSHeader.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSHeader.java index 32209301d..f2b35a34d 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSHeader.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSHeader.java @@ -3,7 +3,6 @@ package net.i2p.i2ptunnel.socks; import net.i2p.I2PAppContext; import net.i2p.data.Base32; import net.i2p.data.Destination; -import net.i2p.i2ptunnel.I2PTunnel; /** * Save the SOCKS header from a datagram diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udpTunnel/I2PTunnelUDPClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udpTunnel/I2PTunnelUDPClientBase.java index 4d592678d..c7613d35e 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udpTunnel/I2PTunnelUDPClientBase.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udpTunnel/I2PTunnelUDPClientBase.java @@ -12,14 +12,12 @@ import net.i2p.client.I2PClient; import net.i2p.client.I2PClientFactory; import net.i2p.client.I2PSession; import net.i2p.client.I2PSessionException; -import net.i2p.data.DataFormatException; import net.i2p.data.Destination; import net.i2p.i2ptunnel.I2PTunnel; import net.i2p.i2ptunnel.I2PTunnelTask; import net.i2p.i2ptunnel.Logging; import net.i2p.i2ptunnel.udp.*; import net.i2p.util.EventDispatcher; -import net.i2p.util.Log; /** * Base client class that sets up an I2P Datagram client destination. diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketEepGet.java b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketEepGet.java index e57993a2c..24be87c01 100644 --- a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketEepGet.java +++ b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketEepGet.java @@ -2,7 +2,6 @@ package net.i2p.client.streaming; import java.io.File; import java.io.IOException; -import java.io.InputStream; import java.io.OutputStream; import java.net.MalformedURLException; import java.net.UnknownHostException; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHandler.java index 3844881e3..e292ddb9a 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHandler.java @@ -3,7 +3,6 @@ package net.i2p.router.web; import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.HashSet; -import java.util.Map; import java.util.Properties; import java.util.Set; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java index 3d5797cf2..304d519f4 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java @@ -3,7 +3,6 @@ package net.i2p.router.web; import java.io.IOException; import java.util.List; -import net.i2p.apps.systray.SysTray; import net.i2p.apps.systray.UrlLauncher; import net.i2p.router.Router; import net.i2p.router.RouterContext; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java index 9cf9bc909..88d0fbb5b 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java @@ -1,7 +1,5 @@ package net.i2p.router.web; -import java.io.File; -import java.util.ArrayList; import java.util.Collection; import java.util.Comparator; import java.util.List; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java index 6746d917c..edd612fe5 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java @@ -8,7 +8,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; -import java.util.Map; import java.util.TreeMap; import net.i2p.data.DataHelper; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java index ebdacbfd6..eca8162bb 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java @@ -20,7 +20,6 @@ import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.Properties; import java.util.Set; import java.util.TreeSet; @@ -34,9 +33,7 @@ import net.i2p.router.RouterContext; import net.i2p.router.TunnelPoolSettings; import net.i2p.router.networkdb.kademlia.HashDistance; // debug import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade; -import net.i2p.util.HexDump; // debug import net.i2p.util.ObjectCounter; -import net.i2p.util.OrderedProperties; import net.i2p.util.VersionComparator; public class NetDbRenderer { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NewsFetcher.java b/apps/routerconsole/java/src/net/i2p/router/web/NewsFetcher.java index aa4a52330..23210dced 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NewsFetcher.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NewsFetcher.java @@ -5,9 +5,7 @@ import java.io.FileInputStream; import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Date; -import java.util.List; -import net.i2p.I2PAppContext; import net.i2p.crypto.TrustedUpdate; import net.i2p.data.DataHelper; import net.i2p.router.Router; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/PluginUpdateChecker.java b/apps/routerconsole/java/src/net/i2p/router/web/PluginUpdateChecker.java index d5e168714..98ad9f603 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/PluginUpdateChecker.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/PluginUpdateChecker.java @@ -3,17 +3,13 @@ package net.i2p.router.web; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.IOException; import java.util.List; import java.util.Properties; -import net.i2p.I2PAppContext; import net.i2p.crypto.TrustedUpdate; -import net.i2p.data.DataHelper; import net.i2p.router.RouterContext; import net.i2p.util.EepGet; import net.i2p.util.I2PAppThread; -import net.i2p.util.Log; import net.i2p.util.PartialEepGet; import net.i2p.util.SimpleScheduler; import net.i2p.util.SimpleTimer; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java index 3031997ee..ba36d928f 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java @@ -25,8 +25,6 @@ import net.i2p.I2PAppContext; import net.i2p.apps.systray.SysTray; import net.i2p.data.Base32; import net.i2p.data.DataHelper; -import net.i2p.desktopgui.Main; -import net.i2p.jetty.I2PLogger; import net.i2p.router.RouterContext; import net.i2p.util.Addresses; import net.i2p.util.FileUtil; @@ -38,8 +36,6 @@ import net.i2p.util.ShellCommand; import net.i2p.util.VersionComparator; import org.mortbay.jetty.AbstractConnector; -import org.mortbay.jetty.Connector; -import org.mortbay.jetty.Handler; import org.mortbay.jetty.NCSARequestLog; import org.mortbay.jetty.Server; import org.mortbay.jetty.handler.ContextHandlerCollection; @@ -57,7 +53,6 @@ import org.mortbay.jetty.servlet.ServletHandler; import org.mortbay.jetty.servlet.ServletHolder; import org.mortbay.jetty.servlet.SessionHandler; import org.mortbay.jetty.webapp.WebAppContext; -import org.mortbay.log.Log; import org.mortbay.thread.QueuedThreadPool; import org.mortbay.thread.concurrent.ThreadPool; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SearchHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/SearchHelper.java index 12809b12d..9a6842119 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SearchHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SearchHelper.java @@ -4,7 +4,6 @@ import java.util.Map; import java.util.TreeMap; import net.i2p.data.DataHelper; -import net.i2p.util.PortMapper; /** * Helper for searches. diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java index a24c34199..68fae0ca4 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java @@ -16,7 +16,6 @@ import net.i2p.data.LeaseSet; import net.i2p.data.RouterAddress; import net.i2p.router.CommSystemFacade; import net.i2p.router.Router; -import net.i2p.router.RouterClock; import net.i2p.router.RouterVersion; import net.i2p.router.TunnelPoolSettings; import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java index 7fc0fdadf..9756c0b5e 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java @@ -21,9 +21,6 @@ import org.jrobin.core.RrdException; import org.jrobin.core.RrdMemoryBackendFactory; import org.jrobin.core.RrdNioBackendFactory; import org.jrobin.core.Sample; -import org.jrobin.graph.RrdGraph; -import org.jrobin.graph.RrdGraphDef; -import org.jrobin.graph.RrdGraphDefTemplate; /** * Creates and updates the in-memory or on-disk RRD database, diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java index 2e0c44fed..d579c320f 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java @@ -15,9 +15,6 @@ import javax.imageio.stream.MemoryCacheImageOutputStream; import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; import net.i2p.router.RouterContext; -import net.i2p.stat.Rate; -import net.i2p.stat.RateStat; -import net.i2p.stat.RateSummaryListener; import net.i2p.util.Log; import org.jrobin.core.RrdException; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java index 16069ae0e..4fdeb66e0 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java @@ -5,27 +5,19 @@ import java.io.Writer; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Set; import net.i2p.data.DataHelper; -import net.i2p.data.Destination; import net.i2p.data.Hash; import net.i2p.data.RouterInfo; import net.i2p.data.TunnelId; import net.i2p.router.Router; import net.i2p.router.RouterContext; import net.i2p.router.TunnelInfo; -import net.i2p.router.TunnelPoolSettings; import net.i2p.router.tunnel.HopConfig; import net.i2p.router.tunnel.pool.TunnelPool; -import net.i2p.router.CommSystemFacade; import net.i2p.stat.RateStat; -import net.i2p.util.ObjectCounter; /** * tunnels.jsp diff --git a/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java index 71372756a..6ebb2a469 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java @@ -9,7 +9,6 @@ import java.util.Collections; import java.util.List; import java.util.StringTokenizer; -import net.i2p.I2PAppContext; import net.i2p.crypto.TrustedUpdate; import net.i2p.data.DataHelper; import net.i2p.router.Router; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java b/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java index f9b605d19..53f71b348 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java @@ -9,9 +9,7 @@ import java.util.concurrent.ConcurrentHashMap; import net.i2p.I2PAppContext; import net.i2p.util.FileUtil; import net.i2p.util.SecureDirectory; -import net.i2p.util.PortMapper; -import org.mortbay.jetty.Connector; import org.mortbay.jetty.Handler; import org.mortbay.jetty.Server; import org.mortbay.jetty.webapp.WebAppContext; diff --git a/apps/sam/java/src/net/i2p/sam/SAMv3DatagramSession.java b/apps/sam/java/src/net/i2p/sam/SAMv3DatagramSession.java index d7f119377..918fa1fc0 100644 --- a/apps/sam/java/src/net/i2p/sam/SAMv3DatagramSession.java +++ b/apps/sam/java/src/net/i2p/sam/SAMv3DatagramSession.java @@ -6,7 +6,6 @@ package net.i2p.sam; import java.io.IOException; -import java.io.InterruptedIOException; import java.util.Properties; import net.i2p.client.I2PSessionException; diff --git a/apps/streaming/java/src/net/i2p/client/streaming/I2PSocketManagerFull.java b/apps/streaming/java/src/net/i2p/client/streaming/I2PSocketManagerFull.java index 573354e89..eddfec953 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/I2PSocketManagerFull.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/I2PSocketManagerFull.java @@ -6,7 +6,6 @@ import java.net.ServerSocket; import java.net.Socket; import java.net.SocketTimeoutException; import java.util.HashSet; -import java.util.Iterator; import java.util.Properties; import java.util.Set; diff --git a/apps/streaming/java/src/net/i2p/client/streaming/MessageInputStream.java b/apps/streaming/java/src/net/i2p/client/streaming/MessageInputStream.java index 75fe8fea0..e83ca74a7 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/MessageInputStream.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/MessageInputStream.java @@ -5,7 +5,6 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; diff --git a/apps/streaming/java/src/net/i2p/client/streaming/PacketQueue.java b/apps/streaming/java/src/net/i2p/client/streaming/PacketQueue.java index 4de4c6e16..724e44202 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/PacketQueue.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/PacketQueue.java @@ -1,13 +1,9 @@ package net.i2p.client.streaming; -import java.util.HashSet; -import java.util.Set; - import net.i2p.I2PAppContext; import net.i2p.client.I2PSession; import net.i2p.client.I2PSessionException; import net.i2p.data.ByteArray; -import net.i2p.data.SessionKey; import net.i2p.util.ByteCache; import net.i2p.util.Log; diff --git a/apps/streaming/java/src/net/i2p/client/streaming/SchedulerConnectedBulk.java b/apps/streaming/java/src/net/i2p/client/streaming/SchedulerConnectedBulk.java index 6edb3a17c..77ec05587 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/SchedulerConnectedBulk.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/SchedulerConnectedBulk.java @@ -1,7 +1,6 @@ package net.i2p.client.streaming; import net.i2p.I2PAppContext; -import net.i2p.util.Log; /** *

Scheduler used for after our SYN has been sent and ACKed but one diff --git a/apps/streaming/java/src/net/i2p/client/streaming/StandardSocket.java b/apps/streaming/java/src/net/i2p/client/streaming/StandardSocket.java index b0ffbf250..94bac2642 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/StandardSocket.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/StandardSocket.java @@ -9,8 +9,6 @@ import java.net.SocketAddress; import java.net.SocketException; import java.nio.channels.SocketChannel; -import net.i2p.I2PException; - /** * Bridge to I2PSocket. * diff --git a/apps/susidns/src/java/src/i2p/susi/dns/AddressBean.java b/apps/susidns/src/java/src/i2p/susi/dns/AddressBean.java index 9c1c85863..3f3e537b7 100644 --- a/apps/susidns/src/java/src/i2p/susi/dns/AddressBean.java +++ b/apps/susidns/src/java/src/i2p/susi/dns/AddressBean.java @@ -25,7 +25,6 @@ package i2p.susi.dns; import java.net.IDN; -import java.util.Date; import java.util.Locale; import java.util.Properties; diff --git a/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java b/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java index b3404e339..93729cad1 100644 --- a/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java +++ b/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java @@ -31,7 +31,6 @@ import java.io.IOException; import java.util.Arrays; import java.util.Comparator; import java.util.Enumeration; -import java.util.Iterator; import java.util.LinkedList; import java.util.Locale; import java.util.Properties; diff --git a/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java b/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java index d1ad65825..eb1e1d48d 100644 --- a/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java +++ b/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java @@ -21,10 +21,7 @@ package i2p.susi.dns; -import java.net.IDN; import java.util.Arrays; -import java.util.Comparator; -import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Locale; @@ -34,7 +31,6 @@ import java.util.Properties; import net.i2p.I2PAppContext; import net.i2p.client.naming.NamingService; import net.i2p.data.DataFormatException; -import net.i2p.data.DataHelper; import net.i2p.data.Destination; /** diff --git a/core/java/src/freenet/support/CPUInformation/CPUID.java b/core/java/src/freenet/support/CPUInformation/CPUID.java index 37f2e7b9d..b5240a0b7 100644 --- a/core/java/src/freenet/support/CPUInformation/CPUID.java +++ b/core/java/src/freenet/support/CPUInformation/CPUID.java @@ -15,7 +15,6 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.net.URL; -import java.util.HashMap; import java.util.Locale; import net.i2p.I2PAppContext; diff --git a/core/java/src/net/i2p/I2PException.java b/core/java/src/net/i2p/I2PException.java index 70b7fdbfc..b5300eb6c 100644 --- a/core/java/src/net/i2p/I2PException.java +++ b/core/java/src/net/i2p/I2PException.java @@ -9,8 +9,7 @@ package net.i2p; * */ -import java.io.PrintStream; -import java.io.PrintWriter; + /** * Base class of I2P exceptions diff --git a/core/java/src/net/i2p/client/ClientWriterRunner.java b/core/java/src/net/i2p/client/ClientWriterRunner.java index f69148da3..931af519c 100644 --- a/core/java/src/net/i2p/client/ClientWriterRunner.java +++ b/core/java/src/net/i2p/client/ClientWriterRunner.java @@ -1,13 +1,11 @@ package net.i2p.client; import java.io.IOException; -import java.io.InputStream; import java.io.OutputStream; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import net.i2p.data.i2cp.I2CPMessage; -import net.i2p.data.i2cp.I2CPMessageImpl; import net.i2p.data.i2cp.I2CPMessageException; import net.i2p.internal.PoisonI2CPMessage; import net.i2p.util.I2PAppThread; diff --git a/core/java/src/net/i2p/client/I2CPMessageProducer.java b/core/java/src/net/i2p/client/I2CPMessageProducer.java index 336c858ca..afb7e69bd 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.Date; import java.util.Properties; import java.util.Set; import java.util.concurrent.TimeUnit; diff --git a/core/java/src/net/i2p/client/I2CPSSLSocketFactory.java b/core/java/src/net/i2p/client/I2CPSSLSocketFactory.java index 70c8461d7..41da015a7 100644 --- a/core/java/src/net/i2p/client/I2CPSSLSocketFactory.java +++ b/core/java/src/net/i2p/client/I2CPSSLSocketFactory.java @@ -7,8 +7,6 @@ import java.io.InputStream; import java.net.Socket; import java.security.KeyStore; import java.security.GeneralSecurityException; -import java.security.cert.Certificate; -import java.security.cert.CertificateException; import java.security.cert.CertificateExpiredException; import java.security.cert.CertificateNotYetValidException; import java.security.cert.CertificateFactory; @@ -17,9 +15,7 @@ import java.util.Locale; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocketFactory; -import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; -import javax.net.ssl.X509TrustManager; import net.i2p.I2PAppContext; import net.i2p.util.Log; diff --git a/core/java/src/net/i2p/client/I2PSessionImpl.java b/core/java/src/net/i2p/client/I2PSessionImpl.java index f1d0b9ed9..ec30a0901 100644 --- a/core/java/src/net/i2p/client/I2PSessionImpl.java +++ b/core/java/src/net/i2p/client/I2PSessionImpl.java @@ -16,13 +16,11 @@ import java.io.OutputStream; import java.net.Socket; import java.net.UnknownHostException; import java.util.ArrayList; -import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Properties; -import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.LinkedBlockingQueue; @@ -33,14 +31,11 @@ import net.i2p.data.Destination; import net.i2p.data.Hash; import net.i2p.data.LeaseSet; import net.i2p.data.PrivateKey; -import net.i2p.data.SessionKey; -import net.i2p.data.SessionTag; import net.i2p.data.SigningPrivateKey; import net.i2p.data.i2cp.DestLookupMessage; import net.i2p.data.i2cp.GetBandwidthLimitsMessage; import net.i2p.data.i2cp.GetDateMessage; import net.i2p.data.i2cp.I2CPMessage; -import net.i2p.data.i2cp.I2CPMessageException; import net.i2p.data.i2cp.I2CPMessageReader; import net.i2p.data.i2cp.MessagePayloadMessage; import net.i2p.data.i2cp.SessionId; diff --git a/core/java/src/net/i2p/client/I2PSessionImpl2.java b/core/java/src/net/i2p/client/I2PSessionImpl2.java index cf8672a78..e2afae6ea 100644 --- a/core/java/src/net/i2p/client/I2PSessionImpl2.java +++ b/core/java/src/net/i2p/client/I2PSessionImpl2.java @@ -21,7 +21,6 @@ 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.Log; diff --git a/core/java/src/net/i2p/client/I2PSimpleSession.java b/core/java/src/net/i2p/client/I2PSimpleSession.java index 0f1981600..1cae83d37 100644 --- a/core/java/src/net/i2p/client/I2PSimpleSession.java +++ b/core/java/src/net/i2p/client/I2PSimpleSession.java @@ -12,17 +12,11 @@ import java.net.UnknownHostException; import java.util.Properties; import net.i2p.I2PAppContext; -import net.i2p.data.Destination; -import net.i2p.data.Hash; import net.i2p.data.i2cp.BandwidthLimitsMessage; -import net.i2p.data.i2cp.DestLookupMessage; import net.i2p.data.i2cp.DestReplyMessage; -import net.i2p.data.i2cp.GetBandwidthLimitsMessage; import net.i2p.data.i2cp.I2CPMessageReader; -import net.i2p.internal.I2CPMessageQueue; import net.i2p.internal.InternalClientManager; import net.i2p.internal.QueuedI2CPMessageReader; -import net.i2p.util.I2PAppThread; /** * Create a new session for doing naming and bandwidth queries only. Do not create a Destination. diff --git a/core/java/src/net/i2p/client/datagram/I2PDatagramDissector.java b/core/java/src/net/i2p/client/datagram/I2PDatagramDissector.java index be88bdb53..8f60e2f2d 100644 --- a/core/java/src/net/i2p/client/datagram/I2PDatagramDissector.java +++ b/core/java/src/net/i2p/client/datagram/I2PDatagramDissector.java @@ -14,7 +14,6 @@ import java.io.IOException; import net.i2p.crypto.DSAEngine; import net.i2p.crypto.SHA256Generator; import net.i2p.data.DataFormatException; -import net.i2p.data.DataHelper; import net.i2p.data.Destination; import net.i2p.data.Hash; import net.i2p.data.Signature; diff --git a/core/java/src/net/i2p/client/naming/BlockfileNamingService.java b/core/java/src/net/i2p/client/naming/BlockfileNamingService.java index 8172ee7fd..6eccd62d6 100644 --- a/core/java/src/net/i2p/client/naming/BlockfileNamingService.java +++ b/core/java/src/net/i2p/client/naming/BlockfileNamingService.java @@ -14,8 +14,6 @@ import java.io.File; import java.io.FileInputStream; import java.io.InputStreamReader; import java.io.IOException; -import java.io.RandomAccessFile; -import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.Collections; import java.util.Date; diff --git a/core/java/src/net/i2p/client/naming/EepGetNamingService.java b/core/java/src/net/i2p/client/naming/EepGetNamingService.java index 24d39942d..2bb4c1830 100644 --- a/core/java/src/net/i2p/client/naming/EepGetNamingService.java +++ b/core/java/src/net/i2p/client/naming/EepGetNamingService.java @@ -14,7 +14,6 @@ import java.util.StringTokenizer; import net.i2p.I2PAppContext; import net.i2p.data.Destination; import net.i2p.util.EepGet; -import net.i2p.util.Log; /** * A network-based naming service using HTTP, with in-memory caching. diff --git a/core/java/src/net/i2p/client/naming/ExecNamingService.java b/core/java/src/net/i2p/client/naming/ExecNamingService.java index 221b95c5a..4843ba68d 100644 --- a/core/java/src/net/i2p/client/naming/ExecNamingService.java +++ b/core/java/src/net/i2p/client/naming/ExecNamingService.java @@ -10,7 +10,6 @@ import java.util.Properties; import net.i2p.I2PAppContext; import net.i2p.data.Destination; -import net.i2p.util.Log; /** * An interface to an external naming service program, with in-memory caching. diff --git a/core/java/src/net/i2p/client/naming/MetaNamingService.java b/core/java/src/net/i2p/client/naming/MetaNamingService.java index 0ff543297..86e7775b5 100644 --- a/core/java/src/net/i2p/client/naming/MetaNamingService.java +++ b/core/java/src/net/i2p/client/naming/MetaNamingService.java @@ -1,7 +1,6 @@ package net.i2p.client.naming; import java.lang.reflect.Constructor; -import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; diff --git a/core/java/src/net/i2p/client/naming/NamingService.java b/core/java/src/net/i2p/client/naming/NamingService.java index a5d860aca..327e0655b 100644 --- a/core/java/src/net/i2p/client/naming/NamingService.java +++ b/core/java/src/net/i2p/client/naming/NamingService.java @@ -8,9 +8,7 @@ package net.i2p.client.naming; import java.lang.reflect.Constructor; -import java.util.ArrayList; import java.util.Collections; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Properties; diff --git a/core/java/src/net/i2p/client/naming/SingleFileNamingService.java b/core/java/src/net/i2p/client/naming/SingleFileNamingService.java index 93388de85..81a4eae1c 100644 --- a/core/java/src/net/i2p/client/naming/SingleFileNamingService.java +++ b/core/java/src/net/i2p/client/naming/SingleFileNamingService.java @@ -18,8 +18,6 @@ import java.io.OutputStreamWriter; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; -import java.util.List; import java.util.Map; import java.util.Properties; import java.util.Set; @@ -28,7 +26,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import net.i2p.I2PAppContext; import net.i2p.data.DataFormatException; -import net.i2p.data.DataHelper; import net.i2p.data.Destination; import net.i2p.util.FileUtil; import net.i2p.util.Log; diff --git a/core/java/src/net/i2p/crypto/AESEngine.java b/core/java/src/net/i2p/crypto/AESEngine.java index 652e563cd..85b98d5f9 100644 --- a/core/java/src/net/i2p/crypto/AESEngine.java +++ b/core/java/src/net/i2p/crypto/AESEngine.java @@ -14,7 +14,6 @@ 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.util.SimpleByteCache; /** diff --git a/core/java/src/net/i2p/crypto/ElGamalEngine.java b/core/java/src/net/i2p/crypto/ElGamalEngine.java index f592533ea..57f40cff9 100644 --- a/core/java/src/net/i2p/crypto/ElGamalEngine.java +++ b/core/java/src/net/i2p/crypto/ElGamalEngine.java @@ -37,10 +37,8 @@ import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.data.PrivateKey; import net.i2p.data.PublicKey; -import net.i2p.util.Clock; import net.i2p.util.Log; import net.i2p.util.NativeBigInteger; -import net.i2p.util.RandomSource; import net.i2p.util.SimpleByteCache; /** diff --git a/core/java/src/net/i2p/crypto/HMAC256Generator.java b/core/java/src/net/i2p/crypto/HMAC256Generator.java index aa30de6f6..c532843ab 100644 --- a/core/java/src/net/i2p/crypto/HMAC256Generator.java +++ b/core/java/src/net/i2p/crypto/HMAC256Generator.java @@ -1,13 +1,10 @@ package net.i2p.crypto; import gnu.crypto.hash.Sha256Standalone; + import net.i2p.I2PAppContext; -import net.i2p.data.Base64; -import net.i2p.data.Hash; -import net.i2p.data.SessionKey; import org.bouncycastle.crypto.Digest; -import org.bouncycastle.crypto.Mac; import org.bouncycastle.crypto.macs.I2PHMac; /** diff --git a/core/java/src/net/i2p/crypto/HMACGenerator.java b/core/java/src/net/i2p/crypto/HMACGenerator.java index 3fe36c61e..b21e994a6 100644 --- a/core/java/src/net/i2p/crypto/HMACGenerator.java +++ b/core/java/src/net/i2p/crypto/HMACGenerator.java @@ -17,7 +17,6 @@ import net.i2p.data.SessionKey; import net.i2p.util.SimpleByteCache; import org.bouncycastle.crypto.digests.MD5Digest; -import org.bouncycastle.crypto.Mac; import org.bouncycastle.crypto.macs.I2PHMac; /** diff --git a/core/java/src/net/i2p/crypto/KeyGenerator.java b/core/java/src/net/i2p/crypto/KeyGenerator.java index 606824418..c6d459cfc 100644 --- a/core/java/src/net/i2p/crypto/KeyGenerator.java +++ b/core/java/src/net/i2p/crypto/KeyGenerator.java @@ -12,19 +12,14 @@ package net.i2p.crypto; import java.math.BigInteger; 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.data.SessionKey; -import net.i2p.data.Signature; import net.i2p.data.SigningPrivateKey; import net.i2p.data.SigningPublicKey; import net.i2p.data.SimpleDataStructure; -import net.i2p.util.Clock; -import net.i2p.util.Log; import net.i2p.util.NativeBigInteger; -import net.i2p.util.RandomSource; /** Define a way of generating asymmetrical key pairs as well as symmetrical keys * @author jrandom diff --git a/core/java/src/net/i2p/crypto/SHA1.java b/core/java/src/net/i2p/crypto/SHA1.java index 6f82c25be..8557f1a07 100644 --- a/core/java/src/net/i2p/crypto/SHA1.java +++ b/core/java/src/net/i2p/crypto/SHA1.java @@ -19,8 +19,6 @@ package net.i2p.crypto; import java.security.DigestException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; - -import net.i2p.data.Base64; /** * NOTE: As of 0.8.7, use getInstance() instead of new SHA1(), which will diff --git a/core/java/src/net/i2p/crypto/SHA1Hash.java b/core/java/src/net/i2p/crypto/SHA1Hash.java index c9a0f783d..fcb6975a2 100644 --- a/core/java/src/net/i2p/crypto/SHA1Hash.java +++ b/core/java/src/net/i2p/crypto/SHA1Hash.java @@ -11,7 +11,6 @@ package net.i2p.crypto; import java.io.IOException; import java.io.InputStream; -import java.io.OutputStream; import net.i2p.data.DataFormatException; import net.i2p.data.SimpleDataStructure; diff --git a/core/java/src/net/i2p/crypto/SHA256Generator.java b/core/java/src/net/i2p/crypto/SHA256Generator.java index 9dfbd7933..dfd77b688 100644 --- a/core/java/src/net/i2p/crypto/SHA256Generator.java +++ b/core/java/src/net/i2p/crypto/SHA256Generator.java @@ -7,7 +7,6 @@ import java.security.NoSuchAlgorithmException; import java.util.concurrent.LinkedBlockingQueue; import net.i2p.I2PAppContext; -import net.i2p.data.Base64; import net.i2p.data.Hash; /** diff --git a/core/java/src/net/i2p/crypto/TrustedUpdate.java b/core/java/src/net/i2p/crypto/TrustedUpdate.java index a2425b791..90b6b301c 100644 --- a/core/java/src/net/i2p/crypto/TrustedUpdate.java +++ b/core/java/src/net/i2p/crypto/TrustedUpdate.java @@ -8,7 +8,6 @@ import java.io.InputStream; import java.io.IOException; import java.io.SequenceInputStream; import java.io.UnsupportedEncodingException; -import java.util.ArrayList; import java.util.HashMap; import java.util.Map; import java.util.StringTokenizer; diff --git a/core/java/src/net/i2p/crypto/YKGenerator.java b/core/java/src/net/i2p/crypto/YKGenerator.java index 18435364d..75f21a50e 100644 --- a/core/java/src/net/i2p/crypto/YKGenerator.java +++ b/core/java/src/net/i2p/crypto/YKGenerator.java @@ -13,9 +13,7 @@ import java.math.BigInteger; import java.util.concurrent.LinkedBlockingQueue; import net.i2p.I2PAppContext; -import net.i2p.util.Clock; import net.i2p.util.I2PThread; -import net.i2p.util.Log; import net.i2p.util.NativeBigInteger; /** diff --git a/core/java/src/net/i2p/data/Base32.java b/core/java/src/net/i2p/data/Base32.java index d3d438d62..1a510a04c 100644 --- a/core/java/src/net/i2p/data/Base32.java +++ b/core/java/src/net/i2p/data/Base32.java @@ -13,8 +13,6 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.Locale; -import net.i2p.util.Log; - /** * Encodes and decodes to and from Base32 notation. * Ref: RFC 3548 diff --git a/core/java/src/net/i2p/data/Base64.java b/core/java/src/net/i2p/data/Base64.java index 9adb3e202..7f04d3985 100644 --- a/core/java/src/net/i2p/data/Base64.java +++ b/core/java/src/net/i2p/data/Base64.java @@ -8,8 +8,6 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.Locale; -import net.i2p.util.Log; - /** * Encodes and decodes to and from Base64 notation. * diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java index 4a6449382..3dcbbdf2f 100644 --- a/core/java/src/net/i2p/data/DataHelper.java +++ b/core/java/src/net/i2p/data/DataHelper.java @@ -40,7 +40,6 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Properties; -import java.util.TreeMap; import java.util.zip.Deflater; import net.i2p.I2PAppContext; diff --git a/core/java/src/net/i2p/data/Payload.java b/core/java/src/net/i2p/data/Payload.java index 453fe8077..290640459 100644 --- a/core/java/src/net/i2p/data/Payload.java +++ b/core/java/src/net/i2p/data/Payload.java @@ -13,8 +13,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import net.i2p.util.Log; - /** * Defines the actual payload of a message being delivered, including the * standard encryption wrapping, as defined by the I2P data structure spec. diff --git a/core/java/src/net/i2p/data/RouterAddress.java b/core/java/src/net/i2p/data/RouterAddress.java index 012ef0194..933231dc9 100644 --- a/core/java/src/net/i2p/data/RouterAddress.java +++ b/core/java/src/net/i2p/data/RouterAddress.java @@ -14,7 +14,6 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.Collections; import java.util.Date; -import java.util.Iterator; import java.util.Map; import java.util.Properties; diff --git a/core/java/src/net/i2p/data/RouterInfo.java b/core/java/src/net/i2p/data/RouterInfo.java index 398b61e0c..ff2ed75fe 100644 --- a/core/java/src/net/i2p/data/RouterInfo.java +++ b/core/java/src/net/i2p/data/RouterInfo.java @@ -18,7 +18,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Properties; diff --git a/core/java/src/net/i2p/data/RoutingKeyGenerator.java b/core/java/src/net/i2p/data/RoutingKeyGenerator.java index fc4ed2764..398f579f0 100644 --- a/core/java/src/net/i2p/data/RoutingKeyGenerator.java +++ b/core/java/src/net/i2p/data/RoutingKeyGenerator.java @@ -18,7 +18,6 @@ import java.util.TimeZone; import net.i2p.I2PAppContext; import net.i2p.crypto.SHA256Generator; import net.i2p.util.Log; -import net.i2p.util.RandomSource; /** * Component to manage the munging of hashes into routing keys - given a hash, diff --git a/core/java/src/net/i2p/data/SDSCache.java b/core/java/src/net/i2p/data/SDSCache.java index b0161c6ff..11b730664 100644 --- a/core/java/src/net/i2p/data/SDSCache.java +++ b/core/java/src/net/i2p/data/SDSCache.java @@ -10,7 +10,6 @@ import java.util.LinkedHashMap; import java.util.Map; import net.i2p.I2PAppContext; -import net.i2p.util.Log; import net.i2p.util.SimpleByteCache; /** diff --git a/core/java/src/net/i2p/data/i2cp/I2CPMessageHandler.java b/core/java/src/net/i2p/data/i2cp/I2CPMessageHandler.java index aaa35427b..d48fe6874 100644 --- a/core/java/src/net/i2p/data/i2cp/I2CPMessageHandler.java +++ b/core/java/src/net/i2p/data/i2cp/I2CPMessageHandler.java @@ -9,7 +9,6 @@ package net.i2p.data.i2cp; * */ -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/core/java/src/net/i2p/data/i2cp/SendMessageExpiresMessage.java b/core/java/src/net/i2p/data/i2cp/SendMessageExpiresMessage.java index 08b31a6e7..072ab59e3 100644 --- a/core/java/src/net/i2p/data/i2cp/SendMessageExpiresMessage.java +++ b/core/java/src/net/i2p/data/i2cp/SendMessageExpiresMessage.java @@ -17,8 +17,6 @@ import java.util.Date; import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; import net.i2p.data.DateAndFlags; -import net.i2p.data.Destination; -import net.i2p.data.Payload; /** * Same as SendMessageMessage, but with an expiration to be passed to the router diff --git a/core/java/src/net/i2p/data/i2cp/SessionConfig.java b/core/java/src/net/i2p/data/i2cp/SessionConfig.java index df442b801..14b324a4e 100644 --- a/core/java/src/net/i2p/data/i2cp/SessionConfig.java +++ b/core/java/src/net/i2p/data/i2cp/SessionConfig.java @@ -14,7 +14,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.Date; -import java.util.Iterator; import java.util.Map; import java.util.Properties; diff --git a/core/java/src/net/i2p/internal/InternalClientManager.java b/core/java/src/net/i2p/internal/InternalClientManager.java index a923fb9f7..58b7d6eb6 100644 --- a/core/java/src/net/i2p/internal/InternalClientManager.java +++ b/core/java/src/net/i2p/internal/InternalClientManager.java @@ -1,7 +1,6 @@ package net.i2p.internal; import net.i2p.client.I2PSessionException; -import net.i2p.data.i2cp.I2CPMessage; /** * A manager for the in-JVM I2CP message interface diff --git a/core/java/src/net/i2p/stat/Rate.java b/core/java/src/net/i2p/stat/Rate.java index d8239f619..f2542a10b 100644 --- a/core/java/src/net/i2p/stat/Rate.java +++ b/core/java/src/net/i2p/stat/Rate.java @@ -4,7 +4,6 @@ import java.io.IOException; import java.util.Properties; import net.i2p.data.DataHelper; -import net.i2p.util.Log; /** * Simple rate calculator for periodically sampled data points - determining an diff --git a/core/java/src/net/i2p/stat/RateStat.java b/core/java/src/net/i2p/stat/RateStat.java index 0884de587..9fbc1495b 100644 --- a/core/java/src/net/i2p/stat/RateStat.java +++ b/core/java/src/net/i2p/stat/RateStat.java @@ -3,7 +3,6 @@ package net.i2p.stat; import java.io.IOException; import java.io.OutputStream; import java.util.Arrays; -import java.util.Map.Entry; import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; diff --git a/core/java/src/net/i2p/stat/StatManager.java b/core/java/src/net/i2p/stat/StatManager.java index 9b00145a1..ec83bd0e6 100644 --- a/core/java/src/net/i2p/stat/StatManager.java +++ b/core/java/src/net/i2p/stat/StatManager.java @@ -1,7 +1,6 @@ package net.i2p.stat; import java.text.Collator; -import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.Map; diff --git a/core/java/src/net/i2p/util/BufferedRandomSource.java b/core/java/src/net/i2p/util/BufferedRandomSource.java index e13ff0d2b..2a9cbb955 100644 --- a/core/java/src/net/i2p/util/BufferedRandomSource.java +++ b/core/java/src/net/i2p/util/BufferedRandomSource.java @@ -10,7 +10,6 @@ package net.i2p.util; */ import net.i2p.I2PAppContext; -import net.i2p.data.DataHelper; /** * Allocate data out of a large buffer of data, rather than the PRNG's diff --git a/core/java/src/net/i2p/util/DecayingHashSet.java b/core/java/src/net/i2p/util/DecayingHashSet.java index 4c6b8c18c..1f7004ce4 100644 --- a/core/java/src/net/i2p/util/DecayingHashSet.java +++ b/core/java/src/net/i2p/util/DecayingHashSet.java @@ -1,6 +1,5 @@ package net.i2p.util; -import java.util.Arrays; import java.util.Random; import net.i2p.I2PAppContext; diff --git a/core/java/src/net/i2p/util/EepHead.java b/core/java/src/net/i2p/util/EepHead.java index 1ff12e37c..13c4c57ed 100644 --- a/core/java/src/net/i2p/util/EepHead.java +++ b/core/java/src/net/i2p/util/EepHead.java @@ -3,7 +3,6 @@ package net.i2p.util; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; -import java.net.MalformedURLException; import java.net.URL; import net.i2p.I2PAppContext; diff --git a/core/java/src/net/i2p/util/EepPost.java b/core/java/src/net/i2p/util/EepPost.java index 63972410f..c139bf69c 100644 --- a/core/java/src/net/i2p/util/EepPost.java +++ b/core/java/src/net/i2p/util/EepPost.java @@ -8,7 +8,6 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.net.Socket; import java.net.URL; -import java.util.HashMap; import java.util.Iterator; import java.util.Map; diff --git a/core/java/src/net/i2p/util/HTTPSendData.java b/core/java/src/net/i2p/util/HTTPSendData.java index 9991ede29..90ec52929 100644 --- a/core/java/src/net/i2p/util/HTTPSendData.java +++ b/core/java/src/net/i2p/util/HTTPSendData.java @@ -1,6 +1,5 @@ package net.i2p.util; -import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; diff --git a/core/java/src/net/i2p/util/I2PProperties.java b/core/java/src/net/i2p/util/I2PProperties.java index e943f561f..9508bb1ac 100644 --- a/core/java/src/net/i2p/util/I2PProperties.java +++ b/core/java/src/net/i2p/util/I2PProperties.java @@ -1,6 +1,5 @@ package net.i2p.util; -import java.util.ArrayList; import java.util.List; import java.util.Properties; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/core/java/src/net/i2p/util/InternalServerSocket.java b/core/java/src/net/i2p/util/InternalServerSocket.java index c7638a689..c5a43a493 100644 --- a/core/java/src/net/i2p/util/InternalServerSocket.java +++ b/core/java/src/net/i2p/util/InternalServerSocket.java @@ -1,9 +1,6 @@ package net.i2p.util; -import java.io.BufferedOutputStream; import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; import java.io.PipedInputStream; import java.io.PipedOutputStream; import java.net.InetAddress; @@ -15,8 +12,6 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.LinkedBlockingQueue; -import net.i2p.I2PAppContext; - /** * A simple in-JVM ServerSocket using Piped Streams. * We use port numbers just like regular sockets. diff --git a/core/java/src/net/i2p/util/LogManager.java b/core/java/src/net/i2p/util/LogManager.java index 8110d58a8..0d6a2f952 100644 --- a/core/java/src/net/i2p/util/LogManager.java +++ b/core/java/src/net/i2p/util/LogManager.java @@ -10,15 +10,12 @@ package net.i2p.util; */ import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.IOException; import java.text.DateFormat; import java.text.DecimalFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Properties; diff --git a/core/java/src/net/i2p/util/LogWriter.java b/core/java/src/net/i2p/util/LogWriter.java index 832672123..a0c9654fd 100644 --- a/core/java/src/net/i2p/util/LogWriter.java +++ b/core/java/src/net/i2p/util/LogWriter.java @@ -12,7 +12,6 @@ package net.i2p.util; import java.io.BufferedWriter; import java.io.File; import java.io.IOException; -import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Writer; import java.util.Queue; diff --git a/core/java/src/net/i2p/util/RandomSource.java b/core/java/src/net/i2p/util/RandomSource.java index c117f3458..4e0fe2656 100644 --- a/core/java/src/net/i2p/util/RandomSource.java +++ b/core/java/src/net/i2p/util/RandomSource.java @@ -17,7 +17,6 @@ import java.security.SecureRandom; import net.i2p.I2PAppContext; import net.i2p.crypto.EntropyHarvester; -import net.i2p.data.Base64; /** * Singleton for whatever PRNG i2p uses. diff --git a/core/java/src/net/i2p/util/ResettableGZIPInputStream.java b/core/java/src/net/i2p/util/ResettableGZIPInputStream.java index d8bb8a603..81c2ecd1c 100644 --- a/core/java/src/net/i2p/util/ResettableGZIPInputStream.java +++ b/core/java/src/net/i2p/util/ResettableGZIPInputStream.java @@ -1,6 +1,5 @@ package net.i2p.util; -import java.io.ByteArrayInputStream; import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/core/java/src/net/i2p/util/ResettableGZIPOutputStream.java b/core/java/src/net/i2p/util/ResettableGZIPOutputStream.java index 9895c5f0a..cb9b461c8 100644 --- a/core/java/src/net/i2p/util/ResettableGZIPOutputStream.java +++ b/core/java/src/net/i2p/util/ResettableGZIPOutputStream.java @@ -1,16 +1,10 @@ package net.i2p.util; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; import java.util.zip.CRC32; import java.util.zip.Deflater; import java.util.zip.DeflaterOutputStream; -import java.util.zip.GZIPInputStream; -import java.util.zip.GZIPOutputStream; - -import net.i2p.data.DataHelper; /** * GZIP implementation per diff --git a/core/java/src/net/i2p/util/ReusableGZIPInputStream.java b/core/java/src/net/i2p/util/ReusableGZIPInputStream.java index abb200ecf..0528c8591 100644 --- a/core/java/src/net/i2p/util/ReusableGZIPInputStream.java +++ b/core/java/src/net/i2p/util/ReusableGZIPInputStream.java @@ -1,13 +1,7 @@ package net.i2p.util; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.util.zip.GZIPOutputStream; import java.util.concurrent.LinkedBlockingQueue; -import net.i2p.data.DataHelper; - /** * Provide a cache of reusable GZIP unzipper streams. * This provides stream output only, and therefore can handle unlimited size. diff --git a/core/java/src/net/i2p/util/ReusableGZIPOutputStream.java b/core/java/src/net/i2p/util/ReusableGZIPOutputStream.java index f4777b095..ab1d6ec43 100644 --- a/core/java/src/net/i2p/util/ReusableGZIPOutputStream.java +++ b/core/java/src/net/i2p/util/ReusableGZIPOutputStream.java @@ -3,7 +3,6 @@ package net.i2p.util; //import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.zip.Deflater; -import java.util.zip.GZIPInputStream; import java.util.concurrent.LinkedBlockingQueue; import net.i2p.data.DataHelper; diff --git a/core/java/src/net/i2p/util/SSLEepGet.java b/core/java/src/net/i2p/util/SSLEepGet.java index 87e9017aa..1368a1619 100644 --- a/core/java/src/net/i2p/util/SSLEepGet.java +++ b/core/java/src/net/i2p/util/SSLEepGet.java @@ -46,7 +46,6 @@ import java.io.OutputStream; import java.io.PipedInputStream; import java.io.PipedOutputStream; import java.io.PrintWriter; -import java.net.MalformedURLException; import java.net.URL; import java.security.KeyStore; import java.security.GeneralSecurityException; diff --git a/core/java/src/net/i2p/util/SimpleByteCache.java b/core/java/src/net/i2p/util/SimpleByteCache.java index 50242e8fd..4aae93650 100644 --- a/core/java/src/net/i2p/util/SimpleByteCache.java +++ b/core/java/src/net/i2p/util/SimpleByteCache.java @@ -5,8 +5,6 @@ import java.util.Queue; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.LinkedBlockingQueue; -import net.i2p.I2PAppContext; - /** * Like ByteCache but works directly with byte arrays, not ByteArrays. * These are designed to be small caches, so there's no cleaner task diff --git a/core/java/src/net/metanotion/io/block/BlockFile.java b/core/java/src/net/metanotion/io/block/BlockFile.java index eab1aa61d..9744d0e1b 100644 --- a/core/java/src/net/metanotion/io/block/BlockFile.java +++ b/core/java/src/net/metanotion/io/block/BlockFile.java @@ -40,14 +40,11 @@ import net.metanotion.io.RandomAccessInterface; import net.metanotion.io.Serializer; import net.metanotion.io.data.IdentityBytes; import net.metanotion.io.data.IntBytes; -import net.metanotion.io.data.LongBytes; -import net.metanotion.io.data.NullBytes; import net.metanotion.io.data.StringBytes; import net.metanotion.io.data.UTF8StringBytes; import net.metanotion.io.block.index.BSkipList; import net.metanotion.io.block.index.BSkipSpan; import net.metanotion.util.skiplist.SkipIterator; -import net.metanotion.util.skiplist.SkipList; import net.i2p.I2PAppContext; import net.i2p.util.Log; diff --git a/core/java/src/net/metanotion/io/block/index/BSkipLevels.java b/core/java/src/net/metanotion/io/block/index/BSkipLevels.java index ea0802df1..d0e056dd9 100644 --- a/core/java/src/net/metanotion/io/block/index/BSkipLevels.java +++ b/core/java/src/net/metanotion/io/block/index/BSkipLevels.java @@ -33,7 +33,6 @@ import java.util.Comparator; import java.util.Set; import java.util.TreeSet; -import net.metanotion.io.RandomAccessInterface; import net.metanotion.io.block.BlockFile; import net.metanotion.util.skiplist.SkipList; import net.metanotion.util.skiplist.SkipLevels; diff --git a/core/java/src/net/metanotion/io/block/index/BSkipList.java b/core/java/src/net/metanotion/io/block/index/BSkipList.java index 5dd2e5fa2..eccd63c40 100644 --- a/core/java/src/net/metanotion/io/block/index/BSkipList.java +++ b/core/java/src/net/metanotion/io/block/index/BSkipList.java @@ -30,9 +30,7 @@ package net.metanotion.io.block.index; import java.io.IOException; import java.util.HashMap; -import java.util.Random; -import net.metanotion.io.RandomAccessInterface; import net.metanotion.io.Serializer; import net.metanotion.io.block.BlockFile; import net.metanotion.util.skiplist.*; diff --git a/core/java/src/net/metanotion/io/block/index/BSkipSpan.java b/core/java/src/net/metanotion/io/block/index/BSkipSpan.java index 2ca5559b9..38342a678 100644 --- a/core/java/src/net/metanotion/io/block/index/BSkipSpan.java +++ b/core/java/src/net/metanotion/io/block/index/BSkipSpan.java @@ -30,7 +30,6 @@ package net.metanotion.io.block.index; import java.io.IOException; -import net.metanotion.io.RandomAccessInterface; import net.metanotion.io.Serializer; import net.metanotion.io.block.BlockFile; import net.metanotion.util.skiplist.SkipList; diff --git a/router/java/src/net/i2p/data/i2np/BuildResponseRecord.java b/router/java/src/net/i2p/data/i2np/BuildResponseRecord.java index d8726fb29..ddd037bcf 100644 --- a/router/java/src/net/i2p/data/i2np/BuildResponseRecord.java +++ b/router/java/src/net/i2p/data/i2np/BuildResponseRecord.java @@ -1,7 +1,6 @@ package net.i2p.data.i2np; import net.i2p.I2PAppContext; -import net.i2p.data.Base64; import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.data.SessionKey; diff --git a/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java b/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java index 02fa58db3..ca53fda9b 100644 --- a/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java +++ b/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java @@ -11,7 +11,6 @@ package net.i2p.data.i2np; import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Set; diff --git a/router/java/src/net/i2p/data/i2np/I2NPMessageHandler.java b/router/java/src/net/i2p/data/i2np/I2NPMessageHandler.java index 4b39c6e52..fe1225f74 100644 --- a/router/java/src/net/i2p/data/i2np/I2NPMessageHandler.java +++ b/router/java/src/net/i2p/data/i2np/I2NPMessageHandler.java @@ -8,7 +8,6 @@ package net.i2p.data.i2np; * */ -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/router/java/src/net/i2p/data/i2np/TunnelDataMessage.java b/router/java/src/net/i2p/data/i2np/TunnelDataMessage.java index 3199cefac..f31e6cc4d 100644 --- a/router/java/src/net/i2p/data/i2np/TunnelDataMessage.java +++ b/router/java/src/net/i2p/data/i2np/TunnelDataMessage.java @@ -13,7 +13,6 @@ import net.i2p.data.ByteArray; import net.i2p.data.DataHelper; import net.i2p.data.TunnelId; import net.i2p.util.ByteCache; -import net.i2p.util.Log; /** * Defines the message sent between routers as part of the tunnel delivery diff --git a/router/java/src/net/i2p/router/Blocklist.java b/router/java/src/net/i2p/router/Blocklist.java index 12557e629..1cda36004 100644 --- a/router/java/src/net/i2p/router/Blocklist.java +++ b/router/java/src/net/i2p/router/Blocklist.java @@ -20,7 +20,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Properties; import java.util.Set; import java.util.TreeSet; diff --git a/router/java/src/net/i2p/router/ClientMessagePool.java b/router/java/src/net/i2p/router/ClientMessagePool.java index 9e18c8a4c..2c27d8089 100644 --- a/router/java/src/net/i2p/router/ClientMessagePool.java +++ b/router/java/src/net/i2p/router/ClientMessagePool.java @@ -8,9 +8,6 @@ package net.i2p.router; * */ -import java.util.Properties; - -import net.i2p.client.I2PClient; import net.i2p.router.message.OutboundCache; import net.i2p.router.message.OutboundClientMessageOneShotJob; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/JobImpl.java b/router/java/src/net/i2p/router/JobImpl.java index 82674d922..9bfd30b39 100644 --- a/router/java/src/net/i2p/router/JobImpl.java +++ b/router/java/src/net/i2p/router/JobImpl.java @@ -10,8 +10,6 @@ package net.i2p.router; import java.util.concurrent.atomic.AtomicLong; -import net.i2p.util.Log; - /** * Base implementation of a Job */ diff --git a/router/java/src/net/i2p/router/JobQueue.java b/router/java/src/net/i2p/router/JobQueue.java index 53ebec2da..5e92d9d25 100644 --- a/router/java/src/net/i2p/router/JobQueue.java +++ b/router/java/src/net/i2p/router/JobQueue.java @@ -10,15 +10,11 @@ package net.i2p.router; import java.io.IOException; import java.io.Writer; -import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.Iterator; -import java.util.List; import java.util.Map; -import java.util.SortedMap; -import java.util.TreeMap; import java.util.TreeSet; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; diff --git a/router/java/src/net/i2p/router/MessageHistory.java b/router/java/src/net/i2p/router/MessageHistory.java index 99a179de1..4a745e0c5 100644 --- a/router/java/src/net/i2p/router/MessageHistory.java +++ b/router/java/src/net/i2p/router/MessageHistory.java @@ -4,9 +4,7 @@ import java.io.File; 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.List; import java.util.Queue; import java.util.TimeZone; diff --git a/router/java/src/net/i2p/router/OutNetMessage.java b/router/java/src/net/i2p/router/OutNetMessage.java index 07ed4fbc4..d52ef380b 100644 --- a/router/java/src/net/i2p/router/OutNetMessage.java +++ b/router/java/src/net/i2p/router/OutNetMessage.java @@ -18,7 +18,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import net.i2p.data.DataHelper; import net.i2p.data.RouterInfo; import net.i2p.data.i2np.I2NPMessage; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java index 761a4370a..c44960a6d 100644 --- a/router/java/src/net/i2p/router/Router.java +++ b/router/java/src/net/i2p/router/Router.java @@ -14,11 +14,9 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.InputStreamReader; import java.io.IOException; -import java.io.Writer; import java.util.Collection; import java.util.Collections; import java.util.Date; -import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Locale; @@ -29,7 +27,6 @@ import java.util.TimeZone; import java.util.TreeSet; import java.util.concurrent.ConcurrentHashMap; -import net.i2p.CoreVersion; import net.i2p.data.Certificate; import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; diff --git a/router/java/src/net/i2p/router/RouterContext.java b/router/java/src/net/i2p/router/RouterContext.java index 0debc4ff1..baf00b5b1 100644 --- a/router/java/src/net/i2p/router/RouterContext.java +++ b/router/java/src/net/i2p/router/RouterContext.java @@ -22,7 +22,6 @@ import net.i2p.router.transport.FIFOBandwidthLimiter; import net.i2p.router.transport.OutboundMessageRegistry; import net.i2p.router.tunnel.TunnelDispatcher; import net.i2p.router.tunnel.pool.TunnelPoolManager; -import net.i2p.util.Clock; import net.i2p.util.KeyRing; import net.i2p.util.I2PProperties.I2PPropertyCallback; diff --git a/router/java/src/net/i2p/router/Shitlist.java b/router/java/src/net/i2p/router/Shitlist.java index 92e78d3de..48b319a51 100644 --- a/router/java/src/net/i2p/router/Shitlist.java +++ b/router/java/src/net/i2p/router/Shitlist.java @@ -18,7 +18,6 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.router.peermanager.PeerProfile; import net.i2p.util.ConcurrentHashSet; diff --git a/router/java/src/net/i2p/router/client/ClientManager.java b/router/java/src/net/i2p/router/client/ClientManager.java index da0926723..d447f771a 100644 --- a/router/java/src/net/i2p/router/client/ClientManager.java +++ b/router/java/src/net/i2p/router/client/ClientManager.java @@ -13,18 +13,15 @@ import java.io.Writer; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; -import java.util.Map; import java.util.Set; import java.util.concurrent.LinkedBlockingQueue; import net.i2p.client.I2PSessionException; import net.i2p.crypto.SessionKeyManager; -import net.i2p.data.DataHelper; import net.i2p.data.Destination; import net.i2p.data.Hash; import net.i2p.data.LeaseSet; import net.i2p.data.Payload; -import net.i2p.data.TunnelId; import net.i2p.data.i2cp.I2CPMessage; import net.i2p.data.i2cp.MessageId; import net.i2p.data.i2cp.SessionConfig; @@ -34,7 +31,6 @@ import net.i2p.router.ClientMessage; import net.i2p.router.Job; import net.i2p.router.JobImpl; import net.i2p.router.RouterContext; -import net.i2p.router.TunnelInfo; import net.i2p.util.I2PThread; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/client/ClientWriterRunner.java b/router/java/src/net/i2p/router/client/ClientWriterRunner.java index b93a4e5f4..86c391ee4 100644 --- a/router/java/src/net/i2p/router/client/ClientWriterRunner.java +++ b/router/java/src/net/i2p/router/client/ClientWriterRunner.java @@ -1,13 +1,9 @@ package net.i2p.router.client; -import java.io.IOException; -import java.io.InputStream; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import net.i2p.data.i2cp.I2CPMessage; -import net.i2p.data.i2cp.I2CPMessageImpl; -import net.i2p.data.i2cp.I2CPMessageException; import net.i2p.internal.PoisonI2CPMessage; import net.i2p.router.RouterContext; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/client/QueuedClientConnectionRunner.java b/router/java/src/net/i2p/router/client/QueuedClientConnectionRunner.java index aac9b68e0..7b16bae02 100644 --- a/router/java/src/net/i2p/router/client/QueuedClientConnectionRunner.java +++ b/router/java/src/net/i2p/router/client/QueuedClientConnectionRunner.java @@ -1,13 +1,10 @@ package net.i2p.router.client; -import java.io.IOException; - import net.i2p.data.i2cp.I2CPMessage; import net.i2p.data.i2cp.I2CPMessageException; import net.i2p.internal.I2CPMessageQueue; import net.i2p.internal.QueuedI2CPMessageReader; import net.i2p.router.RouterContext; -import net.i2p.util.Log; /** * Zero-copy in-JVM. diff --git a/router/java/src/net/i2p/router/client/SSLClientListenerRunner.java b/router/java/src/net/i2p/router/client/SSLClientListenerRunner.java index 8e490c46a..b43d48bec 100644 --- a/router/java/src/net/i2p/router/client/SSLClientListenerRunner.java +++ b/router/java/src/net/i2p/router/client/SSLClientListenerRunner.java @@ -2,7 +2,6 @@ package net.i2p.router.client; import java.io.File; import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -14,7 +13,6 @@ import java.security.KeyStore; import java.security.GeneralSecurityException; import java.security.cert.Certificate; import java.security.cert.CertificateEncodingException; -import java.util.Arrays; import java.util.HashMap; import java.util.Map; diff --git a/router/java/src/net/i2p/router/dummy/DummyClientManagerFacade.java b/router/java/src/net/i2p/router/dummy/DummyClientManagerFacade.java index d1f1792fa..3f98e7577 100644 --- a/router/java/src/net/i2p/router/dummy/DummyClientManagerFacade.java +++ b/router/java/src/net/i2p/router/dummy/DummyClientManagerFacade.java @@ -18,7 +18,6 @@ import net.i2p.router.ClientManagerFacade; import net.i2p.router.ClientMessage; import net.i2p.router.Job; import net.i2p.router.RouterContext; -import net.i2p.router.TunnelInfo; /** * Manage all interactions with clients diff --git a/router/java/src/net/i2p/router/dummy/DummyNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/dummy/DummyNetworkDatabaseFacade.java index a3b1334c1..eeb0e1384 100644 --- a/router/java/src/net/i2p/router/dummy/DummyNetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/dummy/DummyNetworkDatabaseFacade.java @@ -8,8 +8,6 @@ package net.i2p.router.dummy; * */ -import java.io.IOException; -import java.io.Writer; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; diff --git a/router/java/src/net/i2p/router/dummy/VMCommSystem.java b/router/java/src/net/i2p/router/dummy/VMCommSystem.java index 4c905e0b3..cb700011a 100644 --- a/router/java/src/net/i2p/router/dummy/VMCommSystem.java +++ b/router/java/src/net/i2p/router/dummy/VMCommSystem.java @@ -1,7 +1,6 @@ package net.i2p.router.dummy; import java.io.IOException; -import java.io.OutputStream; import java.io.Writer; import java.util.Collections; import java.util.HashMap; diff --git a/router/java/src/net/i2p/router/message/HandleGarlicMessageJob.java b/router/java/src/net/i2p/router/message/HandleGarlicMessageJob.java index d879cb5fc..fb0aaeea5 100644 --- a/router/java/src/net/i2p/router/message/HandleGarlicMessageJob.java +++ b/router/java/src/net/i2p/router/message/HandleGarlicMessageJob.java @@ -8,9 +8,6 @@ package net.i2p.router.message; * */ -import java.util.HashMap; -import java.util.Map; - import net.i2p.data.Hash; import net.i2p.data.RouterIdentity; import net.i2p.data.i2np.DeliveryInstructions; diff --git a/router/java/src/net/i2p/router/message/OutboundCache.java b/router/java/src/net/i2p/router/message/OutboundCache.java index e7f875b33..996088ffe 100644 --- a/router/java/src/net/i2p/router/message/OutboundCache.java +++ b/router/java/src/net/i2p/router/message/OutboundCache.java @@ -11,7 +11,6 @@ import net.i2p.data.LeaseSet; import net.i2p.router.Router; import net.i2p.router.RouterContext; import net.i2p.router.TunnelInfo; -import net.i2p.util.Log; import net.i2p.util.SimpleScheduler; import net.i2p.util.SimpleTimer; diff --git a/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java b/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java index 0df49a984..edd57d3c7 100644 --- a/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java +++ b/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Properties; import java.util.Set; diff --git a/router/java/src/net/i2p/router/networkdb/HandleDatabaseLookupMessageJob.java b/router/java/src/net/i2p/router/networkdb/HandleDatabaseLookupMessageJob.java index 8cdc87e6f..354b610f4 100644 --- a/router/java/src/net/i2p/router/networkdb/HandleDatabaseLookupMessageJob.java +++ b/router/java/src/net/i2p/router/networkdb/HandleDatabaseLookupMessageJob.java @@ -9,7 +9,6 @@ package net.i2p.router.networkdb; */ import java.util.HashSet; -import java.util.Iterator; import java.util.Set; import net.i2p.data.DatabaseEntry; diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodSearchJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodSearchJob.java index fce3fbd63..a54549b23 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodSearchJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodSearchJob.java @@ -4,17 +4,9 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import net.i2p.data.Hash; -import net.i2p.data.i2np.DatabaseLookupMessage; -import net.i2p.data.i2np.DatabaseSearchReplyMessage; -import net.i2p.data.i2np.DatabaseStoreMessage; -import net.i2p.data.i2np.I2NPMessage; import net.i2p.router.Job; import net.i2p.router.JobImpl; -import net.i2p.router.MessageSelector; -import net.i2p.router.OutNetMessage; -import net.i2p.router.ReplyJob; import net.i2p.router.RouterContext; -import net.i2p.router.TunnelInfo; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java index 314f8253b..4a84b3518 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java @@ -1,7 +1,6 @@ package net.i2p.router.networkdb.kademlia; import java.util.List; -import java.util.Properties; import net.i2p.data.Hash; import net.i2p.data.RouterAddress; diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java index 0884a5be2..39e837e4b 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java @@ -2,7 +2,6 @@ package net.i2p.router.networkdb.kademlia; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -10,21 +9,15 @@ import java.util.Set; import net.i2p.data.DatabaseEntry; import net.i2p.data.DataFormatException; import net.i2p.data.Hash; -import net.i2p.data.LeaseSet; import net.i2p.data.RouterInfo; import net.i2p.data.TunnelId; import net.i2p.data.i2np.DatabaseLookupMessage; -import net.i2p.data.i2np.DatabaseSearchReplyMessage; import net.i2p.data.i2np.DatabaseStoreMessage; -import net.i2p.data.i2np.I2NPMessage; import net.i2p.router.Job; import net.i2p.router.JobImpl; -import net.i2p.router.MessageSelector; import net.i2p.router.OutNetMessage; -import net.i2p.router.ReplyJob; import net.i2p.router.Router; import net.i2p.router.RouterContext; -import net.i2p.router.TunnelInfo; import net.i2p.util.ConcurrentHashSet; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java index 581566287..34987aa5e 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java @@ -8,14 +8,11 @@ package net.i2p.router.networkdb.kademlia; * */ -import java.util.Iterator; import java.util.NoSuchElementException; import java.util.Set; import net.i2p.data.DatabaseEntry; import net.i2p.data.Hash; -import net.i2p.data.LeaseSet; -import net.i2p.data.RouterInfo; import net.i2p.router.Job; import net.i2p.router.RouterContext; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java b/router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java index 98ed32686..0fc3e023b 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java @@ -9,15 +9,12 @@ package net.i2p.router.networkdb.kademlia; */ import java.math.BigInteger; -import java.util.Collections; import java.util.HashSet; -import java.util.Iterator; import java.util.Set; import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; import net.i2p.data.Hash; -import net.i2p.router.RouterContext; import net.i2p.util.ConcurrentHashSet; import net.i2p.util.Log; import net.i2p.util.RandomSource; 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 6780ea4b4..393bbda5d 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java @@ -9,26 +9,17 @@ package net.i2p.router.networkdb.kademlia; */ import java.io.IOException; -import java.io.Writer; -import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; -import java.util.Comparator; import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; -import java.util.List; import java.util.Map; -import java.util.Properties; import java.util.Set; -import java.util.TreeSet; import net.i2p.data.DatabaseEntry; import net.i2p.data.DataHelper; -import net.i2p.data.Destination; import net.i2p.data.Hash; -import net.i2p.data.Lease; import net.i2p.data.LeaseSet; import net.i2p.data.RouterAddress; import net.i2p.data.RouterInfo; @@ -38,7 +29,6 @@ import net.i2p.router.Job; import net.i2p.router.NetworkDatabaseFacade; import net.i2p.router.Router; import net.i2p.router.RouterContext; -import net.i2p.router.TunnelPoolSettings; import net.i2p.router.networkdb.DatabaseLookupMessageHandler; import net.i2p.router.networkdb.DatabaseStoreMessageHandler; import net.i2p.router.networkdb.PublishLocalRouterInfoJob; diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/LocalHash.java b/router/java/src/net/i2p/router/networkdb/kademlia/LocalHash.java index 53a28019c..a15716c87 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/LocalHash.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/LocalHash.java @@ -17,7 +17,6 @@ import java.util.Set; import net.i2p.data.DataHelper; import net.i2p.data.Hash; -import net.i2p.util.Log; /** * Pull the caching used only by KBucketImpl out of Hash and put it here. diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/MessageWrapper.java b/router/java/src/net/i2p/router/networkdb/kademlia/MessageWrapper.java index 06ca129c4..f6fb57ae6 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/MessageWrapper.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/MessageWrapper.java @@ -17,7 +17,6 @@ import net.i2p.data.i2np.I2NPMessage; import net.i2p.router.RouterContext; import net.i2p.router.message.GarlicMessageBuilder; import net.i2p.router.message.PayloadGarlicConfig; -import net.i2p.util.Log; /** * Method and class for garlic encrypting outbound netdb traffic, diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/PeerSelector.java b/router/java/src/net/i2p/router/networkdb/kademlia/PeerSelector.java index 49dbc8b8f..de41d63e3 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/PeerSelector.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/PeerSelector.java @@ -10,21 +10,14 @@ package net.i2p.router.networkdb.kademlia; import java.math.BigInteger; import java.util.ArrayList; -import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Set; import java.util.TreeMap; -import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.data.RouterInfo; import net.i2p.router.RouterContext; -import net.i2p.router.peermanager.PeerProfile; -import net.i2p.stat.Rate; -import net.i2p.stat.RateStat; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java b/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java index f5881c7da..92c8add81 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java @@ -12,7 +12,6 @@ import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.File; import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.FilenameFilter; import java.io.IOException; import java.io.InputStream; @@ -27,12 +26,10 @@ import net.i2p.data.Base64; import net.i2p.data.DatabaseEntry; import net.i2p.data.DataFormatException; import net.i2p.data.Hash; -import net.i2p.data.LeaseSet; import net.i2p.data.RouterInfo; import net.i2p.router.JobImpl; import net.i2p.router.Router; import net.i2p.router.RouterContext; -import net.i2p.router.networkdb.reseed.ReseedChecker; import net.i2p.util.I2PThread; import net.i2p.util.Log; import net.i2p.util.SecureDirectory; 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 e86b9b680..b47184da4 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java @@ -15,7 +15,6 @@ import java.util.Set; import net.i2p.data.DatabaseEntry; import net.i2p.data.Hash; -import net.i2p.data.LeaseSet; import net.i2p.data.RouterInfo; import net.i2p.data.TunnelId; import net.i2p.data.i2np.DatabaseStoreMessage; @@ -26,9 +25,6 @@ import net.i2p.router.OutNetMessage; import net.i2p.router.ReplyJob; import net.i2p.router.RouterContext; import net.i2p.router.TunnelInfo; -import net.i2p.router.peermanager.PeerProfile; -import net.i2p.stat.Rate; -import net.i2p.stat.RateStat; import net.i2p.util.Log; import net.i2p.util.VersionComparator; diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/TransientDataStore.java b/router/java/src/net/i2p/router/networkdb/kademlia/TransientDataStore.java index 5caa262ea..cd4b37c04 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/TransientDataStore.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/TransientDataStore.java @@ -12,12 +12,10 @@ import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.concurrent.ConcurrentHashMap; -import java.util.HashSet; import java.util.Map; import java.util.Set; import net.i2p.data.DatabaseEntry; -import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.data.LeaseSet; import net.i2p.data.RouterInfo; diff --git a/router/java/src/net/i2p/router/peermanager/PeerManager.java b/router/java/src/net/i2p/router/peermanager/PeerManager.java index 18619c62e..367b0731d 100644 --- a/router/java/src/net/i2p/router/peermanager/PeerManager.java +++ b/router/java/src/net/i2p/router/peermanager/PeerManager.java @@ -8,8 +8,6 @@ package net.i2p.router.peermanager; * */ -import java.io.IOException; -import java.io.Writer; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; diff --git a/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java b/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java index b84966143..c1ab66931 100644 --- a/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java +++ b/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java @@ -11,7 +11,6 @@ package net.i2p.router.peermanager; import java.io.IOException; import java.io.Writer; import java.util.Collections; -import java.util.Iterator; import java.util.List; import java.util.Set; diff --git a/router/java/src/net/i2p/router/peermanager/ProfileManagerImpl.java b/router/java/src/net/i2p/router/peermanager/ProfileManagerImpl.java index af9e56100..b2a4dad93 100644 --- a/router/java/src/net/i2p/router/peermanager/ProfileManagerImpl.java +++ b/router/java/src/net/i2p/router/peermanager/ProfileManagerImpl.java @@ -8,13 +8,7 @@ package net.i2p.router.peermanager; * */ -import java.text.DecimalFormat; -import java.text.DecimalFormatSymbols; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Locale; import java.util.Properties; -import java.util.Set; import net.i2p.data.Hash; import net.i2p.router.ProfileManager; diff --git a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java index d27829489..65f72dd9a 100644 --- a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java +++ b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java @@ -15,8 +15,6 @@ import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.Properties; -import java.util.Random; import java.util.Set; import java.util.TreeSet; import java.util.concurrent.TimeUnit; diff --git a/router/java/src/net/i2p/router/peermanager/ProfilePersistenceHelper.java b/router/java/src/net/i2p/router/peermanager/ProfilePersistenceHelper.java index 756e4bf78..a45dccf26 100644 --- a/router/java/src/net/i2p/router/peermanager/ProfilePersistenceHelper.java +++ b/router/java/src/net/i2p/router/peermanager/ProfilePersistenceHelper.java @@ -10,14 +10,12 @@ import java.io.IOException; import java.io.OutputStream; import java.util.Date; import java.util.HashSet; -import java.util.Iterator; import java.util.Properties; import java.util.Set; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; import net.i2p.data.Base64; -import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.router.RouterContext; diff --git a/router/java/src/net/i2p/router/startup/CreateRouterInfoJob.java b/router/java/src/net/i2p/router/startup/CreateRouterInfoJob.java index cba94acd5..6bd9d3f08 100644 --- a/router/java/src/net/i2p/router/startup/CreateRouterInfoJob.java +++ b/router/java/src/net/i2p/router/startup/CreateRouterInfoJob.java @@ -11,7 +11,6 @@ package net.i2p.router.startup; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; -import java.util.HashSet; import java.util.Properties; import net.i2p.data.Certificate; diff --git a/router/java/src/net/i2p/router/startup/WorkingDir.java b/router/java/src/net/i2p/router/startup/WorkingDir.java index 78b9aad70..613f3cee1 100644 --- a/router/java/src/net/i2p/router/startup/WorkingDir.java +++ b/router/java/src/net/i2p/router/startup/WorkingDir.java @@ -6,7 +6,6 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.OutputStreamWriter; import java.io.IOException; -import java.io.OutputStreamWriter; import java.io.PrintStream; import java.io.PrintWriter; import java.util.Properties; diff --git a/router/java/src/net/i2p/router/transport/GeoIP.java b/router/java/src/net/i2p/router/transport/GeoIP.java index d51a07528..2bfdcdf85 100644 --- a/router/java/src/net/i2p/router/transport/GeoIP.java +++ b/router/java/src/net/i2p/router/transport/GeoIP.java @@ -18,8 +18,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import net.i2p.I2PAppContext; -import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.router.Router; import net.i2p.router.RouterContext; diff --git a/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java b/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java index cddef3054..4ed7624c9 100644 --- a/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java +++ b/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java @@ -13,8 +13,6 @@ import java.io.Writer; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; diff --git a/router/java/src/net/i2p/router/transport/TransportBid.java b/router/java/src/net/i2p/router/transport/TransportBid.java index 9606b3572..7b4a6f0af 100644 --- a/router/java/src/net/i2p/router/transport/TransportBid.java +++ b/router/java/src/net/i2p/router/transport/TransportBid.java @@ -8,8 +8,6 @@ package net.i2p.router.transport; * */ -import net.i2p.data.RouterInfo; - /** * Provide a bid for how much it would "cost" to transfer a message of a * particular peer diff --git a/router/java/src/net/i2p/router/transport/TransportImpl.java b/router/java/src/net/i2p/router/transport/TransportImpl.java index c5fcaa94f..954c16426 100644 --- a/router/java/src/net/i2p/router/transport/TransportImpl.java +++ b/router/java/src/net/i2p/router/transport/TransportImpl.java @@ -33,7 +33,6 @@ import net.i2p.router.MessageSelector; import net.i2p.router.OutNetMessage; import net.i2p.router.Router; import net.i2p.router.RouterContext; -import net.i2p.router.RouterVersion; import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade; import net.i2p.util.ConcurrentHashSet; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/transport/TransportManager.java b/router/java/src/net/i2p/router/transport/TransportManager.java index 97e7fe8c8..2a45a0ffe 100644 --- a/router/java/src/net/i2p/router/transport/TransportManager.java +++ b/router/java/src/net/i2p/router/transport/TransportManager.java @@ -17,7 +17,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Properties; import java.util.Set; import java.util.TreeMap; import java.util.Vector; diff --git a/router/java/src/net/i2p/router/transport/crypto/DHSessionKeyBuilder.java b/router/java/src/net/i2p/router/transport/crypto/DHSessionKeyBuilder.java index 06b4727ab..c85687335 100644 --- a/router/java/src/net/i2p/router/transport/crypto/DHSessionKeyBuilder.java +++ b/router/java/src/net/i2p/router/transport/crypto/DHSessionKeyBuilder.java @@ -9,7 +9,6 @@ package net.i2p.router.transport.crypto; * */ -import java.io.IOException; //import java.io.InputStream; //import java.io.OutputStream; import java.math.BigInteger; diff --git a/router/java/src/net/i2p/router/transport/ntcp/EstablishState.java b/router/java/src/net/i2p/router/transport/ntcp/EstablishState.java index 54960e28e..6f65d5bdb 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/EstablishState.java +++ b/router/java/src/net/i2p/router/transport/ntcp/EstablishState.java @@ -1,29 +1,18 @@ package net.i2p.router.transport.ntcp; import java.io.ByteArrayOutputStream; -import java.io.EOFException; -import java.io.FileInputStream; import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; import java.net.InetAddress; -import java.net.Socket; import java.net.UnknownHostException; import java.nio.ByteBuffer; import net.i2p.I2PAppContext; import net.i2p.data.Base64; -import net.i2p.data.Certificate; import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; import net.i2p.data.Hash; -import net.i2p.data.PrivateKey; -import net.i2p.data.PublicKey; import net.i2p.data.RouterIdentity; -import net.i2p.data.RouterInfo; import net.i2p.data.Signature; -import net.i2p.data.SigningPrivateKey; -import net.i2p.data.SigningPublicKey; import net.i2p.router.Router; import net.i2p.router.RouterContext; import net.i2p.router.transport.crypto.DHSessionKeyBuilder; diff --git a/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java b/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java index 7058eaebc..0639dabb4 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java +++ b/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java @@ -21,7 +21,6 @@ import java.util.concurrent.LinkedBlockingQueue; import net.i2p.I2PAppContext; import net.i2p.data.RouterIdentity; -import net.i2p.data.RouterInfo; import net.i2p.router.RouterContext; import net.i2p.router.transport.FIFOBandwidthLimiter; import net.i2p.util.ConcurrentHashSet; diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java index e542c0df9..5ffe2ad51 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java +++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java @@ -1,13 +1,10 @@ package net.i2p.router.transport.ntcp; -import java.io.ByteArrayInputStream; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.SelectionKey; import java.nio.channels.SocketChannel; -import java.util.ArrayList; import java.util.Iterator; -import java.util.List; import java.util.Queue; import java.util.Set; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java index 7db762b5b..aed896803 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java +++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java @@ -8,11 +8,9 @@ import java.nio.channels.ServerSocketChannel; import java.nio.channels.SocketChannel; import java.text.DecimalFormat; import java.text.NumberFormat; -import java.util.ArrayList; import java.util.Comparator; import java.util.HashMap; import java.util.Iterator; -import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Set; diff --git a/router/java/src/net/i2p/router/transport/udp/DummyThrottle.java b/router/java/src/net/i2p/router/transport/udp/DummyThrottle.java index d2cb73934..515a8d6ef 100644 --- a/router/java/src/net/i2p/router/transport/udp/DummyThrottle.java +++ b/router/java/src/net/i2p/router/transport/udp/DummyThrottle.java @@ -1,7 +1,6 @@ package net.i2p.router.transport.udp; import net.i2p.data.Hash; -import net.i2p.router.OutNetMessage; /** * Since the TimedWeightedPriorityMessageQueue.add() diff --git a/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java b/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java index 16386280d..79a0176bf 100644 --- a/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java +++ b/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java @@ -3,10 +3,8 @@ package net.i2p.router.transport.udp; import java.net.InetAddress; import java.net.UnknownHostException; import java.util.ArrayList; -import java.util.HashMap; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import net.i2p.data.Base64; diff --git a/router/java/src/net/i2p/router/transport/udp/InboundMessageState.java b/router/java/src/net/i2p/router/transport/udp/InboundMessageState.java index 211817068..c2e6e4124 100644 --- a/router/java/src/net/i2p/router/transport/udp/InboundMessageState.java +++ b/router/java/src/net/i2p/router/transport/udp/InboundMessageState.java @@ -1,6 +1,5 @@ package net.i2p.router.transport.udp; -import net.i2p.data.Base64; import net.i2p.data.ByteArray; import net.i2p.data.Hash; import net.i2p.router.RouterContext; diff --git a/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java b/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java index 6d26e578e..20f7d1e55 100644 --- a/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java +++ b/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java @@ -1,8 +1,6 @@ package net.i2p.router.transport.udp; import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Properties; diff --git a/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java b/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java index 3cb1a7379..1f288155d 100644 --- a/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java +++ b/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java @@ -1,6 +1,5 @@ package net.i2p.router.transport.udp; -import java.util.Arrays; import java.util.Date; import net.i2p.I2PAppContext; diff --git a/router/java/src/net/i2p/router/transport/udp/UDPAddress.java b/router/java/src/net/i2p/router/transport/udp/UDPAddress.java index 7fa6060db..58eba6e7a 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPAddress.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPAddress.java @@ -2,7 +2,6 @@ package net.i2p.router.transport.udp; import java.net.InetAddress; import java.net.UnknownHostException; -import java.util.Properties; import net.i2p.data.Base64; import net.i2p.data.RouterAddress; diff --git a/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java b/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java index 894efe18e..4ae96e50d 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java @@ -1,7 +1,5 @@ package net.i2p.router.transport.udp; -import java.net.InetAddress; - import net.i2p.I2PAppContext; import net.i2p.data.Base64; import net.i2p.data.DataHelper; diff --git a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java index 612965bea..38187c6ba 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java @@ -6,7 +6,6 @@ import java.net.InetAddress; import java.net.UnknownHostException; import java.text.DecimalFormat; import java.util.ArrayList; -import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.Iterator; diff --git a/router/java/src/net/i2p/router/tunnel/BuildMessageGenerator.java b/router/java/src/net/i2p/router/tunnel/BuildMessageGenerator.java index ccc0aaa91..ac79df401 100644 --- a/router/java/src/net/i2p/router/tunnel/BuildMessageGenerator.java +++ b/router/java/src/net/i2p/router/tunnel/BuildMessageGenerator.java @@ -1,21 +1,15 @@ package net.i2p.router.tunnel; -import java.util.ArrayList; -import java.util.Collections; import java.util.List; import net.i2p.I2PAppContext; -import net.i2p.data.Base64; import net.i2p.data.ByteArray; import net.i2p.data.Hash; import net.i2p.data.PublicKey; -import net.i2p.data.RouterInfo; import net.i2p.data.SessionKey; import net.i2p.data.i2np.BuildRequestRecord; import net.i2p.data.i2np.I2NPMessage; import net.i2p.data.i2np.TunnelBuildMessage; -import net.i2p.router.RouterContext; -import net.i2p.util.Log; /** * Fill in the encrypted BuildRequestRecords in a TunnelBuildMessage diff --git a/router/java/src/net/i2p/router/tunnel/FragmentHandler.java b/router/java/src/net/i2p/router/tunnel/FragmentHandler.java index bb054be38..d24ee38da 100644 --- a/router/java/src/net/i2p/router/tunnel/FragmentHandler.java +++ b/router/java/src/net/i2p/router/tunnel/FragmentHandler.java @@ -1,6 +1,5 @@ package net.i2p.router.tunnel; -import java.io.IOException; import java.util.HashMap; import java.util.Map; diff --git a/router/java/src/net/i2p/router/tunnel/HopConfig.java b/router/java/src/net/i2p/router/tunnel/HopConfig.java index 3f888fd09..4c40a1727 100644 --- a/router/java/src/net/i2p/router/tunnel/HopConfig.java +++ b/router/java/src/net/i2p/router/tunnel/HopConfig.java @@ -1,7 +1,5 @@ package net.i2p.router.tunnel; -import java.util.Map; - import net.i2p.data.ByteArray; import net.i2p.data.DataHelper; import net.i2p.data.Hash; diff --git a/router/java/src/net/i2p/router/tunnel/HopProcessor.java b/router/java/src/net/i2p/router/tunnel/HopProcessor.java index 899894bc7..792288a77 100644 --- a/router/java/src/net/i2p/router/tunnel/HopProcessor.java +++ b/router/java/src/net/i2p/router/tunnel/HopProcessor.java @@ -1,7 +1,6 @@ package net.i2p.router.tunnel; import net.i2p.I2PAppContext; -import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.util.ByteCache; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/tunnel/OutboundGatewayProcessor.java b/router/java/src/net/i2p/router/tunnel/OutboundGatewayProcessor.java index 33ab24e11..4deb3bed1 100644 --- a/router/java/src/net/i2p/router/tunnel/OutboundGatewayProcessor.java +++ b/router/java/src/net/i2p/router/tunnel/OutboundGatewayProcessor.java @@ -3,7 +3,6 @@ package net.i2p.router.tunnel; import net.i2p.I2PAppContext; import net.i2p.data.Base64; import net.i2p.data.ByteArray; -import net.i2p.data.DataHelper; import net.i2p.util.ByteCache; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/tunnel/PumpedTunnelGateway.java b/router/java/src/net/i2p/router/tunnel/PumpedTunnelGateway.java index 4752c611e..ab4bd8f76 100644 --- a/router/java/src/net/i2p/router/tunnel/PumpedTunnelGateway.java +++ b/router/java/src/net/i2p/router/tunnel/PumpedTunnelGateway.java @@ -1,6 +1,5 @@ package net.i2p.router.tunnel; -import java.util.ArrayList; import java.util.List; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; diff --git a/router/java/src/net/i2p/router/tunnel/TrivialPreprocessor.java b/router/java/src/net/i2p/router/tunnel/TrivialPreprocessor.java index a4bbddaed..7109e4ae3 100644 --- a/router/java/src/net/i2p/router/tunnel/TrivialPreprocessor.java +++ b/router/java/src/net/i2p/router/tunnel/TrivialPreprocessor.java @@ -1,6 +1,5 @@ package net.i2p.router.tunnel; -import java.util.ArrayList; import java.util.List; import net.i2p.data.Base64; diff --git a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java index 389915637..2503aa9ea 100644 --- a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java +++ b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java @@ -23,8 +23,6 @@ import net.i2p.router.Router; import net.i2p.router.RouterContext; import net.i2p.router.Service; import net.i2p.router.peermanager.PeerProfile; -import net.i2p.stat.Rate; -import net.i2p.stat.RateStat; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/tunnel/pool/BuildExecutor.java b/router/java/src/net/i2p/router/tunnel/pool/BuildExecutor.java index b939b833e..ddde21b12 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/BuildExecutor.java +++ b/router/java/src/net/i2p/router/tunnel/pool/BuildExecutor.java @@ -12,7 +12,6 @@ import net.i2p.data.i2np.I2NPMessage; import net.i2p.data.RouterInfo; import net.i2p.router.RouterContext; import net.i2p.router.TunnelManagerFacade; -import net.i2p.router.tunnel.TunnelCreatorConfig; import net.i2p.stat.Rate; import net.i2p.stat.RateStat; import net.i2p.stat.StatManager; diff --git a/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java b/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java index 299c9af3a..3bbd455dd 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java +++ b/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java @@ -10,7 +10,6 @@ import net.i2p.data.Hash; import net.i2p.data.PublicKey; import net.i2p.data.RouterInfo; import net.i2p.data.TunnelId; -import net.i2p.data.i2np.I2NPMessage; import net.i2p.data.i2np.TunnelBuildMessage; import net.i2p.data.i2np.VariableTunnelBuildMessage; import net.i2p.router.JobImpl; diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java index 9af3fc453..7b385a8ac 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java @@ -7,7 +7,6 @@ import java.util.Date; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Properties; import java.util.TreeSet; import net.i2p.data.DataHelper; diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java index 626566d5c..671a3e16b 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java @@ -3,31 +3,23 @@ package net.i2p.router.tunnel.pool; import java.io.IOException; import java.io.Writer; import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import net.i2p.data.DataHelper; import net.i2p.data.Destination; import net.i2p.data.Hash; -import net.i2p.data.RouterInfo; import net.i2p.data.TunnelId; import net.i2p.router.ClientTunnelSettings; import net.i2p.router.JobImpl; -import net.i2p.router.Router; import net.i2p.router.RouterContext; import net.i2p.router.TunnelInfo; import net.i2p.router.TunnelManagerFacade; import net.i2p.router.TunnelPoolSettings; -import net.i2p.router.tunnel.HopConfig; import net.i2p.router.tunnel.TunnelDispatcher; -import net.i2p.stat.RateStat; import net.i2p.util.I2PThread; import net.i2p.util.Log; import net.i2p.util.ObjectCounter;