From 5782c42d257e4f67b578ba306ac6af36ee013ad7 Mon Sep 17 00:00:00 2001 From: Oldaris Date: Wed, 16 Jul 2008 13:42:54 +0000 Subject: [PATCH] Cleaned up all 'imports' in all applications, core and router. --- .../java/src/addressbook/AddressBook.java | 6 +-- .../java/src/addressbook/ConfigParser.java | 15 ++++-- .../java/src/addressbook/Daemon.java | 10 ++-- .../java/src/addressbook/Servlet.java | 4 +- .../src/addressbook/SubscriptionList.java | 10 ++-- apps/bogobot/Bogobot.java | 4 +- .../java/src/org/klomp/snark/BitField.java | 3 -- .../org/klomp/snark/ConnectionAcceptor.java | 6 ++- .../src/org/klomp/snark/I2PSnarkUtil.java | 18 +++++-- .../java/src/org/klomp/snark/MetaInfo.java | 12 +++-- .../java/src/org/klomp/snark/Peer.java | 12 ++--- .../src/org/klomp/snark/PeerAcceptor.java | 8 ++- .../src/org/klomp/snark/PeerCheckerTask.java | 6 ++- .../src/org/klomp/snark/PeerConnectionIn.java | 5 +- .../org/klomp/snark/PeerConnectionOut.java | 8 +-- .../src/org/klomp/snark/PeerCoordinator.java | 8 ++- .../org/klomp/snark/PeerCoordinatorSet.java | 5 +- .../java/src/org/klomp/snark/PeerID.java | 8 +-- .../src/org/klomp/snark/PeerMonitorTask.java | 3 +- .../java/src/org/klomp/snark/PeerState.java | 2 - .../java/src/org/klomp/snark/Piece.java | 4 +- .../java/src/org/klomp/snark/Snark.java | 23 ++++++--- .../src/org/klomp/snark/SnarkManager.java | 17 ++++++- .../java/src/org/klomp/snark/StaticSnark.java | 4 -- .../java/src/org/klomp/snark/Storage.java | 11 ++-- .../src/org/klomp/snark/TrackerClient.java | 14 +++-- .../java/src/org/klomp/snark/TrackerInfo.java | 7 +-- .../src/org/klomp/snark/bencode/BDecoder.java | 14 ++--- .../src/org/klomp/snark/bencode/BEValue.java | 1 - .../src/org/klomp/snark/bencode/BEncoder.java | 4 +- .../org/klomp/snark/web/I2PSnarkServlet.java | 26 ++++++++-- .../org/klomp/snark/web/RunStandalone.java | 1 + .../i2ptunnel/HTTPResponseOutputStream.java | 12 +++-- .../i2p/i2ptunnel/I2PTunnelClientBase.java | 4 +- .../i2p/i2ptunnel/I2PTunnelHTTPClient.java | 4 +- .../i2ptunnel/I2PTunnelHTTPClientRunner.java | 9 ++-- .../i2p/i2ptunnel/I2PTunnelHTTPServer.java | 9 ++-- .../net/i2p/i2ptunnel/I2PTunnelIRCClient.java | 7 +-- .../net/i2p/i2ptunnel/I2PTunnelServer.java | 2 +- .../net/i2p/i2ptunnel/TunnelController.java | 3 +- .../src/net/i2p/i2ptunnel/web/EditBean.java | 2 - .../client/streaming/StreamSinkClient.java | 4 +- .../i2p/client/streaming/StreamSinkSend.java | 3 +- .../client/streaming/StreamSinkServer.java | 3 -- .../net/i2p/client/streaming/TestSwarm.java | 7 +-- apps/q/java/src/HTML/Template.java | 25 +++++++-- .../src/HTML/Tmpl/Element/Conditional.java | 6 +-- apps/q/java/src/HTML/Tmpl/Element/Loop.java | 4 +- apps/q/java/src/HTML/Tmpl/Element/Var.java | 3 +- apps/q/java/src/HTML/Tmpl/Parsers/Parser.java | 11 +++- apps/q/java/src/net/i2p/aum/DupHashtable.java | 4 +- apps/q/java/src/net/i2p/aum/EchoClient.java | 24 +++++---- apps/q/java/src/net/i2p/aum/EchoServer.java | 24 +++++---- apps/q/java/src/net/i2p/aum/EchoTest.java | 11 ++-- .../java/src/net/i2p/aum/EmbargoedQueue.java | 6 +-- apps/q/java/src/net/i2p/aum/I2PCat.java | 30 +++++++---- .../java/src/net/i2p/aum/I2PSocketHelper.java | 10 ---- .../src/net/i2p/aum/I2PTunnelXMLObject.java | 10 +--- .../src/net/i2p/aum/I2PTunnelXMLServer.java | 10 +--- .../java/src/net/i2p/aum/I2PXmlRpcClient.java | 16 ++---- .../net/i2p/aum/I2PXmlRpcClientFactory.java | 19 +++---- .../src/net/i2p/aum/I2PXmlRpcDemoClass.java | 13 ----- .../java/src/net/i2p/aum/I2PXmlRpcServer.java | 27 ++++++---- .../net/i2p/aum/I2PXmlRpcServerFactory.java | 19 +++---- .../java/src/net/i2p/aum/PrivDestination.java | 26 ++++++---- .../java/src/net/i2p/aum/PropertiesFile.java | 14 +++-- apps/q/java/src/net/i2p/aum/SimpleFile.java | 10 ++-- .../java/src/net/i2p/aum/SimpleFile_old.java | 10 ++-- apps/q/java/src/net/i2p/aum/SimpleQueue.java | 4 +- .../q/java/src/net/i2p/aum/http/HtmlPage.java | 4 +- .../i2p/aum/http/I2PHttpRequestHandler.java | 13 ++--- .../src/net/i2p/aum/http/I2PHttpServer.java | 17 ++++--- .../i2p/aum/http/MiniHttpRequestHandler.java | 17 +++++-- .../src/net/i2p/aum/http/MiniHttpServer.java | 12 ++--- apps/q/java/src/net/i2p/aum/http/Tag.java | 8 +-- apps/q/java/src/net/i2p/aum/q/QClientAPI.java | 12 ++--- .../q/java/src/net/i2p/aum/q/QClientNode.java | 24 ++++----- .../net/i2p/aum/q/QClientWebInterface.java | 18 ++++--- apps/q/java/src/net/i2p/aum/q/QConsole.java | 23 ++++++--- apps/q/java/src/net/i2p/aum/q/QDataItem.java | 23 ++++----- apps/q/java/src/net/i2p/aum/q/QIndexFile.java | 11 ++-- .../src/net/i2p/aum/q/QIndexFileIterator.java | 4 +- .../net/i2p/aum/q/QKademliaComparator.java | 4 +- apps/q/java/src/net/i2p/aum/q/QMgr.java | 22 +++++--- apps/q/java/src/net/i2p/aum/q/QNode.java | 51 ++++++++++++++----- apps/q/java/src/net/i2p/aum/q/QPeer.java | 10 ++-- .../src/net/i2p/aum/q/QServerMethods.java | 6 +-- .../q/java/src/net/i2p/aum/q/QServerNode.java | 17 +++---- apps/q/java/src/net/i2p/aum/q/QTest.java | 12 ++--- apps/q/java/src/net/i2p/aum/q/QUtil.java | 9 ++-- .../java/src/net/i2p/aum/q/QWorkerThread.java | 8 +-- .../src/net/i2p/aum/test/HttpServerTest.java | 4 +- .../q/java/src/net/i2p/aum/util/Ico2Java.java | 8 +-- .../i2p/i2ptunnel/I2PTunnelXMLWrapper.java | 22 +++----- .../i2p/router/web/ConfigAdvancedHandler.java | 2 +- .../i2p/router/web/ConfigClientsHandler.java | 1 - .../i2p/router/web/ConfigClientsHelper.java | 1 + .../net/i2p/router/web/ConfigNetHandler.java | 24 ++------- .../net/i2p/router/web/ConfigNetHelper.java | 8 +-- .../net/i2p/router/web/ConfigRestartBean.java | 2 - .../i2p/router/web/ConfigServiceHandler.java | 5 +- .../i2p/router/web/ConfigStatsHandler.java | 4 +- .../net/i2p/router/web/ConfigStatsHelper.java | 5 +- .../i2p/router/web/ConfigTunnelsHandler.java | 5 +- .../i2p/router/web/ConfigTunnelsHelper.java | 3 +- .../i2p/router/web/ConfigUpdateHandler.java | 5 +- .../i2p/router/web/ConfigUpdateHelper.java | 2 +- .../src/net/i2p/router/web/ContextHelper.java | 1 + .../src/net/i2p/router/web/FormHandler.java | 2 +- .../src/net/i2p/router/web/GraphHelper.java | 7 ++- .../src/net/i2p/router/web/NewsFetcher.java | 1 - .../net/i2p/router/web/OldConsoleHelper.java | 1 + .../src/net/i2p/router/web/ReseedHandler.java | 7 +-- .../i2p/router/web/RouterConsoleRunner.java | 8 +-- .../src/net/i2p/router/web/StatHelper.java | 3 +- .../net/i2p/router/web/StatSummarizer.java | 17 ++++--- .../src/net/i2p/router/web/SummaryHelper.java | 4 +- .../net/i2p/router/web/SummaryListener.java | 10 ++-- .../src/net/i2p/sam/SAMStreamSession.java | 2 +- .../java/src/net/i2p/sam/SAMv2Handler.java | 14 ----- .../src/net/i2p/sam/SAMv2StreamSession.java | 11 +--- .../src/net/i2p/sam/client/SAMReader.java | 5 +- .../src/net/i2p/sam/client/SAMStreamSend.java | 11 ++-- .../src/net/i2p/sam/client/SAMStreamSink.java | 10 ++-- .../i2p/sam/TestCreateSessionDatagram.java | 1 - .../net/i2p/sam/TestCreateSessionRaw.java | 3 +- .../net/i2p/sam/TestCreateSessionStream.java | 1 - .../net/i2p/sam/TestDatagramTransfer.java | 4 +- apps/sam/java/test/net/i2p/sam/TestDest.java | 1 - apps/sam/java/test/net/i2p/sam/TestHello.java | 1 - .../sam/java/test/net/i2p/sam/TestNaming.java | 1 - .../test/net/i2p/sam/TestRawTransfer.java | 4 +- .../test/net/i2p/sam/TestStreamTransfer.java | 7 ++- apps/sam/java/test/net/i2p/sam/TestSwarm.java | 18 ++----- .../net/i2p/client/streaming/Connection.java | 2 +- .../client/streaming/ConnectionManager.java | 3 +- .../i2p/client/streaming/MessageHandler.java | 2 +- .../src/net/i2p/client/streaming/Packet.java | 2 +- .../i2p/client/streaming/PacketHandler.java | 3 +- .../net/i2p/client/streaming/PacketQueue.java | 2 +- .../i2p/client/streaming/SchedulerImpl.java | 2 +- .../i2p/client/streaming/EchoLargeTest.java | 4 +- .../net/i2p/client/streaming/EchoTest.java | 3 +- .../streaming/MessageInputStreamTest.java | 1 - .../streaming/MessageOutputStreamTest.java | 2 - .../streaming/StreamSinkTestClient.java | 1 - .../streaming/StreamSinkTestServer.java | 1 - .../src/i2p/susi/dns/SubscriptionsBean.java | 2 - .../src/src/i2p/susi/webmail/MailCache.java | 4 +- .../src/src/i2p/susi/webmail/WebMail.java | 2 +- .../src/i2p/susi/webmail/encoding/Base64.java | 4 +- .../i2p/susi/webmail/encoding/HeaderLine.java | 12 ++--- .../webmail/encoding/QuotedPrintable.java | 6 +-- .../i2p/susi/webmail/pop3/POP3MailBox.java | 6 +-- .../java/src/net/i2p/syndie/Archive.java | 28 ++++++++-- .../src/net/i2p/syndie/ArchiveIndexer.java | 27 +++++++--- .../java/src/net/i2p/syndie/BlogManager.java | 42 ++++++++++++--- apps/syndie/java/src/net/i2p/syndie/CLI.java | 25 +++++++-- .../java/src/net/i2p/syndie/CLIPost.java | 20 ++++++-- .../java/src/net/i2p/syndie/CachedEntry.java | 26 ++++++++-- .../src/net/i2p/syndie/EntryExtractor.java | 18 +++++-- .../src/net/i2p/syndie/HeaderReceiver.java | 4 +- .../syndie/NewestEntryFirstComparator.java | 7 +-- .../i2p/syndie/NewestNodeFirstComparator.java | 5 +- .../java/src/net/i2p/syndie/Sucker.java | 19 ++++--- .../src/net/i2p/syndie/ThreadNodeImpl.java | 8 ++- .../java/src/net/i2p/syndie/Updater.java | 7 ++- .../src/net/i2p/syndie/UpdaterServlet.java | 4 +- apps/syndie/java/src/net/i2p/syndie/User.java | 16 ++++-- .../net/i2p/syndie/WritableThreadIndex.java | 16 ++++-- .../src/net/i2p/syndie/data/ArchiveIndex.java | 28 ++++++++-- .../src/net/i2p/syndie/data/Attachment.java | 10 +++- .../src/net/i2p/syndie/data/BlogInfo.java | 23 +++++++-- .../src/net/i2p/syndie/data/BlogInfoData.java | 9 +++- .../java/src/net/i2p/syndie/data/BlogURI.java | 7 ++- .../syndie/data/EncodingTestGenerator.java | 12 +++-- .../net/i2p/syndie/data/EntryContainer.java | 23 +++++++-- .../i2p/syndie/data/FilteredThreadIndex.java | 15 ++++-- .../i2p/syndie/data/LocalArchiveIndex.java | 10 +++- .../src/net/i2p/syndie/data/ThreadIndex.java | 5 +- .../src/net/i2p/syndie/data/ThreadNode.java | 4 +- .../syndie/data/TransparentArchiveIndex.java | 13 +++-- .../java/src/net/i2p/syndie/sml/Address.java | 1 - .../src/net/i2p/syndie/sml/ArchiveRef.java | 1 - .../java/src/net/i2p/syndie/sml/Blog.java | 3 +- .../i2p/syndie/sml/BlogPostInfoRenderer.java | 30 ++++++++--- .../src/net/i2p/syndie/sml/BlogRenderer.java | 21 +++++--- .../net/i2p/syndie/sml/EventReceiverImpl.java | 1 + .../i2p/syndie/sml/HTMLPreviewRenderer.java | 15 +++--- .../src/net/i2p/syndie/sml/HTMLRenderer.java | 38 +++++++++++--- .../java/src/net/i2p/syndie/sml/Link.java | 1 - .../src/net/i2p/syndie/sml/RSSRenderer.java | 18 ++++--- .../src/net/i2p/syndie/sml/SMLParser.java | 9 ++-- .../i2p/syndie/sml/ThreadedHTMLRenderer.java | 31 ++++++++--- .../net/i2p/syndie/web/AddressesServlet.java | 24 +++++---- .../src/net/i2p/syndie/web/AdminServlet.java | 18 +++---- .../net/i2p/syndie/web/ArchiveServlet.java | 23 ++++++--- .../net/i2p/syndie/web/ArchiveViewerBean.java | 34 ++++++++++--- .../src/net/i2p/syndie/web/BaseServlet.java | 40 ++++++++++++--- .../net/i2p/syndie/web/BlogConfigBean.java | 22 ++++++-- .../net/i2p/syndie/web/BlogConfigServlet.java | 31 +++++++---- .../src/net/i2p/syndie/web/ExportServlet.java | 23 ++++++--- .../i2p/syndie/web/ExternalLinkServlet.java | 20 ++++---- .../net/i2p/syndie/web/ImportFeedServlet.java | 20 ++++---- .../net/i2p/syndie/web/MultiPartRequest.java | 2 - .../java/src/net/i2p/syndie/web/PostBean.java | 23 +++++++-- .../src/net/i2p/syndie/web/PostServlet.java | 30 ++++++----- .../net/i2p/syndie/web/ProfileServlet.java | 25 +++++---- .../src/net/i2p/syndie/web/RSSServlet.java | 27 +++++++--- .../net/i2p/syndie/web/RemoteArchiveBean.java | 44 ++++++++++++---- .../src/net/i2p/syndie/web/RunStandalone.java | 1 + .../src/net/i2p/syndie/web/SwitchServlet.java | 18 +++---- .../net/i2p/syndie/web/SyndicateServlet.java | 21 ++++---- .../net/i2p/syndie/web/ThreadNavServlet.java | 23 ++++++--- .../net/i2p/syndie/web/ViewBlogServlet.java | 39 ++++++++++---- .../net/i2p/syndie/web/ViewBlogsServlet.java | 29 +++++++---- .../i2p/syndie/web/ViewThreadedServlet.java | 33 ++++++++---- .../src/net/i2p/apps/systray/SysTray.java | 4 +- .../crypto/prng/AsyncFortunaStandalone.java | 3 +- .../gnu/crypto/prng/FortunaStandalone.java | 11 ++-- core/java/src/net/i2p/I2PAppContext.java | 6 +-- .../client/I2PClientMessageHandlerMap.java | 3 -- .../client/MessagePayloadMessageHandler.java | 1 - .../java/src/net/i2p/client/MessageState.java | 1 - .../src/net/i2p/client/naming/AddressDB.java | 2 +- .../client/naming/AddressDBNamingService.java | 2 +- .../client/naming/EepGetNamingService.java | 1 - .../i2p/client/naming/ExecNamingService.java | 2 - .../client/naming/FilesystemAddressDB.java | 10 ++-- .../i2p/client/naming/MetaNamingService.java | 2 +- .../src/net/i2p/client/naming/PetName.java | 5 +- .../src/net/i2p/client/naming/PetNameDB.java | 18 ++++++- .../client/naming/PetNameNamingService.java | 4 -- .../src/net/i2p/crypto/AESInputStream.java | 1 + .../net/i2p/crypto/DHSessionKeyBuilder.java | 7 ++- core/java/src/net/i2p/crypto/DSAEngine.java | 4 +- .../i2p/crypto/DummyPooledRandomSource.java | 2 +- .../src/net/i2p/crypto/HMAC256Generator.java | 1 + .../src/net/i2p/crypto/HMACGenerator.java | 3 +- .../java/src/net/i2p/crypto/KeyGenerator.java | 2 - core/java/src/net/i2p/crypto/SHA1.java | 5 +- core/java/src/net/i2p/crypto/SHA1Test.java | 3 +- .../src/net/i2p/crypto/SHA256Generator.java | 6 +-- core/java/src/net/i2p/data/ByteArray.java | 1 - core/java/src/net/i2p/data/DataHelper.java | 3 +- core/java/src/net/i2p/data/Destination.java | 2 +- core/java/src/net/i2p/data/PrivateKey.java | 2 +- .../java/src/net/i2p/data/PrivateKeyFile.java | 4 +- .../src/net/i2p/data/SigningPrivateKey.java | 2 +- .../net/i2p/data/i2cp/I2CPMessageImpl.java | 1 - .../i2p/data/i2cp/MessageStatusMessage.java | 1 - .../data/i2cp/ReceiveMessageBeginMessage.java | 1 - .../data/i2cp/ReceiveMessageEndMessage.java | 1 - .../net/i2p/data/i2cp/SendMessageMessage.java | 1 - .../src/net/i2p/stat/BufferedStatLog.java | 1 - core/java/src/net/i2p/stat/Rate.java | 1 - .../src/net/i2p/stat/StatLogSplitter.java | 4 +- .../net/i2p/util/BufferedRandomSource.java | 4 -- .../src/net/i2p/util/DecayingBloomFilter.java | 5 +- core/java/src/net/i2p/util/EepGet.java | 3 -- .../src/net/i2p/util/EepGetScheduler.java | 1 + core/java/src/net/i2p/util/EepPost.java | 16 ++++-- core/java/src/net/i2p/util/Executor.java | 5 -- core/java/src/net/i2p/util/FileUtil.java | 4 +- .../src/net/i2p/util/FortunaRandomSource.java | 7 +-- .../net/i2p/util/LookaheadInputStream.java | 2 +- .../src/net/i2p/util/NativeBigInteger.java | 15 +++--- core/java/src/net/i2p/util/RandomSource.java | 9 ++-- .../i2p/util/ResettableGZIPInputStream.java | 2 - .../i2p/util/ResettableGZIPOutputStream.java | 6 +-- .../net/i2p/util/ReusableGZIPInputStream.java | 5 +- .../i2p/util/ReusableGZIPOutputStream.java | 6 +-- core/java/src/net/i2p/util/SimpleTimer.java | 2 +- .../org/bouncycastle/crypto/macs/HMac.java | 6 +-- .../test/net/i2p/client/I2PClientTest.java | 3 -- .../net/i2p/client/I2PClientTestSuite.java | 3 +- .../test/net/i2p/client/I2PSessionTest.java | 16 ++---- .../net/i2p/client/datagram/DatagramTest.java | 19 +++---- .../java/test/net/i2p/crypto/AES256Bench.java | 4 +- core/java/test/net/i2p/crypto/AES256Test.java | 9 ++-- .../net/i2p/crypto/AESInputStreamTest.java | 9 +--- .../net/i2p/crypto/CryptixAESEngineTest.java | 8 +-- .../crypto/CryptixRijndael_AlgorithmTest.java | 3 +- .../i2p/crypto/DHSessionKeyBuilderTest.java | 8 ++- core/java/test/net/i2p/crypto/DSABench.java | 1 + core/java/test/net/i2p/crypto/DSATest.java | 6 +-- .../test/net/i2p/crypto/ElGamalBench.java | 2 +- .../java/test/net/i2p/crypto/ElGamalTest.java | 28 +++++----- .../test/net/i2p/crypto/HMACSHA256Bench.java | 3 +- .../test/net/i2p/crypto/HMACSHA256Test.java | 3 +- .../test/net/i2p/crypto/KeyGeneratorTest.java | 13 +++-- .../test/net/i2p/crypto/SHA1HashTest.java | 2 +- core/java/test/net/i2p/crypto/SHA256Test.java | 5 +- .../net/i2p/crypto/SessionEncryptionTest.java | 17 +++---- .../test/net/i2p/data/AbuseReasonTest.java | 2 - .../test/net/i2p/data/AbuseSeverityTest.java | 2 - core/java/test/net/i2p/data/BooleanTest.java | 8 +-- .../test/net/i2p/data/CertificateTest.java | 3 -- .../i2p/data/CreateLeaseSetMessageTest.java | 5 -- .../i2p/data/CreateSessionMessageTest.java | 2 - .../test/net/i2p/data/DataHelperTest.java | 3 +- .../net/i2p/data/DataStructureImplTest.java | 8 +-- core/java/test/net/i2p/data/DateTest.java | 8 +-- .../test/net/i2p/data/DestinationTest.java | 6 --- .../i2p/data/DestroySessionMessageTest.java | 2 - .../net/i2p/data/DisconnectMessageTest.java | 2 - core/java/test/net/i2p/data/HashTest.java | 3 -- core/java/test/net/i2p/data/LeaseSetTest.java | 7 --- core/java/test/net/i2p/data/LeaseTest.java | 8 +-- core/java/test/net/i2p/data/MappingTest.java | 7 +-- .../java/test/net/i2p/data/MessageIdTest.java | 2 - .../i2p/data/MessagePayloadMessageTest.java | 10 +--- .../i2p/data/MessageStatusMessageTest.java | 4 -- core/java/test/net/i2p/data/PayloadTest.java | 12 +---- .../test/net/i2p/data/PrivateKeyTest.java | 7 +-- .../java/test/net/i2p/data/PublicKeyTest.java | 6 +-- .../data/ReceiveMessageBeginMessageTest.java | 4 -- .../data/ReceiveMessageEndMessageTest.java | 4 -- .../net/i2p/data/ReportAbuseMessageTest.java | 2 - .../i2p/data/RequestLeaseSetMessageTest.java | 4 -- .../test/net/i2p/data/RouterAddressTest.java | 4 -- .../test/net/i2p/data/RouterIdentityTest.java | 7 --- .../test/net/i2p/data/RouterInfoTest.java | 9 ---- .../net/i2p/data/SendMessageMessageTest.java | 9 +--- .../test/net/i2p/data/SessionConfigTest.java | 5 -- .../java/test/net/i2p/data/SessionIdTest.java | 2 - .../test/net/i2p/data/SessionKeyTest.java | 3 -- .../i2p/data/SessionStatusMessageTest.java | 2 - .../java/test/net/i2p/data/SignatureTest.java | 3 -- .../net/i2p/data/SigningPrivateKeyTest.java | 7 +-- .../net/i2p/data/SigningPublicKeyTest.java | 6 +-- core/java/test/net/i2p/data/StringTest.java | 8 +-- .../java/test/net/i2p/data/StructureTest.java | 9 +--- core/java/test/net/i2p/data/TunnelIdTest.java | 3 -- .../net/i2p/data/UnsignedIntegerTest.java | 9 +--- .../test/net/i2p/util/LogSettingsTest.java | 15 +++--- .../i2p/util/LookAheadInputStreamTest.java | 1 - .../util/ResettableGZIPInputStreamTest.java | 5 +- .../util/ResettableGZIPOutputStreamTest.java | 6 +-- .../i2p/util/ReusableGZIPInputStreamTest.java | 7 ++- .../util/ReusableGZIPOutputStreamTest.java | 6 +-- .../net/i2p/data/i2np/BuildRequestRecord.java | 7 ++- .../i2p/data/i2np/BuildResponseRecord.java | 5 +- .../src/net/i2p/data/i2np/DataMessage.java | 1 + .../i2p/data/i2np/DatabaseStoreMessage.java | 1 + .../src/net/i2p/data/i2np/DateMessage.java | 1 + .../i2p/data/i2np/DeliveryInstructions.java | 1 - .../i2p/data/i2np/DeliveryStatusMessage.java | 1 + .../src/net/i2p/data/i2np/GarlicMessage.java | 1 + .../net/i2p/data/i2np/I2NPMessageImpl.java | 1 - .../net/i2p/data/i2np/TunnelBuildMessage.java | 5 +- .../data/i2np/TunnelBuildReplyMessage.java | 5 +- .../data/i2np/TunnelCreateStatusMessage.java | 1 + .../net/i2p/data/i2np/TunnelDataMessage.java | 1 + .../i2p/data/i2np/TunnelGatewayMessage.java | 1 + .../src/net/i2p/router/ClientMessagePool.java | 1 - .../src/net/i2p/router/CommSystemFacade.java | 1 + .../src/net/i2p/router/InNetMessagePool.java | 6 +-- .../src/net/i2p/router/LoadTestManager.java | 37 ++++++++++---- .../net/i2p/router/NetworkDatabaseFacade.java | 6 ++- .../src/net/i2p/router/PeerManagerFacade.java | 1 + router/java/src/net/i2p/router/Router.java | 13 ++--- .../java/src/net/i2p/router/RouterClock.java | 4 +- .../src/net/i2p/router/RouterContext.java | 4 +- .../java/src/net/i2p/router/RouterLaunch.java | 4 +- .../src/net/i2p/router/RouterThrottle.java | 1 - .../net/i2p/router/RouterThrottleImpl.java | 1 - router/java/src/net/i2p/router/SSUDemo.java | 18 +++++-- router/java/src/net/i2p/router/Shitlist.java | 10 +++- .../src/net/i2p/router/StatisticsManager.java | 4 +- .../net/i2p/router/TunnelManagerFacade.java | 6 +-- .../src/net/i2p/router/admin/AdminRunner.java | 2 +- .../router/client/ClientConnectionRunner.java | 2 +- .../net/i2p/router/client/ClientManager.java | 2 +- .../message/HandleGarlicMessageJob.java | 1 + .../OutboundClientMessageJobHelper.java | 1 - .../OutboundClientMessageOneShotJob.java | 16 ++---- .../message/OutboundClientMessageStatus.java | 1 + .../HandleDatabaseLookupMessageJob.java | 5 +- .../HandleDatabaseStoreMessageJob.java | 1 + .../networkdb/PublishLocalRouterInfoJob.java | 3 +- .../router/networkdb/kademlia/ExploreJob.java | 1 + .../kademlia/FloodOnlySearchJob.java | 20 ++++++-- .../kademlia/FloodfillMonitorJob.java | 3 +- .../FloodfillNetworkDatabaseFacade.java | 27 ++++++++-- .../kademlia/FloodfillPeerSelector.java | 11 ++-- .../networkdb/kademlia/FloodfillStoreJob.java | 14 ----- .../kademlia/FloodfillVerifyStoreJob.java | 15 ++++-- ...ndleFloodfillDatabaseLookupMessageJob.java | 16 ------ ...andleFloodfillDatabaseStoreMessageJob.java | 15 ++++-- .../networkdb/kademlia/HarvesterJob.java | 2 +- .../networkdb/kademlia/KBucketImpl.java | 4 +- .../KademliaNetworkDatabaseFacade.java | 6 +-- .../networkdb/kademlia/PeerSelector.java | 4 +- .../kademlia/PersistentDataStore.java | 6 ++- .../router/networkdb/kademlia/SearchJob.java | 2 - .../router/networkdb/kademlia/StoreJob.java | 5 +- .../networkdb/kademlia/XORComparator.java | 1 + .../InverseCapacityComparator.java | 1 + .../i2p/router/peermanager/PeerManager.java | 14 +++-- .../router/peermanager/ProfileOrganizer.java | 2 +- .../peermanager/ProfileOrganizerRenderer.java | 5 -- .../peermanager/StrictSpeedCalculator.java | 2 +- .../i2p/router/startup/ClientAppConfig.java | 2 +- .../router/startup/CreateRouterInfoJob.java | 1 - .../net/i2p/router/startup/ReadConfigJob.java | 1 + .../router/startup/RebuildRouterInfoJob.java | 1 - .../transport/CommSystemFacadeImpl.java | 2 +- .../transport/FIFOBandwidthRefiller.java | 4 +- .../net/i2p/router/transport/GetBidsJob.java | 1 - .../transport/OutboundMessageRegistry.java | 8 ++- .../net/i2p/router/transport/Transport.java | 3 +- .../i2p/router/transport/TransportImpl.java | 11 +++- .../router/transport/TransportManager.java | 9 ++-- .../router/transport/ntcp/EstablishState.java | 24 +++++++-- .../router/transport/ntcp/EventPumper.java | 13 ++++- .../router/transport/ntcp/NTCPAddress.java | 1 - .../router/transport/ntcp/NTCPConnection.java | 8 +-- .../router/transport/ntcp/NTCPTransport.java | 9 ++-- .../net/i2p/router/transport/ntcp/Reader.java | 4 +- .../net/i2p/router/transport/ntcp/Writer.java | 5 +- .../transport/tcp/ConnectionHandler.java | 6 +-- .../transport/tcp/ConnectionRunner.java | 3 +- .../router/transport/tcp/MessageHandler.java | 4 +- .../tcp/PersistentConnectionTagManager.java | 3 +- .../router/transport/tcp/TCPConnection.java | 4 +- .../i2p/router/transport/tcp/TCPListener.java | 1 - .../router/transport/tcp/TCPTransport.java | 7 ++- .../transport/udp/EstablishmentManager.java | 4 +- .../transport/udp/InboundEstablishState.java | 4 -- .../udp/InboundMessageFragments.java | 5 -- .../transport/udp/IntroductionManager.java | 11 ++-- .../router/transport/udp/MessageReceiver.java | 3 +- .../transport/udp/OutboundEstablishState.java | 3 -- .../udp/OutboundMessageFragments.java | 4 -- .../transport/udp/OutboundMessageState.java | 3 +- .../router/transport/udp/PacketBuilder.java | 2 +- .../router/transport/udp/PacketHandler.java | 2 - .../router/transport/udp/PacketPusher.java | 1 - .../i2p/router/transport/udp/PeerState.java | 10 ++-- .../router/transport/udp/PeerTestManager.java | 10 ++-- .../router/transport/udp/PeerTestState.java | 1 + .../TimedWeightedPriorityMessageQueue.java | 1 - .../i2p/router/transport/udp/UDPEndpoint.java | 1 - .../router/transport/udp/UDPEndpointTest.java | 2 - .../i2p/router/transport/udp/UDPFlooder.java | 1 + .../i2p/router/transport/udp/UDPPacket.java | 7 +-- .../router/transport/udp/UDPPacketReader.java | 1 + .../i2p/router/transport/udp/UDPReceiver.java | 5 +- .../i2p/router/transport/udp/UDPSender.java | 5 +- .../router/transport/udp/UDPTransport.java | 29 ++++++----- .../router/tunnel/BatchedPreprocessor.java | 2 - .../tunnel/BatchedRouterPreprocessor.java | 4 +- .../router/tunnel/BuildMessageGenerator.java | 16 ++++-- .../router/tunnel/BuildMessageProcessor.java | 11 ++-- .../i2p/router/tunnel/BuildMessageTest.java | 17 +++++-- .../i2p/router/tunnel/BuildReplyHandler.java | 11 ++-- .../i2p/router/tunnel/FragmentedMessage.java | 5 +- .../i2p/router/tunnel/HashSetIVValidator.java | 1 + .../net/i2p/router/tunnel/HopProcessor.java | 1 - .../tunnel/InboundEndpointProcessor.java | 2 +- .../tunnel/InboundMessageDistributor.java | 8 +-- .../tunnel/OutboundMessageDistributor.java | 2 +- .../router/tunnel/PumpedTunnelGateway.java | 2 - .../tunnel/TrivialRouterPreprocessor.java | 1 + .../router/tunnel/TunnelCreatorConfig.java | 7 ++- .../i2p/router/tunnel/TunnelDispatcher.java | 4 +- .../router/tunnel/TunnelGatewayPumper.java | 4 +- .../i2p/router/tunnel/pool/BuildExecutor.java | 17 ++++--- .../i2p/router/tunnel/pool/BuildHandler.java | 29 +++++++++-- .../router/tunnel/pool/BuildRequestor.java | 18 ++++--- .../tunnel/pool/ClientPeerSelector.java | 6 ++- .../tunnel/pool/ExploratoryPeerSelector.java | 7 ++- .../pool/HandleTunnelCreateMessageJob.java | 6 +-- .../pool/PooledTunnelCreatorConfig.java | 3 +- .../tunnel/pool/SendGarlicMessageJob.java | 2 +- .../net/i2p/router/tunnel/pool/TestJob.java | 4 +- .../pool/TunnelMessageHandlerBuilder.java | 2 +- .../tunnel/pool/TunnelPeerSelector.java | 15 ++++-- .../i2p/router/tunnel/pool/TunnelPool.java | 5 +- .../router/tunnel/pool/TunnelPoolManager.java | 19 +++++-- .../data/i2np/DatabaseStoreMessageTest.java | 5 +- .../data/i2np/DeliveryInstructionsTest.java | 2 - .../i2p/data/i2np/I2NPMessageReaderTest.java | 8 +-- .../networkdb/kademlia/KBucketImplTest.java | 4 +- .../networkdb/kademlia/KBucketSetTest.java | 6 +-- .../transport/BandwidthLimiterTest.java | 7 +-- .../router/tunnel/BatchedFragmentTest.java | 7 +-- .../net/i2p/router/tunnel/FragmentTest.java | 6 +-- .../i2p/router/tunnel/InboundGatewayTest.java | 4 +- .../net/i2p/router/tunnel/InboundTest.java | 5 +- .../router/tunnel/OutboundGatewayTest.java | 5 +- .../net/i2p/router/tunnel/OutboundTest.java | 5 +- 493 files changed, 2221 insertions(+), 1833 deletions(-) diff --git a/apps/addressbook/java/src/addressbook/AddressBook.java b/apps/addressbook/java/src/addressbook/AddressBook.java index 7379c44601..a590915916 100644 --- a/apps/addressbook/java/src/addressbook/AddressBook.java +++ b/apps/addressbook/java/src/addressbook/AddressBook.java @@ -21,11 +21,11 @@ package addressbook; -import java.util.Map; -import java.util.HashMap; -import java.util.Iterator; import java.io.File; import java.io.IOException; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; import net.i2p.I2PAppContext; import net.i2p.util.EepGet; diff --git a/apps/addressbook/java/src/addressbook/ConfigParser.java b/apps/addressbook/java/src/addressbook/ConfigParser.java index bc8920e180..2df3f63972 100644 --- a/apps/addressbook/java/src/addressbook/ConfigParser.java +++ b/apps/addressbook/java/src/addressbook/ConfigParser.java @@ -21,12 +21,19 @@ package addressbook; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.StringReader; import java.util.HashMap; -import java.util.Map; -import java.util.List; -import java.util.LinkedList; import java.util.Iterator; -import java.io.*; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; /** * Utility class providing methods to parse and write files in config file diff --git a/apps/addressbook/java/src/addressbook/Daemon.java b/apps/addressbook/java/src/addressbook/Daemon.java index e43a02436b..752e898dcf 100644 --- a/apps/addressbook/java/src/addressbook/Daemon.java +++ b/apps/addressbook/java/src/addressbook/Daemon.java @@ -21,12 +21,12 @@ package addressbook; -import java.util.Iterator; -import java.util.Map; -import java.util.HashMap; -import java.util.List; -import java.util.LinkedList; import java.io.File; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; /** * Main class of addressbook. Performs updates, and runs the main loop. diff --git a/apps/addressbook/java/src/addressbook/Servlet.java b/apps/addressbook/java/src/addressbook/Servlet.java index 1fa9dee15d..a6b61bcf79 100644 --- a/apps/addressbook/java/src/addressbook/Servlet.java +++ b/apps/addressbook/java/src/addressbook/Servlet.java @@ -22,10 +22,10 @@ package addressbook; import javax.servlet.GenericServlet; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; import javax.servlet.ServletConfig; import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; /** * A wrapper for addressbook to allow it to be started as a web application. diff --git a/apps/addressbook/java/src/addressbook/SubscriptionList.java b/apps/addressbook/java/src/addressbook/SubscriptionList.java index 9b20add2c3..66c45829bd 100644 --- a/apps/addressbook/java/src/addressbook/SubscriptionList.java +++ b/apps/addressbook/java/src/addressbook/SubscriptionList.java @@ -21,13 +21,13 @@ package addressbook; -import java.util.List; -import java.util.LinkedList; -import java.util.Map; -import java.util.HashMap; -import java.util.Iterator; import java.io.File; import java.io.IOException; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; /** * A list of Subscriptions loaded from a file. diff --git a/apps/bogobot/Bogobot.java b/apps/bogobot/Bogobot.java index 8d37ca9d3d..0c0c40c92e 100644 --- a/apps/bogobot/Bogobot.java +++ b/apps/bogobot/Bogobot.java @@ -10,16 +10,14 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; - +import java.util.Properties; import java.util.Timer; import java.util.TimerTask; -import java.util.Properties; import org.apache.log4j.DailyRollingFileAppender; import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.apache.log4j.PatternLayout; - import org.jibble.pircbot.IrcException; import org.jibble.pircbot.NickAlreadyInUseException; import org.jibble.pircbot.PircBot; diff --git a/apps/i2psnark/java/src/org/klomp/snark/BitField.java b/apps/i2psnark/java/src/org/klomp/snark/BitField.java index d0b347b5ef..85117b93d7 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/BitField.java +++ b/apps/i2psnark/java/src/org/klomp/snark/BitField.java @@ -20,9 +20,6 @@ package org.klomp.snark; -import java.util.Iterator; -import java.util.Set; -import java.util.HashSet; /** * Container of a byte array representing set and unset bits. diff --git a/apps/i2psnark/java/src/org/klomp/snark/ConnectionAcceptor.java b/apps/i2psnark/java/src/org/klomp/snark/ConnectionAcceptor.java index 5767abc565..eb2be0d546 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/ConnectionAcceptor.java +++ b/apps/i2psnark/java/src/org/klomp/snark/ConnectionAcceptor.java @@ -20,8 +20,10 @@ package org.klomp.snark; -import java.io.*; -import java.net.*; +import java.io.BufferedInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import net.i2p.I2PException; import net.i2p.client.streaming.I2PServerSocket; diff --git a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java index 8c3c4d4cfa..a319954a4d 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java +++ b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java @@ -1,20 +1,28 @@ package org.klomp.snark; +import java.io.File; +import java.io.IOException; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + import net.i2p.I2PAppContext; import net.i2p.I2PException; -import net.i2p.util.EepGet; import net.i2p.client.I2PSession; -import net.i2p.data.*; import net.i2p.client.streaming.I2PServerSocket; import net.i2p.client.streaming.I2PSocket; import net.i2p.client.streaming.I2PSocketManager; import net.i2p.client.streaming.I2PSocketManagerFactory; +import net.i2p.data.DataFormatException; +import net.i2p.data.Destination; +import net.i2p.data.Hash; +import net.i2p.util.EepGet; import net.i2p.util.Log; import net.i2p.util.SimpleTimer; -import java.io.*; -import java.util.*; - /** * I2P specific helpers for I2PSnark */ diff --git a/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java b/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java index 66e183720c..2d882489bd 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java +++ b/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java @@ -22,20 +22,22 @@ package org.klomp.snark; import java.io.IOException; import java.io.InputStream; -import java.io.File; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.ArrayList; +import java.util.HashMap; import java.util.Iterator; import java.util.List; -import java.util.ArrayList; import java.util.Map; -import java.util.HashMap; -import org.klomp.snark.bencode.*; +import net.i2p.crypto.SHA1; import net.i2p.data.Base64; import net.i2p.util.Log; -import net.i2p.crypto.SHA1; + +import org.klomp.snark.bencode.BDecoder; +import org.klomp.snark.bencode.BEValue; +import org.klomp.snark.bencode.BEncoder; +import org.klomp.snark.bencode.InvalidBEncodingException; /** * Note: this class is buggy, as it doesn't propogate custom meta fields into the bencoded diff --git a/apps/i2psnark/java/src/org/klomp/snark/Peer.java b/apps/i2psnark/java/src/org/klomp/snark/Peer.java index c297fd37ae..e18be2da99 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/Peer.java +++ b/apps/i2psnark/java/src/org/klomp/snark/Peer.java @@ -20,15 +20,15 @@ package org.klomp.snark; -import java.io.*; -import java.net.*; +import java.io.BufferedInputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.util.Arrays; -import java.util.Map; - -import org.klomp.snark.bencode.*; import net.i2p.client.streaming.I2PSocket; -import net.i2p.data.DataHelper; import net.i2p.util.Log; public class Peer implements Comparable diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerAcceptor.java b/apps/i2psnark/java/src/org/klomp/snark/PeerAcceptor.java index e54d91b9cc..b2015fea28 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/PeerAcceptor.java +++ b/apps/i2psnark/java/src/org/klomp/snark/PeerAcceptor.java @@ -20,8 +20,12 @@ package org.klomp.snark; -import java.io.*; -import java.net.*; +import java.io.BufferedInputStream; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.SequenceInputStream; import java.util.Iterator; import net.i2p.client.streaming.I2PSocket; diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java b/apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java index 278971a7db..f8e36fe42e 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java +++ b/apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java @@ -20,7 +20,11 @@ package org.klomp.snark; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Random; +import java.util.TimerTask; /** * TimerTask that checks for good/bad up/downloader. Works together diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionIn.java b/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionIn.java index 5182114d03..3c3e6e825a 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionIn.java +++ b/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionIn.java @@ -20,9 +20,8 @@ package org.klomp.snark; -import java.io.*; -import java.net.*; -import java.util.*; +import java.io.DataInputStream; +import java.io.IOException; import net.i2p.util.Log; diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java b/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java index 275a05c353..eeb6455c6d 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java +++ b/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java @@ -20,9 +20,11 @@ package org.klomp.snark; -import java.io.*; -import java.net.*; -import java.util.*; +import java.io.DataOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; import net.i2p.util.I2PThread; import net.i2p.util.Log; diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java index 2304f050b0..c85db3f127 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java +++ b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java @@ -20,8 +20,14 @@ package org.klomp.snark; -import java.util.*; import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Random; +import java.util.Timer; import net.i2p.util.I2PThread; import net.i2p.util.Log; diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinatorSet.java b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinatorSet.java index 8c89091cab..cf36c93782 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinatorSet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinatorSet.java @@ -1,6 +1,9 @@ package org.klomp.snark; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; /** * Hmm, any guesses as to what this is? Used by the multitorrent functionality diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerID.java b/apps/i2psnark/java/src/org/klomp/snark/PeerID.java index cbde1a33a4..e9b03b3910 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/PeerID.java +++ b/apps/i2psnark/java/src/org/klomp/snark/PeerID.java @@ -21,15 +21,15 @@ package org.klomp.snark; import java.io.IOException; -import java.net.InetAddress; import java.net.UnknownHostException; import java.util.Map; -import org.klomp.snark.bencode.*; - import net.i2p.data.Base64; import net.i2p.data.Destination; -import net.i2p.data.DataFormatException; + +import org.klomp.snark.bencode.BDecoder; +import org.klomp.snark.bencode.BEValue; +import org.klomp.snark.bencode.InvalidBEncodingException; public class PeerID implements Comparable { diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerMonitorTask.java b/apps/i2psnark/java/src/org/klomp/snark/PeerMonitorTask.java index b409f58c8e..e361523309 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/PeerMonitorTask.java +++ b/apps/i2psnark/java/src/org/klomp/snark/PeerMonitorTask.java @@ -20,7 +20,8 @@ package org.klomp.snark; -import java.util.*; +import java.util.Iterator; +import java.util.TimerTask; /** * TimerTask that monitors the peers and total up/download speeds. diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerState.java b/apps/i2psnark/java/src/org/klomp/snark/PeerState.java index 8f8b7bbc6b..469445aa31 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/PeerState.java +++ b/apps/i2psnark/java/src/org/klomp/snark/PeerState.java @@ -23,8 +23,6 @@ package org.klomp.snark; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import java.util.Set; -import java.util.HashSet; import net.i2p.util.Log; diff --git a/apps/i2psnark/java/src/org/klomp/snark/Piece.java b/apps/i2psnark/java/src/org/klomp/snark/Piece.java index 4d6f693c95..0c153262a5 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/Piece.java +++ b/apps/i2psnark/java/src/org/klomp/snark/Piece.java @@ -1,8 +1,8 @@ package org.klomp.snark; -import java.util.Set; -import java.util.HashSet; import java.util.Collections; +import java.util.HashSet; +import java.util.Set; public class Piece implements Comparable { diff --git a/apps/i2psnark/java/src/org/klomp/snark/Snark.java b/apps/i2psnark/java/src/org/klomp/snark/Snark.java index f7ea7f0fac..0e4fc3da51 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/Snark.java +++ b/apps/i2psnark/java/src/org/klomp/snark/Snark.java @@ -20,17 +20,26 @@ package org.klomp.snark; -import java.io.*; -import java.net.*; -import java.util.*; +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.Iterator; +import java.util.List; +import java.util.Properties; +import java.util.Random; +import java.util.StringTokenizer; +import java.util.Timer; +import java.util.TimerTask; -import org.klomp.snark.bencode.*; - -import net.i2p.data.Destination; -import net.i2p.client.streaming.I2PSocket; import net.i2p.client.streaming.I2PServerSocket; +import net.i2p.data.Destination; import net.i2p.util.I2PThread; +import org.klomp.snark.bencode.BDecoder; + /** * Main Snark program startup class. * diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index 771fdb410e..e45e64e70e 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -1,7 +1,20 @@ package org.klomp.snark; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FilenameFilter; +import java.io.IOException; +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.Properties; +import java.util.Set; +import java.util.StringTokenizer; +import java.util.TreeMap; + import net.i2p.I2PAppContext; import net.i2p.data.Base64; import net.i2p.data.DataHelper; diff --git a/apps/i2psnark/java/src/org/klomp/snark/StaticSnark.java b/apps/i2psnark/java/src/org/klomp/snark/StaticSnark.java index 22ef1c2a45..38b470a7c9 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/StaticSnark.java +++ b/apps/i2psnark/java/src/org/klomp/snark/StaticSnark.java @@ -20,10 +20,6 @@ package org.klomp.snark; -import java.security.Provider; -import java.security.Security; - -import org.klomp.snark.bencode.*; /** * Main snark startup class for staticly linking with gcj. diff --git a/apps/i2psnark/java/src/org/klomp/snark/Storage.java b/apps/i2psnark/java/src/org/klomp/snark/Storage.java index 47f65e7ffa..6b49819b14 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/Storage.java +++ b/apps/i2psnark/java/src/org/klomp/snark/Storage.java @@ -20,10 +20,13 @@ package org.klomp.snark; -import java.io.*; -import java.util.*; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.StringTokenizer; import net.i2p.crypto.SHA1; diff --git a/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java b/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java index 466cccd09a..66217f30a8 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java +++ b/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java @@ -20,11 +20,17 @@ package org.klomp.snark; -import java.io.*; -import java.net.*; -import java.util.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Random; +import java.util.Set; -import org.klomp.snark.bencode.*; import net.i2p.util.I2PThread; import net.i2p.util.Log; diff --git a/apps/i2psnark/java/src/org/klomp/snark/TrackerInfo.java b/apps/i2psnark/java/src/org/klomp/snark/TrackerInfo.java index 765598faba..4319a63103 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/TrackerInfo.java +++ b/apps/i2psnark/java/src/org/klomp/snark/TrackerInfo.java @@ -22,14 +22,15 @@ package org.klomp.snark; import java.io.IOException; import java.io.InputStream; -import java.math.BigInteger; +import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.HashSet; -import org.klomp.snark.bencode.*; +import org.klomp.snark.bencode.BDecoder; +import org.klomp.snark.bencode.BEValue; +import org.klomp.snark.bencode.InvalidBEncodingException; public class TrackerInfo { diff --git a/apps/i2psnark/java/src/org/klomp/snark/bencode/BDecoder.java b/apps/i2psnark/java/src/org/klomp/snark/bencode/BDecoder.java index 87b3bf4c54..9fb675c261 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/bencode/BDecoder.java +++ b/apps/i2psnark/java/src/org/klomp/snark/bencode/BDecoder.java @@ -20,20 +20,16 @@ package org.klomp.snark.bencode; +import java.io.EOFException; import java.io.IOException; import java.io.InputStream; -import java.io.EOFException; -import java.io.UnsupportedEncodingException; - import java.math.BigInteger; - -import java.util.ArrayList; -import java.util.List; -import java.util.HashMap; -import java.util.Map; - import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * Decodes a bencoded stream to BEValues. diff --git a/apps/i2psnark/java/src/org/klomp/snark/bencode/BEValue.java b/apps/i2psnark/java/src/org/klomp/snark/bencode/BEValue.java index 7a8ef02b80..47814df347 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/bencode/BEValue.java +++ b/apps/i2psnark/java/src/org/klomp/snark/bencode/BEValue.java @@ -21,7 +21,6 @@ package org.klomp.snark.bencode; import java.io.UnsupportedEncodingException; - import java.util.List; import java.util.Map; diff --git a/apps/i2psnark/java/src/org/klomp/snark/bencode/BEncoder.java b/apps/i2psnark/java/src/org/klomp/snark/bencode/BEncoder.java index fa6e874d3f..b8129f4772 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/bencode/BEncoder.java +++ b/apps/i2psnark/java/src/org/klomp/snark/bencode/BEncoder.java @@ -20,11 +20,9 @@ package org.klomp.snark.bencode; +import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; -import java.io.ByteArrayOutputStream; -import java.io.UnsupportedEncodingException; - import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; 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 8c190fb1c6..3c00a7e319 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -1,12 +1,23 @@ package org.klomp.snark.web; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; +import java.util.TreeSet; + import javax.servlet.ServletConfig; import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServlet; import net.i2p.I2PAppContext; import net.i2p.data.Base64; @@ -14,7 +25,14 @@ import net.i2p.data.DataHelper; import net.i2p.util.FileUtil; import net.i2p.util.I2PThread; import net.i2p.util.Log; -import org.klomp.snark.*; + +import org.klomp.snark.I2PSnarkUtil; +import org.klomp.snark.MetaInfo; +import org.klomp.snark.Peer; +import org.klomp.snark.Snark; +import org.klomp.snark.SnarkManager; +import org.klomp.snark.Storage; +import org.klomp.snark.TrackerClient; /** * diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/RunStandalone.java b/apps/i2psnark/java/src/org/klomp/snark/web/RunStandalone.java index c3d4548eda..05795b8611 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/RunStandalone.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/RunStandalone.java @@ -3,6 +3,7 @@ package org.klomp.snark.web; import java.io.File; import net.i2p.util.FileUtil; + import org.mortbay.jetty.Server; public class RunStandalone { diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java index 05ca1d852f..2b5cc2c5e2 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java @@ -8,11 +8,15 @@ package net.i2p.i2ptunnel; * */ -import java.io.*; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; +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 net.i2p.I2PAppContext; import net.i2p.data.ByteArray; import net.i2p.util.ByteCache; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java index 1426e481e4..7ac922a598 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java @@ -16,8 +16,8 @@ import java.util.Iterator; import java.util.List; import java.util.Properties; -import net.i2p.I2PException; import net.i2p.I2PAppContext; +import net.i2p.I2PException; import net.i2p.client.I2PSession; import net.i2p.client.streaming.I2PSocket; import net.i2p.client.streaming.I2PSocketManager; @@ -26,8 +26,8 @@ import net.i2p.client.streaming.I2PSocketOptions; import net.i2p.data.Destination; import net.i2p.util.EventDispatcher; import net.i2p.util.I2PThread; -import net.i2p.util.SimpleTimer; import net.i2p.util.Log; +import net.i2p.util.SimpleTimer; public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runnable { diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java index 9aca9c1614..e64af04aac 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java @@ -11,10 +11,10 @@ import java.net.Socket; import java.net.SocketException; import java.util.ArrayList; import java.util.Date; -import java.util.List; -import java.util.StringTokenizer; import java.util.HashMap; +import java.util.List; import java.util.Properties; +import java.util.StringTokenizer; import net.i2p.I2PAppContext; import net.i2p.I2PException; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientRunner.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientRunner.java index 8c442bcc65..9ade9021f5 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientRunner.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientRunner.java @@ -3,17 +3,14 @@ */ package net.i2p.i2ptunnel; -import java.io.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.net.Socket; -import java.util.Iterator; import java.util.List; -import java.util.Properties; import net.i2p.I2PAppContext; import net.i2p.client.streaming.I2PSocket; -import net.i2p.data.ByteArray; -import net.i2p.data.DataHelper; -import net.i2p.util.ByteCache; 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 5d9c162c0b..794e5c05fd 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java @@ -3,18 +3,17 @@ */ package net.i2p.i2ptunnel; -import java.io.*; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.net.InetAddress; import java.net.Socket; import java.net.SocketException; import java.util.Iterator; import java.util.Properties; import java.util.zip.GZIPOutputStream; -import java.util.zip.Deflater; -import net.i2p.I2PAppContext; -import net.i2p.I2PException; -import net.i2p.client.streaming.I2PServerSocket; import net.i2p.client.streaming.I2PSocket; import net.i2p.data.DataHelper; import net.i2p.util.EventDispatcher; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java index ad2f55b2b1..e6708aa21d 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java @@ -1,16 +1,17 @@ package net.i2p.i2ptunnel; -import java.io.*; +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; import java.util.StringTokenizer; -import java.lang.IndexOutOfBoundsException; import net.i2p.I2PAppContext; import net.i2p.client.streaming.I2PSocket; import net.i2p.data.DataFormatException; -import net.i2p.data.DataHelper; import net.i2p.data.Destination; import net.i2p.util.EventDispatcher; import net.i2p.util.I2PThread; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java index f6d1c2ea0a..014d91e9bf 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java @@ -8,10 +8,10 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; +import java.net.ConnectException; import java.net.InetAddress; import java.net.Socket; import java.net.SocketException; -import java.net.ConnectException; import java.util.Iterator; import java.util.Properties; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java index 6a3b228b00..614bc1f743 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java @@ -1,9 +1,8 @@ package net.i2p.i2ptunnel; -import java.io.IOException; import java.io.File; import java.io.FileOutputStream; - +import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java index 5ed8e26af0..eb7de9cf1e 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java @@ -13,10 +13,8 @@ import java.util.List; import java.util.Properties; import java.util.StringTokenizer; -import net.i2p.I2PAppContext; import net.i2p.i2ptunnel.TunnelController; import net.i2p.i2ptunnel.TunnelControllerGroup; -import net.i2p.util.Log; /** * Ugly little accessor for the edit page diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkClient.java b/apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkClient.java index 74365b2ff1..fb0e006fa2 100644 --- a/apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkClient.java +++ b/apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkClient.java @@ -4,17 +4,15 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InterruptedIOException; import java.io.OutputStream; - import java.net.ConnectException; import java.net.NoRouteToHostException; - import java.util.Properties; import java.util.Random; import net.i2p.I2PAppContext; import net.i2p.I2PException; -import net.i2p.data.Destination; import net.i2p.data.DataFormatException; +import net.i2p.data.Destination; import net.i2p.util.I2PThread; import net.i2p.util.Log; diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkSend.java b/apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkSend.java index 82c51b43d3..1470e76e06 100644 --- a/apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkSend.java +++ b/apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkSend.java @@ -4,14 +4,13 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InterruptedIOException; import java.io.OutputStream; - import java.net.ConnectException; import java.net.NoRouteToHostException; import net.i2p.I2PAppContext; import net.i2p.I2PException; -import net.i2p.data.Destination; import net.i2p.data.DataFormatException; +import net.i2p.data.Destination; import net.i2p.util.Log; /** diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkServer.java b/apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkServer.java index 7651cb5efe..c8b566190c 100644 --- a/apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkServer.java +++ b/apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkServer.java @@ -4,10 +4,7 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; - import java.net.ConnectException; -import java.util.ArrayList; -import java.util.List; import java.util.Properties; import net.i2p.I2PAppContext; diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/TestSwarm.java b/apps/ministreaming/java/src/net/i2p/client/streaming/TestSwarm.java index f8a3c73516..f9ccadf834 100644 --- a/apps/ministreaming/java/src/net/i2p/client/streaming/TestSwarm.java +++ b/apps/ministreaming/java/src/net/i2p/client/streaming/TestSwarm.java @@ -1,15 +1,16 @@ package net.i2p.client.streaming; -import java.io.InputStream; import java.io.File; -import java.io.FileOutputStream; import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.InputStream; import java.io.OutputStream; + import net.i2p.I2PAppContext; import net.i2p.client.I2PClientFactory; import net.i2p.data.Destination; -import net.i2p.util.Log; import net.i2p.util.I2PThread; +import net.i2p.util.Log; /** * Sit around on a destination, receiving lots of data and sending lots of diff --git a/apps/q/java/src/HTML/Template.java b/apps/q/java/src/HTML/Template.java index 5baf9c425e..6b6ce914aa 100644 --- a/apps/q/java/src/HTML/Template.java +++ b/apps/q/java/src/HTML/Template.java @@ -34,13 +34,28 @@ */ package HTML; -import java.util.*; -import java.io.*; +import java.io.BufferedReader; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.Reader; +import java.util.EmptyStackException; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.NoSuchElementException; +import java.util.Properties; +import java.util.Stack; +import java.util.StringTokenizer; +import java.util.Vector; -import HTML.Tmpl.Element.*; -import HTML.Tmpl.Parsers.*; -import HTML.Tmpl.Util; import HTML.Tmpl.Filter; +import HTML.Tmpl.Util; +import HTML.Tmpl.Element.Conditional; +import HTML.Tmpl.Element.Element; +import HTML.Tmpl.Element.If; +import HTML.Tmpl.Element.Var; +import HTML.Tmpl.Parsers.Parser; /** * Use HTML Templates with java. diff --git a/apps/q/java/src/HTML/Tmpl/Element/Conditional.java b/apps/q/java/src/HTML/Tmpl/Element/Conditional.java index 32b1832e6c..25a8d4e6d2 100644 --- a/apps/q/java/src/HTML/Tmpl/Element/Conditional.java +++ b/apps/q/java/src/HTML/Tmpl/Element/Conditional.java @@ -35,12 +35,12 @@ package HTML.Tmpl.Element; -import java.util.Vector; -import java.util.Hashtable; import java.util.Enumeration; +import java.util.Hashtable; import java.util.NoSuchElementException; +import java.util.Vector; -import HTML.*; +import HTML.Template; public class Conditional extends Element { diff --git a/apps/q/java/src/HTML/Tmpl/Element/Loop.java b/apps/q/java/src/HTML/Tmpl/Element/Loop.java index ffd13dafd0..cb1911a870 100644 --- a/apps/q/java/src/HTML/Tmpl/Element/Loop.java +++ b/apps/q/java/src/HTML/Tmpl/Element/Loop.java @@ -29,10 +29,10 @@ */ package HTML.Tmpl.Element; -import java.util.Vector; -import java.util.Hashtable; import java.util.Enumeration; +import java.util.Hashtable; import java.util.NoSuchElementException; +import java.util.Vector; public class Loop extends Element { diff --git a/apps/q/java/src/HTML/Tmpl/Element/Var.java b/apps/q/java/src/HTML/Tmpl/Element/Var.java index 7aee9b165a..bf761b9c0a 100644 --- a/apps/q/java/src/HTML/Tmpl/Element/Var.java +++ b/apps/q/java/src/HTML/Tmpl/Element/Var.java @@ -35,8 +35,9 @@ package HTML.Tmpl.Element; import java.util.Hashtable; import java.util.NoSuchElementException; -import HTML.Tmpl.Util; + import HTML.Template; +import HTML.Tmpl.Util; public class Var extends Element { diff --git a/apps/q/java/src/HTML/Tmpl/Parsers/Parser.java b/apps/q/java/src/HTML/Tmpl/Parsers/Parser.java index dd6fd439c1..78b9ceff91 100644 --- a/apps/q/java/src/HTML/Tmpl/Parsers/Parser.java +++ b/apps/q/java/src/HTML/Tmpl/Parsers/Parser.java @@ -30,9 +30,16 @@ package HTML.Tmpl.Parsers; -import java.util.*; -import HTML.Tmpl.Element.*; +import java.util.NoSuchElementException; +import java.util.Properties; +import java.util.StringTokenizer; +import java.util.Vector; + import HTML.Tmpl.Util; +import HTML.Tmpl.Element.Element; +import HTML.Tmpl.Element.If; +import HTML.Tmpl.Element.Loop; +import HTML.Tmpl.Element.Unless; public class Parser { diff --git a/apps/q/java/src/net/i2p/aum/DupHashtable.java b/apps/q/java/src/net/i2p/aum/DupHashtable.java index 57df10d352..6184337f26 100644 --- a/apps/q/java/src/net/i2p/aum/DupHashtable.java +++ b/apps/q/java/src/net/i2p/aum/DupHashtable.java @@ -6,8 +6,8 @@ package net.i2p.aum; -import java.*; -import java.util.*; +import java.util.Hashtable; +import java.util.Vector; /** * similar in some ways to Properties, except that duplicate keys diff --git a/apps/q/java/src/net/i2p/aum/EchoClient.java b/apps/q/java/src/net/i2p/aum/EchoClient.java index 1552c38ee5..9647084c11 100644 --- a/apps/q/java/src/net/i2p/aum/EchoClient.java +++ b/apps/q/java/src/net/i2p/aum/EchoClient.java @@ -4,16 +4,22 @@ package net.i2p.aum; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.net.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.InterruptedIOException; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.net.ConnectException; +import java.net.NoRouteToHostException; -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; -import net.i2p.data.*; -import net.i2p.util.*; +import net.i2p.I2PException; +import net.i2p.client.streaming.I2PSocket; +import net.i2p.client.streaming.I2PSocketManager; +import net.i2p.client.streaming.I2PSocketManagerFactory; +import net.i2p.data.DataFormatException; +import net.i2p.data.DataHelper; +import net.i2p.data.Destination; +import net.i2p.util.Log; /** * a simple program which illustrates the use of I2P stream diff --git a/apps/q/java/src/net/i2p/aum/EchoServer.java b/apps/q/java/src/net/i2p/aum/EchoServer.java index a9c2d4ecd0..0e77d8e442 100644 --- a/apps/q/java/src/net/i2p/aum/EchoServer.java +++ b/apps/q/java/src/net/i2p/aum/EchoServer.java @@ -1,17 +1,21 @@ package net.i2p.aum; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.net.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.net.ConnectException; +import java.util.Properties; -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; -import net.i2p.data.*; - -import net.i2p.util.*; +import net.i2p.I2PException; +import net.i2p.client.streaming.I2PServerSocket; +import net.i2p.client.streaming.I2PSocket; +import net.i2p.client.streaming.I2PSocketManager; +import net.i2p.client.streaming.I2PSocketManagerFactory; +import net.i2p.data.DataFormatException; +import net.i2p.data.DataHelper; +import net.i2p.data.Destination; +import net.i2p.util.Log; /** * a simple program which illustrates the use of I2P stream diff --git a/apps/q/java/src/net/i2p/aum/EchoTest.java b/apps/q/java/src/net/i2p/aum/EchoTest.java index e3e009b0e7..5ba4cf56f2 100644 --- a/apps/q/java/src/net/i2p/aum/EchoTest.java +++ b/apps/q/java/src/net/i2p/aum/EchoTest.java @@ -2,15 +2,10 @@ package net.i2p.aum; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.net.*; +import java.io.IOException; -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; -import net.i2p.data.*; +import net.i2p.I2PException; +import net.i2p.data.Destination; /** * A simple program which runs the EchoServer and EchoClient diff --git a/apps/q/java/src/net/i2p/aum/EmbargoedQueue.java b/apps/q/java/src/net/i2p/aum/EmbargoedQueue.java index 39ca901f35..384224f7b6 100644 --- a/apps/q/java/src/net/i2p/aum/EmbargoedQueue.java +++ b/apps/q/java/src/net/i2p/aum/EmbargoedQueue.java @@ -6,9 +6,9 @@ package net.i2p.aum; -import java.*; -import java.lang.*; -import java.util.*; +import java.util.Date; +import java.util.Random; +import java.util.Vector; /** *

Implements a queue of objects, where each object is 'embargoed' diff --git a/apps/q/java/src/net/i2p/aum/I2PCat.java b/apps/q/java/src/net/i2p/aum/I2PCat.java index ad76e546f6..35be1ad120 100644 --- a/apps/q/java/src/net/i2p/aum/I2PCat.java +++ b/apps/q/java/src/net/i2p/aum/I2PCat.java @@ -3,18 +3,26 @@ package net.i2p.aum; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.net.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.InterruptedIOException; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.net.ConnectException; +import java.net.NoRouteToHostException; +import java.util.Properties; -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.naming.*; -import net.i2p.client.streaming.*; -import net.i2p.data.*; - -import net.i2p.util.*; +import net.i2p.I2PAppContext; +import net.i2p.I2PException; +import net.i2p.client.naming.HostsTxtNamingService; +import net.i2p.client.streaming.I2PServerSocket; +import net.i2p.client.streaming.I2PSocket; +import net.i2p.client.streaming.I2PSocketManager; +import net.i2p.client.streaming.I2PSocketManagerFactory; +import net.i2p.data.DataFormatException; +import net.i2p.data.DataHelper; +import net.i2p.data.Destination; +import net.i2p.util.Log; /** * A I2P equivalent of the much-beloved 'netcat' utility. diff --git a/apps/q/java/src/net/i2p/aum/I2PSocketHelper.java b/apps/q/java/src/net/i2p/aum/I2PSocketHelper.java index 90a73d5ee8..bc3570c5bd 100644 --- a/apps/q/java/src/net/i2p/aum/I2PSocketHelper.java +++ b/apps/q/java/src/net/i2p/aum/I2PSocketHelper.java @@ -1,16 +1,6 @@ package net.i2p.aum; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.net.*; - -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; -import net.i2p.util.*; -import net.i2p.data.*; /** * Class which wraps an I2PSocket object with convenient methods. diff --git a/apps/q/java/src/net/i2p/aum/I2PTunnelXMLObject.java b/apps/q/java/src/net/i2p/aum/I2PTunnelXMLObject.java index 0f92c86158..7fa8237344 100644 --- a/apps/q/java/src/net/i2p/aum/I2PTunnelXMLObject.java +++ b/apps/q/java/src/net/i2p/aum/I2PTunnelXMLObject.java @@ -1,15 +1,7 @@ package net.i2p.aum; -import org.apache.xmlrpc.*; -import java.lang.*; -import java.io.*; -import java.util.*; +import java.util.Hashtable; -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; -import net.i2p.util.*; -import net.i2p.data.*; import net.i2p.i2ptunnel.I2PTunnelXMLWrapper; /** diff --git a/apps/q/java/src/net/i2p/aum/I2PTunnelXMLServer.java b/apps/q/java/src/net/i2p/aum/I2PTunnelXMLServer.java index 2d9c544590..7c9ebbd0d8 100644 --- a/apps/q/java/src/net/i2p/aum/I2PTunnelXMLServer.java +++ b/apps/q/java/src/net/i2p/aum/I2PTunnelXMLServer.java @@ -1,15 +1,7 @@ package net.i2p.aum; -import org.apache.xmlrpc.*; -import java.lang.*; -import java.io.*; - -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; -import net.i2p.util.*; -import net.i2p.data.*; +import org.apache.xmlrpc.WebServer; /** * Provides a means for programs in any language to dynamically manage diff --git a/apps/q/java/src/net/i2p/aum/I2PXmlRpcClient.java b/apps/q/java/src/net/i2p/aum/I2PXmlRpcClient.java index 2358afc106..fdf650897a 100644 --- a/apps/q/java/src/net/i2p/aum/I2PXmlRpcClient.java +++ b/apps/q/java/src/net/i2p/aum/I2PXmlRpcClient.java @@ -1,19 +1,13 @@ package net.i2p.aum; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.net.*; +import java.net.MalformedURLException; +import java.net.URL; -import org.apache.xmlrpc.*; +import net.i2p.data.Destination; +import net.i2p.util.Log; -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; -import net.i2p.data.Base64; -import net.i2p.util.*; -import net.i2p.data.*; +import org.apache.xmlrpc.XmlRpcClient; /** diff --git a/apps/q/java/src/net/i2p/aum/I2PXmlRpcClientFactory.java b/apps/q/java/src/net/i2p/aum/I2PXmlRpcClientFactory.java index 425ec02d1e..16edc157ea 100644 --- a/apps/q/java/src/net/i2p/aum/I2PXmlRpcClientFactory.java +++ b/apps/q/java/src/net/i2p/aum/I2PXmlRpcClientFactory.java @@ -1,19 +1,16 @@ package net.i2p.aum; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.net.*; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Properties; +import java.util.Vector; -import org.apache.xmlrpc.*; +import net.i2p.data.DataFormatException; +import net.i2p.data.Destination; +import net.i2p.util.Log; -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; -import net.i2p.data.Base64; -import net.i2p.util.*; -import net.i2p.data.*; +import org.apache.xmlrpc.XmlRpcClient; /** diff --git a/apps/q/java/src/net/i2p/aum/I2PXmlRpcDemoClass.java b/apps/q/java/src/net/i2p/aum/I2PXmlRpcDemoClass.java index e7909f459b..a8de8e7913 100644 --- a/apps/q/java/src/net/i2p/aum/I2PXmlRpcDemoClass.java +++ b/apps/q/java/src/net/i2p/aum/I2PXmlRpcDemoClass.java @@ -1,19 +1,6 @@ package net.i2p.aum; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.net.*; - -import org.apache.xmlrpc.*; - -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; -import net.i2p.data.Base64; -import net.i2p.util.*; -import net.i2p.data.*; /** * A simple class providing callable xmlrpc server methods, gets linked in to diff --git a/apps/q/java/src/net/i2p/aum/I2PXmlRpcServer.java b/apps/q/java/src/net/i2p/aum/I2PXmlRpcServer.java index 1aca5fbafa..82854b00f7 100644 --- a/apps/q/java/src/net/i2p/aum/I2PXmlRpcServer.java +++ b/apps/q/java/src/net/i2p/aum/I2PXmlRpcServer.java @@ -1,18 +1,23 @@ package net.i2p.aum; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.net.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.util.Date; +import java.util.Properties; -import org.apache.xmlrpc.*; +import net.i2p.I2PAppContext; +import net.i2p.I2PException; +import net.i2p.client.streaming.I2PServerSocket; +import net.i2p.client.streaming.I2PSocket; +import net.i2p.client.streaming.I2PSocketManager; +import net.i2p.client.streaming.I2PSocketManagerFactory; +import net.i2p.data.DataFormatException; +import net.i2p.data.Destination; -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; -import net.i2p.data.Base64; -import net.i2p.util.*; -import net.i2p.data.*; +import org.apache.xmlrpc.XmlRpcServer; /** diff --git a/apps/q/java/src/net/i2p/aum/I2PXmlRpcServerFactory.java b/apps/q/java/src/net/i2p/aum/I2PXmlRpcServerFactory.java index ef7ca42a8f..14fd092b51 100644 --- a/apps/q/java/src/net/i2p/aum/I2PXmlRpcServerFactory.java +++ b/apps/q/java/src/net/i2p/aum/I2PXmlRpcServerFactory.java @@ -1,18 +1,13 @@ package net.i2p.aum; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.net.*; +import java.io.IOException; +import java.util.Properties; -import org.apache.xmlrpc.*; - -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; -import net.i2p.data.Base64; -import net.i2p.util.*; -import net.i2p.data.*; +import net.i2p.I2PAppContext; +import net.i2p.I2PException; +import net.i2p.client.streaming.I2PSocketManager; +import net.i2p.data.DataFormatException; +import net.i2p.util.Log; /** diff --git a/apps/q/java/src/net/i2p/aum/PrivDestination.java b/apps/q/java/src/net/i2p/aum/PrivDestination.java index f540774165..2d09bb0af6 100644 --- a/apps/q/java/src/net/i2p/aum/PrivDestination.java +++ b/apps/q/java/src/net/i2p/aum/PrivDestination.java @@ -1,19 +1,23 @@ package net.i2p.aum; -import java.lang.*; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.FileNotFoundException; +import java.io.IOException; -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.data.*; - -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; +import net.i2p.I2PException; +import net.i2p.client.I2PClient; +import net.i2p.client.I2PClientFactory; import net.i2p.data.Base64; -import net.i2p.util.*; -import net.i2p.data.*; +import net.i2p.data.DataFormatException; +import net.i2p.data.DataStructureImpl; +import net.i2p.data.Destination; +import net.i2p.data.PrivateKey; +import net.i2p.data.PublicKey; +import net.i2p.data.SigningPrivateKey; +import net.i2p.data.SigningPublicKey; +import net.i2p.util.Log; /** * A convenience class for encapsulating and manipulating I2P private keys diff --git a/apps/q/java/src/net/i2p/aum/PropertiesFile.java b/apps/q/java/src/net/i2p/aum/PropertiesFile.java index 77c7c2c417..2d1891549a 100644 --- a/apps/q/java/src/net/i2p/aum/PropertiesFile.java +++ b/apps/q/java/src/net/i2p/aum/PropertiesFile.java @@ -6,9 +6,17 @@ package net.i2p.aum; -import java.lang.*; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.NoSuchElementException; +import java.util.Properties; /** * builds on Properties with methods to load/save directly to/from file diff --git a/apps/q/java/src/net/i2p/aum/SimpleFile.java b/apps/q/java/src/net/i2p/aum/SimpleFile.java index 281948aa3c..a6f0438deb 100644 --- a/apps/q/java/src/net/i2p/aum/SimpleFile.java +++ b/apps/q/java/src/net/i2p/aum/SimpleFile.java @@ -1,11 +1,9 @@ package net.i2p.aum; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.net.*; - -import net.i2p.data.*; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.RandomAccessFile; /** * SimpleFile - subclass of File which adds some python-like diff --git a/apps/q/java/src/net/i2p/aum/SimpleFile_old.java b/apps/q/java/src/net/i2p/aum/SimpleFile_old.java index 4afa7f7832..ac74b58ac2 100644 --- a/apps/q/java/src/net/i2p/aum/SimpleFile_old.java +++ b/apps/q/java/src/net/i2p/aum/SimpleFile_old.java @@ -1,11 +1,9 @@ package net.i2p.aum; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.net.*; - -import net.i2p.data.*; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; /** * SimpleFile - subclass of File which adds some python-like diff --git a/apps/q/java/src/net/i2p/aum/SimpleQueue.java b/apps/q/java/src/net/i2p/aum/SimpleQueue.java index 835100ec03..15da498ecd 100644 --- a/apps/q/java/src/net/i2p/aum/SimpleQueue.java +++ b/apps/q/java/src/net/i2p/aum/SimpleQueue.java @@ -6,9 +6,7 @@ package net.i2p.aum; -import java.*; -import java.lang.*; -import java.util.*; +import java.util.Vector; /** * Implements simething similar to python's 'Queue' class diff --git a/apps/q/java/src/net/i2p/aum/http/HtmlPage.java b/apps/q/java/src/net/i2p/aum/http/HtmlPage.java index 5e9749e59e..67ede7207c 100644 --- a/apps/q/java/src/net/i2p/aum/http/HtmlPage.java +++ b/apps/q/java/src/net/i2p/aum/http/HtmlPage.java @@ -6,9 +6,9 @@ package net.i2p.aum.http; -import java.util.*; +import java.util.Enumeration; -import net.i2p.aum.*; +import net.i2p.aum.DupHashtable; /** * Framework for building up a page of HTML by method calls alone, breaking diff --git a/apps/q/java/src/net/i2p/aum/http/I2PHttpRequestHandler.java b/apps/q/java/src/net/i2p/aum/http/I2PHttpRequestHandler.java index f2671d7623..5ab1911be1 100644 --- a/apps/q/java/src/net/i2p/aum/http/I2PHttpRequestHandler.java +++ b/apps/q/java/src/net/i2p/aum/http/I2PHttpRequestHandler.java @@ -6,15 +6,12 @@ package net.i2p.aum.http; -import java.lang.*; -import java.lang.reflect.*; -import java.util.*; -import java.io.*; -import java.net.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.Socket; -import net.i2p.data.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; +import net.i2p.client.streaming.I2PSocket; /** * diff --git a/apps/q/java/src/net/i2p/aum/http/I2PHttpServer.java b/apps/q/java/src/net/i2p/aum/http/I2PHttpServer.java index 2027ec7689..0e693dac0d 100644 --- a/apps/q/java/src/net/i2p/aum/http/I2PHttpServer.java +++ b/apps/q/java/src/net/i2p/aum/http/I2PHttpServer.java @@ -6,15 +6,16 @@ package net.i2p.aum.http; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.util.Properties; -import net.i2p.*; -import net.i2p.data.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; - -import net.i2p.aum.*; +import net.i2p.I2PException; +import net.i2p.aum.PrivDestination; +import net.i2p.client.streaming.I2PServerSocket; +import net.i2p.client.streaming.I2PSocket; +import net.i2p.client.streaming.I2PSocketManager; +import net.i2p.client.streaming.I2PSocketManagerFactory; +import net.i2p.data.DataFormatException; /** * diff --git a/apps/q/java/src/net/i2p/aum/http/MiniHttpRequestHandler.java b/apps/q/java/src/net/i2p/aum/http/MiniHttpRequestHandler.java index fe0786e642..42317a39a4 100644 --- a/apps/q/java/src/net/i2p/aum/http/MiniHttpRequestHandler.java +++ b/apps/q/java/src/net/i2p/aum/http/MiniHttpRequestHandler.java @@ -7,12 +7,19 @@ package net.i2p.aum.http; -import java.net.*; -import java.io.*; -import java.util.*; -import java.lang.*; +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.net.Socket; +import java.net.URLDecoder; +import java.util.Enumeration; +import java.util.Vector; -import net.i2p.aum.*; +import net.i2p.aum.DupHashtable; +import net.i2p.aum.Mimetypes; public abstract class MiniHttpRequestHandler implements Runnable { final static String CRLF = "\r\n"; diff --git a/apps/q/java/src/net/i2p/aum/http/MiniHttpServer.java b/apps/q/java/src/net/i2p/aum/http/MiniHttpServer.java index 150e7442fc..434b6a05c4 100644 --- a/apps/q/java/src/net/i2p/aum/http/MiniHttpServer.java +++ b/apps/q/java/src/net/i2p/aum/http/MiniHttpServer.java @@ -13,13 +13,13 @@ package net.i2p.aum.http; // server implements HTTP GET method //*************************************** -import java.net.*; -import java.io.*; -import java.util.*; -import java.lang.*; -import java.lang.reflect.*; +import java.io.IOException; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.net.ServerSocket; +import java.net.Socket; -import org.apache.xmlrpc.*; +import org.apache.xmlrpc.XmlRpcServer; public class MiniHttpServer extends Thread { diff --git a/apps/q/java/src/net/i2p/aum/http/Tag.java b/apps/q/java/src/net/i2p/aum/http/Tag.java index bb196f3728..6370d1339a 100644 --- a/apps/q/java/src/net/i2p/aum/http/Tag.java +++ b/apps/q/java/src/net/i2p/aum/http/Tag.java @@ -6,9 +6,11 @@ package net.i2p.aum.http; -import java.lang.*; -import java.util.*; -import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.Enumeration; +import java.util.Vector; /** * Base class for building up quick-n-dirty HTML by code alone; diff --git a/apps/q/java/src/net/i2p/aum/q/QClientAPI.java b/apps/q/java/src/net/i2p/aum/q/QClientAPI.java index 1f7f1f86f0..a431283df7 100644 --- a/apps/q/java/src/net/i2p/aum/q/QClientAPI.java +++ b/apps/q/java/src/net/i2p/aum/q/QClientAPI.java @@ -6,13 +6,13 @@ package net.i2p.aum.q; -import java.*; -import java.io.*; -import java.util.*; -import java.lang.*; -import java.net.*; +import java.io.IOException; +import java.net.MalformedURLException; +import java.util.Hashtable; +import java.util.Vector; -import org.apache.xmlrpc.*; +import org.apache.xmlrpc.XmlRpcClient; +import org.apache.xmlrpc.XmlRpcException; /** *

The official Java API for client applications wishing to access the Q diff --git a/apps/q/java/src/net/i2p/aum/q/QClientNode.java b/apps/q/java/src/net/i2p/aum/q/QClientNode.java index cd8bff090d..4cd7b37c35 100644 --- a/apps/q/java/src/net/i2p/aum/q/QClientNode.java +++ b/apps/q/java/src/net/i2p/aum/q/QClientNode.java @@ -6,20 +6,18 @@ package net.i2p.aum.q; -import java.*; -import java.io.*; -import java.util.*; -import java.lang.*; +import java.io.File; +import java.io.IOException; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.Properties; +import java.util.Vector; -import org.apache.xmlrpc.*; - -import net.i2p.*; -import net.i2p.data.*; - -import net.i2p.aum.*; -import net.i2p.aum.http.*; - -import HTML.Template; +import net.i2p.I2PException; +import net.i2p.aum.Mimetypes; +import net.i2p.aum.http.I2PHttpServer; +import net.i2p.aum.http.MiniHttpServer; +import net.i2p.data.DataFormatException; /** * Implements Q client nodes. diff --git a/apps/q/java/src/net/i2p/aum/q/QClientWebInterface.java b/apps/q/java/src/net/i2p/aum/q/QClientWebInterface.java index 4d02d46dec..72b5bd857f 100644 --- a/apps/q/java/src/net/i2p/aum/q/QClientWebInterface.java +++ b/apps/q/java/src/net/i2p/aum/q/QClientWebInterface.java @@ -6,16 +6,20 @@ package net.i2p.aum.q; -import java.lang.*; -import java.lang.reflect.*; -import java.io.*; -import java.net.*; -import java.util.*; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.net.Socket; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; +import net.i2p.aum.http.HtmlPage; +import net.i2p.aum.http.I2PHttpRequestHandler; +import net.i2p.aum.http.MiniHttpServer; import HTML.Template; -import net.i2p.aum.http.*; - /** * Request handler for Q Client nodes that listens within I2P diff --git a/apps/q/java/src/net/i2p/aum/q/QConsole.java b/apps/q/java/src/net/i2p/aum/q/QConsole.java index ed3b80e18d..b2fbec0f8d 100644 --- a/apps/q/java/src/net/i2p/aum/q/QConsole.java +++ b/apps/q/java/src/net/i2p/aum/q/QConsole.java @@ -6,16 +6,23 @@ package net.i2p.aum.q; -import java.io.*; -import java.net.*; -import java.util.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.PrintWriter; +import java.net.URLDecoder; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Properties; +import java.util.Vector; -import javax.servlet.*; -import javax.servlet.http.*; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -import org.apache.xmlrpc.*; - -import HTML.*; +import org.apache.xmlrpc.XmlRpcClient; /** * diff --git a/apps/q/java/src/net/i2p/aum/q/QDataItem.java b/apps/q/java/src/net/i2p/aum/q/QDataItem.java index 68dba414e8..de3ed060d9 100644 --- a/apps/q/java/src/net/i2p/aum/q/QDataItem.java +++ b/apps/q/java/src/net/i2p/aum/q/QDataItem.java @@ -6,20 +6,17 @@ package net.i2p.aum.q; -import java.*; -import java.lang.*; -import java.util.*; -import java.io.*; -import java.net.*; +import java.io.Serializable; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.TreeSet; -import net.i2p.*; -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; -import net.i2p.data.*; -import net.i2p.crypto.*; - -import net.i2p.aum.*; +import net.i2p.aum.Mimetypes; +import net.i2p.crypto.DSAEngine; +import net.i2p.data.DataFormatException; +import net.i2p.data.Signature; +import net.i2p.data.SigningPrivateKey; +import net.i2p.data.SigningPublicKey; /** diff --git a/apps/q/java/src/net/i2p/aum/q/QIndexFile.java b/apps/q/java/src/net/i2p/aum/q/QIndexFile.java index c14e1192ca..0df2411a45 100644 --- a/apps/q/java/src/net/i2p/aum/q/QIndexFile.java +++ b/apps/q/java/src/net/i2p/aum/q/QIndexFile.java @@ -6,10 +6,13 @@ package net.i2p.aum.q; -import java.*; -import java.lang.*; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.RandomAccessFile; +import java.util.Date; +import java.util.Iterator; /** *

Implements a binary-searchable file for storing (time, hash) records. diff --git a/apps/q/java/src/net/i2p/aum/q/QIndexFileIterator.java b/apps/q/java/src/net/i2p/aum/q/QIndexFileIterator.java index d96676c7d8..95a7df8457 100644 --- a/apps/q/java/src/net/i2p/aum/q/QIndexFileIterator.java +++ b/apps/q/java/src/net/i2p/aum/q/QIndexFileIterator.java @@ -6,8 +6,8 @@ package net.i2p.aum.q; -import java.*; -import java.util.*; +import java.util.Iterator; +import java.util.NoSuchElementException; /** * Implements an Iterator for index files diff --git a/apps/q/java/src/net/i2p/aum/q/QKademliaComparator.java b/apps/q/java/src/net/i2p/aum/q/QKademliaComparator.java index 6b39552484..2b949b08df 100644 --- a/apps/q/java/src/net/i2p/aum/q/QKademliaComparator.java +++ b/apps/q/java/src/net/i2p/aum/q/QKademliaComparator.java @@ -6,8 +6,8 @@ package net.i2p.aum.q; -import java.util.*; -import java.math.*; +import java.math.BigInteger; +import java.util.Comparator; /** * implements a Comparator class which compares two QPeerRec objects diff --git a/apps/q/java/src/net/i2p/aum/q/QMgr.java b/apps/q/java/src/net/i2p/aum/q/QMgr.java index 62554a17de..a9e048a641 100644 --- a/apps/q/java/src/net/i2p/aum/q/QMgr.java +++ b/apps/q/java/src/net/i2p/aum/q/QMgr.java @@ -6,16 +6,22 @@ package net.i2p.aum.q; -import java.*; -import java.lang.*; -import java.io.*; -import java.util.*; +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Properties; +import java.util.Vector; -import org.apache.xmlrpc.*; +import net.i2p.aum.I2PXmlRpcClientFactory; +import net.i2p.aum.PropertiesFile; +import net.i2p.aum.SimpleFile; +import net.i2p.data.Destination; -import net.i2p.data.*; - -import net.i2p.aum.*; +import org.apache.xmlrpc.XmlRpcClient; /** *

Command Line Interface (CLI) for starting/stopping Q nodes, diff --git a/apps/q/java/src/net/i2p/aum/q/QNode.java b/apps/q/java/src/net/i2p/aum/q/QNode.java index a648077333..bb4a29c2a1 100644 --- a/apps/q/java/src/net/i2p/aum/q/QNode.java +++ b/apps/q/java/src/net/i2p/aum/q/QNode.java @@ -6,21 +6,46 @@ package net.i2p.aum.q; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.util.jar.*; -import java.net.*; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.RandomAccessFile; +import java.util.Calendar; +import java.util.Collections; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.List; +import java.util.NoSuchElementException; +import java.util.Properties; +import java.util.Vector; +import java.util.jar.JarEntry; +import java.util.jar.JarFile; -import org.apache.xmlrpc.*; +import net.i2p.I2PAppContext; +import net.i2p.I2PException; +import net.i2p.aum.EmbargoedQueue; +import net.i2p.aum.I2PXmlRpcClient; +import net.i2p.aum.I2PXmlRpcClientFactory; +import net.i2p.aum.I2PXmlRpcServer; +import net.i2p.aum.PrivDestination; +import net.i2p.aum.PropertiesFile; +import net.i2p.aum.SimpleFile; +import net.i2p.aum.SimpleSemaphore; +import net.i2p.client.I2PClient; +import net.i2p.client.I2PClientFactory; +import net.i2p.data.DataFormatException; +import net.i2p.data.Destination; -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; -import net.i2p.data.*; -import net.i2p.crypto.*; - -import net.i2p.aum.*; +import org.apache.xmlrpc.XmlRpcException; //import gnu.crypto.hash.*; diff --git a/apps/q/java/src/net/i2p/aum/q/QPeer.java b/apps/q/java/src/net/i2p/aum/q/QPeer.java index 4b03e9a67f..83fe2311a3 100644 --- a/apps/q/java/src/net/i2p/aum/q/QPeer.java +++ b/apps/q/java/src/net/i2p/aum/q/QPeer.java @@ -6,12 +6,12 @@ package net.i2p.aum.q; -import java.io.*; +import java.io.IOException; +import java.io.Serializable; -import net.i2p.*; -import net.i2p.data.*; -import net.i2p.util.*; -import net.i2p.aum.*; +import net.i2p.aum.PropertiesFile; +import net.i2p.data.DataFormatException; +import net.i2p.data.Destination; /** * Wrapper for a peer record file. diff --git a/apps/q/java/src/net/i2p/aum/q/QServerMethods.java b/apps/q/java/src/net/i2p/aum/q/QServerMethods.java index 3ed226b8d5..b06c22817d 100644 --- a/apps/q/java/src/net/i2p/aum/q/QServerMethods.java +++ b/apps/q/java/src/net/i2p/aum/q/QServerMethods.java @@ -6,9 +6,9 @@ package net.i2p.aum.q; -import java.lang.*; -import java.util.*; -import java.io.*; +import java.io.IOException; +import java.util.Hashtable; +import java.util.Vector; /** diff --git a/apps/q/java/src/net/i2p/aum/q/QServerNode.java b/apps/q/java/src/net/i2p/aum/q/QServerNode.java index 2729ba3503..1b91e652d8 100644 --- a/apps/q/java/src/net/i2p/aum/q/QServerNode.java +++ b/apps/q/java/src/net/i2p/aum/q/QServerNode.java @@ -6,17 +6,14 @@ package net.i2p.aum.q; -import java.*; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.util.Properties; -import org.apache.xmlrpc.*; - -import net.i2p.*; -import net.i2p.data.*; - -import net.i2p.aum.*; -import net.i2p.aum.http.*; +import net.i2p.I2PException; +import net.i2p.aum.I2PXmlRpcServerFactory; +import net.i2p.aum.http.I2PHttpServer; +import net.i2p.aum.http.MiniHttpServer; +import net.i2p.data.DataFormatException; /** * diff --git a/apps/q/java/src/net/i2p/aum/q/QTest.java b/apps/q/java/src/net/i2p/aum/q/QTest.java index 72bf3f5771..0c5dbfd635 100644 --- a/apps/q/java/src/net/i2p/aum/q/QTest.java +++ b/apps/q/java/src/net/i2p/aum/q/QTest.java @@ -6,15 +6,11 @@ package net.i2p.aum.q; -import java.*; -import java.lang.*; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.util.Hashtable; -import net.i2p.*; -import net.i2p.data.*; - -import net.i2p.aum.*; +import net.i2p.I2PException; +import net.i2p.data.DataFormatException; /** diff --git a/apps/q/java/src/net/i2p/aum/q/QUtil.java b/apps/q/java/src/net/i2p/aum/q/QUtil.java index 65ca76d246..5b1ccec2cc 100644 --- a/apps/q/java/src/net/i2p/aum/q/QUtil.java +++ b/apps/q/java/src/net/i2p/aum/q/QUtil.java @@ -6,10 +6,11 @@ package net.i2p.aum.q; -import java.*; - -import net.i2p.*; -import net.i2p.data.*; +import net.i2p.I2PAppContext; +import net.i2p.data.Base64; +import net.i2p.data.DataFormatException; +import net.i2p.data.SigningPrivateKey; +import net.i2p.data.SigningPublicKey; /** * A general collection of static utility methods diff --git a/apps/q/java/src/net/i2p/aum/q/QWorkerThread.java b/apps/q/java/src/net/i2p/aum/q/QWorkerThread.java index 2123ad78de..502de342e8 100644 --- a/apps/q/java/src/net/i2p/aum/q/QWorkerThread.java +++ b/apps/q/java/src/net/i2p/aum/q/QWorkerThread.java @@ -6,10 +6,12 @@ package net.i2p.aum.q; -import java.util.*; -import java.io.*; +import java.io.File; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; -import net.i2p.aum.*; +import net.i2p.aum.SimpleFile; /** * Thread which performs a single background job for a nod diff --git a/apps/q/java/src/net/i2p/aum/test/HttpServerTest.java b/apps/q/java/src/net/i2p/aum/test/HttpServerTest.java index 25e96ff16e..797982d97f 100644 --- a/apps/q/java/src/net/i2p/aum/test/HttpServerTest.java +++ b/apps/q/java/src/net/i2p/aum/test/HttpServerTest.java @@ -4,8 +4,8 @@ */ package net.i2p.aum.test; -import java.util.*; -import net.i2p.aum.http.*; +import net.i2p.aum.http.MiniHttpRequestPage; +import net.i2p.aum.http.MiniHttpServer; public class HttpServerTest extends MiniHttpRequestPage { diff --git a/apps/q/java/src/net/i2p/aum/util/Ico2Java.java b/apps/q/java/src/net/i2p/aum/util/Ico2Java.java index e82a92c997..fa6fe9c735 100644 --- a/apps/q/java/src/net/i2p/aum/util/Ico2Java.java +++ b/apps/q/java/src/net/i2p/aum/util/Ico2Java.java @@ -1,9 +1,9 @@ package net.i2p.aum.util; -import java.*; -import java.io.*; -import java.util.*; -import java.lang.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileWriter; +import java.io.InputStream; /** * development utility - converts Favicon.ico to diff --git a/apps/q/java/src/net/i2p/i2ptunnel/I2PTunnelXMLWrapper.java b/apps/q/java/src/net/i2p/i2ptunnel/I2PTunnelXMLWrapper.java index 4c2c53b3ec..725ef67e64 100644 --- a/apps/q/java/src/net/i2p/i2ptunnel/I2PTunnelXMLWrapper.java +++ b/apps/q/java/src/net/i2p/i2ptunnel/I2PTunnelXMLWrapper.java @@ -1,20 +1,12 @@ package net.i2p.i2ptunnel; -import org.apache.xmlrpc.*; -import java.lang.*; -import java.util.*; -import java.io.*; -import java.lang.reflect.*; - - -import net.i2p.*; -import net.i2p.client.*; -import net.i2p.client.streaming.*; -import net.i2p.data.Base64; -import net.i2p.util.*; -import net.i2p.util.*; -import net.i2p.data.*; -import net.i2p.i2ptunnel.*; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.lang.reflect.Array; +import java.util.Hashtable; +import java.util.Vector; /** 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 78f66fbf96..3f60e57a94 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHandler.java @@ -1,7 +1,7 @@ package net.i2p.router.web; -import java.io.ByteArrayInputStream; import java.io.BufferedReader; +import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStreamReader; import java.util.HashSet; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java index d6f46ae8e7..69c910b4a4 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java @@ -8,7 +8,6 @@ import java.util.Map; import java.util.Properties; import java.util.Set; -import net.i2p.data.DataFormatException; import net.i2p.router.startup.ClientAppConfig; import net.i2p.router.startup.LoadClientAppsJob; import net.i2p.util.Log; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java index a678b48a5a..ac10ed6a10 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.Properties; import java.util.Set; import java.util.TreeSet; + import net.i2p.router.RouterContext; import net.i2p.router.startup.ClientAppConfig; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java index 51cd532928..38d9b2074e 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java @@ -1,27 +1,11 @@ package net.i2p.router.web; -import java.io.BufferedReader; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.File; -import java.io.FileOutputStream; - -import java.net.URL; -import java.net.URLConnection; - -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; - -import net.i2p.time.Timestamper; -import net.i2p.router.transport.udp.UDPTransport; -import net.i2p.router.Router; -import net.i2p.router.LoadTestManager; import net.i2p.data.RouterInfo; -import net.i2p.router.web.ConfigServiceHandler.UpdateWrapperManagerTask; +import net.i2p.router.LoadTestManager; +import net.i2p.router.Router; +import net.i2p.router.transport.udp.UDPTransport; import net.i2p.router.web.ConfigServiceHandler.UpdateWrapperManagerAndRekeyTask; +import net.i2p.time.Timestamper; /** * Handler to deal with form submissions from the main config form and act diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java index e8487542bc..0b6a7b65df 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java @@ -1,13 +1,13 @@ package net.i2p.router.web; -import net.i2p.time.Timestamper; -import net.i2p.router.RouterContext; -import net.i2p.router.CommSystemFacade; import net.i2p.data.RouterAddress; +import net.i2p.router.CommSystemFacade; import net.i2p.router.LoadTestManager; +import net.i2p.router.Router; +import net.i2p.router.RouterContext; import net.i2p.router.transport.udp.UDPAddress; import net.i2p.router.transport.udp.UDPTransport; -import net.i2p.router.Router; +import net.i2p.time.Timestamper; public class ConfigNetHelper { private RouterContext _context; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java index 93244f8907..b8c1f3ca22 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java @@ -3,8 +3,6 @@ package net.i2p.router.web; import net.i2p.data.DataHelper; import net.i2p.router.Router; import net.i2p.router.RouterContext; -import net.i2p.router.web.ConfigServiceHandler.UpdateWrapperManagerTask; -import net.i2p.router.web.ConfigServiceHandler.UpdateWrapperManagerAndRekeyTask; /** * simple helper to control restarts/shutdowns in the left hand nav 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 aa26406a6d..a72ac9286a 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java @@ -7,10 +7,11 @@ import java.util.Iterator; import java.util.Properties; import java.util.TreeMap; -import net.i2p.data.DataHelper; -import net.i2p.router.Router; import net.i2p.apps.systray.SysTray; import net.i2p.apps.systray.UrlLauncher; +import net.i2p.data.DataHelper; +import net.i2p.router.Router; + import org.tanukisoftware.wrapper.WrapperManager; /** diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHandler.java index 5e4b436d66..00d2f509d6 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHandler.java @@ -1,13 +1,11 @@ package net.i2p.router.web; -import java.io.ByteArrayInputStream; -import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; -import net.i2p.util.Log; import net.i2p.stat.StatManager; +import net.i2p.util.Log; /** * Handler to deal with form submissions from the stats config form and act diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHelper.java index 8297a05ca1..925fce79ac 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHelper.java @@ -7,11 +7,12 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.StringTokenizer; + +import net.i2p.router.RouterContext; +import net.i2p.stat.FrequencyStat; import net.i2p.stat.Rate; import net.i2p.stat.RateStat; -import net.i2p.stat.FrequencyStat; import net.i2p.stat.StatManager; -import net.i2p.router.RouterContext; import net.i2p.util.Log; public class ConfigStatsHelper { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHandler.java index c64fbc4e9f..60d30e6ea9 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHandler.java @@ -2,10 +2,11 @@ package net.i2p.router.web; import java.util.HashMap; import java.util.Map; -import net.i2p.data.Hash; + import net.i2p.data.DataFormatException; -import net.i2p.util.Log; +import net.i2p.data.Hash; import net.i2p.router.TunnelPoolSettings; +import net.i2p.util.Log; /** * Handler to deal with form submissions from the tunnel config form and act diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java index 1e5e60b4f4..8c5474d622 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java @@ -1,8 +1,9 @@ package net.i2p.router.web; import java.util.Iterator; -import java.util.Set; import java.util.Properties; +import java.util.Set; + import net.i2p.data.Destination; import net.i2p.router.RouterContext; import net.i2p.router.TunnelPoolSettings; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java index 3ba4a93c80..d11a6a9186 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java @@ -1,11 +1,8 @@ package net.i2p.router.web; import net.i2p.I2PAppContext; -import net.i2p.data.DataHelper; import net.i2p.crypto.TrustedUpdate; -import net.i2p.router.Router; -import net.i2p.router.web.ConfigServiceHandler.UpdateWrapperManagerTask; -import net.i2p.util.Log; +import net.i2p.data.DataHelper; /** * diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java index bcd090268a..e0027e510e 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java @@ -1,7 +1,7 @@ package net.i2p.router.web; -import net.i2p.data.DataHelper; import net.i2p.crypto.TrustedUpdate; +import net.i2p.data.DataHelper; import net.i2p.router.RouterContext; public class ConfigUpdateHelper { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ContextHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ContextHelper.java index 2cdd0ba32d..d78e7c031a 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ContextHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ContextHelper.java @@ -1,6 +1,7 @@ package net.i2p.router.web; import java.util.List; + import net.i2p.data.Hash; import net.i2p.router.RouterContext; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java index 8f2b39cb28..69a39c28cc 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java @@ -1,7 +1,7 @@ package net.i2p.router.web; -import java.util.List; import java.util.ArrayList; +import java.util.List; import net.i2p.router.RouterContext; import net.i2p.util.Log; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java index 4a96f6d6f6..658caa1a30 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java @@ -2,11 +2,14 @@ package net.i2p.router.web; import java.io.IOException; import java.io.Writer; -import java.util.*; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; +import java.util.TreeSet; import net.i2p.data.DataHelper; -import net.i2p.stat.Rate; import net.i2p.router.RouterContext; +import net.i2p.stat.Rate; public class GraphHelper { private RouterContext _context; 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 31c1565eb6..c9527093f3 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NewsFetcher.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NewsFetcher.java @@ -4,7 +4,6 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.util.List; -import java.util.StringTokenizer; import net.i2p.I2PAppContext; import net.i2p.crypto.TrustedUpdate; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/OldConsoleHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/OldConsoleHelper.java index 4dade47cee..556367e27b 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/OldConsoleHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/OldConsoleHelper.java @@ -4,6 +4,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; import java.io.Writer; + import net.i2p.router.RouterContext; import net.i2p.router.admin.StatsGenerator; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ReseedHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ReseedHandler.java index 2f953df406..e8641fb3e0 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ReseedHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ReseedHandler.java @@ -3,9 +3,6 @@ package net.i2p.router.web; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileOutputStream; -import java.io.OutputStream; - -import java.net.Socket; import java.net.URL; import java.util.ArrayList; import java.util.Collections; @@ -17,9 +14,9 @@ import java.util.StringTokenizer; import net.i2p.I2PAppContext; import net.i2p.router.RouterContext; -import net.i2p.util.Log; -import net.i2p.util.I2PThread; import net.i2p.util.EepGet; +import net.i2p.util.I2PThread; +import net.i2p.util.Log; /** * Handler to deal with reseed requests. This will reseed from the URL 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 937f8116dc..ae11e55fbf 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java @@ -7,18 +7,18 @@ import java.util.List; import java.util.Properties; import net.i2p.I2PAppContext; -import net.i2p.router.RouterContext; import net.i2p.apps.systray.SysTray; import net.i2p.data.DataHelper; +import net.i2p.router.RouterContext; import net.i2p.util.FileUtil; import net.i2p.util.I2PThread; -import org.mortbay.jetty.Server; -import org.mortbay.jetty.servlet.WebApplicationContext; import org.mortbay.http.DigestAuthenticator; -import org.mortbay.http.handler.SecurityHandler; import org.mortbay.http.HashUserRealm; import org.mortbay.http.SecurityConstraint; +import org.mortbay.http.handler.SecurityHandler; +import org.mortbay.jetty.Server; +import org.mortbay.jetty.servlet.WebApplicationContext; public class RouterConsoleRunner { private Server _server; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/StatHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/StatHelper.java index 3cdebdf925..8b67d2622e 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/StatHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/StatHelper.java @@ -1,10 +1,9 @@ package net.i2p.router.web; +import java.io.Writer; import java.util.Iterator; import java.util.Set; -import java.io.Writer; - import net.i2p.data.Hash; import net.i2p.router.RouterContext; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java b/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java index bd3676ae98..6fc9823865 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java @@ -1,17 +1,20 @@ package net.i2p.router.web; -import java.io.*; -import java.util.*; +import java.awt.Color; +import java.io.IOException; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.StringTokenizer; -import net.i2p.stat.*; -import net.i2p.router.*; +import net.i2p.router.RouterContext; +import net.i2p.stat.Rate; +import net.i2p.stat.RateStat; import net.i2p.util.Log; -import java.awt.Color; +import org.jrobin.core.RrdException; import org.jrobin.graph.RrdGraph; import org.jrobin.graph.RrdGraphDef; -import org.jrobin.graph.RrdGraphDefTemplate; -import org.jrobin.core.RrdException; /** * 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 dec2d78915..38451cdd1b 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java @@ -11,14 +11,14 @@ import net.i2p.data.DataHelper; import net.i2p.data.Destination; import net.i2p.data.LeaseSet; import net.i2p.data.RouterAddress; -import net.i2p.stat.Rate; -import net.i2p.stat.RateStat; import net.i2p.router.CommSystemFacade; import net.i2p.router.Router; import net.i2p.router.RouterContext; import net.i2p.router.RouterVersion; import net.i2p.router.TunnelPoolSettings; import net.i2p.router.transport.ntcp.NTCPAddress; +import net.i2p.stat.Rate; +import net.i2p.stat.RateStat; /** * Simple helper to query the appropriate router for data necessary to render 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 1179b19fbd..c6e629b526 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java @@ -1,6 +1,8 @@ package net.i2p.router.web; -import java.io.*; +import java.awt.Color; +import java.io.IOException; +import java.io.OutputStream; import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; @@ -9,17 +11,15 @@ import net.i2p.stat.RateStat; import net.i2p.stat.RateSummaryListener; import net.i2p.util.Log; +import org.jrobin.core.RrdBackendFactory; import org.jrobin.core.RrdDb; import org.jrobin.core.RrdDef; -import org.jrobin.core.RrdBackendFactory; +import org.jrobin.core.RrdException; import org.jrobin.core.RrdMemoryBackendFactory; import org.jrobin.core.Sample; - -import java.awt.Color; import org.jrobin.graph.RrdGraph; import org.jrobin.graph.RrdGraphDef; import org.jrobin.graph.RrdGraphDefTemplate; -import org.jrobin.core.RrdException; class SummaryListener implements RateSummaryListener { private I2PAppContext _context; diff --git a/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java b/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java index 0c946471de..7729aa18cd 100644 --- a/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java +++ b/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java @@ -31,8 +31,8 @@ import net.i2p.client.streaming.I2PSocketManagerFactory; import net.i2p.client.streaming.I2PSocketOptions; import net.i2p.data.Base64; import net.i2p.data.ByteArray; -import net.i2p.data.DataHelper; import net.i2p.data.DataFormatException; +import net.i2p.data.DataHelper; import net.i2p.data.Destination; import net.i2p.util.ByteCache; import net.i2p.util.I2PThread; diff --git a/apps/sam/java/src/net/i2p/sam/SAMv2Handler.java b/apps/sam/java/src/net/i2p/sam/SAMv2Handler.java index 5d52b7fceb..75f1bd4b47 100644 --- a/apps/sam/java/src/net/i2p/sam/SAMv2Handler.java +++ b/apps/sam/java/src/net/i2p/sam/SAMv2Handler.java @@ -8,25 +8,11 @@ package net.i2p.sam; * */ -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.EOFException; import java.io.IOException; -import java.io.InputStream; -import java.io.InterruptedIOException; -import java.io.OutputStream; -import java.net.ConnectException; -import java.net.NoRouteToHostException; import java.net.Socket; import java.util.Properties; -import java.util.StringTokenizer; -import net.i2p.I2PException; -import net.i2p.client.I2PSessionException; -import net.i2p.data.Base64; import net.i2p.data.DataFormatException; -import net.i2p.data.DataHelper; -import net.i2p.data.Destination; import net.i2p.util.Log; /** diff --git a/apps/sam/java/src/net/i2p/sam/SAMv2StreamSession.java b/apps/sam/java/src/net/i2p/sam/SAMv2StreamSession.java index 198b79fe2b..5e74974245 100644 --- a/apps/sam/java/src/net/i2p/sam/SAMv2StreamSession.java +++ b/apps/sam/java/src/net/i2p/sam/SAMv2StreamSession.java @@ -8,7 +8,6 @@ package net.i2p.sam; * */ -import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.io.InterruptedIOException; @@ -16,23 +15,15 @@ import java.io.OutputStream; import java.net.ConnectException; import java.net.NoRouteToHostException; import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Properties; -import java.util.Set; import net.i2p.I2PException; -import net.i2p.client.I2PClient; -import net.i2p.client.streaming.I2PServerSocket; import net.i2p.client.streaming.I2PSocket; -import net.i2p.client.streaming.I2PSocketManager; -import net.i2p.client.streaming.I2PSocketManagerFactory; import net.i2p.client.streaming.I2PSocketOptions; -import net.i2p.data.Base64; import net.i2p.data.ByteArray; -import net.i2p.data.DataHelper; import net.i2p.data.DataFormatException; +import net.i2p.data.DataHelper; import net.i2p.data.Destination; import net.i2p.util.ByteCache; import net.i2p.util.I2PThread; diff --git a/apps/sam/java/src/net/i2p/sam/client/SAMReader.java b/apps/sam/java/src/net/i2p/sam/client/SAMReader.java index c002fb6af9..e3736d3623 100644 --- a/apps/sam/java/src/net/i2p/sam/client/SAMReader.java +++ b/apps/sam/java/src/net/i2p/sam/client/SAMReader.java @@ -1,16 +1,15 @@ package net.i2p.sam.client; import java.io.ByteArrayOutputStream; -import java.io.InputStream; import java.io.IOException; - +import java.io.InputStream; import java.util.Properties; import java.util.StringTokenizer; import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; -import net.i2p.util.Log; import net.i2p.util.I2PThread; +import net.i2p.util.Log; /** * Read from a socket, producing events for any SAM message read diff --git a/apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java b/apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java index 2de4836c56..b14795fef2 100644 --- a/apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java +++ b/apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java @@ -1,20 +1,17 @@ package net.i2p.sam.client; +import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import java.io.FileInputStream; import java.io.OutputStream; import java.net.Socket; - -import java.util.Map; import java.util.HashMap; +import java.util.Map; + import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; -import net.i2p.util.Log; import net.i2p.util.I2PThread; - -import net.i2p.sam.client.SAMEventHandler; -import net.i2p.sam.client.SAMReader; +import net.i2p.util.Log; /** * Send a file to a peer diff --git a/apps/sam/java/src/net/i2p/sam/client/SAMStreamSink.java b/apps/sam/java/src/net/i2p/sam/client/SAMStreamSink.java index c3d634e932..d0328d2101 100644 --- a/apps/sam/java/src/net/i2p/sam/client/SAMStreamSink.java +++ b/apps/sam/java/src/net/i2p/sam/client/SAMStreamSink.java @@ -1,18 +1,16 @@ package net.i2p.sam.client; +import java.io.File; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.io.FileOutputStream; -import java.io.File; import java.io.OutputStream; import java.net.Socket; - -import java.util.Map; import java.util.HashMap; +import java.util.Map; + import net.i2p.I2PAppContext; import net.i2p.util.Log; -import net.i2p.sam.client.SAMEventHandler; -import net.i2p.sam.client.SAMReader; /** * Sit around on a SAM destination, receiving lots of data and diff --git a/apps/sam/java/test/net/i2p/sam/TestCreateSessionDatagram.java b/apps/sam/java/test/net/i2p/sam/TestCreateSessionDatagram.java index 6bfbd0c36a..80772755e3 100644 --- a/apps/sam/java/test/net/i2p/sam/TestCreateSessionDatagram.java +++ b/apps/sam/java/test/net/i2p/sam/TestCreateSessionDatagram.java @@ -1,6 +1,5 @@ package net.i2p.sam; -import java.io.IOException; import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.OutputStream; diff --git a/apps/sam/java/test/net/i2p/sam/TestCreateSessionRaw.java b/apps/sam/java/test/net/i2p/sam/TestCreateSessionRaw.java index 974b6cd4fe..246ca615d1 100644 --- a/apps/sam/java/test/net/i2p/sam/TestCreateSessionRaw.java +++ b/apps/sam/java/test/net/i2p/sam/TestCreateSessionRaw.java @@ -1,13 +1,12 @@ package net.i2p.sam; -import java.io.IOException; import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.OutputStream; import java.net.Socket; -import net.i2p.util.Log; import net.i2p.util.Clock; +import net.i2p.util.Log; public class TestCreateSessionRaw { private static Log _log = new Log(TestCreateSessionRaw.class); diff --git a/apps/sam/java/test/net/i2p/sam/TestCreateSessionStream.java b/apps/sam/java/test/net/i2p/sam/TestCreateSessionStream.java index 0d2e073990..13a16a932c 100644 --- a/apps/sam/java/test/net/i2p/sam/TestCreateSessionStream.java +++ b/apps/sam/java/test/net/i2p/sam/TestCreateSessionStream.java @@ -1,6 +1,5 @@ package net.i2p.sam; -import java.io.IOException; import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.OutputStream; diff --git a/apps/sam/java/test/net/i2p/sam/TestDatagramTransfer.java b/apps/sam/java/test/net/i2p/sam/TestDatagramTransfer.java index 9c180f59ec..845093bfc7 100644 --- a/apps/sam/java/test/net/i2p/sam/TestDatagramTransfer.java +++ b/apps/sam/java/test/net/i2p/sam/TestDatagramTransfer.java @@ -1,15 +1,13 @@ package net.i2p.sam; -import java.io.IOException; import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.OutputStream; import java.net.Socket; -import java.util.StringTokenizer; import java.util.Properties; +import java.util.StringTokenizer; import net.i2p.util.Log; -import net.i2p.sam.SAMUtils; public class TestDatagramTransfer { private static Log _log = new Log(TestCreateSessionDatagram.class); diff --git a/apps/sam/java/test/net/i2p/sam/TestDest.java b/apps/sam/java/test/net/i2p/sam/TestDest.java index 9dbd8e73a4..f5d8cdff46 100644 --- a/apps/sam/java/test/net/i2p/sam/TestDest.java +++ b/apps/sam/java/test/net/i2p/sam/TestDest.java @@ -1,6 +1,5 @@ package net.i2p.sam; -import java.io.IOException; import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.OutputStream; diff --git a/apps/sam/java/test/net/i2p/sam/TestHello.java b/apps/sam/java/test/net/i2p/sam/TestHello.java index 1e14176999..d2e1da68ff 100644 --- a/apps/sam/java/test/net/i2p/sam/TestHello.java +++ b/apps/sam/java/test/net/i2p/sam/TestHello.java @@ -1,6 +1,5 @@ package net.i2p.sam; -import java.io.IOException; import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.OutputStream; diff --git a/apps/sam/java/test/net/i2p/sam/TestNaming.java b/apps/sam/java/test/net/i2p/sam/TestNaming.java index 32af88baa2..61c0364c36 100644 --- a/apps/sam/java/test/net/i2p/sam/TestNaming.java +++ b/apps/sam/java/test/net/i2p/sam/TestNaming.java @@ -1,6 +1,5 @@ package net.i2p.sam; -import java.io.IOException; import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.OutputStream; diff --git a/apps/sam/java/test/net/i2p/sam/TestRawTransfer.java b/apps/sam/java/test/net/i2p/sam/TestRawTransfer.java index 6f2e55f54f..3e9a769243 100644 --- a/apps/sam/java/test/net/i2p/sam/TestRawTransfer.java +++ b/apps/sam/java/test/net/i2p/sam/TestRawTransfer.java @@ -1,15 +1,13 @@ package net.i2p.sam; -import java.io.IOException; import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.OutputStream; import java.net.Socket; -import java.util.StringTokenizer; import java.util.Properties; +import java.util.StringTokenizer; import net.i2p.util.Log; -import net.i2p.sam.SAMUtils; public class TestRawTransfer { private static Log _log = new Log(TestCreateSessionDatagram.class); diff --git a/apps/sam/java/test/net/i2p/sam/TestStreamTransfer.java b/apps/sam/java/test/net/i2p/sam/TestStreamTransfer.java index 43d7875e0c..2ebb09afc8 100644 --- a/apps/sam/java/test/net/i2p/sam/TestStreamTransfer.java +++ b/apps/sam/java/test/net/i2p/sam/TestStreamTransfer.java @@ -1,19 +1,18 @@ package net.i2p.sam; -import java.io.IOException; import java.io.BufferedReader; +import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStream; import java.net.Socket; - -import java.util.Map; import java.util.Collections; import java.util.HashMap; +import java.util.Map; import java.util.Properties; import java.util.StringTokenizer; -import net.i2p.util.Log; import net.i2p.util.I2PThread; +import net.i2p.util.Log; /** *

    diff --git a/apps/sam/java/test/net/i2p/sam/TestSwarm.java b/apps/sam/java/test/net/i2p/sam/TestSwarm.java index 7561e5c734..01f5a22a5b 100644 --- a/apps/sam/java/test/net/i2p/sam/TestSwarm.java +++ b/apps/sam/java/test/net/i2p/sam/TestSwarm.java @@ -1,28 +1,20 @@ package net.i2p.sam; -import java.io.BufferedReader; +import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.FileOutputStream; -import java.io.FileInputStream; import java.io.OutputStream; import java.net.Socket; - -import java.util.Map; -import java.util.Collections; import java.util.HashMap; -import java.util.Properties; -import java.util.StringTokenizer; +import java.util.Map; import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; -import net.i2p.util.Log; -import net.i2p.util.I2PThread; - import net.i2p.sam.client.SAMEventHandler; -import net.i2p.sam.client.SAMClientEventListenerImpl; import net.i2p.sam.client.SAMReader; +import net.i2p.util.I2PThread; +import net.i2p.util.Log; /** * Sit around on a SAM destination, receiving lots of data and sending lots of diff --git a/apps/streaming/java/src/net/i2p/client/streaming/Connection.java b/apps/streaming/java/src/net/i2p/client/streaming/Connection.java index 343e741595..62bfe4a83e 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/Connection.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/Connection.java @@ -6,9 +6,9 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.TreeMap; + import net.i2p.I2PAppContext; import net.i2p.client.I2PSession; -import net.i2p.data.Base64; import net.i2p.data.DataHelper; import net.i2p.data.Destination; import net.i2p.util.Log; diff --git a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionManager.java b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionManager.java index 4670033be0..dcc93c5ec0 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionManager.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionManager.java @@ -9,12 +9,11 @@ import java.util.Set; import net.i2p.I2PAppContext; import net.i2p.I2PException; import net.i2p.client.I2PSession; -import net.i2p.data.ByteArray; import net.i2p.data.DataHelper; import net.i2p.data.Destination; import net.i2p.data.SessionKey; -import net.i2p.util.SimpleTimer; import net.i2p.util.Log; +import net.i2p.util.SimpleTimer; /** * Coordinate all of the connections for a single local destination. diff --git a/apps/streaming/java/src/net/i2p/client/streaming/MessageHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/MessageHandler.java index 74daeb9aba..30365762ec 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/MessageHandler.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/MessageHandler.java @@ -5,8 +5,8 @@ import java.util.List; import net.i2p.I2PAppContext; import net.i2p.client.I2PSession; -import net.i2p.client.I2PSessionListener; import net.i2p.client.I2PSessionException; +import net.i2p.client.I2PSessionListener; import net.i2p.util.Log; /** diff --git a/apps/streaming/java/src/net/i2p/client/streaming/Packet.java b/apps/streaming/java/src/net/i2p/client/streaming/Packet.java index 593863564f..d95df7d8cb 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/Packet.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/Packet.java @@ -1,6 +1,7 @@ package net.i2p.client.streaming; import java.util.Arrays; + import net.i2p.I2PAppContext; import net.i2p.data.Base64; import net.i2p.data.ByteArray; @@ -9,7 +10,6 @@ import net.i2p.data.DataHelper; import net.i2p.data.Destination; import net.i2p.data.Signature; import net.i2p.data.SigningPrivateKey; -import net.i2p.util.ByteCache; import net.i2p.util.Log; /** diff --git a/apps/streaming/java/src/net/i2p/client/streaming/PacketHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/PacketHandler.java index c7c0f0836d..529eb7894f 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/PacketHandler.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/PacketHandler.java @@ -1,13 +1,12 @@ package net.i2p.client.streaming; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.Iterator; import java.util.Set; -import java.text.SimpleDateFormat; import net.i2p.I2PAppContext; import net.i2p.I2PException; -import net.i2p.data.Base64; import net.i2p.data.DataHelper; import net.i2p.util.Log; import net.i2p.util.SimpleTimer; 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 9ce96071d1..2d22226d37 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/PacketQueue.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/PacketQueue.java @@ -1,7 +1,7 @@ package net.i2p.client.streaming; -import java.util.Set; import java.util.HashSet; +import java.util.Set; import net.i2p.I2PAppContext; import net.i2p.client.I2PSession; diff --git a/apps/streaming/java/src/net/i2p/client/streaming/SchedulerImpl.java b/apps/streaming/java/src/net/i2p/client/streaming/SchedulerImpl.java index 4ee5440a85..3d29880f0a 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/SchedulerImpl.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/SchedulerImpl.java @@ -1,8 +1,8 @@ package net.i2p.client.streaming; import net.i2p.I2PAppContext; -import net.i2p.util.SimpleTimer; import net.i2p.util.Log; +import net.i2p.util.SimpleTimer; /** * Base scheduler diff --git a/apps/streaming/java/test/net/i2p/client/streaming/EchoLargeTest.java b/apps/streaming/java/test/net/i2p/client/streaming/EchoLargeTest.java index 5ff344daae..dc1b0dbb61 100644 --- a/apps/streaming/java/test/net/i2p/client/streaming/EchoLargeTest.java +++ b/apps/streaming/java/test/net/i2p/client/streaming/EchoLargeTest.java @@ -1,10 +1,9 @@ package net.i2p.client.streaming; -import java.io.InputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.InputStream; import java.io.OutputStream; -import java.util.Date; import java.util.Properties; import net.i2p.I2PAppContext; @@ -12,7 +11,6 @@ import net.i2p.client.I2PClient; import net.i2p.client.I2PClientFactory; import net.i2p.client.I2PSession; import net.i2p.data.Base64; -import net.i2p.data.DataHelper; import net.i2p.data.Destination; import net.i2p.util.Log; diff --git a/apps/streaming/java/test/net/i2p/client/streaming/EchoTest.java b/apps/streaming/java/test/net/i2p/client/streaming/EchoTest.java index 70ebf899cb..1946aa4f61 100644 --- a/apps/streaming/java/test/net/i2p/client/streaming/EchoTest.java +++ b/apps/streaming/java/test/net/i2p/client/streaming/EchoTest.java @@ -1,10 +1,9 @@ package net.i2p.client.streaming; -import java.io.InputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.InputStream; import java.io.OutputStream; -import java.util.Date; import java.util.Properties; import net.i2p.I2PAppContext; diff --git a/apps/streaming/java/test/net/i2p/client/streaming/MessageInputStreamTest.java b/apps/streaming/java/test/net/i2p/client/streaming/MessageInputStreamTest.java index dcfa0f611f..564bfb0054 100644 --- a/apps/streaming/java/test/net/i2p/client/streaming/MessageInputStreamTest.java +++ b/apps/streaming/java/test/net/i2p/client/streaming/MessageInputStreamTest.java @@ -1,6 +1,5 @@ package net.i2p.client.streaming; -import java.io.InputStream; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; diff --git a/apps/streaming/java/test/net/i2p/client/streaming/MessageOutputStreamTest.java b/apps/streaming/java/test/net/i2p/client/streaming/MessageOutputStreamTest.java index 4748440ac3..8a1bcf5bea 100644 --- a/apps/streaming/java/test/net/i2p/client/streaming/MessageOutputStreamTest.java +++ b/apps/streaming/java/test/net/i2p/client/streaming/MessageOutputStreamTest.java @@ -2,11 +2,9 @@ package net.i2p.client.streaming; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.OutputStream; import net.i2p.I2PAppContext; import net.i2p.data.Base64; -import net.i2p.data.DataHelper; import net.i2p.util.Log; /** diff --git a/apps/streaming/java/test/net/i2p/client/streaming/StreamSinkTestClient.java b/apps/streaming/java/test/net/i2p/client/streaming/StreamSinkTestClient.java index c44af7a258..48ab0bd942 100644 --- a/apps/streaming/java/test/net/i2p/client/streaming/StreamSinkTestClient.java +++ b/apps/streaming/java/test/net/i2p/client/streaming/StreamSinkTestClient.java @@ -1,6 +1,5 @@ package net.i2p.client.streaming; -import net.i2p.client.I2PClient; /** * diff --git a/apps/streaming/java/test/net/i2p/client/streaming/StreamSinkTestServer.java b/apps/streaming/java/test/net/i2p/client/streaming/StreamSinkTestServer.java index ff2544e885..725a367910 100644 --- a/apps/streaming/java/test/net/i2p/client/streaming/StreamSinkTestServer.java +++ b/apps/streaming/java/test/net/i2p/client/streaming/StreamSinkTestServer.java @@ -1,6 +1,5 @@ package net.i2p.client.streaming; -import net.i2p.client.I2PClient; /** * diff --git a/apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java b/apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java index 2fb04b00a3..45dd0fd6c7 100644 --- a/apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java +++ b/apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java @@ -32,8 +32,6 @@ import java.io.FileOutputStream; import java.io.FileReader; import java.io.IOException; import java.io.PrintWriter; -import java.util.Iterator; -import java.util.LinkedList; import java.util.Properties; public class SubscriptionsBean diff --git a/apps/susimail/src/src/i2p/susi/webmail/MailCache.java b/apps/susimail/src/src/i2p/susi/webmail/MailCache.java index 9455639c50..8052b4c447 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/MailCache.java +++ b/apps/susimail/src/src/i2p/susi/webmail/MailCache.java @@ -23,10 +23,10 @@ */ package i2p.susi.webmail; -import java.util.Hashtable; - import i2p.susi.webmail.pop3.POP3MailBox; +import java.util.Hashtable; + /** * @author user */ diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java index 38e9ffc816..015659ecd5 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java +++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java @@ -43,10 +43,10 @@ import java.io.PrintWriter; import java.io.StringWriter; import java.io.UnsupportedEncodingException; import java.util.ArrayList; +import java.util.Comparator; import java.util.Enumeration; import java.util.Iterator; import java.util.ListIterator; -import java.util.Comparator; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; diff --git a/apps/susimail/src/src/i2p/susi/webmail/encoding/Base64.java b/apps/susimail/src/src/i2p/susi/webmail/encoding/Base64.java index b847a2e8b0..078e130d3b 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/encoding/Base64.java +++ b/apps/susimail/src/src/i2p/susi/webmail/encoding/Base64.java @@ -23,13 +23,13 @@ */ package i2p.susi.webmail.encoding; +import i2p.susi.util.ReadBuffer; + import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.io.StringBufferInputStream; -import i2p.susi.util.ReadBuffer; - /** * @author susi */ diff --git a/apps/susimail/src/src/i2p/susi/webmail/encoding/HeaderLine.java b/apps/susimail/src/src/i2p/susi/webmail/encoding/HeaderLine.java index 1b4b7d983f..0b0d67424a 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/encoding/HeaderLine.java +++ b/apps/susimail/src/src/i2p/susi/webmail/encoding/HeaderLine.java @@ -23,14 +23,14 @@ */ package i2p.susi.webmail.encoding; +import i2p.susi.util.HexTable; +import i2p.susi.util.ReadBuffer; + import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.io.StringBufferInputStream; -import i2p.susi.util.HexTable; -import i2p.susi.util.ReadBuffer; - /** * @author susi */ @@ -294,10 +294,10 @@ public class HeaderLine implements Encoding { } public static void main( String[] args ) throws EncodingException { String text = "Subject: test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test \r\n" + - "From: Smörebröd \r\n" + - "To: äüöß \r\n"; + "From: Sm�rebr�d \r\n" + + "To: ���� \r\n"; HeaderLine hl = new HeaderLine(); System.out.println( hl.encode( text ) ); - System.out.println( hl.encode( "test äöü" ) ); + System.out.println( hl.encode( "test ���" ) ); } } \ No newline at end of file diff --git a/apps/susimail/src/src/i2p/susi/webmail/encoding/QuotedPrintable.java b/apps/susimail/src/src/i2p/susi/webmail/encoding/QuotedPrintable.java index 52d5253041..f42d3ecea3 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/encoding/QuotedPrintable.java +++ b/apps/susimail/src/src/i2p/susi/webmail/encoding/QuotedPrintable.java @@ -23,14 +23,14 @@ */ package i2p.susi.webmail.encoding; +import i2p.susi.util.HexTable; +import i2p.susi.util.ReadBuffer; + import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.io.StringBufferInputStream; -import i2p.susi.util.HexTable; -import i2p.susi.util.ReadBuffer; - /** * @author susi */ diff --git a/apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java b/apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java index 68f89cf3aa..a8a1b05a66 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java +++ b/apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java @@ -23,6 +23,9 @@ */ package i2p.susi.webmail.pop3; +import i2p.susi.debug.Debug; +import i2p.susi.util.ReadBuffer; + import java.io.IOException; import java.io.InputStream; import java.net.Socket; @@ -30,9 +33,6 @@ import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Hashtable; -import i2p.susi.debug.Debug; -import i2p.susi.util.*; - /** * @author susi23 */ diff --git a/apps/syndie/java/src/net/i2p/syndie/Archive.java b/apps/syndie/java/src/net/i2p/syndie/Archive.java index cb4392548f..d44d3dfd07 100644 --- a/apps/syndie/java/src/net/i2p/syndie/Archive.java +++ b/apps/syndie/java/src/net/i2p/syndie/Archive.java @@ -1,11 +1,29 @@ package net.i2p.syndie; -import java.io.*; -import java.util.*; -import java.text.*; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.FilenameFilter; +import java.io.IOException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +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 net.i2p.I2PAppContext; -import net.i2p.data.*; -import net.i2p.syndie.data.*; +import net.i2p.data.Base64; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; +import net.i2p.data.SessionKey; +import net.i2p.syndie.data.ArchiveIndex; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; import net.i2p.util.FileUtil; import net.i2p.util.Log; diff --git a/apps/syndie/java/src/net/i2p/syndie/ArchiveIndexer.java b/apps/syndie/java/src/net/i2p/syndie/ArchiveIndexer.java index 25bcfac9a1..9a39f70a03 100644 --- a/apps/syndie/java/src/net/i2p/syndie/ArchiveIndexer.java +++ b/apps/syndie/java/src/net/i2p/syndie/ArchiveIndexer.java @@ -1,12 +1,27 @@ package net.i2p.syndie; -import java.io.*; -import java.text.*; -import java.util.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.StringTokenizer; +import java.util.TreeMap; + import net.i2p.I2PAppContext; -import net.i2p.data.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.data.Base64; +import net.i2p.data.Hash; +import net.i2p.syndie.data.ArchiveIndex; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; +import net.i2p.syndie.data.LocalArchiveIndex; +import net.i2p.syndie.sml.HTMLRenderer; +import net.i2p.syndie.sml.SMLParser; import net.i2p.util.Log; /** diff --git a/apps/syndie/java/src/net/i2p/syndie/BlogManager.java b/apps/syndie/java/src/net/i2p/syndie/BlogManager.java index 2fb05eaf05..2eefba7840 100644 --- a/apps/syndie/java/src/net/i2p/syndie/BlogManager.java +++ b/apps/syndie/java/src/net/i2p/syndie/BlogManager.java @@ -1,15 +1,45 @@ package net.i2p.syndie; -import java.io.*; -import java.text.*; -import java.util.*; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.io.UnsupportedEncodingException; +import java.io.Writer; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Properties; +import java.util.StringTokenizer; +import java.util.TimeZone; import net.i2p.I2PAppContext; import net.i2p.client.naming.PetName; import net.i2p.client.naming.PetNameDB; -import net.i2p.data.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +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; +import net.i2p.data.SessionKey; +import net.i2p.data.SigningPrivateKey; +import net.i2p.data.SigningPublicKey; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; +import net.i2p.syndie.sml.HTMLRenderer; import net.i2p.util.Log; /** diff --git a/apps/syndie/java/src/net/i2p/syndie/CLI.java b/apps/syndie/java/src/net/i2p/syndie/CLI.java index b51a94593c..556886d890 100644 --- a/apps/syndie/java/src/net/i2p/syndie/CLI.java +++ b/apps/syndie/java/src/net/i2p/syndie/CLI.java @@ -1,11 +1,26 @@ package net.i2p.syndie; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.Writer; +import java.util.ArrayList; +import java.util.List; +import java.util.StringTokenizer; + import net.i2p.I2PAppContext; -import net.i2p.data.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.data.Base64; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; +import net.i2p.data.SessionKey; +import net.i2p.data.SigningPrivateKey; +import net.i2p.syndie.data.Attachment; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; +import net.i2p.syndie.sml.HTMLRenderer; /** */ diff --git a/apps/syndie/java/src/net/i2p/syndie/CLIPost.java b/apps/syndie/java/src/net/i2p/syndie/CLIPost.java index 0b2dfe8869..59f0bb6a75 100644 --- a/apps/syndie/java/src/net/i2p/syndie/CLIPost.java +++ b/apps/syndie/java/src/net/i2p/syndie/CLIPost.java @@ -1,10 +1,20 @@ package net.i2p.syndie; -import java.io.*; -import java.util.*; -import net.i2p.*; -import net.i2p.data.*; -import net.i2p.syndie.data.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.StringTokenizer; + +import net.i2p.I2PAppContext; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.EntryContainer; import net.i2p.util.EepPost; /** diff --git a/apps/syndie/java/src/net/i2p/syndie/CachedEntry.java b/apps/syndie/java/src/net/i2p/syndie/CachedEntry.java index 9e05c66da8..b1fdaa8111 100644 --- a/apps/syndie/java/src/net/i2p/syndie/CachedEntry.java +++ b/apps/syndie/java/src/net/i2p/syndie/CachedEntry.java @@ -1,10 +1,28 @@ package net.i2p.syndie; -import java.io.*; -import java.util.*; +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.io.OutputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Properties; + import net.i2p.I2PAppContext; -import net.i2p.data.*; -import net.i2p.syndie.data.*; +import net.i2p.data.Base64; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; +import net.i2p.data.SessionKey; +import net.i2p.data.Signature; +import net.i2p.syndie.data.Attachment; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.Entry; +import net.i2p.syndie.data.EntryContainer; /** * Lazy loading wrapper for an entry, pulling data out of a cached & extracted dir, diff --git a/apps/syndie/java/src/net/i2p/syndie/EntryExtractor.java b/apps/syndie/java/src/net/i2p/syndie/EntryExtractor.java index c89ed7b5cb..179a35f9e3 100644 --- a/apps/syndie/java/src/net/i2p/syndie/EntryExtractor.java +++ b/apps/syndie/java/src/net/i2p/syndie/EntryExtractor.java @@ -1,12 +1,20 @@ package net.i2p.syndie; -import java.io.*; -import java.util.*; -import java.util.zip.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Iterator; +import java.util.Map; -import net.i2p.data.*; -import net.i2p.syndie.data.*; import net.i2p.I2PAppContext; +import net.i2p.data.DataHelper; +import net.i2p.data.SessionKey; +import net.i2p.syndie.data.Attachment; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.Entry; +import net.i2p.syndie.data.EntryContainer; /** * To cut down on unnecessary IO/cpu load, extract entries onto the disk for diff --git a/apps/syndie/java/src/net/i2p/syndie/HeaderReceiver.java b/apps/syndie/java/src/net/i2p/syndie/HeaderReceiver.java index 8b6bfe0ec7..69c1ce1f86 100644 --- a/apps/syndie/java/src/net/i2p/syndie/HeaderReceiver.java +++ b/apps/syndie/java/src/net/i2p/syndie/HeaderReceiver.java @@ -1,6 +1,8 @@ package net.i2p.syndie; -import java.util.*; +import java.util.List; +import java.util.Properties; + import net.i2p.syndie.sml.SMLParser; public class HeaderReceiver implements SMLParser.EventReceiver { diff --git a/apps/syndie/java/src/net/i2p/syndie/NewestEntryFirstComparator.java b/apps/syndie/java/src/net/i2p/syndie/NewestEntryFirstComparator.java index 21304ef7a4..aeb7ccf457 100644 --- a/apps/syndie/java/src/net/i2p/syndie/NewestEntryFirstComparator.java +++ b/apps/syndie/java/src/net/i2p/syndie/NewestEntryFirstComparator.java @@ -1,8 +1,9 @@ package net.i2p.syndie; -import java.util.*; -import net.i2p.data.*; -import net.i2p.syndie.data.*; +import java.util.Comparator; + +import net.i2p.data.DataHelper; +import net.i2p.syndie.data.BlogURI; /** sort BlogURI instances with the highest entryId first */ public class NewestEntryFirstComparator implements Comparator { diff --git a/apps/syndie/java/src/net/i2p/syndie/NewestNodeFirstComparator.java b/apps/syndie/java/src/net/i2p/syndie/NewestNodeFirstComparator.java index 6046bf0c7f..50ba5bac00 100644 --- a/apps/syndie/java/src/net/i2p/syndie/NewestNodeFirstComparator.java +++ b/apps/syndie/java/src/net/i2p/syndie/NewestNodeFirstComparator.java @@ -1,7 +1,8 @@ package net.i2p.syndie; -import java.util.*; -import net.i2p.data.*; +import java.util.Comparator; + +import net.i2p.data.DataHelper; /** sort ThreadNodeImpl instances with the highest entryId first */ public class NewestNodeFirstComparator implements Comparator { diff --git a/apps/syndie/java/src/net/i2p/syndie/Sucker.java b/apps/syndie/java/src/net/i2p/syndie/Sucker.java index a62175b474..e399392a89 100644 --- a/apps/syndie/java/src/net/i2p/syndie/Sucker.java +++ b/apps/syndie/java/src/net/i2p/syndie/Sucker.java @@ -1,6 +1,5 @@ package net.i2p.syndie; -import java.io.DataInputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -15,15 +14,6 @@ import java.util.Date; import java.util.Iterator; import java.util.List; -import com.sun.syndication.feed.synd.SyndCategory; -import com.sun.syndication.feed.synd.SyndContent; -import com.sun.syndication.feed.synd.SyndEntry; -import com.sun.syndication.feed.synd.SyndEnclosure; -import com.sun.syndication.feed.synd.SyndFeed; -import com.sun.syndication.io.FeedException; -import com.sun.syndication.io.SyndFeedInput; -import com.sun.syndication.io.XmlReader; - import net.i2p.I2PAppContext; import net.i2p.data.Base64; import net.i2p.data.DataFormatException; @@ -33,6 +23,15 @@ import net.i2p.syndie.data.BlogURI; import net.i2p.util.EepGet; import net.i2p.util.Log; +import com.sun.syndication.feed.synd.SyndCategory; +import com.sun.syndication.feed.synd.SyndContent; +import com.sun.syndication.feed.synd.SyndEnclosure; +import com.sun.syndication.feed.synd.SyndEntry; +import com.sun.syndication.feed.synd.SyndFeed; +import com.sun.syndication.io.FeedException; +import com.sun.syndication.io.SyndFeedInput; +import com.sun.syndication.io.XmlReader; + /** * * todo: diff --git a/apps/syndie/java/src/net/i2p/syndie/ThreadNodeImpl.java b/apps/syndie/java/src/net/i2p/syndie/ThreadNodeImpl.java index 406ca10e4e..67ede7fb2d 100644 --- a/apps/syndie/java/src/net/i2p/syndie/ThreadNodeImpl.java +++ b/apps/syndie/java/src/net/i2p/syndie/ThreadNodeImpl.java @@ -1,6 +1,12 @@ package net.i2p.syndie; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.TreeSet; + import net.i2p.data.Hash; import net.i2p.syndie.data.BlogURI; import net.i2p.syndie.data.ThreadNode; diff --git a/apps/syndie/java/src/net/i2p/syndie/Updater.java b/apps/syndie/java/src/net/i2p/syndie/Updater.java index ae5d1d32ae..72a13e6031 100644 --- a/apps/syndie/java/src/net/i2p/syndie/Updater.java +++ b/apps/syndie/java/src/net/i2p/syndie/Updater.java @@ -1,12 +1,15 @@ package net.i2p.syndie; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; import net.i2p.I2PAppContext; import net.i2p.client.naming.PetName; import net.i2p.client.naming.PetNameDB; -import net.i2p.util.Log; import net.i2p.syndie.web.RemoteArchiveBean; +import net.i2p.util.Log; public class Updater { public static final String VERSION = "1.0"; diff --git a/apps/syndie/java/src/net/i2p/syndie/UpdaterServlet.java b/apps/syndie/java/src/net/i2p/syndie/UpdaterServlet.java index b30b8d8673..8ade5e9cba 100644 --- a/apps/syndie/java/src/net/i2p/syndie/UpdaterServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/UpdaterServlet.java @@ -1,10 +1,10 @@ package net.i2p.syndie; import javax.servlet.GenericServlet; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; import javax.servlet.ServletConfig; import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; /** * A wrapper for syndie updater to allow it to be started as a web application. diff --git a/apps/syndie/java/src/net/i2p/syndie/User.java b/apps/syndie/java/src/net/i2p/syndie/User.java index b469908cfe..fd386685a5 100644 --- a/apps/syndie/java/src/net/i2p/syndie/User.java +++ b/apps/syndie/java/src/net/i2p/syndie/User.java @@ -1,12 +1,20 @@ package net.i2p.syndie; -import java.io.UnsupportedEncodingException; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.StringTokenizer; + import net.i2p.I2PAppContext; -import net.i2p.client.naming.PetNameDB; import net.i2p.client.naming.PetName; -import net.i2p.data.*; +import net.i2p.client.naming.PetNameDB; +import net.i2p.data.Base64; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; import net.i2p.syndie.web.AddressesServlet; /** diff --git a/apps/syndie/java/src/net/i2p/syndie/WritableThreadIndex.java b/apps/syndie/java/src/net/i2p/syndie/WritableThreadIndex.java index 06ffc8e35f..996148bdfd 100644 --- a/apps/syndie/java/src/net/i2p/syndie/WritableThreadIndex.java +++ b/apps/syndie/java/src/net/i2p/syndie/WritableThreadIndex.java @@ -1,12 +1,18 @@ package net.i2p.syndie; -import java.util.*; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.TreeMap; +import java.util.TreeSet; + import net.i2p.I2PAppContext; -import net.i2p.data.DataHelper; -import net.i2p.data.Hash; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.SMLParser; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; +import net.i2p.syndie.data.ThreadIndex; +import net.i2p.syndie.data.ThreadNode; import net.i2p.syndie.sml.HTMLRenderer; +import net.i2p.syndie.sml.SMLParser; /** * diff --git a/apps/syndie/java/src/net/i2p/syndie/data/ArchiveIndex.java b/apps/syndie/java/src/net/i2p/syndie/data/ArchiveIndex.java index ea194c716d..4e92ce2c8d 100644 --- a/apps/syndie/java/src/net/i2p/syndie/data/ArchiveIndex.java +++ b/apps/syndie/java/src/net/i2p/syndie/data/ArchiveIndex.java @@ -1,10 +1,30 @@ package net.i2p.syndie.data; -import java.io.*; -import java.text.*; -import java.util.*; +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.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +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.StringTokenizer; +import java.util.TreeMap; + import net.i2p.I2PAppContext; -import net.i2p.data.*; +import net.i2p.data.Base64; +import net.i2p.data.Hash; import net.i2p.syndie.Archive; import net.i2p.syndie.BlogManager; import net.i2p.util.Log; diff --git a/apps/syndie/java/src/net/i2p/syndie/data/Attachment.java b/apps/syndie/java/src/net/i2p/syndie/data/Attachment.java index 1d5cd52978..f3efa2396d 100644 --- a/apps/syndie/java/src/net/i2p/syndie/data/Attachment.java +++ b/apps/syndie/java/src/net/i2p/syndie/data/Attachment.java @@ -1,7 +1,13 @@ package net.i2p.syndie.data; -import java.io.*; -import java.util.*; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import net.i2p.data.DataHelper; /** diff --git a/apps/syndie/java/src/net/i2p/syndie/data/BlogInfo.java b/apps/syndie/java/src/net/i2p/syndie/data/BlogInfo.java index 41839f227a..82613096c7 100644 --- a/apps/syndie/java/src/net/i2p/syndie/data/BlogInfo.java +++ b/apps/syndie/java/src/net/i2p/syndie/data/BlogInfo.java @@ -1,9 +1,26 @@ package net.i2p.syndie.data; -import java.io.*; -import java.util.*; -import net.i2p.data.*; +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Properties; +import java.util.StringTokenizer; + import net.i2p.I2PAppContext; +import net.i2p.data.Base64; +import net.i2p.data.DataHelper; +import net.i2p.data.Signature; +import net.i2p.data.SigningPrivateKey; +import net.i2p.data.SigningPublicKey; import net.i2p.util.Log; /** diff --git a/apps/syndie/java/src/net/i2p/syndie/data/BlogInfoData.java b/apps/syndie/java/src/net/i2p/syndie/data/BlogInfoData.java index 673dd08259..8cda08be3c 100644 --- a/apps/syndie/java/src/net/i2p/syndie/data/BlogInfoData.java +++ b/apps/syndie/java/src/net/i2p/syndie/data/BlogInfoData.java @@ -1,7 +1,12 @@ package net.i2p.syndie.data; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; + import net.i2p.client.naming.PetName; import net.i2p.data.DataHelper; diff --git a/apps/syndie/java/src/net/i2p/syndie/data/BlogURI.java b/apps/syndie/java/src/net/i2p/syndie/data/BlogURI.java index b2b7a814f5..a164cb32c4 100644 --- a/apps/syndie/java/src/net/i2p/syndie/data/BlogURI.java +++ b/apps/syndie/java/src/net/i2p/syndie/data/BlogURI.java @@ -1,7 +1,10 @@ package net.i2p.syndie.data; -import java.util.*; -import net.i2p.data.*; +import java.util.Comparator; + +import net.i2p.data.Base64; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; /** * diff --git a/apps/syndie/java/src/net/i2p/syndie/data/EncodingTestGenerator.java b/apps/syndie/java/src/net/i2p/syndie/data/EncodingTestGenerator.java index 90743cd3cb..7bc0cae36b 100644 --- a/apps/syndie/java/src/net/i2p/syndie/data/EncodingTestGenerator.java +++ b/apps/syndie/java/src/net/i2p/syndie/data/EncodingTestGenerator.java @@ -1,9 +1,15 @@ package net.i2p.syndie.data; -import java.io.*; -import java.util.*; -import net.i2p.data.*; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.util.Properties; + import net.i2p.I2PAppContext; +import net.i2p.data.DataHelper; +import net.i2p.data.SigningPrivateKey; +import net.i2p.data.SigningPublicKey; /** * Create a new blog metadata & set of entries using some crazy UTF8 encoded chars, diff --git a/apps/syndie/java/src/net/i2p/syndie/data/EntryContainer.java b/apps/syndie/java/src/net/i2p/syndie/data/EntryContainer.java index 0743bd6d45..892d58adec 100644 --- a/apps/syndie/java/src/net/i2p/syndie/data/EntryContainer.java +++ b/apps/syndie/java/src/net/i2p/syndie/data/EntryContainer.java @@ -1,11 +1,26 @@ package net.i2p.syndie.data; -import java.io.*; -import java.util.*; -import java.util.zip.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.StringTokenizer; +import java.util.zip.ZipEntry; +import java.util.zip.ZipInputStream; +import java.util.zip.ZipOutputStream; -import net.i2p.data.*; import net.i2p.I2PAppContext; +import net.i2p.data.Base64; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; +import net.i2p.data.SessionKey; +import net.i2p.data.Signature; +import net.i2p.data.SigningPrivateKey; import net.i2p.util.Log; /** diff --git a/apps/syndie/java/src/net/i2p/syndie/data/FilteredThreadIndex.java b/apps/syndie/java/src/net/i2p/syndie/data/FilteredThreadIndex.java index c8684be87f..8cf4a66e98 100644 --- a/apps/syndie/java/src/net/i2p/syndie/data/FilteredThreadIndex.java +++ b/apps/syndie/java/src/net/i2p/syndie/data/FilteredThreadIndex.java @@ -1,9 +1,16 @@ package net.i2p.syndie.data; -import java.util.*; -import net.i2p.syndie.*; -import net.i2p.data.*; -import net.i2p.client.naming.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; + +import net.i2p.client.naming.PetName; +import net.i2p.data.DataFormatException; +import net.i2p.data.Hash; +import net.i2p.syndie.Archive; +import net.i2p.syndie.User; /** * diff --git a/apps/syndie/java/src/net/i2p/syndie/data/LocalArchiveIndex.java b/apps/syndie/java/src/net/i2p/syndie/data/LocalArchiveIndex.java index cb791fcdde..b14f6156a7 100644 --- a/apps/syndie/java/src/net/i2p/syndie/data/LocalArchiveIndex.java +++ b/apps/syndie/java/src/net/i2p/syndie/data/LocalArchiveIndex.java @@ -1,8 +1,14 @@ package net.i2p.syndie.data; -import java.util.*; +import java.util.Collections; +import java.util.Comparator; +import java.util.Properties; +import java.util.Set; +import java.util.TreeSet; + import net.i2p.I2PAppContext; -import net.i2p.data.*; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; import net.i2p.syndie.Archive; import net.i2p.util.Log; diff --git a/apps/syndie/java/src/net/i2p/syndie/data/ThreadIndex.java b/apps/syndie/java/src/net/i2p/syndie/data/ThreadIndex.java index 3ba3b2833b..810dceb1eb 100644 --- a/apps/syndie/java/src/net/i2p/syndie/data/ThreadIndex.java +++ b/apps/syndie/java/src/net/i2p/syndie/data/ThreadIndex.java @@ -1,6 +1,9 @@ package net.i2p.syndie.data; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * List of threads, ordered with the most recently updated thread first. diff --git a/apps/syndie/java/src/net/i2p/syndie/data/ThreadNode.java b/apps/syndie/java/src/net/i2p/syndie/data/ThreadNode.java index 7ab3f8aa63..437772d712 100644 --- a/apps/syndie/java/src/net/i2p/syndie/data/ThreadNode.java +++ b/apps/syndie/java/src/net/i2p/syndie/data/ThreadNode.java @@ -1,6 +1,8 @@ package net.i2p.syndie.data; -import java.util.*; +import java.util.Collection; +import java.util.Iterator; + import net.i2p.data.Hash; /** diff --git a/apps/syndie/java/src/net/i2p/syndie/data/TransparentArchiveIndex.java b/apps/syndie/java/src/net/i2p/syndie/data/TransparentArchiveIndex.java index 49d9c45e7c..85d15996d1 100644 --- a/apps/syndie/java/src/net/i2p/syndie/data/TransparentArchiveIndex.java +++ b/apps/syndie/java/src/net/i2p/syndie/data/TransparentArchiveIndex.java @@ -1,11 +1,14 @@ package net.i2p.syndie.data; -import java.io.*; -import java.text.*; -import java.util.*; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.util.List; +import java.util.Properties; +import java.util.Set; + import net.i2p.I2PAppContext; -import net.i2p.data.*; -import net.i2p.syndie.Archive; +import net.i2p.data.Hash; import net.i2p.syndie.BlogManager; /** diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/Address.java b/apps/syndie/java/src/net/i2p/syndie/sml/Address.java index ef2d1cc5c7..c8caac56d8 100644 --- a/apps/syndie/java/src/net/i2p/syndie/sml/Address.java +++ b/apps/syndie/java/src/net/i2p/syndie/sml/Address.java @@ -1,6 +1,5 @@ package net.i2p.syndie.sml; -import java.util.*; import net.i2p.data.DataHelper; /** contains intermediary rendering state */ diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/ArchiveRef.java b/apps/syndie/java/src/net/i2p/syndie/sml/ArchiveRef.java index 650b7b36e8..1b3df20e4f 100644 --- a/apps/syndie/java/src/net/i2p/syndie/sml/ArchiveRef.java +++ b/apps/syndie/java/src/net/i2p/syndie/sml/ArchiveRef.java @@ -1,6 +1,5 @@ package net.i2p.syndie.sml; -import java.util.*; import net.i2p.data.DataHelper; /** contains intermediary rendering state */ diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/Blog.java b/apps/syndie/java/src/net/i2p/syndie/sml/Blog.java index 325a0db11c..0eb4c14b0b 100644 --- a/apps/syndie/java/src/net/i2p/syndie/sml/Blog.java +++ b/apps/syndie/java/src/net/i2p/syndie/sml/Blog.java @@ -1,6 +1,7 @@ package net.i2p.syndie.sml; -import java.util.*; +import java.util.List; + import net.i2p.data.DataHelper; /** contains intermediary rendering state */ diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/BlogPostInfoRenderer.java b/apps/syndie/java/src/net/i2p/syndie/sml/BlogPostInfoRenderer.java index 6d52dff049..98a1a3ea5b 100644 --- a/apps/syndie/java/src/net/i2p/syndie/sml/BlogPostInfoRenderer.java +++ b/apps/syndie/java/src/net/i2p/syndie/sml/BlogPostInfoRenderer.java @@ -1,15 +1,31 @@ package net.i2p.syndie.sml; -import java.io.*; -import java.text.*; -import java.util.*; +import java.io.IOException; +import java.io.Writer; +import java.text.ParseException; +import java.text.SimpleDateFormat; +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.StringTokenizer; + import net.i2p.I2PAppContext; import net.i2p.client.naming.PetName; import net.i2p.client.naming.PetNameDB; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.web.*; +import net.i2p.data.Base64; +import net.i2p.data.Hash; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.Attachment; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; +import net.i2p.syndie.data.SafeURL; +import net.i2p.syndie.web.AddressesServlet; +import net.i2p.syndie.web.ViewBlogServlet; import net.i2p.util.Log; /** diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/BlogRenderer.java b/apps/syndie/java/src/net/i2p/syndie/sml/BlogRenderer.java index 467ebd43c4..55b19f5f4c 100644 --- a/apps/syndie/java/src/net/i2p/syndie/sml/BlogRenderer.java +++ b/apps/syndie/java/src/net/i2p/syndie/sml/BlogRenderer.java @@ -1,13 +1,22 @@ package net.i2p.syndie.sml; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.Writer; + import net.i2p.I2PAppContext; import net.i2p.client.naming.PetName; -import net.i2p.data.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.web.*; -import net.i2p.syndie.*; +import net.i2p.data.Base64; +import net.i2p.data.Hash; +import net.i2p.syndie.Archive; +import net.i2p.syndie.User; +import net.i2p.syndie.data.Attachment; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogInfoData; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; +import net.i2p.syndie.data.ThreadNode; +import net.i2p.syndie.web.PostServlet; +import net.i2p.syndie.web.ViewBlogServlet; /** * Renders posts for display within the blog view diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/EventReceiverImpl.java b/apps/syndie/java/src/net/i2p/syndie/sml/EventReceiverImpl.java index 854882aa95..515f80b86d 100644 --- a/apps/syndie/java/src/net/i2p/syndie/sml/EventReceiverImpl.java +++ b/apps/syndie/java/src/net/i2p/syndie/sml/EventReceiverImpl.java @@ -1,6 +1,7 @@ package net.i2p.syndie.sml; import java.util.List; + import net.i2p.I2PAppContext; import net.i2p.util.Log; diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/HTMLPreviewRenderer.java b/apps/syndie/java/src/net/i2p/syndie/sml/HTMLPreviewRenderer.java index 6d67e14085..6038423048 100644 --- a/apps/syndie/java/src/net/i2p/syndie/sml/HTMLPreviewRenderer.java +++ b/apps/syndie/java/src/net/i2p/syndie/sml/HTMLPreviewRenderer.java @@ -1,14 +1,15 @@ package net.i2p.syndie.sml; -import java.io.*; -import java.text.*; -import java.util.*; +import java.io.File; +import java.util.List; + import net.i2p.I2PAppContext; import net.i2p.client.naming.PetName; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.web.*; +import net.i2p.data.Base64; +import net.i2p.data.Hash; +import net.i2p.syndie.data.SafeURL; +import net.i2p.syndie.web.AddressesServlet; +import net.i2p.syndie.web.ArchiveViewerBean; /** * diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java b/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java index b676322a83..3c0346ab92 100644 --- a/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java +++ b/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java @@ -1,14 +1,38 @@ package net.i2p.syndie.sml; -import java.io.*; -import java.text.*; -import java.util.*; +import java.io.ByteArrayOutputStream; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.Writer; +import java.text.ParseException; +import java.text.SimpleDateFormat; +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.StringTokenizer; + import net.i2p.I2PAppContext; import net.i2p.client.naming.PetName; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.web.*; +import net.i2p.data.Base64; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.Attachment; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; +import net.i2p.syndie.data.SafeURL; +import net.i2p.syndie.web.AddressesServlet; +import net.i2p.syndie.web.ArchiveViewerBean; +import net.i2p.syndie.web.PostServlet; +import net.i2p.syndie.web.SyndicateServlet; import net.i2p.util.Log; /** diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/Link.java b/apps/syndie/java/src/net/i2p/syndie/sml/Link.java index 291c83c4b7..c343216f74 100644 --- a/apps/syndie/java/src/net/i2p/syndie/sml/Link.java +++ b/apps/syndie/java/src/net/i2p/syndie/sml/Link.java @@ -1,6 +1,5 @@ package net.i2p.syndie.sml; -import java.util.*; import net.i2p.data.DataHelper; /** contains intermediary rendering state */ diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/RSSRenderer.java b/apps/syndie/java/src/net/i2p/syndie/sml/RSSRenderer.java index 442ebb687a..8e99a50bf3 100644 --- a/apps/syndie/java/src/net/i2p/syndie/sml/RSSRenderer.java +++ b/apps/syndie/java/src/net/i2p/syndie/sml/RSSRenderer.java @@ -1,14 +1,20 @@ package net.i2p.syndie.sml; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.Writer; import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; + import net.i2p.I2PAppContext; import net.i2p.client.naming.PetName; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.web.AddressesServlet; +import net.i2p.data.Base64; +import net.i2p.data.Hash; +import net.i2p.syndie.Archive; +import net.i2p.syndie.User; +import net.i2p.syndie.data.Attachment; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.EntryContainer; /** * diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/SMLParser.java b/apps/syndie/java/src/net/i2p/syndie/sml/SMLParser.java index 6a965ed249..fd9d643872 100644 --- a/apps/syndie/java/src/net/i2p/syndie/sml/SMLParser.java +++ b/apps/syndie/java/src/net/i2p/syndie/sml/SMLParser.java @@ -1,9 +1,12 @@ package net.i2p.syndie.sml; -import java.lang.String; -import java.util.*; -import net.i2p.syndie.data.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import net.i2p.I2PAppContext; +import net.i2p.syndie.data.SafeURL; import net.i2p.util.Log; /** diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/ThreadedHTMLRenderer.java b/apps/syndie/java/src/net/i2p/syndie/sml/ThreadedHTMLRenderer.java index c63307b5f4..70137b6f62 100644 --- a/apps/syndie/java/src/net/i2p/syndie/sml/ThreadedHTMLRenderer.java +++ b/apps/syndie/java/src/net/i2p/syndie/sml/ThreadedHTMLRenderer.java @@ -1,14 +1,31 @@ package net.i2p.syndie.sml; -import java.io.*; -import java.text.*; -import java.util.*; +import java.io.IOException; +import java.io.Writer; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; + import net.i2p.I2PAppContext; import net.i2p.client.naming.PetName; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.web.*; +import net.i2p.data.Base64; +import net.i2p.data.Hash; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.Attachment; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; +import net.i2p.syndie.data.SafeURL; +import net.i2p.syndie.data.ThreadIndex; +import net.i2p.syndie.data.ThreadNode; +import net.i2p.syndie.web.AddressesServlet; +import net.i2p.syndie.web.ArchiveViewerBean; +import net.i2p.syndie.web.BaseServlet; +import net.i2p.syndie.web.PostServlet; import net.i2p.util.Log; /** diff --git a/apps/syndie/java/src/net/i2p/syndie/web/AddressesServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/AddressesServlet.java index 628344479c..ff1a49ccc2 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/AddressesServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/AddressesServlet.java @@ -1,19 +1,21 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Iterator; +import java.util.TreeSet; -import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; -import net.i2p.I2PAppContext; -import net.i2p.client.naming.*; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.client.naming.PetName; +import net.i2p.client.naming.PetNameDB; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.FilteredThreadIndex; +import net.i2p.syndie.data.ThreadIndex; +import net.i2p.syndie.sml.ThreadedHTMLRenderer; /** * Show the user's addressbook diff --git a/apps/syndie/java/src/net/i2p/syndie/web/AdminServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/AdminServlet.java index e452cbe9e9..fa9b852ba3 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/AdminServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/AdminServlet.java @@ -1,19 +1,15 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.PrintWriter; -import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; -import net.i2p.I2PAppContext; -import net.i2p.client.naming.*; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.ThreadIndex; /** * Admin form diff --git a/apps/syndie/java/src/net/i2p/syndie/web/ArchiveServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/ArchiveServlet.java index cb45ed73cb..afd701b9cb 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/ArchiveServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/ArchiveServlet.java @@ -1,17 +1,28 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; import net.i2p.I2PAppContext; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; +import net.i2p.data.Base64; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.data.ArchiveIndex; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; /** * diff --git a/apps/syndie/java/src/net/i2p/syndie/web/ArchiveViewerBean.java b/apps/syndie/java/src/net/i2p/syndie/web/ArchiveViewerBean.java index 19af7e9a4d..56ed1b60b2 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/ArchiveViewerBean.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/ArchiveViewerBean.java @@ -1,15 +1,35 @@ package net.i2p.syndie.web; -import java.io.*; -import java.text.*; -import java.util.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.Writer; +import java.util.ArrayList; +import java.util.Collection; +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 net.i2p.I2PAppContext; import net.i2p.client.naming.PetName; import net.i2p.client.naming.PetNameDB; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.data.Base64; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; +import net.i2p.data.SigningPublicKey; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.ArchiveIndex; +import net.i2p.syndie.data.Attachment; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; +import net.i2p.syndie.sml.HTMLRenderer; +import net.i2p.syndie.sml.ThreadedHTMLRenderer; /** * diff --git a/apps/syndie/java/src/net/i2p/syndie/web/BaseServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/BaseServlet.java index 2c06521a2f..aba868a15d 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/BaseServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/BaseServlet.java @@ -1,19 +1,43 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.PrintWriter; +import java.io.Reader; +import java.io.Writer; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Enumeration; +import java.util.Iterator; +import java.util.List; +import java.util.Properties; +import java.util.Set; +import java.util.StringTokenizer; +import java.util.TreeSet; +import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; import net.i2p.I2PAppContext; -import net.i2p.client.naming.*; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.client.naming.PetName; +import net.i2p.client.naming.PetNameDB; +import net.i2p.data.Base64; +import net.i2p.data.DataFormatException; +import net.i2p.data.Hash; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.FilteredThreadIndex; +import net.i2p.syndie.data.ThreadIndex; +import net.i2p.syndie.data.ThreadNode; +import net.i2p.syndie.sml.HTMLRenderer; +import net.i2p.syndie.sml.ThreadedHTMLRenderer; import net.i2p.util.FileUtil; import net.i2p.util.Log; diff --git a/apps/syndie/java/src/net/i2p/syndie/web/BlogConfigBean.java b/apps/syndie/java/src/net/i2p/syndie/web/BlogConfigBean.java index a568ab3838..1652a525ae 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/BlogConfigBean.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/BlogConfigBean.java @@ -1,12 +1,26 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Properties; + import net.i2p.I2PAppContext; import net.i2p.client.naming.PetName; import net.i2p.data.DataHelper; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogInfoData; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; import net.i2p.util.Log; /** diff --git a/apps/syndie/java/src/net/i2p/syndie/web/BlogConfigServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/BlogConfigServlet.java index 98b06483e6..c2cfc5d143 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/BlogConfigServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/BlogConfigServlet.java @@ -1,19 +1,28 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import java.util.TreeSet; -import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; -import net.i2p.I2PAppContext; -import net.i2p.client.naming.*; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.client.naming.PetName; +import net.i2p.client.naming.PetNameDB; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.BlogInfoData; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.ThreadIndex; +import net.i2p.syndie.sml.HTMLRenderer; /** * Display our blog config, and let us edit it through several screens diff --git a/apps/syndie/java/src/net/i2p/syndie/web/ExportServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/ExportServlet.java index 51179a7897..5bcd2f2c69 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/ExportServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/ExportServlet.java @@ -1,18 +1,25 @@ package net.i2p.syndie.web; -import java.io.*; -import java.io.*; -import java.util.*; -import java.util.zip.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; +import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; +import net.i2p.data.Base64; +import net.i2p.data.Hash; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.data.BlogURI; /** * Dump out a whole series of blog metadata and entries as a zip stream. All metadata diff --git a/apps/syndie/java/src/net/i2p/syndie/web/ExternalLinkServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/ExternalLinkServlet.java index fab84f7696..f89e58079d 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/ExternalLinkServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/ExternalLinkServlet.java @@ -1,19 +1,17 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.PrintWriter; -import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; -import net.i2p.I2PAppContext; -import net.i2p.client.naming.*; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.data.Base64; +import net.i2p.data.DataHelper; +import net.i2p.syndie.Archive; +import net.i2p.syndie.User; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.ThreadIndex; +import net.i2p.syndie.sml.HTMLRenderer; /** * Confirm page before hitting a remote site diff --git a/apps/syndie/java/src/net/i2p/syndie/web/ImportFeedServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/ImportFeedServlet.java index 1a454e4ac6..9b603bbbf7 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/ImportFeedServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/ImportFeedServlet.java @@ -1,19 +1,17 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Iterator; +import java.util.List; -import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; -import net.i2p.I2PAppContext; -import net.i2p.client.naming.*; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.ThreadIndex; /** * Schedule the import of atom/rss feeds diff --git a/apps/syndie/java/src/net/i2p/syndie/web/MultiPartRequest.java b/apps/syndie/java/src/net/i2p/syndie/web/MultiPartRequest.java index 780070aa59..22f73b40a0 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/MultiPartRequest.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/MultiPartRequest.java @@ -1,8 +1,6 @@ // see below for license info package net.i2p.syndie.web; -import org.mortbay.servlet.*; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/apps/syndie/java/src/net/i2p/syndie/web/PostBean.java b/apps/syndie/java/src/net/i2p/syndie/web/PostBean.java index 6cd475b2d5..7e653587d9 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/PostBean.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/PostBean.java @@ -1,11 +1,26 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.Writer; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.StringTokenizer; + import net.i2p.I2PAppContext; import net.i2p.client.naming.PetName; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; import net.i2p.syndie.sml.HTMLPreviewRenderer; import net.i2p.syndie.sml.HTMLRenderer; import net.i2p.util.Log; diff --git a/apps/syndie/java/src/net/i2p/syndie/web/PostServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/PostServlet.java index 4cc2127b4d..8d7ce38148 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/PostServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/PostServlet.java @@ -1,22 +1,24 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.TreeSet; -import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; -// temporarily, we use our overwride, until jetty applies our patches -//import org.mortbay.servlet.MultiPartRequest; - -import net.i2p.I2PAppContext; -import net.i2p.client.naming.*; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.client.naming.PetName; +import net.i2p.client.naming.PetNameDB; +import net.i2p.data.Base64; +import net.i2p.data.DataHelper; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.ThreadIndex; +import net.i2p.syndie.sml.HTMLRenderer; +import net.i2p.syndie.sml.ThreadedHTMLRenderer; /** * Post and preview form diff --git a/apps/syndie/java/src/net/i2p/syndie/web/ProfileServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/ProfileServlet.java index ebebc4914b..1c961a768d 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/ProfileServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/ProfileServlet.java @@ -1,19 +1,22 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.PrintWriter; -import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; -import net.i2p.I2PAppContext; -import net.i2p.client.naming.*; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.client.naming.PetName; +import net.i2p.data.DataFormatException; +import net.i2p.data.Hash; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.FilteredThreadIndex; +import net.i2p.syndie.data.ThreadIndex; +import net.i2p.syndie.sml.HTMLRenderer; +import net.i2p.syndie.sml.ThreadedHTMLRenderer; /** * Render the requested profile diff --git a/apps/syndie/java/src/net/i2p/syndie/web/RSSServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/RSSServlet.java index da6cfc1174..2d6c2b8f12 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/RSSServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/RSSServlet.java @@ -1,18 +1,31 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.Writer; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.StringTokenizer; +import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; import net.i2p.I2PAppContext; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.data.Base64; +import net.i2p.data.Hash; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; +import net.i2p.syndie.data.FilteredThreadIndex; +import net.i2p.syndie.data.ThreadNode; +import net.i2p.syndie.sml.HTMLRenderer; +import net.i2p.syndie.sml.RSSRenderer; +import net.i2p.syndie.sml.ThreadedHTMLRenderer; /** * diff --git a/apps/syndie/java/src/net/i2p/syndie/web/RemoteArchiveBean.java b/apps/syndie/java/src/net/i2p/syndie/web/RemoteArchiveBean.java index fbe73ff4fc..3601d4b24d 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/RemoteArchiveBean.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/RemoteArchiveBean.java @@ -1,19 +1,45 @@ package net.i2p.syndie.web; -import java.io.*; -import java.text.*; -import java.util.*; -import java.util.zip.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.Writer; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +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; +import java.util.zip.ZipEntry; +import java.util.zip.ZipInputStream; + import net.i2p.I2PAppContext; -import net.i2p.client.naming.PetNameDB; import net.i2p.client.naming.PetName; -import net.i2p.data.*; +import net.i2p.client.naming.PetNameDB; +import net.i2p.data.Base64; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.ArchiveIndex; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; +import net.i2p.syndie.sml.HTMLRenderer; +import net.i2p.syndie.sml.ThreadedHTMLRenderer; import net.i2p.util.EepGet; import net.i2p.util.EepGetScheduler; import net.i2p.util.EepPost; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; -import net.i2p.syndie.*; import net.i2p.util.I2PThread; import net.i2p.util.Log; diff --git a/apps/syndie/java/src/net/i2p/syndie/web/RunStandalone.java b/apps/syndie/java/src/net/i2p/syndie/web/RunStandalone.java index ffef2957da..778d3e41a3 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/RunStandalone.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/RunStandalone.java @@ -3,6 +3,7 @@ package net.i2p.syndie.web; import java.io.File; import net.i2p.util.FileUtil; + import org.mortbay.jetty.Server; public class RunStandalone { diff --git a/apps/syndie/java/src/net/i2p/syndie/web/SwitchServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/SwitchServlet.java index 97949dbbea..44fd4e9708 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/SwitchServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/SwitchServlet.java @@ -1,19 +1,15 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.PrintWriter; -import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; -import net.i2p.I2PAppContext; -import net.i2p.client.naming.*; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.syndie.Archive; +import net.i2p.syndie.User; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.ThreadIndex; +import net.i2p.syndie.sml.ThreadedHTMLRenderer; /** * Login/register form diff --git a/apps/syndie/java/src/net/i2p/syndie/web/SyndicateServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/SyndicateServlet.java index 0705dc93f6..337ac5aa13 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/SyndicateServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/SyndicateServlet.java @@ -1,19 +1,18 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Iterator; -import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; -import net.i2p.I2PAppContext; -import net.i2p.client.naming.*; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.client.naming.PetName; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.ThreadIndex; +import net.i2p.syndie.sml.HTMLRenderer; /** * Syndicate with another remote Syndie node diff --git a/apps/syndie/java/src/net/i2p/syndie/web/ThreadNavServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/ThreadNavServlet.java index b748253660..abb6f852e7 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/ThreadNavServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/ThreadNavServlet.java @@ -1,19 +1,26 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.PrintWriter; import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import net.i2p.I2PAppContext; -import net.i2p.client.naming.*; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.client.naming.PetName; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.HeaderReceiver; +import net.i2p.syndie.User; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; +import net.i2p.syndie.data.FilteredThreadIndex; +import net.i2p.syndie.data.ThreadIndex; +import net.i2p.syndie.data.ThreadNode; +import net.i2p.syndie.sml.HTMLRenderer; +import net.i2p.syndie.sml.SMLParser; /** * Export the thread nav as either RDF or XML diff --git a/apps/syndie/java/src/net/i2p/syndie/web/ViewBlogServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/ViewBlogServlet.java index daacf3010c..6a254f5214 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/ViewBlogServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/ViewBlogServlet.java @@ -1,19 +1,40 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +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.io.PrintWriter; +import java.io.Reader; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import net.i2p.I2PAppContext; -import net.i2p.client.naming.*; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.client.naming.PetName; +import net.i2p.data.Base64; +import net.i2p.data.Hash; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.User; +import net.i2p.syndie.data.ArchiveIndex; +import net.i2p.syndie.data.Attachment; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogInfoData; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; +import net.i2p.syndie.data.FilteredThreadIndex; +import net.i2p.syndie.data.ThreadIndex; +import net.i2p.syndie.data.ThreadNode; +import net.i2p.syndie.sml.BlogPostInfoRenderer; +import net.i2p.syndie.sml.BlogRenderer; +import net.i2p.syndie.sml.HTMLRenderer; +import net.i2p.syndie.sml.ThreadedHTMLRenderer; import net.i2p.util.FileUtil; import net.i2p.util.Log; diff --git a/apps/syndie/java/src/net/i2p/syndie/web/ViewBlogsServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/ViewBlogsServlet.java index 80f28402dc..4a1d4d2586 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/ViewBlogsServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/ViewBlogsServlet.java @@ -1,18 +1,27 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.TreeSet; -import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import net.i2p.I2PAppContext; -import net.i2p.client.naming.*; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.client.naming.PetName; +import net.i2p.client.naming.PetNameDB; +import net.i2p.data.Hash; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.NewestEntryFirstComparator; +import net.i2p.syndie.User; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.FilteredThreadIndex; +import net.i2p.syndie.data.ThreadIndex; +import net.i2p.syndie.data.ThreadNode; +import net.i2p.syndie.sml.HTMLRenderer; /** * List the blogs known in the archive diff --git a/apps/syndie/java/src/net/i2p/syndie/web/ViewThreadedServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/ViewThreadedServlet.java index 375733a6a7..065bed3775 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/ViewThreadedServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/ViewThreadedServlet.java @@ -1,18 +1,33 @@ package net.i2p.syndie.web; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; -import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import net.i2p.I2PAppContext; -import net.i2p.client.naming.*; -import net.i2p.data.*; -import net.i2p.syndie.*; -import net.i2p.syndie.data.*; -import net.i2p.syndie.sml.*; +import net.i2p.client.naming.PetName; +import net.i2p.client.naming.PetNameDB; +import net.i2p.data.Base64; +import net.i2p.data.Hash; +import net.i2p.syndie.Archive; +import net.i2p.syndie.BlogManager; +import net.i2p.syndie.HeaderReceiver; +import net.i2p.syndie.User; +import net.i2p.syndie.data.ArchiveIndex; +import net.i2p.syndie.data.BlogInfo; +import net.i2p.syndie.data.BlogURI; +import net.i2p.syndie.data.EntryContainer; +import net.i2p.syndie.data.FilteredThreadIndex; +import net.i2p.syndie.data.ThreadIndex; +import net.i2p.syndie.data.ThreadNode; +import net.i2p.syndie.sml.HTMLRenderer; +import net.i2p.syndie.sml.SMLParser; +import net.i2p.syndie.sml.ThreadedHTMLRenderer; /** * Render the appropriate posts and the thread tree diff --git a/apps/systray/java/src/net/i2p/apps/systray/SysTray.java b/apps/systray/java/src/net/i2p/apps/systray/SysTray.java index 2e42de659b..380c5b1720 100644 --- a/apps/systray/java/src/net/i2p/apps/systray/SysTray.java +++ b/apps/systray/java/src/net/i2p/apps/systray/SysTray.java @@ -10,14 +10,14 @@ package net.i2p.apps.systray; import java.awt.Frame; + +import net.i2p.util.SimpleTimer; import snoozesoft.systray4j.SysTrayMenu; import snoozesoft.systray4j.SysTrayMenuEvent; import snoozesoft.systray4j.SysTrayMenuIcon; import snoozesoft.systray4j.SysTrayMenuItem; import snoozesoft.systray4j.SysTrayMenuListener; -import net.i2p.util.SimpleTimer; - /** * A system tray control for launching the I2P router console. * diff --git a/core/java/src/gnu/crypto/prng/AsyncFortunaStandalone.java b/core/java/src/gnu/crypto/prng/AsyncFortunaStandalone.java index c7b5c36e5d..3fdffcd9ea 100644 --- a/core/java/src/gnu/crypto/prng/AsyncFortunaStandalone.java +++ b/core/java/src/gnu/crypto/prng/AsyncFortunaStandalone.java @@ -1,6 +1,7 @@ package gnu.crypto.prng; -import java.util.*; +import java.util.HashMap; +import java.util.Map; import net.i2p.I2PAppContext; diff --git a/core/java/src/gnu/crypto/prng/FortunaStandalone.java b/core/java/src/gnu/crypto/prng/FortunaStandalone.java index 007d52c1eb..fbe6fdc27c 100644 --- a/core/java/src/gnu/crypto/prng/FortunaStandalone.java +++ b/core/java/src/gnu/crypto/prng/FortunaStandalone.java @@ -41,22 +41,19 @@ exception statement from your version. */ package gnu.crypto.prng; +import gnu.crypto.hash.Sha256Standalone; + import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; - import java.security.InvalidKeyException; - import java.util.Arrays; -import java.util.Collections; -import java.util.Iterator; -import java.util.Map; import java.util.HashMap; +import java.util.Map; -import gnu.crypto.hash.Sha256Standalone; -import net.i2p.crypto.CryptixRijndael_Algorithm; import net.i2p.crypto.CryptixAESKeyCache; +import net.i2p.crypto.CryptixRijndael_Algorithm; /** * The Fortuna continuously-seeded pseudo-random number generator. This diff --git a/core/java/src/net/i2p/I2PAppContext.java b/core/java/src/net/i2p/I2PAppContext.java index aca9ebdc1a..403acf44b4 100644 --- a/core/java/src/net/i2p/I2PAppContext.java +++ b/core/java/src/net/i2p/I2PAppContext.java @@ -23,10 +23,10 @@ import net.i2p.crypto.SessionKeyManager; import net.i2p.data.RoutingKeyGenerator; import net.i2p.stat.StatManager; import net.i2p.util.Clock; -import net.i2p.util.LogManager; -import net.i2p.util.RandomSource; -import net.i2p.util.PooledRandomSource; import net.i2p.util.FortunaRandomSource; +import net.i2p.util.LogManager; +import net.i2p.util.PooledRandomSource; +import net.i2p.util.RandomSource; /** *

    Provide a base scope for accessing singletons that I2P exposes. Rather than diff --git a/core/java/src/net/i2p/client/I2PClientMessageHandlerMap.java b/core/java/src/net/i2p/client/I2PClientMessageHandlerMap.java index 90c111c151..50b7955719 100644 --- a/core/java/src/net/i2p/client/I2PClientMessageHandlerMap.java +++ b/core/java/src/net/i2p/client/I2PClientMessageHandlerMap.java @@ -9,9 +9,6 @@ package net.i2p.client; * */ -import java.util.HashMap; -import java.util.Map; - import net.i2p.I2PAppContext; import net.i2p.data.i2cp.DisconnectMessage; import net.i2p.data.i2cp.MessagePayloadMessage; diff --git a/core/java/src/net/i2p/client/MessagePayloadMessageHandler.java b/core/java/src/net/i2p/client/MessagePayloadMessageHandler.java index eec16feea8..e38927933b 100644 --- a/core/java/src/net/i2p/client/MessagePayloadMessageHandler.java +++ b/core/java/src/net/i2p/client/MessagePayloadMessageHandler.java @@ -13,7 +13,6 @@ import net.i2p.I2PAppContext; import net.i2p.data.DataFormatException; import net.i2p.data.Payload; import net.i2p.data.i2cp.I2CPMessage; -import net.i2p.data.i2cp.MessageId; import net.i2p.data.i2cp.MessagePayloadMessage; import net.i2p.data.i2cp.ReceiveMessageEndMessage; import net.i2p.util.Log; diff --git a/core/java/src/net/i2p/client/MessageState.java b/core/java/src/net/i2p/client/MessageState.java index 4ae18c74a4..28ab4bdaa7 100644 --- a/core/java/src/net/i2p/client/MessageState.java +++ b/core/java/src/net/i2p/client/MessageState.java @@ -9,7 +9,6 @@ import net.i2p.data.Destination; import net.i2p.data.SessionKey; import net.i2p.data.i2cp.MessageId; import net.i2p.data.i2cp.MessageStatusMessage; -import net.i2p.util.Clock; import net.i2p.util.Log; /** diff --git a/core/java/src/net/i2p/client/naming/AddressDB.java b/core/java/src/net/i2p/client/naming/AddressDB.java index 2ad38c3e22..29b8cf7cb3 100644 --- a/core/java/src/net/i2p/client/naming/AddressDB.java +++ b/core/java/src/net/i2p/client/naming/AddressDB.java @@ -4,8 +4,8 @@ import java.lang.reflect.Constructor; import java.util.Collection; import net.i2p.I2PAppContext; -import net.i2p.util.Log; import net.i2p.data.Address; +import net.i2p.util.Log; public abstract class AddressDB { diff --git a/core/java/src/net/i2p/client/naming/AddressDBNamingService.java b/core/java/src/net/i2p/client/naming/AddressDBNamingService.java index 04abba456f..72cee3cdab 100644 --- a/core/java/src/net/i2p/client/naming/AddressDBNamingService.java +++ b/core/java/src/net/i2p/client/naming/AddressDBNamingService.java @@ -3,8 +3,8 @@ package net.i2p.client.naming; import java.util.Iterator; import net.i2p.I2PAppContext; -import net.i2p.data.Destination; import net.i2p.data.Address; +import net.i2p.data.Destination; public class AddressDBNamingService extends NamingService { diff --git a/core/java/src/net/i2p/client/naming/EepGetNamingService.java b/core/java/src/net/i2p/client/naming/EepGetNamingService.java index 057f3d4f68..0b3c7d08e5 100644 --- a/core/java/src/net/i2p/client/naming/EepGetNamingService.java +++ b/core/java/src/net/i2p/client/naming/EepGetNamingService.java @@ -11,7 +11,6 @@ import java.util.Properties; import java.util.StringTokenizer; import net.i2p.I2PAppContext; -import net.i2p.data.DataHelper; import net.i2p.data.Destination; import net.i2p.util.EepGet; import net.i2p.util.Log; diff --git a/core/java/src/net/i2p/client/naming/ExecNamingService.java b/core/java/src/net/i2p/client/naming/ExecNamingService.java index 8d76f50fd8..15b770ec88 100644 --- a/core/java/src/net/i2p/client/naming/ExecNamingService.java +++ b/core/java/src/net/i2p/client/naming/ExecNamingService.java @@ -8,9 +8,7 @@ import java.io.InputStream; import java.util.Properties; import net.i2p.I2PAppContext; -import net.i2p.data.DataHelper; import net.i2p.data.Destination; -import net.i2p.util.Exec; import net.i2p.util.Log; /** diff --git a/core/java/src/net/i2p/client/naming/FilesystemAddressDB.java b/core/java/src/net/i2p/client/naming/FilesystemAddressDB.java index 4a2e37e279..f644674609 100644 --- a/core/java/src/net/i2p/client/naming/FilesystemAddressDB.java +++ b/core/java/src/net/i2p/client/naming/FilesystemAddressDB.java @@ -1,10 +1,14 @@ package net.i2p.client.naming; -import java.util.Collection; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; import java.util.Arrays; -import java.util.Properties; +import java.util.Collection; import java.util.Iterator; -import java.io.*; +import java.util.Properties; import net.i2p.I2PAppContext; import net.i2p.data.Address; diff --git a/core/java/src/net/i2p/client/naming/MetaNamingService.java b/core/java/src/net/i2p/client/naming/MetaNamingService.java index 00cd382acb..753b50f153 100644 --- a/core/java/src/net/i2p/client/naming/MetaNamingService.java +++ b/core/java/src/net/i2p/client/naming/MetaNamingService.java @@ -2,8 +2,8 @@ package net.i2p.client.naming; import java.lang.reflect.Constructor; import java.util.ArrayList; -import java.util.List; import java.util.Iterator; +import java.util.List; import java.util.StringTokenizer; import net.i2p.I2PAppContext; diff --git a/core/java/src/net/i2p/client/naming/PetName.java b/core/java/src/net/i2p/client/naming/PetName.java index 8b5fdda917..3642fd14e2 100644 --- a/core/java/src/net/i2p/client/naming/PetName.java +++ b/core/java/src/net/i2p/client/naming/PetName.java @@ -1,6 +1,9 @@ package net.i2p.client.naming; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.StringTokenizer; + import net.i2p.data.DataHelper; /** diff --git a/core/java/src/net/i2p/client/naming/PetNameDB.java b/core/java/src/net/i2p/client/naming/PetNameDB.java index c335a93419..0f6fc977fa 100644 --- a/core/java/src/net/i2p/client/naming/PetNameDB.java +++ b/core/java/src/net/i2p/client/naming/PetNameDB.java @@ -1,7 +1,21 @@ package net.i2p.client.naming; -import java.io.*; -import java.util.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +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/core/java/src/net/i2p/client/naming/PetNameNamingService.java b/core/java/src/net/i2p/client/naming/PetNameNamingService.java index fb57a3c022..1d0294a251 100644 --- a/core/java/src/net/i2p/client/naming/PetNameNamingService.java +++ b/core/java/src/net/i2p/client/naming/PetNameNamingService.java @@ -1,12 +1,8 @@ package net.i2p.client.naming; -import java.io.File; import java.io.IOException; -import java.util.Iterator; -import java.util.Properties; import net.i2p.I2PAppContext; -import net.i2p.data.DataHelper; import net.i2p.data.Destination; public class PetNameNamingService extends NamingService { diff --git a/core/java/src/net/i2p/crypto/AESInputStream.java b/core/java/src/net/i2p/crypto/AESInputStream.java index cdc11bbc7e..f4ec8533d6 100644 --- a/core/java/src/net/i2p/crypto/AESInputStream.java +++ b/core/java/src/net/i2p/crypto/AESInputStream.java @@ -14,6 +14,7 @@ import java.io.ByteArrayOutputStream; import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; + import net.i2p.I2PAppContext; import net.i2p.data.Base64; import net.i2p.data.DataHelper; diff --git a/core/java/src/net/i2p/crypto/DHSessionKeyBuilder.java b/core/java/src/net/i2p/crypto/DHSessionKeyBuilder.java index 949d3a70b2..d00f3d1aa7 100644 --- a/core/java/src/net/i2p/crypto/DHSessionKeyBuilder.java +++ b/core/java/src/net/i2p/crypto/DHSessionKeyBuilder.java @@ -9,13 +9,12 @@ package net.i2p.crypto; * */ -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.List; - import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.List; import net.i2p.I2PAppContext; import net.i2p.I2PException; diff --git a/core/java/src/net/i2p/crypto/DSAEngine.java b/core/java/src/net/i2p/crypto/DSAEngine.java index 113627cafd..b083cc2480 100644 --- a/core/java/src/net/i2p/crypto/DSAEngine.java +++ b/core/java/src/net/i2p/crypto/DSAEngine.java @@ -29,13 +29,11 @@ package net.i2p.crypto; * POSSIBILITY OF SUCH DAMAGE. */ -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.math.BigInteger; -import java.util.Arrays; import net.i2p.I2PAppContext; -import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.data.Signature; import net.i2p.data.SigningPrivateKey; diff --git a/core/java/src/net/i2p/crypto/DummyPooledRandomSource.java b/core/java/src/net/i2p/crypto/DummyPooledRandomSource.java index 6b47520c42..a29d923a5f 100644 --- a/core/java/src/net/i2p/crypto/DummyPooledRandomSource.java +++ b/core/java/src/net/i2p/crypto/DummyPooledRandomSource.java @@ -1,10 +1,10 @@ package net.i2p.crypto; import java.util.Random; + import net.i2p.I2PAppContext; import net.i2p.util.PooledRandomSource; import net.i2p.util.RandomSource; -import net.i2p.util.Log; /** * diff --git a/core/java/src/net/i2p/crypto/HMAC256Generator.java b/core/java/src/net/i2p/crypto/HMAC256Generator.java index 2d106298b5..9ad2b55a75 100644 --- a/core/java/src/net/i2p/crypto/HMAC256Generator.java +++ b/core/java/src/net/i2p/crypto/HMAC256Generator.java @@ -5,6 +5,7 @@ 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.macs.HMac; diff --git a/core/java/src/net/i2p/crypto/HMACGenerator.java b/core/java/src/net/i2p/crypto/HMACGenerator.java index fa853df9b3..8388590a29 100644 --- a/core/java/src/net/i2p/crypto/HMACGenerator.java +++ b/core/java/src/net/i2p/crypto/HMACGenerator.java @@ -1,8 +1,9 @@ package net.i2p.crypto; -import java.util.Arrays; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; + import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; import net.i2p.data.Hash; diff --git a/core/java/src/net/i2p/crypto/KeyGenerator.java b/core/java/src/net/i2p/crypto/KeyGenerator.java index a221f9ef13..6140b9c5dd 100644 --- a/core/java/src/net/i2p/crypto/KeyGenerator.java +++ b/core/java/src/net/i2p/crypto/KeyGenerator.java @@ -9,11 +9,9 @@ package net.i2p.crypto; * */ -import gnu.crypto.hash.Sha256Standalone; import java.math.BigInteger; import net.i2p.I2PAppContext; -import net.i2p.data.Base64; import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.data.PrivateKey; diff --git a/core/java/src/net/i2p/crypto/SHA1.java b/core/java/src/net/i2p/crypto/SHA1.java index 35d68a02fe..66956ed092 100644 --- a/core/java/src/net/i2p/crypto/SHA1.java +++ b/core/java/src/net/i2p/crypto/SHA1.java @@ -15,9 +15,8 @@ package net.i2p.crypto; * put("MessageDigest.SHA-1", "com.bitzi.util.SHA1"); */ //package com.bitzi.util; -import java.security.*; -//--+---+1--+---+--2+---+---+3--+---+--4+---+---+5--+---+--6+---+---+7--+---+-- -//34567890123456789012345678901234567890123456789012345678901234567890123456789 +import java.security.DigestException; +import java.security.MessageDigest; /** *

    The FIPS PUB 180-2 standard specifies four secure hash algorithms (SHA-1, diff --git a/core/java/src/net/i2p/crypto/SHA1Test.java b/core/java/src/net/i2p/crypto/SHA1Test.java index 69ad3be144..de1bf1b819 100644 --- a/core/java/src/net/i2p/crypto/SHA1Test.java +++ b/core/java/src/net/i2p/crypto/SHA1Test.java @@ -12,7 +12,8 @@ package net.i2p.crypto; */ //package com.bitzi.util; -import java.security.*; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; public class SHA1Test { diff --git a/core/java/src/net/i2p/crypto/SHA256Generator.java b/core/java/src/net/i2p/crypto/SHA256Generator.java index 96d533a1df..d77ac84c63 100644 --- a/core/java/src/net/i2p/crypto/SHA256Generator.java +++ b/core/java/src/net/i2p/crypto/SHA256Generator.java @@ -1,14 +1,14 @@ package net.i2p.crypto; -import java.util.Arrays; +import gnu.crypto.hash.Sha256Standalone; + import java.util.ArrayList; import java.util.List; + import net.i2p.I2PAppContext; import net.i2p.data.Base64; import net.i2p.data.Hash; -import gnu.crypto.hash.Sha256Standalone; - /** * Defines a wrapper for SHA-256 operation. All the good stuff occurs * in the GNU-Crypto {@link gnu.crypto.hash.Sha256Standalone} diff --git a/core/java/src/net/i2p/data/ByteArray.java b/core/java/src/net/i2p/data/ByteArray.java index 5dbed12981..90bcc43ecb 100644 --- a/core/java/src/net/i2p/data/ByteArray.java +++ b/core/java/src/net/i2p/data/ByteArray.java @@ -10,7 +10,6 @@ package net.i2p.data; */ import java.io.Serializable; -import net.i2p.data.Base64; /** * Wrap up an array of bytes so that they can be compared and placed in hashes, diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java index 359b274981..b3aad342a8 100644 --- a/core/java/src/net/i2p/data/DataHelper.java +++ b/core/java/src/net/i2p/data/DataHelper.java @@ -10,6 +10,7 @@ package net.i2p.data; */ import gnu.crypto.hash.Sha256Standalone; + import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.ByteArrayInputStream; @@ -32,10 +33,8 @@ import java.util.Iterator; import java.util.List; import java.util.Properties; import java.util.TreeMap; -import java.util.zip.GZIPInputStream; import net.i2p.util.ByteCache; -import net.i2p.util.CachingByteArrayOutputStream; import net.i2p.util.OrderedProperties; import net.i2p.util.ReusableGZIPInputStream; import net.i2p.util.ReusableGZIPOutputStream; diff --git a/core/java/src/net/i2p/data/Destination.java b/core/java/src/net/i2p/data/Destination.java index 7f190e3541..cc647877bb 100644 --- a/core/java/src/net/i2p/data/Destination.java +++ b/core/java/src/net/i2p/data/Destination.java @@ -9,10 +9,10 @@ package net.i2p.data; * */ +import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.FileInputStream; import net.i2p.util.Log; diff --git a/core/java/src/net/i2p/data/PrivateKey.java b/core/java/src/net/i2p/data/PrivateKey.java index 6b4f923f8f..23ba1d673f 100644 --- a/core/java/src/net/i2p/data/PrivateKey.java +++ b/core/java/src/net/i2p/data/PrivateKey.java @@ -13,8 +13,8 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import net.i2p.util.Log; import net.i2p.crypto.KeyGenerator; +import net.i2p.util.Log; /** * Defines the PrivateKey as defined by the I2P data structure spec. diff --git a/core/java/src/net/i2p/data/PrivateKeyFile.java b/core/java/src/net/i2p/data/PrivateKeyFile.java index 572adce176..85e7614505 100644 --- a/core/java/src/net/i2p/data/PrivateKeyFile.java +++ b/core/java/src/net/i2p/data/PrivateKeyFile.java @@ -2,10 +2,10 @@ package net.i2p.data; import java.io.File; -import java.io.IOException; -import java.util.Properties; import java.io.FileInputStream; import java.io.FileOutputStream; +import java.io.IOException; +import java.util.Properties; import net.i2p.I2PException; import net.i2p.client.I2PClient; diff --git a/core/java/src/net/i2p/data/SigningPrivateKey.java b/core/java/src/net/i2p/data/SigningPrivateKey.java index 9fd65e37ad..2035c7b0a7 100644 --- a/core/java/src/net/i2p/data/SigningPrivateKey.java +++ b/core/java/src/net/i2p/data/SigningPrivateKey.java @@ -13,8 +13,8 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import net.i2p.util.Log; import net.i2p.crypto.KeyGenerator; +import net.i2p.util.Log; /** * Defines the SigningPrivateKey as defined by the I2P data structure spec. diff --git a/core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java b/core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java index 3788374393..4462fdf5df 100644 --- a/core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java +++ b/core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java @@ -9,7 +9,6 @@ package net.i2p.data.i2cp; * */ -import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; diff --git a/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java b/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java index 917b53ba06..6c410cf339 100644 --- a/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java +++ b/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java @@ -9,7 +9,6 @@ package net.i2p.data.i2cp; * */ -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; diff --git a/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java b/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java index 473dd4f8c8..f314ad213a 100644 --- a/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java +++ b/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java @@ -9,7 +9,6 @@ package net.i2p.data.i2cp; * */ -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; diff --git a/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java b/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java index 9ecb016a0a..bb43441a90 100644 --- a/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java +++ b/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java @@ -9,7 +9,6 @@ package net.i2p.data.i2cp; * */ -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; diff --git a/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java b/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java index cb97c0ff1b..9d8fe81c4a 100644 --- a/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java +++ b/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java @@ -17,7 +17,6 @@ import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; import net.i2p.data.Destination; import net.i2p.data.Payload; -import net.i2p.data.i2cp.I2CPMessageException; import net.i2p.util.Log; /** diff --git a/core/java/src/net/i2p/stat/BufferedStatLog.java b/core/java/src/net/i2p/stat/BufferedStatLog.java index 0d20737e8e..7fed2d0904 100644 --- a/core/java/src/net/i2p/stat/BufferedStatLog.java +++ b/core/java/src/net/i2p/stat/BufferedStatLog.java @@ -4,7 +4,6 @@ import java.io.BufferedWriter; import java.io.FileWriter; import java.io.IOException; import java.text.SimpleDateFormat; - import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/core/java/src/net/i2p/stat/Rate.java b/core/java/src/net/i2p/stat/Rate.java index 54ac391d48..6d4fed17a4 100644 --- a/core/java/src/net/i2p/stat/Rate.java +++ b/core/java/src/net/i2p/stat/Rate.java @@ -3,7 +3,6 @@ package net.i2p.stat; import java.io.IOException; import java.util.Properties; -import net.i2p.util.Clock; import net.i2p.util.Log; /** diff --git a/core/java/src/net/i2p/stat/StatLogSplitter.java b/core/java/src/net/i2p/stat/StatLogSplitter.java index ca9c357909..c1b202fc60 100644 --- a/core/java/src/net/i2p/stat/StatLogSplitter.java +++ b/core/java/src/net/i2p/stat/StatLogSplitter.java @@ -1,11 +1,11 @@ package net.i2p.stat; -import java.io.IOException; import java.io.BufferedReader; import java.io.FileReader; import java.io.FileWriter; -import java.text.SimpleDateFormat; +import java.io.IOException; import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; import java.util.Iterator; diff --git a/core/java/src/net/i2p/util/BufferedRandomSource.java b/core/java/src/net/i2p/util/BufferedRandomSource.java index e344b5a2ae..3c0082565e 100644 --- a/core/java/src/net/i2p/util/BufferedRandomSource.java +++ b/core/java/src/net/i2p/util/BufferedRandomSource.java @@ -9,11 +9,7 @@ package net.i2p.util; * */ -import java.security.SecureRandom; - import net.i2p.I2PAppContext; -import net.i2p.crypto.EntropyHarvester; -import net.i2p.data.Base64; import net.i2p.data.DataHelper; /** diff --git a/core/java/src/net/i2p/util/DecayingBloomFilter.java b/core/java/src/net/i2p/util/DecayingBloomFilter.java index d2d7fd722c..164c8e4534 100644 --- a/core/java/src/net/i2p/util/DecayingBloomFilter.java +++ b/core/java/src/net/i2p/util/DecayingBloomFilter.java @@ -1,10 +1,11 @@ package net.i2p.util; -import org.xlattice.crypto.filters.BloomSHA1; +import java.util.Random; + import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; -import java.util.Random; +import org.xlattice.crypto.filters.BloomSHA1; /** * Series of bloom filters which decay over time, allowing their continual use diff --git a/core/java/src/net/i2p/util/EepGet.java b/core/java/src/net/i2p/util/EepGet.java index 15fa4c28e9..4487744549 100644 --- a/core/java/src/net/i2p/util/EepGet.java +++ b/core/java/src/net/i2p/util/EepGet.java @@ -9,16 +9,13 @@ import java.net.MalformedURLException; import java.net.Socket; import java.net.URL; import java.text.DecimalFormat; -import java.text.NumberFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.StringTokenizer; -import java.util.Properties; import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; -import net.i2p.util.SocketTimeout; /** * EepGet [-p localhost:4444] diff --git a/core/java/src/net/i2p/util/EepGetScheduler.java b/core/java/src/net/i2p/util/EepGetScheduler.java index 9c09d0ada2..c295196b3d 100644 --- a/core/java/src/net/i2p/util/EepGetScheduler.java +++ b/core/java/src/net/i2p/util/EepGetScheduler.java @@ -3,6 +3,7 @@ package net.i2p.util; import java.io.File; import java.util.ArrayList; import java.util.List; + 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 3b45280528..7f5bd2ca31 100644 --- a/core/java/src/net/i2p/util/EepPost.java +++ b/core/java/src/net/i2p/util/EepPost.java @@ -1,10 +1,18 @@ package net.i2p.util; -import java.io.*; -import java.net.*; -import java.util.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +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; + import net.i2p.I2PAppContext; -import net.i2p.util.Log; /** * Simple helper for uploading files and such via HTTP POST (rfc 1867) diff --git a/core/java/src/net/i2p/util/Executor.java b/core/java/src/net/i2p/util/Executor.java index dfb72cb5fc..e3c1b6fbfe 100644 --- a/core/java/src/net/i2p/util/Executor.java +++ b/core/java/src/net/i2p/util/Executor.java @@ -1,11 +1,6 @@ package net.i2p.util; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.TreeMap; import net.i2p.I2PAppContext; diff --git a/core/java/src/net/i2p/util/FileUtil.java b/core/java/src/net/i2p/util/FileUtil.java index e168ccbb59..677c500866 100644 --- a/core/java/src/net/i2p/util/FileUtil.java +++ b/core/java/src/net/i2p/util/FileUtil.java @@ -3,12 +3,12 @@ package net.i2p.util; import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.FileNotFoundException; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.io.OutputStream; import java.io.InputStreamReader; +import java.io.OutputStream; import java.util.ArrayList; import java.util.Enumeration; import java.util.List; diff --git a/core/java/src/net/i2p/util/FortunaRandomSource.java b/core/java/src/net/i2p/util/FortunaRandomSource.java index 865cc0bb44..04d4305a35 100644 --- a/core/java/src/net/i2p/util/FortunaRandomSource.java +++ b/core/java/src/net/i2p/util/FortunaRandomSource.java @@ -9,16 +9,13 @@ package net.i2p.util; * */ +import gnu.crypto.prng.AsyncFortunaStandalone; + import java.security.SecureRandom; import net.i2p.I2PAppContext; import net.i2p.crypto.EntropyHarvester; -import gnu.crypto.prng.AsyncFortunaStandalone; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; - /** * Wrapper around GNU-Crypto's Fortuna PRNG. This seeds from /dev/urandom and * ./prngseed.rnd on startup (if they exist), writing a new seed to ./prngseed.rnd diff --git a/core/java/src/net/i2p/util/LookaheadInputStream.java b/core/java/src/net/i2p/util/LookaheadInputStream.java index 774f09be4a..cdce06df27 100644 --- a/core/java/src/net/i2p/util/LookaheadInputStream.java +++ b/core/java/src/net/i2p/util/LookaheadInputStream.java @@ -1,9 +1,9 @@ package net.i2p.util; import java.io.ByteArrayInputStream; +import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; -import java.io.FilterInputStream; import java.util.Arrays; /** diff --git a/core/java/src/net/i2p/util/NativeBigInteger.java b/core/java/src/net/i2p/util/NativeBigInteger.java index 8803b684b6..7132086955 100644 --- a/core/java/src/net/i2p/util/NativeBigInteger.java +++ b/core/java/src/net/i2p/util/NativeBigInteger.java @@ -8,15 +8,14 @@ package net.i2p.util; * */ -import java.math.BigInteger; -import java.util.Random; -import java.security.SecureRandom; - -import java.net.URL; -import java.io.FileOutputStream; -import java.io.InputStream; -import java.io.IOException; import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.math.BigInteger; +import java.net.URL; +import java.security.SecureRandom; +import java.util.Random; import freenet.support.CPUInformation.AMDCPUInfo; import freenet.support.CPUInformation.CPUID; diff --git a/core/java/src/net/i2p/util/RandomSource.java b/core/java/src/net/i2p/util/RandomSource.java index 51e340a57e..e8a0a31e71 100644 --- a/core/java/src/net/i2p/util/RandomSource.java +++ b/core/java/src/net/i2p/util/RandomSource.java @@ -9,17 +9,16 @@ package net.i2p.util; * */ +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; import java.security.SecureRandom; import net.i2p.I2PAppContext; import net.i2p.crypto.EntropyHarvester; import net.i2p.data.Base64; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; - /** * 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 2896fa587f..5832a81741 100644 --- a/core/java/src/net/i2p/util/ResettableGZIPInputStream.java +++ b/core/java/src/net/i2p/util/ResettableGZIPInputStream.java @@ -3,11 +3,9 @@ package net.i2p.util; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; - import java.util.zip.CRC32; import java.util.zip.Inflater; import java.util.zip.InflaterInputStream; -import java.util.zip.GZIPInputStream; /** * GZIP implementation per diff --git a/core/java/src/net/i2p/util/ResettableGZIPOutputStream.java b/core/java/src/net/i2p/util/ResettableGZIPOutputStream.java index 3d5184fb54..d7f578da79 100644 --- a/core/java/src/net/i2p/util/ResettableGZIPOutputStream.java +++ b/core/java/src/net/i2p/util/ResettableGZIPOutputStream.java @@ -1,15 +1,15 @@ package net.i2p.util; -import java.io.ByteArrayOutputStream; 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.GZIPOutputStream; import java.util.zip.GZIPInputStream; +import java.util.zip.GZIPOutputStream; + import net.i2p.data.DataHelper; /** diff --git a/core/java/src/net/i2p/util/ReusableGZIPInputStream.java b/core/java/src/net/i2p/util/ReusableGZIPInputStream.java index 832d242a5b..d3dcb52611 100644 --- a/core/java/src/net/i2p/util/ReusableGZIPInputStream.java +++ b/core/java/src/net/i2p/util/ReusableGZIPInputStream.java @@ -1,12 +1,11 @@ package net.i2p.util; -import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.OutputStream; import java.util.ArrayList; import java.util.zip.GZIPOutputStream; -import java.util.zip.GZIPInputStream; + import net.i2p.data.DataHelper; /** diff --git a/core/java/src/net/i2p/util/ReusableGZIPOutputStream.java b/core/java/src/net/i2p/util/ReusableGZIPOutputStream.java index ebdd1f3916..49cf34084a 100644 --- a/core/java/src/net/i2p/util/ReusableGZIPOutputStream.java +++ b/core/java/src/net/i2p/util/ReusableGZIPOutputStream.java @@ -1,12 +1,10 @@ package net.i2p.util; -import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.OutputStream; +import java.io.ByteArrayOutputStream; import java.util.ArrayList; -import java.util.zip.GZIPOutputStream; import java.util.zip.GZIPInputStream; + import net.i2p.data.DataHelper; /** diff --git a/core/java/src/net/i2p/util/SimpleTimer.java b/core/java/src/net/i2p/util/SimpleTimer.java index 3114e4dbd0..a4e3524976 100644 --- a/core/java/src/net/i2p/util/SimpleTimer.java +++ b/core/java/src/net/i2p/util/SimpleTimer.java @@ -1,8 +1,8 @@ package net.i2p.util; import java.util.ArrayList; -import java.util.Iterator; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.TreeMap; diff --git a/core/java/src/org/bouncycastle/crypto/macs/HMac.java b/core/java/src/org/bouncycastle/crypto/macs/HMac.java index e43e80c1ef..7176c8acaf 100644 --- a/core/java/src/org/bouncycastle/crypto/macs/HMac.java +++ b/core/java/src/org/bouncycastle/crypto/macs/HMac.java @@ -27,11 +27,11 @@ package org.bouncycastle.crypto.macs; */ //import org.bouncycastle.crypto.CipherParameters; +import java.util.ArrayList; +import java.util.Arrays; + import org.bouncycastle.crypto.Digest; import org.bouncycastle.crypto.Mac; -//import org.bouncycastle.crypto.params.KeyParameter; -import java.util.Arrays; -import java.util.ArrayList; /** * HMAC implementation based on RFC2104 diff --git a/core/java/test/net/i2p/client/I2PClientTest.java b/core/java/test/net/i2p/client/I2PClientTest.java index 4d4bc1aa2c..c9f9089894 100644 --- a/core/java/test/net/i2p/client/I2PClientTest.java +++ b/core/java/test/net/i2p/client/I2PClientTest.java @@ -11,9 +11,6 @@ package net.i2p.client; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import net.i2p.client.I2PClientFactory; -import net.i2p.client.I2PClient; - import junit.framework.TestCase; diff --git a/core/java/test/net/i2p/client/I2PClientTestSuite.java b/core/java/test/net/i2p/client/I2PClientTestSuite.java index 35678e3a5c..208ddf3517 100644 --- a/core/java/test/net/i2p/client/I2PClientTestSuite.java +++ b/core/java/test/net/i2p/client/I2PClientTestSuite.java @@ -8,10 +8,9 @@ package net.i2p.client; * */ -import net.i2p.client.datagram.DatagramTest; - import junit.framework.Test; import junit.framework.TestSuite; +import net.i2p.client.datagram.DatagramTest; /** * @author Comwiz diff --git a/core/java/test/net/i2p/client/I2PSessionTest.java b/core/java/test/net/i2p/client/I2PSessionTest.java index 616dd3ab02..7f06a4234e 100644 --- a/core/java/test/net/i2p/client/I2PSessionTest.java +++ b/core/java/test/net/i2p/client/I2PSessionTest.java @@ -8,22 +8,14 @@ package net.i2p.client; * */ -import java.util.HashSet; -import java.util.Set; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; - -import net.i2p.client.I2PSession; -import net.i2p.client.I2PSessionImpl; -import net.i2p.client.I2PSessionImpl2; -import net.i2p.client.I2PSessionException; -import net.i2p.client.I2PClient; -import net.i2p.client.I2PClientFactory; -import net.i2p.client.I2PSessionListener; -import net.i2p.data.Destination; -import net.i2p.I2PAppContext; +import java.util.HashSet; +import java.util.Set; import junit.framework.TestCase; +import net.i2p.I2PAppContext; +import net.i2p.data.Destination; /** diff --git a/core/java/test/net/i2p/client/datagram/DatagramTest.java b/core/java/test/net/i2p/client/datagram/DatagramTest.java index 2136fd2caa..c521bc48ec 100644 --- a/core/java/test/net/i2p/client/datagram/DatagramTest.java +++ b/core/java/test/net/i2p/client/datagram/DatagramTest.java @@ -11,19 +11,14 @@ package net.i2p.client.datagram; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import net.i2p.client.datagram.I2PDatagramMaker; -import net.i2p.client.datagram.I2PDatagramDissector; -import net.i2p.client.datagram.I2PInvalidDatagramException; -import net.i2p.client.I2PClientFactory; -import net.i2p.client.I2PClient; -import net.i2p.client.I2PSession; -import net.i2p.data.DataHelper; -import net.i2p.data.Hash; -import net.i2p.data.Destination; -import net.i2p.data.DataFormatException; -import net.i2p.crypto.DSAEngine; - import junit.framework.TestCase; +import net.i2p.client.I2PClient; +import net.i2p.client.I2PClientFactory; +import net.i2p.client.I2PSession; +import net.i2p.crypto.DSAEngine; +import net.i2p.data.DataHelper; +import net.i2p.data.Destination; +import net.i2p.data.Hash; /** diff --git a/core/java/test/net/i2p/crypto/AES256Bench.java b/core/java/test/net/i2p/crypto/AES256Bench.java index f4adb32819..c5e718d477 100644 --- a/core/java/test/net/i2p/crypto/AES256Bench.java +++ b/core/java/test/net/i2p/crypto/AES256Bench.java @@ -29,9 +29,9 @@ package net.i2p.crypto; * POSSIBILITY OF SUCH DAMAGE. */ -import net.i2p.data.SessionKey; -import net.i2p.data.DataHelper; import net.i2p.I2PAppContext; +import net.i2p.data.DataHelper; +import net.i2p.data.SessionKey; public class AES256Bench { private static I2PAppContext _context = new I2PAppContext(); diff --git a/core/java/test/net/i2p/crypto/AES256Test.java b/core/java/test/net/i2p/crypto/AES256Test.java index 4464a1d829..eddf1cb012 100644 --- a/core/java/test/net/i2p/crypto/AES256Test.java +++ b/core/java/test/net/i2p/crypto/AES256Test.java @@ -8,12 +8,11 @@ package net.i2p.crypto; * */ -import net.i2p.data.SessionKey; -import net.i2p.data.DataHelper; -import net.i2p.I2PAppContext; -import net.i2p.util.RandomSource; - import junit.framework.TestCase; +import net.i2p.I2PAppContext; +import net.i2p.data.DataHelper; +import net.i2p.data.SessionKey; +import net.i2p.util.RandomSource; /** * @author Comwiz diff --git a/core/java/test/net/i2p/crypto/AESInputStreamTest.java b/core/java/test/net/i2p/crypto/AESInputStreamTest.java index ea18106b71..961dad91c4 100644 --- a/core/java/test/net/i2p/crypto/AESInputStreamTest.java +++ b/core/java/test/net/i2p/crypto/AESInputStreamTest.java @@ -10,20 +10,13 @@ package net.i2p.crypto; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.FilterInputStream; -import java.io.IOException; -import java.io.InputStream; +import junit.framework.TestCase; import net.i2p.I2PAppContext; -import net.i2p.data.Base64; import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.data.SessionKey; -import net.i2p.util.Clock; -import net.i2p.util.Log; import net.i2p.util.RandomSource; - -import junit.framework.TestCase; /** * @author Comwiz */ diff --git a/core/java/test/net/i2p/crypto/CryptixAESEngineTest.java b/core/java/test/net/i2p/crypto/CryptixAESEngineTest.java index 2110b6667f..eaf6647343 100644 --- a/core/java/test/net/i2p/crypto/CryptixAESEngineTest.java +++ b/core/java/test/net/i2p/crypto/CryptixAESEngineTest.java @@ -8,16 +8,10 @@ package net.i2p.crypto; * */ -import java.security.InvalidKeyException; - +import junit.framework.TestCase; import net.i2p.I2PAppContext; -import net.i2p.data.ByteArray; import net.i2p.data.DataHelper; import net.i2p.data.SessionKey; -import net.i2p.util.ByteCache; -import net.i2p.crypto.CryptixAESEngine; - -import junit.framework.TestCase; public class CryptixAESEngineTest extends TestCase{ public void testED() { diff --git a/core/java/test/net/i2p/crypto/CryptixRijndael_AlgorithmTest.java b/core/java/test/net/i2p/crypto/CryptixRijndael_AlgorithmTest.java index bbc579d6b2..451dfb04d6 100644 --- a/core/java/test/net/i2p/crypto/CryptixRijndael_AlgorithmTest.java +++ b/core/java/test/net/i2p/crypto/CryptixRijndael_AlgorithmTest.java @@ -10,9 +10,8 @@ package net.i2p.crypto; */ -import net.i2p.data.DataHelper; - import junit.framework.TestCase; +import net.i2p.data.DataHelper; public class CryptixRijndael_AlgorithmTest extends TestCase { public void testCRA() throws Exception{ diff --git a/core/java/test/net/i2p/crypto/DHSessionKeyBuilderTest.java b/core/java/test/net/i2p/crypto/DHSessionKeyBuilderTest.java index c91948d55b..0bf6a1f611 100644 --- a/core/java/test/net/i2p/crypto/DHSessionKeyBuilderTest.java +++ b/core/java/test/net/i2p/crypto/DHSessionKeyBuilderTest.java @@ -11,12 +11,10 @@ package net.i2p.crypto; import java.math.BigInteger; -import net.i2p.data.DataHelper; -import net.i2p.data.SessionKey; -import net.i2p.I2PAppContext; -import net.i2p.util.RandomSource; - import junit.framework.TestCase; +import net.i2p.I2PAppContext; +import net.i2p.data.SessionKey; +import net.i2p.util.RandomSource; public class DHSessionKeyBuilderTest extends TestCase { public void testDHSessionKeyBuilder(){ diff --git a/core/java/test/net/i2p/crypto/DSABench.java b/core/java/test/net/i2p/crypto/DSABench.java index cbc18fd685..363a23b8e0 100644 --- a/core/java/test/net/i2p/crypto/DSABench.java +++ b/core/java/test/net/i2p/crypto/DSABench.java @@ -30,6 +30,7 @@ package net.i2p.crypto; */ import java.io.ByteArrayInputStream; + import net.i2p.data.Signature; import net.i2p.data.SigningPrivateKey; import net.i2p.data.SigningPublicKey; diff --git a/core/java/test/net/i2p/crypto/DSATest.java b/core/java/test/net/i2p/crypto/DSATest.java index 7d695d3fd7..b2fbfab733 100644 --- a/core/java/test/net/i2p/crypto/DSATest.java +++ b/core/java/test/net/i2p/crypto/DSATest.java @@ -9,12 +9,12 @@ package net.i2p.crypto; */ import java.io.ByteArrayInputStream; + +import junit.framework.TestCase; +import net.i2p.I2PAppContext; import net.i2p.data.Signature; import net.i2p.data.SigningPrivateKey; import net.i2p.data.SigningPublicKey; -import net.i2p.I2PAppContext; - -import junit.framework.TestCase; public class DSATest extends TestCase{ private I2PAppContext _context; diff --git a/core/java/test/net/i2p/crypto/ElGamalBench.java b/core/java/test/net/i2p/crypto/ElGamalBench.java index 92728674e0..02daf06ccc 100644 --- a/core/java/test/net/i2p/crypto/ElGamalBench.java +++ b/core/java/test/net/i2p/crypto/ElGamalBench.java @@ -29,10 +29,10 @@ package net.i2p.crypto; * POSSIBILITY OF SUCH DAMAGE. */ +import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; import net.i2p.data.PrivateKey; import net.i2p.data.PublicKey; -import net.i2p.I2PAppContext; public class ElGamalBench { private static I2PAppContext _context = new I2PAppContext(); diff --git a/core/java/test/net/i2p/crypto/ElGamalTest.java b/core/java/test/net/i2p/crypto/ElGamalTest.java index 302c9621c4..7789f99d9f 100644 --- a/core/java/test/net/i2p/crypto/ElGamalTest.java +++ b/core/java/test/net/i2p/crypto/ElGamalTest.java @@ -8,27 +8,23 @@ package net.i2p.crypto; * */ -import net.i2p.I2PAppContext; -import net.i2p.data.Hash; -import net.i2p.data.SessionKey; -import net.i2p.data.Base64; -import net.i2p.data.PublicKey; -import net.i2p.data.PrivateKey; -import net.i2p.data.DataHelper; -import net.i2p.data.DataFormatException; -import net.i2p.data.SessionTag; -import net.i2p.util.RandomSource; -import net.i2p.util.Log; -import net.i2p.util.Clock; - -import java.io.IOException; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; - -import java.util.Set; +import java.io.IOException; import java.util.HashSet; +import java.util.Set; import junit.framework.TestCase; +import net.i2p.I2PAppContext; +import net.i2p.data.Base64; +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.SessionKey; +import net.i2p.data.SessionTag; +import net.i2p.util.RandomSource; public class ElGamalTest extends TestCase{ private I2PAppContext _context; diff --git a/core/java/test/net/i2p/crypto/HMACSHA256Bench.java b/core/java/test/net/i2p/crypto/HMACSHA256Bench.java index fe03719bc3..762821f158 100644 --- a/core/java/test/net/i2p/crypto/HMACSHA256Bench.java +++ b/core/java/test/net/i2p/crypto/HMACSHA256Bench.java @@ -29,10 +29,11 @@ package net.i2p.crypto; * POSSIBILITY OF SUCH DAMAGE. */ +import java.util.Properties; + import net.i2p.I2PAppContext; import net.i2p.data.Hash; import net.i2p.data.SessionKey; -import java.util.Properties; public class HMACSHA256Bench { public static void main(String args[]) { diff --git a/core/java/test/net/i2p/crypto/HMACSHA256Test.java b/core/java/test/net/i2p/crypto/HMACSHA256Test.java index 57e94f78ec..67e4721cd1 100644 --- a/core/java/test/net/i2p/crypto/HMACSHA256Test.java +++ b/core/java/test/net/i2p/crypto/HMACSHA256Test.java @@ -8,11 +8,10 @@ package net.i2p.crypto; * */ +import junit.framework.TestCase; import net.i2p.I2PAppContext; import net.i2p.data.SessionKey; -import junit.framework.TestCase; - public class HMACSHA256Test extends TestCase{ private I2PAppContext _context; diff --git a/core/java/test/net/i2p/crypto/KeyGeneratorTest.java b/core/java/test/net/i2p/crypto/KeyGeneratorTest.java index 3815e07630..ce644bb403 100644 --- a/core/java/test/net/i2p/crypto/KeyGeneratorTest.java +++ b/core/java/test/net/i2p/crypto/KeyGeneratorTest.java @@ -8,16 +8,15 @@ package net.i2p.crypto; * */ +import junit.framework.TestCase; import net.i2p.I2PAppContext; -import net.i2p.util.RandomSource; +import net.i2p.data.DataHelper; +import net.i2p.data.PrivateKey; +import net.i2p.data.PublicKey; +import net.i2p.data.Signature; import net.i2p.data.SigningPrivateKey; import net.i2p.data.SigningPublicKey; -import net.i2p.data.DataHelper; -import net.i2p.data.Signature; -import net.i2p.data.PublicKey; -import net.i2p.data.PrivateKey; - -import junit.framework.TestCase; +import net.i2p.util.RandomSource; public class KeyGeneratorTest extends TestCase{ public void testKeyGen(){ diff --git a/core/java/test/net/i2p/crypto/SHA1HashTest.java b/core/java/test/net/i2p/crypto/SHA1HashTest.java index 72e9f0aa47..140f784ebf 100644 --- a/core/java/test/net/i2p/crypto/SHA1HashTest.java +++ b/core/java/test/net/i2p/crypto/SHA1HashTest.java @@ -21,7 +21,7 @@ package net.i2p.crypto; */ //package com.bitzi.util; -import java.security.*; +import java.security.MessageDigest; import junit.framework.TestCase; diff --git a/core/java/test/net/i2p/crypto/SHA256Test.java b/core/java/test/net/i2p/crypto/SHA256Test.java index c800f60eec..9778887db3 100644 --- a/core/java/test/net/i2p/crypto/SHA256Test.java +++ b/core/java/test/net/i2p/crypto/SHA256Test.java @@ -8,13 +8,10 @@ package net.i2p.crypto; * */ +import junit.framework.TestCase; import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; import net.i2p.data.Hash; - -import org.bouncycastle.crypto.digests.SHA256Digest; - -import junit.framework.TestCase; /** * @author Comwiz */ diff --git a/core/java/test/net/i2p/crypto/SessionEncryptionTest.java b/core/java/test/net/i2p/crypto/SessionEncryptionTest.java index d1d614a98f..c6ec05326c 100644 --- a/core/java/test/net/i2p/crypto/SessionEncryptionTest.java +++ b/core/java/test/net/i2p/crypto/SessionEncryptionTest.java @@ -8,21 +8,16 @@ package net.i2p.crypto; * */ -import net.i2p.data.PublicKey; -import net.i2p.data.PrivateKey; -import net.i2p.data.SessionKey; -import net.i2p.data.SessionTag; -import net.i2p.data.DataHelper; -import net.i2p.data.DataFormatException; - -import net.i2p.util.Log; -import net.i2p.util.Clock; -import net.i2p.I2PAppContext; - import java.util.HashSet; import java.util.Set; import junit.framework.TestCase; +import net.i2p.I2PAppContext; +import net.i2p.data.DataHelper; +import net.i2p.data.PrivateKey; +import net.i2p.data.PublicKey; +import net.i2p.data.SessionKey; +import net.i2p.data.SessionTag; /** * diff --git a/core/java/test/net/i2p/data/AbuseReasonTest.java b/core/java/test/net/i2p/data/AbuseReasonTest.java index b9a45023a6..f7c93d52d2 100644 --- a/core/java/test/net/i2p/data/AbuseReasonTest.java +++ b/core/java/test/net/i2p/data/AbuseReasonTest.java @@ -8,8 +8,6 @@ package net.i2p.data; * */ -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; import net.i2p.data.i2cp.AbuseReason; /** diff --git a/core/java/test/net/i2p/data/AbuseSeverityTest.java b/core/java/test/net/i2p/data/AbuseSeverityTest.java index 7eacc7488b..0f91c95a64 100644 --- a/core/java/test/net/i2p/data/AbuseSeverityTest.java +++ b/core/java/test/net/i2p/data/AbuseSeverityTest.java @@ -8,8 +8,6 @@ package net.i2p.data; * */ -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; import net.i2p.data.i2cp.AbuseSeverity; /** diff --git a/core/java/test/net/i2p/data/BooleanTest.java b/core/java/test/net/i2p/data/BooleanTest.java index 761ba51783..b5613afa79 100644 --- a/core/java/test/net/i2p/data/BooleanTest.java +++ b/core/java/test/net/i2p/data/BooleanTest.java @@ -8,14 +8,8 @@ package net.i2p.data; * */ -import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; - -import net.i2p.data.DataFormatException; -import net.i2p.data.DataHelper; -import net.i2p.util.Log; +import java.io.ByteArrayOutputStream; import junit.framework.TestCase; diff --git a/core/java/test/net/i2p/data/CertificateTest.java b/core/java/test/net/i2p/data/CertificateTest.java index 98315667da..e865522a3f 100644 --- a/core/java/test/net/i2p/data/CertificateTest.java +++ b/core/java/test/net/i2p/data/CertificateTest.java @@ -8,9 +8,6 @@ package net.i2p.data; * */ -import net.i2p.data.Certificate; -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; /** * Test harness for loading / storing Hash objects diff --git a/core/java/test/net/i2p/data/CreateLeaseSetMessageTest.java b/core/java/test/net/i2p/data/CreateLeaseSetMessageTest.java index 875f92cf94..9a37906dcf 100644 --- a/core/java/test/net/i2p/data/CreateLeaseSetMessageTest.java +++ b/core/java/test/net/i2p/data/CreateLeaseSetMessageTest.java @@ -8,11 +8,6 @@ package net.i2p.data; * */ -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.LeaseSet; -import net.i2p.data.PrivateKey; -import net.i2p.data.SigningPrivateKey; import net.i2p.data.i2cp.CreateLeaseSetMessage; import net.i2p.data.i2cp.SessionId; diff --git a/core/java/test/net/i2p/data/CreateSessionMessageTest.java b/core/java/test/net/i2p/data/CreateSessionMessageTest.java index 431162fe86..11704139ed 100644 --- a/core/java/test/net/i2p/data/CreateSessionMessageTest.java +++ b/core/java/test/net/i2p/data/CreateSessionMessageTest.java @@ -8,8 +8,6 @@ package net.i2p.data; * */ -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; import net.i2p.data.i2cp.CreateSessionMessage; import net.i2p.data.i2cp.SessionConfig; diff --git a/core/java/test/net/i2p/data/DataHelperTest.java b/core/java/test/net/i2p/data/DataHelperTest.java index 1f15276e4a..b2f2e1b2d5 100644 --- a/core/java/test/net/i2p/data/DataHelperTest.java +++ b/core/java/test/net/i2p/data/DataHelperTest.java @@ -6,9 +6,8 @@ import java.util.Calendar; import java.util.Date; import java.util.TimeZone; -import net.i2p.I2PAppContext; - import junit.framework.TestCase; +import net.i2p.I2PAppContext; /** * basic unit tests for the DataHelper diff --git a/core/java/test/net/i2p/data/DataStructureImplTest.java b/core/java/test/net/i2p/data/DataStructureImplTest.java index e30602863b..f0d30f5eef 100644 --- a/core/java/test/net/i2p/data/DataStructureImplTest.java +++ b/core/java/test/net/i2p/data/DataStructureImplTest.java @@ -8,13 +8,9 @@ package net.i2p.data; * */ -import java.io.OutputStream; -import java.io.InputStream; import java.io.IOException; - -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.DataStructureImpl; +import java.io.InputStream; +import java.io.OutputStream; import junit.framework.TestCase; diff --git a/core/java/test/net/i2p/data/DateTest.java b/core/java/test/net/i2p/data/DateTest.java index a5ba6638b0..b61cd3b39f 100644 --- a/core/java/test/net/i2p/data/DateTest.java +++ b/core/java/test/net/i2p/data/DateTest.java @@ -8,16 +8,10 @@ package net.i2p.data; * */ -import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; +import java.io.ByteArrayOutputStream; import java.util.Date; -import net.i2p.data.DataFormatException; -import net.i2p.data.DataHelper; -import net.i2p.util.Log; - import junit.framework.TestCase; /** diff --git a/core/java/test/net/i2p/data/DestinationTest.java b/core/java/test/net/i2p/data/DestinationTest.java index 21df5bec7d..16b3a4016d 100644 --- a/core/java/test/net/i2p/data/DestinationTest.java +++ b/core/java/test/net/i2p/data/DestinationTest.java @@ -8,12 +8,6 @@ package net.i2p.data; * */ -import net.i2p.data.Certificate; -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.Destination; -import net.i2p.data.PublicKey; -import net.i2p.data.SigningPublicKey; /** * Test harness for loading / storing Hash objects diff --git a/core/java/test/net/i2p/data/DestroySessionMessageTest.java b/core/java/test/net/i2p/data/DestroySessionMessageTest.java index 74c8ee2cdf..00531d8a2c 100644 --- a/core/java/test/net/i2p/data/DestroySessionMessageTest.java +++ b/core/java/test/net/i2p/data/DestroySessionMessageTest.java @@ -8,8 +8,6 @@ package net.i2p.data; * */ -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; import net.i2p.data.i2cp.DestroySessionMessage; import net.i2p.data.i2cp.SessionId; diff --git a/core/java/test/net/i2p/data/DisconnectMessageTest.java b/core/java/test/net/i2p/data/DisconnectMessageTest.java index 82e17540f1..fff2ca1a16 100644 --- a/core/java/test/net/i2p/data/DisconnectMessageTest.java +++ b/core/java/test/net/i2p/data/DisconnectMessageTest.java @@ -8,8 +8,6 @@ package net.i2p.data; * */ -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; import net.i2p.data.i2cp.DisconnectMessage; /** diff --git a/core/java/test/net/i2p/data/HashTest.java b/core/java/test/net/i2p/data/HashTest.java index 98d60f0cb7..cddfb7da11 100644 --- a/core/java/test/net/i2p/data/HashTest.java +++ b/core/java/test/net/i2p/data/HashTest.java @@ -8,9 +8,6 @@ package net.i2p.data; * */ -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.Hash; /** * Test harness for loading / storing Hash objects diff --git a/core/java/test/net/i2p/data/LeaseSetTest.java b/core/java/test/net/i2p/data/LeaseSetTest.java index 385a4c5133..61c3b73c6d 100644 --- a/core/java/test/net/i2p/data/LeaseSetTest.java +++ b/core/java/test/net/i2p/data/LeaseSetTest.java @@ -8,13 +8,6 @@ package net.i2p.data; * */ -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.Destination; -import net.i2p.data.LeaseSet; -import net.i2p.data.PublicKey; -import net.i2p.data.Signature; -import net.i2p.data.SigningPublicKey; /** * Test harness for loading / storing Lease objects diff --git a/core/java/test/net/i2p/data/LeaseTest.java b/core/java/test/net/i2p/data/LeaseTest.java index f508a2dffb..15a9366da0 100644 --- a/core/java/test/net/i2p/data/LeaseTest.java +++ b/core/java/test/net/i2p/data/LeaseTest.java @@ -8,14 +8,8 @@ package net.i2p.data; * */ -import java.util.Date; import java.io.ByteArrayOutputStream; - -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.Lease; -import net.i2p.data.Hash; -import net.i2p.data.TunnelId; +import java.util.Date; /** * Test harness for loading / storing Lease objects diff --git a/core/java/test/net/i2p/data/MappingTest.java b/core/java/test/net/i2p/data/MappingTest.java index 80aa582197..0d2a393e68 100644 --- a/core/java/test/net/i2p/data/MappingTest.java +++ b/core/java/test/net/i2p/data/MappingTest.java @@ -8,15 +8,10 @@ package net.i2p.data; * */ -import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; +import java.io.ByteArrayOutputStream; import java.util.Properties; -import net.i2p.data.DataFormatException; -import net.i2p.data.DataHelper; - import junit.framework.TestCase; /** diff --git a/core/java/test/net/i2p/data/MessageIdTest.java b/core/java/test/net/i2p/data/MessageIdTest.java index 6c78afb91b..f038798f2b 100644 --- a/core/java/test/net/i2p/data/MessageIdTest.java +++ b/core/java/test/net/i2p/data/MessageIdTest.java @@ -8,8 +8,6 @@ package net.i2p.data; * */ -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; import net.i2p.data.i2cp.MessageId; /** diff --git a/core/java/test/net/i2p/data/MessagePayloadMessageTest.java b/core/java/test/net/i2p/data/MessagePayloadMessageTest.java index f818ade52d..3625796ed9 100644 --- a/core/java/test/net/i2p/data/MessagePayloadMessageTest.java +++ b/core/java/test/net/i2p/data/MessagePayloadMessageTest.java @@ -8,18 +8,10 @@ package net.i2p.data; * */ -import java.io.IOException; -import java.io.InputStream; -import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.Payload; -import net.i2p.data.i2cp.MessageId; import net.i2p.data.i2cp.MessagePayloadMessage; -import net.i2p.data.i2cp.SessionId; -import net.i2p.util.Log; /** * Test harness for loading / storing SendMessageMessage objects diff --git a/core/java/test/net/i2p/data/MessageStatusMessageTest.java b/core/java/test/net/i2p/data/MessageStatusMessageTest.java index cd8aabc67a..c737a21916 100644 --- a/core/java/test/net/i2p/data/MessageStatusMessageTest.java +++ b/core/java/test/net/i2p/data/MessageStatusMessageTest.java @@ -8,11 +8,7 @@ package net.i2p.data; * */ -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.i2cp.MessageId; import net.i2p.data.i2cp.MessageStatusMessage; -import net.i2p.data.i2cp.SessionId; /** * Test harness for loading / storing MessageStatusMessage objects diff --git a/core/java/test/net/i2p/data/PayloadTest.java b/core/java/test/net/i2p/data/PayloadTest.java index b425b0d68b..fe48bee764 100644 --- a/core/java/test/net/i2p/data/PayloadTest.java +++ b/core/java/test/net/i2p/data/PayloadTest.java @@ -8,18 +8,8 @@ package net.i2p.data; * */ -import java.io.IOException; -import java.io.InputStream; -import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; - -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.Destination; -import net.i2p.data.Hash; -import net.i2p.data.Payload; -import net.i2p.data.SessionKey; -import net.i2p.util.Log; +import java.io.ByteArrayOutputStream; /** * Test harness for loading / storing Payload objects diff --git a/core/java/test/net/i2p/data/PrivateKeyTest.java b/core/java/test/net/i2p/data/PrivateKeyTest.java index 9aa159e034..cb3c3124d9 100644 --- a/core/java/test/net/i2p/data/PrivateKeyTest.java +++ b/core/java/test/net/i2p/data/PrivateKeyTest.java @@ -8,13 +8,8 @@ package net.i2p.data; * */ -import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; - -import net.i2p.I2PAppContext; -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.PrivateKey; +import java.io.ByteArrayOutputStream; /** * Test harness for loading / storing PrivateKey objects diff --git a/core/java/test/net/i2p/data/PublicKeyTest.java b/core/java/test/net/i2p/data/PublicKeyTest.java index d1300ad92a..8ca6282ccc 100644 --- a/core/java/test/net/i2p/data/PublicKeyTest.java +++ b/core/java/test/net/i2p/data/PublicKeyTest.java @@ -8,12 +8,8 @@ package net.i2p.data; * */ -import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; - -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.PublicKey; +import java.io.ByteArrayOutputStream; /** * Test harness for loading / storing PublicKey objects diff --git a/core/java/test/net/i2p/data/ReceiveMessageBeginMessageTest.java b/core/java/test/net/i2p/data/ReceiveMessageBeginMessageTest.java index 19edd8a610..b09eedc7d5 100644 --- a/core/java/test/net/i2p/data/ReceiveMessageBeginMessageTest.java +++ b/core/java/test/net/i2p/data/ReceiveMessageBeginMessageTest.java @@ -8,11 +8,7 @@ package net.i2p.data; * */ -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.i2cp.MessageId; import net.i2p.data.i2cp.ReceiveMessageBeginMessage; -import net.i2p.data.i2cp.SessionId; /** * Test harness for loading / storing Hash objects diff --git a/core/java/test/net/i2p/data/ReceiveMessageEndMessageTest.java b/core/java/test/net/i2p/data/ReceiveMessageEndMessageTest.java index 4e33406d5d..a399faefb6 100644 --- a/core/java/test/net/i2p/data/ReceiveMessageEndMessageTest.java +++ b/core/java/test/net/i2p/data/ReceiveMessageEndMessageTest.java @@ -8,11 +8,7 @@ package net.i2p.data; * */ -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.i2cp.MessageId; import net.i2p.data.i2cp.ReceiveMessageEndMessage; -import net.i2p.data.i2cp.SessionId; /** * Test harness for loading / storing Hash objects diff --git a/core/java/test/net/i2p/data/ReportAbuseMessageTest.java b/core/java/test/net/i2p/data/ReportAbuseMessageTest.java index b666fb44f3..3edfbec05e 100644 --- a/core/java/test/net/i2p/data/ReportAbuseMessageTest.java +++ b/core/java/test/net/i2p/data/ReportAbuseMessageTest.java @@ -8,8 +8,6 @@ package net.i2p.data; * */ -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; import net.i2p.data.i2cp.AbuseReason; import net.i2p.data.i2cp.AbuseSeverity; import net.i2p.data.i2cp.MessageId; diff --git a/core/java/test/net/i2p/data/RequestLeaseSetMessageTest.java b/core/java/test/net/i2p/data/RequestLeaseSetMessageTest.java index a3b6ba0d97..cd01d854c8 100644 --- a/core/java/test/net/i2p/data/RequestLeaseSetMessageTest.java +++ b/core/java/test/net/i2p/data/RequestLeaseSetMessageTest.java @@ -10,10 +10,6 @@ package net.i2p.data; import java.util.Date; -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.Hash; -import net.i2p.data.TunnelId; import net.i2p.data.i2cp.RequestLeaseSetMessage; import net.i2p.data.i2cp.SessionId; diff --git a/core/java/test/net/i2p/data/RouterAddressTest.java b/core/java/test/net/i2p/data/RouterAddressTest.java index b4075ce8fd..65a44f9212 100644 --- a/core/java/test/net/i2p/data/RouterAddressTest.java +++ b/core/java/test/net/i2p/data/RouterAddressTest.java @@ -12,10 +12,6 @@ import java.io.ByteArrayOutputStream; import java.util.Date; import java.util.Properties; -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.RouterAddress; - /** * Test harness for loading / storing Hash objects * diff --git a/core/java/test/net/i2p/data/RouterIdentityTest.java b/core/java/test/net/i2p/data/RouterIdentityTest.java index 1b74dffdb2..ce1978ebcd 100644 --- a/core/java/test/net/i2p/data/RouterIdentityTest.java +++ b/core/java/test/net/i2p/data/RouterIdentityTest.java @@ -10,13 +10,6 @@ package net.i2p.data; import java.io.ByteArrayOutputStream; -import net.i2p.data.Certificate; -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.PublicKey; -import net.i2p.data.RouterIdentity; -import net.i2p.data.SigningPublicKey; - /** * Test harness for loading / storing Hash objects * diff --git a/core/java/test/net/i2p/data/RouterInfoTest.java b/core/java/test/net/i2p/data/RouterInfoTest.java index 4e26fbf4b3..0dbba64bce 100644 --- a/core/java/test/net/i2p/data/RouterInfoTest.java +++ b/core/java/test/net/i2p/data/RouterInfoTest.java @@ -12,15 +12,6 @@ import java.util.HashSet; import java.util.Properties; import net.i2p.crypto.KeyGenerator; -import net.i2p.data.Certificate; -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.PrivateKey; -import net.i2p.data.PublicKey; -import net.i2p.data.RouterIdentity; -import net.i2p.data.RouterInfo; -import net.i2p.data.SigningPrivateKey; -import net.i2p.data.SigningPublicKey; import net.i2p.util.Log; /** diff --git a/core/java/test/net/i2p/data/SendMessageMessageTest.java b/core/java/test/net/i2p/data/SendMessageMessageTest.java index e0ff9f68a4..4394e3ecb8 100644 --- a/core/java/test/net/i2p/data/SendMessageMessageTest.java +++ b/core/java/test/net/i2p/data/SendMessageMessageTest.java @@ -8,18 +8,11 @@ package net.i2p.data; * */ -import java.io.IOException; -import java.io.InputStream; -import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.Destination; -import net.i2p.data.Payload; import net.i2p.data.i2cp.SendMessageMessage; import net.i2p.data.i2cp.SessionId; -import net.i2p.util.Log; /** * Test harness for loading / storing SendMessageMessage objects diff --git a/core/java/test/net/i2p/data/SessionConfigTest.java b/core/java/test/net/i2p/data/SessionConfigTest.java index ecd24dc3fc..8b1fc829cf 100644 --- a/core/java/test/net/i2p/data/SessionConfigTest.java +++ b/core/java/test/net/i2p/data/SessionConfigTest.java @@ -10,11 +10,6 @@ package net.i2p.data; import java.util.Properties; -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.Destination; -import net.i2p.data.Signature; -import net.i2p.data.SigningPrivateKey; import net.i2p.data.i2cp.SessionConfig; /** diff --git a/core/java/test/net/i2p/data/SessionIdTest.java b/core/java/test/net/i2p/data/SessionIdTest.java index 36ba16d7ac..de47ac10ed 100644 --- a/core/java/test/net/i2p/data/SessionIdTest.java +++ b/core/java/test/net/i2p/data/SessionIdTest.java @@ -8,8 +8,6 @@ package net.i2p.data; * */ -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; import net.i2p.data.i2cp.SessionId; /** diff --git a/core/java/test/net/i2p/data/SessionKeyTest.java b/core/java/test/net/i2p/data/SessionKeyTest.java index d07bbf0395..6c27d69113 100644 --- a/core/java/test/net/i2p/data/SessionKeyTest.java +++ b/core/java/test/net/i2p/data/SessionKeyTest.java @@ -8,9 +8,6 @@ package net.i2p.data; * */ -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.SessionKey; /** * Test harness for loading / storing SessionKey objects diff --git a/core/java/test/net/i2p/data/SessionStatusMessageTest.java b/core/java/test/net/i2p/data/SessionStatusMessageTest.java index 1dfa4ff472..402edf8fba 100644 --- a/core/java/test/net/i2p/data/SessionStatusMessageTest.java +++ b/core/java/test/net/i2p/data/SessionStatusMessageTest.java @@ -8,8 +8,6 @@ package net.i2p.data; * */ -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; import net.i2p.data.i2cp.SessionId; import net.i2p.data.i2cp.SessionStatusMessage; diff --git a/core/java/test/net/i2p/data/SignatureTest.java b/core/java/test/net/i2p/data/SignatureTest.java index ece90332ff..3e3b227e4a 100644 --- a/core/java/test/net/i2p/data/SignatureTest.java +++ b/core/java/test/net/i2p/data/SignatureTest.java @@ -8,9 +8,6 @@ package net.i2p.data; * */ -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.Signature; /** * Test harness for loading / storing Signature objects diff --git a/core/java/test/net/i2p/data/SigningPrivateKeyTest.java b/core/java/test/net/i2p/data/SigningPrivateKeyTest.java index fd7c5f922e..bafc3bdaca 100644 --- a/core/java/test/net/i2p/data/SigningPrivateKeyTest.java +++ b/core/java/test/net/i2p/data/SigningPrivateKeyTest.java @@ -8,13 +8,8 @@ package net.i2p.data; * */ -import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; - -import net.i2p.I2PAppContext; -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.SigningPrivateKey; +import java.io.ByteArrayOutputStream; /** * Test harness for loading / storing SigningPrivateKey objects diff --git a/core/java/test/net/i2p/data/SigningPublicKeyTest.java b/core/java/test/net/i2p/data/SigningPublicKeyTest.java index d424c392d2..f976e53dac 100644 --- a/core/java/test/net/i2p/data/SigningPublicKeyTest.java +++ b/core/java/test/net/i2p/data/SigningPublicKeyTest.java @@ -8,12 +8,8 @@ package net.i2p.data; * */ -import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; - -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.SigningPublicKey; +import java.io.ByteArrayOutputStream; /** * Test harness for loading / storing PublicKey objects diff --git a/core/java/test/net/i2p/data/StringTest.java b/core/java/test/net/i2p/data/StringTest.java index 099fa58539..f4de303d21 100644 --- a/core/java/test/net/i2p/data/StringTest.java +++ b/core/java/test/net/i2p/data/StringTest.java @@ -8,14 +8,8 @@ package net.i2p.data; * */ -import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; - -import net.i2p.data.DataFormatException; -import net.i2p.data.DataHelper; -import net.i2p.util.Log; +import java.io.ByteArrayOutputStream; import junit.framework.TestCase; diff --git a/core/java/test/net/i2p/data/StructureTest.java b/core/java/test/net/i2p/data/StructureTest.java index 8159764cb8..c1de20ba35 100644 --- a/core/java/test/net/i2p/data/StructureTest.java +++ b/core/java/test/net/i2p/data/StructureTest.java @@ -8,15 +8,8 @@ package net.i2p.data; * */ -import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; - -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.util.Log; -import net.i2p.I2PAppContext; +import java.io.ByteArrayOutputStream; import junit.framework.TestCase; diff --git a/core/java/test/net/i2p/data/TunnelIdTest.java b/core/java/test/net/i2p/data/TunnelIdTest.java index 12655f238e..1926ed8123 100644 --- a/core/java/test/net/i2p/data/TunnelIdTest.java +++ b/core/java/test/net/i2p/data/TunnelIdTest.java @@ -8,9 +8,6 @@ package net.i2p.data; * */ -import net.i2p.data.DataFormatException; -import net.i2p.data.DataStructure; -import net.i2p.data.TunnelId; /** * Test harness for loading / storing TunnelId objects diff --git a/core/java/test/net/i2p/data/UnsignedIntegerTest.java b/core/java/test/net/i2p/data/UnsignedIntegerTest.java index 1fbcd8f364..35a9aabdc4 100644 --- a/core/java/test/net/i2p/data/UnsignedIntegerTest.java +++ b/core/java/test/net/i2p/data/UnsignedIntegerTest.java @@ -8,15 +8,8 @@ package net.i2p.data; * */ -import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.Date; - -import net.i2p.data.DataFormatException; -import net.i2p.data.DataHelper; -import net.i2p.util.Log; +import java.io.ByteArrayOutputStream; import junit.framework.TestCase; diff --git a/core/java/test/net/i2p/util/LogSettingsTest.java b/core/java/test/net/i2p/util/LogSettingsTest.java index d3194a50a7..face457257 100644 --- a/core/java/test/net/i2p/util/LogSettingsTest.java +++ b/core/java/test/net/i2p/util/LogSettingsTest.java @@ -8,20 +8,19 @@ package net.i2p.util; * */ -import java.util.Properties; +import java.io.BufferedReader; import java.io.File; import java.io.FileWriter; -import java.io.PrintStream; +import java.io.IOException; +import java.io.InputStreamReader; import java.io.PipedInputStream; import java.io.PipedOutputStream; -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.io.IOException; - -import net.i2p.I2PAppContext; -import net.i2p.data.DataHelper; +import java.io.PrintStream; +import java.util.Properties; import junit.framework.TestCase; +import net.i2p.I2PAppContext; +import net.i2p.data.DataHelper; /** diff --git a/core/java/test/net/i2p/util/LookAheadInputStreamTest.java b/core/java/test/net/i2p/util/LookAheadInputStreamTest.java index cfde3cc815..408e94f76c 100644 --- a/core/java/test/net/i2p/util/LookAheadInputStreamTest.java +++ b/core/java/test/net/i2p/util/LookAheadInputStreamTest.java @@ -9,7 +9,6 @@ package net.i2p.util; */ import java.io.ByteArrayInputStream; -import java.util.Properties; import junit.framework.TestCase; diff --git a/core/java/test/net/i2p/util/ResettableGZIPInputStreamTest.java b/core/java/test/net/i2p/util/ResettableGZIPInputStreamTest.java index bb3836ed27..d78166654f 100644 --- a/core/java/test/net/i2p/util/ResettableGZIPInputStreamTest.java +++ b/core/java/test/net/i2p/util/ResettableGZIPInputStreamTest.java @@ -8,13 +8,12 @@ package net.i2p.util; * */ -import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.util.zip.GZIPOutputStream; -import net.i2p.data.DataHelper; - import junit.framework.TestCase; +import net.i2p.data.DataHelper; public class ResettableGZIPInputStreamTest extends TestCase { diff --git a/core/java/test/net/i2p/util/ResettableGZIPOutputStreamTest.java b/core/java/test/net/i2p/util/ResettableGZIPOutputStreamTest.java index 106f718182..58c2dd9ee3 100644 --- a/core/java/test/net/i2p/util/ResettableGZIPOutputStreamTest.java +++ b/core/java/test/net/i2p/util/ResettableGZIPOutputStreamTest.java @@ -8,14 +8,12 @@ package net.i2p.util; * */ -import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; -import java.util.zip.GZIPOutputStream; +import java.io.ByteArrayOutputStream; import java.util.zip.GZIPInputStream; -import net.i2p.data.DataHelper; - import junit.framework.TestCase; +import net.i2p.data.DataHelper; public class ResettableGZIPOutputStreamTest extends TestCase { diff --git a/core/java/test/net/i2p/util/ReusableGZIPInputStreamTest.java b/core/java/test/net/i2p/util/ReusableGZIPInputStreamTest.java index e6a5dbaa2b..7f10a25fa3 100644 --- a/core/java/test/net/i2p/util/ReusableGZIPInputStreamTest.java +++ b/core/java/test/net/i2p/util/ReusableGZIPInputStreamTest.java @@ -8,14 +8,13 @@ package net.i2p.util; * */ -import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; -import java.util.zip.GZIPOutputStream; +import java.io.ByteArrayOutputStream; import java.util.zip.GZIPInputStream; - -import net.i2p.data.DataHelper; +import java.util.zip.GZIPOutputStream; import junit.framework.TestCase; +import net.i2p.data.DataHelper; public class ReusableGZIPInputStreamTest extends TestCase { diff --git a/core/java/test/net/i2p/util/ReusableGZIPOutputStreamTest.java b/core/java/test/net/i2p/util/ReusableGZIPOutputStreamTest.java index 4e8f16da1c..b48d267fe5 100644 --- a/core/java/test/net/i2p/util/ReusableGZIPOutputStreamTest.java +++ b/core/java/test/net/i2p/util/ReusableGZIPOutputStreamTest.java @@ -8,14 +8,12 @@ package net.i2p.util; * */ -import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; -import java.util.zip.GZIPOutputStream; +import java.io.ByteArrayOutputStream; import java.util.zip.GZIPInputStream; -import net.i2p.data.DataHelper; - import junit.framework.TestCase; +import net.i2p.data.DataHelper; public class ReusableGZIPOutputStreamTest extends TestCase { diff --git a/router/java/src/net/i2p/data/i2np/BuildRequestRecord.java b/router/java/src/net/i2p/data/i2np/BuildRequestRecord.java index a374c10016..7bd8352b65 100644 --- a/router/java/src/net/i2p/data/i2np/BuildRequestRecord.java +++ b/router/java/src/net/i2p/data/i2np/BuildRequestRecord.java @@ -1,7 +1,12 @@ package net.i2p.data.i2np; import net.i2p.I2PAppContext; -import net.i2p.data.*; +import net.i2p.data.ByteArray; +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; /** * Hold the tunnel request record, managing its encryption and decryption. diff --git a/router/java/src/net/i2p/data/i2np/BuildResponseRecord.java b/router/java/src/net/i2p/data/i2np/BuildResponseRecord.java index f6f97b3cca..562f082bad 100644 --- a/router/java/src/net/i2p/data/i2np/BuildResponseRecord.java +++ b/router/java/src/net/i2p/data/i2np/BuildResponseRecord.java @@ -1,7 +1,10 @@ package net.i2p.data.i2np; import net.i2p.I2PAppContext; -import net.i2p.data.*; +import net.i2p.data.Base64; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; +import net.i2p.data.SessionKey; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/data/i2np/DataMessage.java b/router/java/src/net/i2p/data/i2np/DataMessage.java index 124606cabd..7e839117fa 100644 --- a/router/java/src/net/i2p/data/i2np/DataMessage.java +++ b/router/java/src/net/i2p/data/i2np/DataMessage.java @@ -9,6 +9,7 @@ package net.i2p.data.i2np; */ import java.io.IOException; + import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/data/i2np/DatabaseStoreMessage.java b/router/java/src/net/i2p/data/i2np/DatabaseStoreMessage.java index 3bb22152b2..cb838daca3 100644 --- a/router/java/src/net/i2p/data/i2np/DatabaseStoreMessage.java +++ b/router/java/src/net/i2p/data/i2np/DatabaseStoreMessage.java @@ -10,6 +10,7 @@ package net.i2p.data.i2np; import java.io.ByteArrayInputStream; import java.io.IOException; + import net.i2p.I2PAppContext; import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; diff --git a/router/java/src/net/i2p/data/i2np/DateMessage.java b/router/java/src/net/i2p/data/i2np/DateMessage.java index 61c244cdec..554c31ef29 100644 --- a/router/java/src/net/i2p/data/i2np/DateMessage.java +++ b/router/java/src/net/i2p/data/i2np/DateMessage.java @@ -9,6 +9,7 @@ package net.i2p.data.i2np; */ import java.io.IOException; + import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java b/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java index 006f77c736..3e46fc8fe5 100644 --- a/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java +++ b/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java @@ -8,7 +8,6 @@ package net.i2p.data.i2np; * */ -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; diff --git a/router/java/src/net/i2p/data/i2np/DeliveryStatusMessage.java b/router/java/src/net/i2p/data/i2np/DeliveryStatusMessage.java index f0f0183df5..9f1d61b45a 100644 --- a/router/java/src/net/i2p/data/i2np/DeliveryStatusMessage.java +++ b/router/java/src/net/i2p/data/i2np/DeliveryStatusMessage.java @@ -9,6 +9,7 @@ package net.i2p.data.i2np; */ import java.io.IOException; + import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/data/i2np/GarlicMessage.java b/router/java/src/net/i2p/data/i2np/GarlicMessage.java index b27a20dfe9..5d76a2b224 100644 --- a/router/java/src/net/i2p/data/i2np/GarlicMessage.java +++ b/router/java/src/net/i2p/data/i2np/GarlicMessage.java @@ -9,6 +9,7 @@ package net.i2p.data.i2np; */ import java.io.IOException; + import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java b/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java index ba57d3e093..8c1de62d5e 100644 --- a/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java +++ b/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java @@ -11,7 +11,6 @@ package net.i2p.data.i2np; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; - import java.util.HashMap; import java.util.Map; diff --git a/router/java/src/net/i2p/data/i2np/TunnelBuildMessage.java b/router/java/src/net/i2p/data/i2np/TunnelBuildMessage.java index 859251dff7..17bada1c19 100644 --- a/router/java/src/net/i2p/data/i2np/TunnelBuildMessage.java +++ b/router/java/src/net/i2p/data/i2np/TunnelBuildMessage.java @@ -1,8 +1,9 @@ package net.i2p.data.i2np; -import java.io.*; +import java.io.IOException; + import net.i2p.I2PAppContext; -import net.i2p.data.*; +import net.i2p.data.ByteArray; /** * diff --git a/router/java/src/net/i2p/data/i2np/TunnelBuildReplyMessage.java b/router/java/src/net/i2p/data/i2np/TunnelBuildReplyMessage.java index 277e425c28..737acd69a7 100644 --- a/router/java/src/net/i2p/data/i2np/TunnelBuildReplyMessage.java +++ b/router/java/src/net/i2p/data/i2np/TunnelBuildReplyMessage.java @@ -1,8 +1,9 @@ package net.i2p.data.i2np; -import java.io.*; +import java.io.IOException; + import net.i2p.I2PAppContext; -import net.i2p.data.*; +import net.i2p.data.ByteArray; /** * Transmitted from the new outbound endpoint to the creator through a diff --git a/router/java/src/net/i2p/data/i2np/TunnelCreateStatusMessage.java b/router/java/src/net/i2p/data/i2np/TunnelCreateStatusMessage.java index 6e9b6568a2..a5994f26de 100644 --- a/router/java/src/net/i2p/data/i2np/TunnelCreateStatusMessage.java +++ b/router/java/src/net/i2p/data/i2np/TunnelCreateStatusMessage.java @@ -9,6 +9,7 @@ package net.i2p.data.i2np; */ import java.io.IOException; + import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; import net.i2p.data.TunnelId; diff --git a/router/java/src/net/i2p/data/i2np/TunnelDataMessage.java b/router/java/src/net/i2p/data/i2np/TunnelDataMessage.java index de91a858b7..a07b99069a 100644 --- a/router/java/src/net/i2p/data/i2np/TunnelDataMessage.java +++ b/router/java/src/net/i2p/data/i2np/TunnelDataMessage.java @@ -9,6 +9,7 @@ package net.i2p.data.i2np; */ import java.io.IOException; + import net.i2p.I2PAppContext; import net.i2p.data.ByteArray; import net.i2p.data.DataHelper; diff --git a/router/java/src/net/i2p/data/i2np/TunnelGatewayMessage.java b/router/java/src/net/i2p/data/i2np/TunnelGatewayMessage.java index 9848d31e8a..bf97dc10c2 100644 --- a/router/java/src/net/i2p/data/i2np/TunnelGatewayMessage.java +++ b/router/java/src/net/i2p/data/i2np/TunnelGatewayMessage.java @@ -9,6 +9,7 @@ package net.i2p.data.i2np; */ import java.io.IOException; + import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; import net.i2p.data.TunnelId; diff --git a/router/java/src/net/i2p/router/ClientMessagePool.java b/router/java/src/net/i2p/router/ClientMessagePool.java index e2e67dc994..f4dfd0e440 100644 --- a/router/java/src/net/i2p/router/ClientMessagePool.java +++ b/router/java/src/net/i2p/router/ClientMessagePool.java @@ -11,7 +11,6 @@ package net.i2p.router; import java.util.Properties; import net.i2p.client.I2PClient; - import net.i2p.router.message.OutboundClientMessageOneShotJob; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/CommSystemFacade.java b/router/java/src/net/i2p/router/CommSystemFacade.java index 3fb1418654..20de7fdad7 100644 --- a/router/java/src/net/i2p/router/CommSystemFacade.java +++ b/router/java/src/net/i2p/router/CommSystemFacade.java @@ -14,6 +14,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; + import net.i2p.data.Hash; import net.i2p.data.RouterAddress; diff --git a/router/java/src/net/i2p/router/InNetMessagePool.java b/router/java/src/net/i2p/router/InNetMessagePool.java index 4a8eb6e748..9741f9d446 100644 --- a/router/java/src/net/i2p/router/InNetMessagePool.java +++ b/router/java/src/net/i2p/router/InNetMessagePool.java @@ -11,13 +11,13 @@ package net.i2p.router; import java.io.Writer; import java.util.ArrayList; import java.util.List; + import net.i2p.data.Hash; import net.i2p.data.RouterIdentity; -import net.i2p.data.i2np.DataMessage; +import net.i2p.data.i2np.DatabaseLookupMessage; +import net.i2p.data.i2np.DatabaseSearchReplyMessage; import net.i2p.data.i2np.DeliveryStatusMessage; import net.i2p.data.i2np.I2NPMessage; -import net.i2p.data.i2np.DatabaseSearchReplyMessage; -import net.i2p.data.i2np.DatabaseLookupMessage; import net.i2p.data.i2np.TunnelCreateMessage; import net.i2p.data.i2np.TunnelCreateStatusMessage; import net.i2p.data.i2np.TunnelDataMessage; diff --git a/router/java/src/net/i2p/router/LoadTestManager.java b/router/java/src/net/i2p/router/LoadTestManager.java index 0dbd9aceee..55adb61382 100644 --- a/router/java/src/net/i2p/router/LoadTestManager.java +++ b/router/java/src/net/i2p/router/LoadTestManager.java @@ -1,16 +1,33 @@ package net.i2p.router; -import java.io.*; -import java.util.*; +import java.io.BufferedWriter; +import java.io.FileWriter; +import java.io.IOException; +import java.io.Writer; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import net.i2p.I2PAppContext; -import net.i2p.util.*; -import net.i2p.data.*; -import net.i2p.data.i2np.*; -import net.i2p.router.TunnelInfo; -import net.i2p.router.message.*; -import net.i2p.router.tunnel.*; -import net.i2p.router.tunnel.pool.*; -import net.i2p.router.transport.udp.UDPTransport; +import net.i2p.data.Certificate; +import net.i2p.data.Hash; +import net.i2p.data.RouterInfo; +import net.i2p.data.SessionKey; +import net.i2p.data.SessionTag; +import net.i2p.data.TunnelId; +import net.i2p.data.i2np.DataMessage; +import net.i2p.data.i2np.DeliveryInstructions; +import net.i2p.data.i2np.DeliveryStatusMessage; +import net.i2p.data.i2np.GarlicMessage; +import net.i2p.data.i2np.I2NPMessage; +import net.i2p.data.i2np.TunnelGatewayMessage; +import net.i2p.router.message.GarlicMessageBuilder; +import net.i2p.router.message.PayloadGarlicConfig; +import net.i2p.router.tunnel.TunnelCreatorConfig; +import net.i2p.util.Log; +import net.i2p.util.SimpleTimer; /** * Coordinate some tests of peers to see how much load they can handle. If diff --git a/router/java/src/net/i2p/router/NetworkDatabaseFacade.java b/router/java/src/net/i2p/router/NetworkDatabaseFacade.java index 3027b66b1f..eee8251779 100644 --- a/router/java/src/net/i2p/router/NetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/NetworkDatabaseFacade.java @@ -10,7 +10,11 @@ package net.i2p.router; import java.io.IOException; import java.io.Writer; -import java.util.*; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; import net.i2p.data.Hash; import net.i2p.data.LeaseSet; diff --git a/router/java/src/net/i2p/router/PeerManagerFacade.java b/router/java/src/net/i2p/router/PeerManagerFacade.java index 53a4f6bdb5..bebe1a927d 100644 --- a/router/java/src/net/i2p/router/PeerManagerFacade.java +++ b/router/java/src/net/i2p/router/PeerManagerFacade.java @@ -10,6 +10,7 @@ package net.i2p.router; import java.io.Writer; import java.util.List; + import net.i2p.data.Hash; /** diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java index 5abbeaf37c..3b687098fd 100644 --- a/router/java/src/net/i2p/router/Router.java +++ b/router/java/src/net/i2p/router/Router.java @@ -9,13 +9,12 @@ package net.i2p.router; */ import java.io.File; -import java.io.FileOutputStream; import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.IOException; import java.io.Writer; import java.text.DecimalFormat; import java.util.Calendar; -import java.util.Collection; import java.util.Date; import java.util.GregorianCalendar; import java.util.HashSet; @@ -28,11 +27,13 @@ import java.util.TreeSet; import net.i2p.CoreVersion; import net.i2p.crypto.DHSessionKeyBuilder; -import net.i2p.data.*; +import net.i2p.data.Certificate; +import net.i2p.data.DataFormatException; +import net.i2p.data.DataHelper; +import net.i2p.data.RouterInfo; +import net.i2p.data.SigningPrivateKey; import net.i2p.data.i2np.GarlicMessage; -//import net.i2p.data.i2np.TunnelMessage; import net.i2p.router.message.GarlicMessageHandler; -//import net.i2p.router.message.TunnelMessageHandler; import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade; import net.i2p.router.startup.StartupJob; import net.i2p.router.transport.FIFOBandwidthLimiter; @@ -41,8 +42,8 @@ import net.i2p.stat.RateStat; import net.i2p.stat.StatManager; import net.i2p.util.FileUtil; import net.i2p.util.I2PThread; -import net.i2p.util.SimpleTimer; import net.i2p.util.Log; +import net.i2p.util.SimpleTimer; /** * Main driver for the router. diff --git a/router/java/src/net/i2p/router/RouterClock.java b/router/java/src/net/i2p/router/RouterClock.java index 4e2a2b3bf0..3174e60276 100644 --- a/router/java/src/net/i2p/router/RouterClock.java +++ b/router/java/src/net/i2p/router/RouterClock.java @@ -1,9 +1,7 @@ package net.i2p.router; -import net.i2p.util.Log; -import net.i2p.I2PAppContext; -import net.i2p.router.RouterContext; import net.i2p.util.Clock; +import net.i2p.util.Log; /** * Alternate location for determining the time which takes into account an offset. diff --git a/router/java/src/net/i2p/router/RouterContext.java b/router/java/src/net/i2p/router/RouterContext.java index 7878f613c5..195db00d0d 100644 --- a/router/java/src/net/i2p/router/RouterContext.java +++ b/router/java/src/net/i2p/router/RouterContext.java @@ -8,7 +8,6 @@ import net.i2p.I2PAppContext; import net.i2p.data.Hash; import net.i2p.router.admin.AdminManager; import net.i2p.router.client.ClientManagerFacadeImpl; -import net.i2p.router.networkdb.kademlia.KademliaNetworkDatabaseFacade; import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade; import net.i2p.router.peermanager.Calculator; import net.i2p.router.peermanager.CapacityCalculator; @@ -24,10 +23,9 @@ import net.i2p.router.transport.CommSystemFacadeImpl; import net.i2p.router.transport.FIFOBandwidthLimiter; import net.i2p.router.transport.OutboundMessageRegistry; import net.i2p.router.transport.VMCommSystem; -import net.i2p.router.tunnel.pool.TunnelPoolManager; import net.i2p.router.tunnel.TunnelDispatcher; +import net.i2p.router.tunnel.pool.TunnelPoolManager; import net.i2p.util.Clock; -import net.i2p.router.RouterClock; /** * Build off the core I2P context to provide a root for a router instance to diff --git a/router/java/src/net/i2p/router/RouterLaunch.java b/router/java/src/net/i2p/router/RouterLaunch.java index 531099ae5e..6aab4e8ac2 100644 --- a/router/java/src/net/i2p/router/RouterLaunch.java +++ b/router/java/src/net/i2p/router/RouterLaunch.java @@ -1,6 +1,8 @@ package net.i2p.router; -import java.io.*; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintStream; public class RouterLaunch { public static void main(String args[]) { diff --git a/router/java/src/net/i2p/router/RouterThrottle.java b/router/java/src/net/i2p/router/RouterThrottle.java index 2b3ffdcaf3..23bac00842 100644 --- a/router/java/src/net/i2p/router/RouterThrottle.java +++ b/router/java/src/net/i2p/router/RouterThrottle.java @@ -1,7 +1,6 @@ package net.i2p.router; import net.i2p.data.Hash; -import net.i2p.data.i2np.TunnelCreateMessage; /** * Gatekeeper for deciding whether to throttle the further processing diff --git a/router/java/src/net/i2p/router/RouterThrottleImpl.java b/router/java/src/net/i2p/router/RouterThrottleImpl.java index c44e9be1b2..8bae056d8b 100644 --- a/router/java/src/net/i2p/router/RouterThrottleImpl.java +++ b/router/java/src/net/i2p/router/RouterThrottleImpl.java @@ -1,7 +1,6 @@ package net.i2p.router; import net.i2p.data.Hash; -import net.i2p.data.i2np.TunnelCreateMessage; import net.i2p.router.peermanager.TunnelHistory; import net.i2p.stat.Rate; import net.i2p.stat.RateStat; diff --git a/router/java/src/net/i2p/router/SSUDemo.java b/router/java/src/net/i2p/router/SSUDemo.java index 00c848e8de..b94367c567 100644 --- a/router/java/src/net/i2p/router/SSUDemo.java +++ b/router/java/src/net/i2p/router/SSUDemo.java @@ -1,11 +1,21 @@ package net.i2p.router; -import java.util.*; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.Properties; import net.i2p.I2PAppContext; -import net.i2p.data.*; -import net.i2p.data.i2np.*; +import net.i2p.data.Base64; +import net.i2p.data.DataFormatException; +import net.i2p.data.Hash; +import net.i2p.data.RouterIdentity; +import net.i2p.data.RouterInfo; +import net.i2p.data.i2np.DatabaseStoreMessage; +import net.i2p.data.i2np.I2NPMessage; +import net.i2p.data.i2np.I2NPMessageException; +import net.i2p.data.i2np.I2NPMessageImpl; /** * Demo of a stripped down router - no tunnels, no netDb, no i2cp, no peer profiling, diff --git a/router/java/src/net/i2p/router/Shitlist.java b/router/java/src/net/i2p/router/Shitlist.java index 48cadfcf47..09a3562fd8 100644 --- a/router/java/src/net/i2p/router/Shitlist.java +++ b/router/java/src/net/i2p/router/Shitlist.java @@ -10,7 +10,15 @@ package net.i2p.router; import java.io.IOException; import java.io.Writer; -import java.util.*; +import java.util.ArrayList; +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.TreeMap; import net.i2p.data.DataHelper; import net.i2p.data.Hash; diff --git a/router/java/src/net/i2p/router/StatisticsManager.java b/router/java/src/net/i2p/router/StatisticsManager.java index d00a237afc..65fca1562b 100644 --- a/router/java/src/net/i2p/router/StatisticsManager.java +++ b/router/java/src/net/i2p/router/StatisticsManager.java @@ -8,8 +8,6 @@ package net.i2p.router; * */ -import java.io.FileInputStream; -import java.io.IOException; import java.io.Writer; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; @@ -18,10 +16,10 @@ import java.util.Properties; import net.i2p.CoreVersion; import net.i2p.data.DataHelper; +import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade; import net.i2p.stat.Rate; import net.i2p.stat.RateStat; import net.i2p.util.Log; -import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade; /** * Maintain the statistics about the router diff --git a/router/java/src/net/i2p/router/TunnelManagerFacade.java b/router/java/src/net/i2p/router/TunnelManagerFacade.java index 1caa56c9b8..be0b7e441d 100644 --- a/router/java/src/net/i2p/router/TunnelManagerFacade.java +++ b/router/java/src/net/i2p/router/TunnelManagerFacade.java @@ -8,13 +8,13 @@ package net.i2p.router; * */ +import java.io.IOException; +import java.io.Writer; + import net.i2p.data.Destination; import net.i2p.data.Hash; import net.i2p.data.TunnelId; -import java.io.IOException; -import java.io.Writer; - /** * Build and maintain tunnels throughout the network. * diff --git a/router/java/src/net/i2p/router/admin/AdminRunner.java b/router/java/src/net/i2p/router/admin/AdminRunner.java index 0ded465eb3..c515f89769 100644 --- a/router/java/src/net/i2p/router/admin/AdminRunner.java +++ b/router/java/src/net/i2p/router/admin/AdminRunner.java @@ -11,8 +11,8 @@ import java.util.Iterator; import java.util.Set; import net.i2p.data.Hash; -import net.i2p.router.RouterContext; import net.i2p.router.Router; +import net.i2p.router.RouterContext; import net.i2p.util.I2PThread; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java index ee455f90b5..544badcad4 100644 --- a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java +++ b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java @@ -19,9 +19,9 @@ import java.util.Map; import java.util.Set; import net.i2p.data.Destination; +import net.i2p.data.Hash; import net.i2p.data.LeaseSet; import net.i2p.data.Payload; -import net.i2p.data.Hash; import net.i2p.data.i2cp.DisconnectMessage; import net.i2p.data.i2cp.I2CPMessage; import net.i2p.data.i2cp.I2CPMessageException; diff --git a/router/java/src/net/i2p/router/client/ClientManager.java b/router/java/src/net/i2p/router/client/ClientManager.java index c9acbe430a..d9838ef7b5 100644 --- a/router/java/src/net/i2p/router/client/ClientManager.java +++ b/router/java/src/net/i2p/router/client/ClientManager.java @@ -24,8 +24,8 @@ import net.i2p.data.Payload; import net.i2p.data.TunnelId; import net.i2p.data.i2cp.MessageId; import net.i2p.data.i2cp.SessionConfig; -import net.i2p.router.ClientMessage; import net.i2p.router.ClientManagerFacade; +import net.i2p.router.ClientMessage; import net.i2p.router.Job; import net.i2p.router.JobImpl; import net.i2p.router.RouterContext; diff --git a/router/java/src/net/i2p/router/message/HandleGarlicMessageJob.java b/router/java/src/net/i2p/router/message/HandleGarlicMessageJob.java index 6d982f24c5..a114764f6a 100644 --- a/router/java/src/net/i2p/router/message/HandleGarlicMessageJob.java +++ b/router/java/src/net/i2p/router/message/HandleGarlicMessageJob.java @@ -10,6 +10,7 @@ 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/OutboundClientMessageJobHelper.java b/router/java/src/net/i2p/router/message/OutboundClientMessageJobHelper.java index 514e81ba6b..efbdd90f05 100644 --- a/router/java/src/net/i2p/router/message/OutboundClientMessageJobHelper.java +++ b/router/java/src/net/i2p/router/message/OutboundClientMessageJobHelper.java @@ -24,7 +24,6 @@ import net.i2p.data.i2np.DeliveryInstructions; import net.i2p.data.i2np.DeliveryStatusMessage; import net.i2p.data.i2np.GarlicMessage; import net.i2p.data.i2np.I2NPMessage; -import net.i2p.router.Router; import net.i2p.router.RouterContext; import net.i2p.router.TunnelInfo; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java b/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java index 02e2efd401..a51153387d 100644 --- a/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java +++ b/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java @@ -8,7 +8,6 @@ import java.util.Iterator; import java.util.List; import java.util.Properties; import java.util.Set; -import java.util.TreeMap; import net.i2p.data.Base64; import net.i2p.data.Certificate; @@ -16,28 +15,23 @@ import net.i2p.data.Destination; import net.i2p.data.Hash; import net.i2p.data.Lease; import net.i2p.data.LeaseSet; +import net.i2p.data.Payload; import net.i2p.data.PublicKey; import net.i2p.data.RouterInfo; import net.i2p.data.SessionKey; -import net.i2p.data.Payload; import net.i2p.data.i2cp.MessageId; - import net.i2p.data.i2np.DataMessage; -import net.i2p.data.i2np.DeliveryStatusMessage; -import net.i2p.data.i2np.I2NPMessage; -import net.i2p.data.i2np.GarlicMessage; import net.i2p.data.i2np.DeliveryInstructions; - -import net.i2p.router.message.PayloadGarlicConfig; - +import net.i2p.data.i2np.DeliveryStatusMessage; +import net.i2p.data.i2np.GarlicMessage; +import net.i2p.data.i2np.I2NPMessage; import net.i2p.router.ClientMessage; import net.i2p.router.JobImpl; +import net.i2p.router.MessageSelector; import net.i2p.router.ReplyJob; import net.i2p.router.Router; import net.i2p.router.RouterContext; import net.i2p.router.TunnelInfo; -import net.i2p.router.MessageSelector; - import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/message/OutboundClientMessageStatus.java b/router/java/src/net/i2p/router/message/OutboundClientMessageStatus.java index f309dca7d5..b24154d6f6 100644 --- a/router/java/src/net/i2p/router/message/OutboundClientMessageStatus.java +++ b/router/java/src/net/i2p/router/message/OutboundClientMessageStatus.java @@ -2,6 +2,7 @@ package net.i2p.router.message; import java.util.HashSet; import java.util.Set; + import net.i2p.data.Destination; import net.i2p.data.Hash; import net.i2p.data.LeaseSet; diff --git a/router/java/src/net/i2p/router/networkdb/HandleDatabaseLookupMessageJob.java b/router/java/src/net/i2p/router/networkdb/HandleDatabaseLookupMessageJob.java index f0e27d044b..a61de8c055 100644 --- a/router/java/src/net/i2p/router/networkdb/HandleDatabaseLookupMessageJob.java +++ b/router/java/src/net/i2p/router/networkdb/HandleDatabaseLookupMessageJob.java @@ -8,8 +8,8 @@ package net.i2p.router.networkdb; * */ -import java.util.Iterator; import java.util.HashSet; +import java.util.Iterator; import java.util.Set; import net.i2p.data.DataStructure; @@ -25,9 +25,8 @@ import net.i2p.data.i2np.I2NPMessage; import net.i2p.data.i2np.TunnelGatewayMessage; import net.i2p.router.Job; import net.i2p.router.JobImpl; -import net.i2p.router.RouterContext; import net.i2p.router.Router; -import net.i2p.router.TunnelInfo; +import net.i2p.router.RouterContext; import net.i2p.router.message.SendMessageDirectJob; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/networkdb/HandleDatabaseStoreMessageJob.java b/router/java/src/net/i2p/router/networkdb/HandleDatabaseStoreMessageJob.java index d0fd57ad1c..3a395db0ac 100644 --- a/router/java/src/net/i2p/router/networkdb/HandleDatabaseStoreMessageJob.java +++ b/router/java/src/net/i2p/router/networkdb/HandleDatabaseStoreMessageJob.java @@ -9,6 +9,7 @@ package net.i2p.router.networkdb; */ import java.util.Date; + import net.i2p.data.Hash; import net.i2p.data.LeaseSet; import net.i2p.data.RouterIdentity; diff --git a/router/java/src/net/i2p/router/networkdb/PublishLocalRouterInfoJob.java b/router/java/src/net/i2p/router/networkdb/PublishLocalRouterInfoJob.java index 346cdc3fd3..96dbadd6cf 100644 --- a/router/java/src/net/i2p/router/networkdb/PublishLocalRouterInfoJob.java +++ b/router/java/src/net/i2p/router/networkdb/PublishLocalRouterInfoJob.java @@ -15,9 +15,8 @@ import net.i2p.data.DataFormatException; import net.i2p.data.RouterInfo; import net.i2p.data.SigningPrivateKey; import net.i2p.router.JobImpl; -import net.i2p.router.RouterContext; import net.i2p.router.Router; -import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade; +import net.i2p.router.RouterContext; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/ExploreJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/ExploreJob.java index b282f897a3..a64046f6a2 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/ExploreJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/ExploreJob.java @@ -9,6 +9,7 @@ package net.i2p.router.networkdb.kademlia; */ import java.util.List; + import net.i2p.data.Hash; import net.i2p.data.RouterInfo; import net.i2p.data.TunnelId; diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodOnlySearchJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodOnlySearchJob.java index f293b59ad4..4f3dc3e097 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodOnlySearchJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodOnlySearchJob.java @@ -1,11 +1,23 @@ package net.i2p.router.networkdb.kademlia; -import java.util.*; -import net.i2p.router.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + import net.i2p.data.Hash; -import net.i2p.data.i2np.*; -import net.i2p.util.Log; +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.router.peermanager.PeerProfile; +import net.i2p.util.Log; /** * Try sending a search to some floodfill peers, failing completely if we don't get 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 0d4748a3aa..8a55718195 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java @@ -5,12 +5,11 @@ import java.util.Properties; import net.i2p.data.Hash; import net.i2p.data.RouterAddress; -import net.i2p.data.RouterInfo; -import net.i2p.util.Log; import net.i2p.router.JobImpl; import net.i2p.router.Router; import net.i2p.router.RouterContext; import net.i2p.router.peermanager.PeerProfile; +import net.i2p.util.Log; /** * Simple job to monitor the floodfill pool. 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 0d0cc47060..26ef1586af 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java @@ -1,10 +1,27 @@ package net.i2p.router.networkdb.kademlia; -import java.util.*; -import net.i2p.router.*; -import net.i2p.router.networkdb.DatabaseStoreMessageHandler; -import net.i2p.data.i2np.*; -import net.i2p.data.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import net.i2p.data.DataStructure; +import net.i2p.data.Hash; +import net.i2p.data.LeaseSet; +import net.i2p.data.RouterInfo; +import net.i2p.data.i2np.DatabaseLookupMessage; +import net.i2p.data.i2np.DatabaseSearchReplyMessage; +import net.i2p.data.i2np.DatabaseStoreMessage; +import net.i2p.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/FloodfillPeerSelector.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillPeerSelector.java index 8ebdf2f45b..7cc70a56fa 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillPeerSelector.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillPeerSelector.java @@ -9,15 +9,16 @@ package net.i2p.router.networkdb.kademlia; */ import java.math.BigInteger; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +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; class FloodfillPeerSelector extends PeerSelector { 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 8f9cf35d37..f3880597d8 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java @@ -8,26 +8,12 @@ package net.i2p.router.networkdb.kademlia; * */ -import java.util.Iterator; -import java.util.List; import java.util.Set; import net.i2p.data.DataStructure; 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; -import net.i2p.data.i2np.I2NPMessage; import net.i2p.router.Job; -import net.i2p.router.JobImpl; -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; class FloodfillStoreJob extends StoreJob { private FloodfillNetworkDatabaseFacade _facade; diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillVerifyStoreJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillVerifyStoreJob.java index 015294b53e..f74d5f470d 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillVerifyStoreJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillVerifyStoreJob.java @@ -2,9 +2,18 @@ package net.i2p.router.networkdb.kademlia; import java.util.Collections; import java.util.List; -import net.i2p.data.*; -import net.i2p.data.i2np.*; -import net.i2p.router.*; + +import net.i2p.data.DataStructure; +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.JobImpl; +import net.i2p.router.MessageSelector; +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/HandleFloodfillDatabaseLookupMessageJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseLookupMessageJob.java index cd78c7fee3..986dc2eddb 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseLookupMessageJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseLookupMessageJob.java @@ -8,27 +8,11 @@ package net.i2p.router.networkdb.kademlia; * */ -import java.util.Iterator; -import java.util.Set; - -import net.i2p.data.DataStructure; import net.i2p.data.Hash; -import net.i2p.data.LeaseSet; import net.i2p.data.RouterIdentity; -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.data.i2np.TunnelGatewayMessage; -import net.i2p.router.Job; -import net.i2p.router.JobImpl; import net.i2p.router.RouterContext; -import net.i2p.router.TunnelInfo; -import net.i2p.router.message.SendMessageDirectJob; import net.i2p.router.networkdb.HandleDatabaseLookupMessageJob; -import net.i2p.util.Log; /** * Handle a lookup for a key received from a remote peer. Needs to be implemented diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java index e8d6e6ac32..34555b1de3 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java @@ -8,10 +8,17 @@ package net.i2p.router.networkdb.kademlia; * */ -import java.util.*; -import net.i2p.data.*; -import net.i2p.data.i2np.*; -import net.i2p.router.*; +import java.util.Date; + +import net.i2p.data.Hash; +import net.i2p.data.LeaseSet; +import net.i2p.data.RouterIdentity; +import net.i2p.data.RouterInfo; +import net.i2p.data.i2np.DatabaseStoreMessage; +import net.i2p.data.i2np.DeliveryStatusMessage; +import net.i2p.router.JobImpl; +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/HarvesterJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/HarvesterJob.java index aa23dfff5f..948709d98d 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/HarvesterJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/HarvesterJob.java @@ -10,11 +10,11 @@ import java.util.TreeMap; import net.i2p.data.Hash; import net.i2p.data.RouterInfo; import net.i2p.data.i2np.DatabaseLookupMessage; -import net.i2p.util.Log; import net.i2p.router.JobImpl; import net.i2p.router.RouterContext; import net.i2p.router.TunnelInfo; import net.i2p.router.message.SendMessageDirectJob; +import net.i2p.util.Log; /** * Simple job to try to keep our peer references up to date by aggressively 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 8de3448375..538deea43e 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java @@ -9,11 +9,11 @@ package net.i2p.router.networkdb.kademlia; */ import java.math.BigInteger; +import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; -import java.util.Set; -import java.util.ArrayList; import java.util.List; +import java.util.Set; import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; 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 c0b124dd57..9c4f8a3528 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java @@ -8,8 +8,6 @@ package net.i2p.router.networkdb.kademlia; * */ -import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; import java.io.Writer; import java.util.Collection; @@ -23,8 +21,6 @@ import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; -import net.i2p.data.Base64; -import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; import net.i2p.data.DataStructure; import net.i2p.data.Destination; @@ -39,11 +35,11 @@ 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; import net.i2p.router.peermanager.PeerProfile; -import net.i2p.router.TunnelPoolSettings; import net.i2p.util.Log; /** 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 0d3aa52b7f..26c1799a36 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/PeerSelector.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/PeerSelector.java @@ -18,7 +18,9 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; -import net.i2p.data.*; +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; 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 66431b85ee..ec4cc66de4 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java @@ -10,11 +10,13 @@ package net.i2p.router.networkdb.kademlia; import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.FilenameFilter; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import net.i2p.data.DataFormatException; import net.i2p.data.DataStructure; diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java index 64f1a7a545..f49ca4276a 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java @@ -27,8 +27,6 @@ import net.i2p.router.JobImpl; import net.i2p.router.RouterContext; import net.i2p.router.TunnelInfo; import net.i2p.router.message.SendMessageDirectJob; -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/StoreJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java index ed23bd97a2..69311b62e7 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java @@ -8,7 +8,10 @@ package net.i2p.router.networkdb.kademlia; * */ -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Set; import net.i2p.data.DataStructure; import net.i2p.data.Hash; diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/XORComparator.java b/router/java/src/net/i2p/router/networkdb/kademlia/XORComparator.java index d8880b5258..3c2b9d2d2c 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/XORComparator.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/XORComparator.java @@ -1,6 +1,7 @@ package net.i2p.router.networkdb.kademlia; import java.util.Comparator; + import net.i2p.data.DataHelper; import net.i2p.data.Hash; diff --git a/router/java/src/net/i2p/router/peermanager/InverseCapacityComparator.java b/router/java/src/net/i2p/router/peermanager/InverseCapacityComparator.java index 2cc28f864f..520cee0754 100644 --- a/router/java/src/net/i2p/router/peermanager/InverseCapacityComparator.java +++ b/router/java/src/net/i2p/router/peermanager/InverseCapacityComparator.java @@ -1,6 +1,7 @@ package net.i2p.router.peermanager; import java.util.Comparator; + import net.i2p.data.DataHelper; /** diff --git a/router/java/src/net/i2p/router/peermanager/PeerManager.java b/router/java/src/net/i2p/router/peermanager/PeerManager.java index 2fcebfedf2..b2b16a00df 100644 --- a/router/java/src/net/i2p/router/peermanager/PeerManager.java +++ b/router/java/src/net/i2p/router/peermanager/PeerManager.java @@ -10,17 +10,21 @@ package net.i2p.router.peermanager; import java.io.IOException; import java.io.Writer; -import java.util.*; +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 net.i2p.data.Hash; +import net.i2p.data.RouterInfo; import net.i2p.router.PeerSelectionCriteria; import net.i2p.router.RouterContext; import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade; -import net.i2p.util.SimpleTimer; import net.i2p.util.Log; - -import net.i2p.data.RouterInfo; -import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade; +import net.i2p.util.SimpleTimer; /** * Manage the current state of the statistics diff --git a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java index 425c31fa56..660324deed 100644 --- a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java +++ b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java @@ -23,8 +23,8 @@ import java.util.TreeSet; import net.i2p.data.Hash; import net.i2p.data.RouterAddress; import net.i2p.data.RouterInfo; -import net.i2p.router.RouterContext; import net.i2p.router.NetworkDatabaseFacade; +import net.i2p.router.RouterContext; import net.i2p.router.tunnel.pool.TunnelPeerSelector; import net.i2p.stat.Rate; import net.i2p.stat.RateStat; diff --git a/router/java/src/net/i2p/router/peermanager/ProfileOrganizerRenderer.java b/router/java/src/net/i2p/router/peermanager/ProfileOrganizerRenderer.java index 1a5541f917..38590570d3 100644 --- a/router/java/src/net/i2p/router/peermanager/ProfileOrganizerRenderer.java +++ b/router/java/src/net/i2p/router/peermanager/ProfileOrganizerRenderer.java @@ -2,12 +2,8 @@ package net.i2p.router.peermanager; import java.io.IOException; import java.io.Writer; - -import java.lang.Math; - import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; - import java.util.Comparator; import java.util.Iterator; import java.util.Locale; @@ -18,7 +14,6 @@ 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.DBHistory; import net.i2p.stat.Rate; import net.i2p.stat.RateStat; diff --git a/router/java/src/net/i2p/router/peermanager/StrictSpeedCalculator.java b/router/java/src/net/i2p/router/peermanager/StrictSpeedCalculator.java index f8527e40a3..99453b0abf 100644 --- a/router/java/src/net/i2p/router/peermanager/StrictSpeedCalculator.java +++ b/router/java/src/net/i2p/router/peermanager/StrictSpeedCalculator.java @@ -1,8 +1,8 @@ package net.i2p.router.peermanager; +import net.i2p.router.RouterContext; import net.i2p.stat.Rate; import net.i2p.stat.RateStat; -import net.i2p.router.RouterContext; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/startup/ClientAppConfig.java b/router/java/src/net/i2p/router/startup/ClientAppConfig.java index 0a994069f9..316c0b5006 100644 --- a/router/java/src/net/i2p/router/startup/ClientAppConfig.java +++ b/router/java/src/net/i2p/router/startup/ClientAppConfig.java @@ -1,8 +1,8 @@ package net.i2p.router.startup; -import java.io.IOException; import java.io.File; import java.io.FileOutputStream; +import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Properties; diff --git a/router/java/src/net/i2p/router/startup/CreateRouterInfoJob.java b/router/java/src/net/i2p/router/startup/CreateRouterInfoJob.java index 18e524d318..de84fa49bb 100644 --- a/router/java/src/net/i2p/router/startup/CreateRouterInfoJob.java +++ b/router/java/src/net/i2p/router/startup/CreateRouterInfoJob.java @@ -25,7 +25,6 @@ import net.i2p.router.Job; import net.i2p.router.JobImpl; import net.i2p.router.Router; import net.i2p.router.RouterContext; -import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade; import net.i2p.util.Log; public class CreateRouterInfoJob extends JobImpl { diff --git a/router/java/src/net/i2p/router/startup/ReadConfigJob.java b/router/java/src/net/i2p/router/startup/ReadConfigJob.java index 4059822b85..04796dd465 100644 --- a/router/java/src/net/i2p/router/startup/ReadConfigJob.java +++ b/router/java/src/net/i2p/router/startup/ReadConfigJob.java @@ -9,6 +9,7 @@ package net.i2p.router.startup; */ import java.io.File; + import net.i2p.router.JobImpl; import net.i2p.router.RouterContext; diff --git a/router/java/src/net/i2p/router/startup/RebuildRouterInfoJob.java b/router/java/src/net/i2p/router/startup/RebuildRouterInfoJob.java index e80af2570a..a43fc63119 100644 --- a/router/java/src/net/i2p/router/startup/RebuildRouterInfoJob.java +++ b/router/java/src/net/i2p/router/startup/RebuildRouterInfoJob.java @@ -25,7 +25,6 @@ import net.i2p.data.SigningPublicKey; import net.i2p.router.JobImpl; import net.i2p.router.Router; import net.i2p.router.RouterContext; -import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java index c2b024c054..cd10225803 100644 --- a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java +++ b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java @@ -10,6 +10,7 @@ package net.i2p.router.transport; import java.io.IOException; import java.io.Writer; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -17,7 +18,6 @@ import java.util.Map; import java.util.Properties; import java.util.Set; import java.util.Vector; -import java.util.Collections; import net.i2p.data.Hash; import net.i2p.data.RouterAddress; diff --git a/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java b/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java index b71bcf40a6..6a116126eb 100644 --- a/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java +++ b/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java @@ -1,6 +1,8 @@ package net.i2p.router.transport; -import java.util.*; +import java.util.ArrayList; +import java.util.List; + import net.i2p.I2PAppContext; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/transport/GetBidsJob.java b/router/java/src/net/i2p/router/transport/GetBidsJob.java index 353540e1ea..a60ba6ee62 100644 --- a/router/java/src/net/i2p/router/transport/GetBidsJob.java +++ b/router/java/src/net/i2p/router/transport/GetBidsJob.java @@ -8,7 +8,6 @@ package net.i2p.router.transport; * */ -import java.util.List; import net.i2p.data.Hash; import net.i2p.router.JobImpl; import net.i2p.router.MessageSelector; diff --git a/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java b/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java index ce9673e613..4ddcd44a00 100644 --- a/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java +++ b/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java @@ -10,7 +10,13 @@ package net.i2p.router.transport; import java.io.IOException; import java.io.Writer; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import net.i2p.data.i2np.I2NPMessage; import net.i2p.router.Job; diff --git a/router/java/src/net/i2p/router/transport/Transport.java b/router/java/src/net/i2p/router/transport/Transport.java index 499e47d69f..cba920b6d1 100644 --- a/router/java/src/net/i2p/router/transport/Transport.java +++ b/router/java/src/net/i2p/router/transport/Transport.java @@ -11,10 +11,9 @@ package net.i2p.router.transport; import java.io.IOException; import java.io.Writer; import java.util.List; -import java.util.Set; import java.util.Vector; -import net.i2p.data.Hash; +import net.i2p.data.Hash; import net.i2p.data.RouterAddress; import net.i2p.data.RouterInfo; import net.i2p.router.OutNetMessage; diff --git a/router/java/src/net/i2p/router/transport/TransportImpl.java b/router/java/src/net/i2p/router/transport/TransportImpl.java index c00a5485ed..4f91c12dd4 100644 --- a/router/java/src/net/i2p/router/transport/TransportImpl.java +++ b/router/java/src/net/i2p/router/transport/TransportImpl.java @@ -10,7 +10,16 @@ package net.i2p.router.transport; import java.io.IOException; import java.io.Writer; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +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.Set; +import java.util.Vector; import net.i2p.data.Hash; import net.i2p.data.RouterAddress; diff --git a/router/java/src/net/i2p/router/transport/TransportManager.java b/router/java/src/net/i2p/router/transport/TransportManager.java index fefbb9df8a..6222e4321c 100644 --- a/router/java/src/net/i2p/router/transport/TransportManager.java +++ b/router/java/src/net/i2p/router/transport/TransportManager.java @@ -10,25 +10,26 @@ package net.i2p.router.transport; import java.io.IOException; import java.io.Writer; -import java.util.Arrays; import java.util.ArrayList; -import java.util.Iterator; +import java.util.Arrays; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeMap; import java.util.Vector; + import net.i2p.data.Hash; import net.i2p.data.RouterAddress; import net.i2p.data.RouterIdentity; import net.i2p.data.i2np.I2NPMessage; -import net.i2p.router.OutNetMessage; import net.i2p.router.CommSystemFacade; +import net.i2p.router.OutNetMessage; import net.i2p.router.RouterContext; +import net.i2p.router.transport.ntcp.NTCPTransport; import net.i2p.router.transport.tcp.TCPTransport; import net.i2p.router.transport.udp.UDPTransport; -import net.i2p.router.transport.ntcp.NTCPTransport; import net.i2p.util.Log; public class TransportManager implements TransportEventListener { 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 a3e06e09a6..1ecc078d11 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/EstablishState.java +++ b/router/java/src/net/i2p/router/transport/ntcp/EstablishState.java @@ -1,17 +1,33 @@ package net.i2p.router.transport.ntcp; -import java.io.*; +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.channels.SelectionKey; +import java.nio.ByteBuffer; + import net.i2p.I2PAppContext; import net.i2p.crypto.DHSessionKeyBuilder; -import net.i2p.data.*; +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.util.Log; -import java.nio.ByteBuffer; /* * Alice contacts Bob 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 f5915789a2..dfb5220044 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java +++ b/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java @@ -3,12 +3,21 @@ package net.i2p.router.transport.ntcp; import java.io.IOException; import java.net.InetSocketAddress; import java.nio.ByteBuffer; -import java.nio.channels.*; +import java.nio.channels.CancelledKeyException; +import java.nio.channels.ClosedChannelException; +import java.nio.channels.ClosedSelectorException; +import java.nio.channels.NoConnectionPendingException; +import java.nio.channels.NotYetConnectedException; +import java.nio.channels.SelectionKey; +import java.nio.channels.Selector; +import java.nio.channels.ServerSocketChannel; +import java.nio.channels.SocketChannel; +import java.nio.channels.UnresolvedAddressException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Set; -import net.i2p.data.DataHelper; + import net.i2p.data.RouterIdentity; import net.i2p.data.RouterInfo; import net.i2p.router.RouterContext; diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPAddress.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPAddress.java index e7ab7c3bd8..71d395e5f0 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/NTCPAddress.java +++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPAddress.java @@ -9,7 +9,6 @@ package net.i2p.router.transport.ntcp; */ import java.net.InetAddress; -import java.net.UnknownHostException; import java.util.Properties; import net.i2p.data.DataHelper; 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 593db86930..5610d62e11 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java +++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java @@ -1,14 +1,16 @@ package net.i2p.router.transport.ntcp; import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.SequenceInputStream; import java.nio.ByteBuffer; import java.nio.channels.SelectionKey; import java.nio.channels.SocketChannel; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; import java.util.zip.Adler32; + import net.i2p.data.Base64; import net.i2p.data.DataHelper; import net.i2p.data.Hash; 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 8ff160d781..7c7a8df218 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java +++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java @@ -1,9 +1,7 @@ package net.i2p.router.transport.ntcp; import java.io.IOException; -import java.io.Writer; import java.net.InetSocketAddress; -import java.nio.channels.Selector; import java.nio.channels.ServerSocketChannel; import java.nio.channels.SocketChannel; import java.text.DecimalFormat; @@ -16,15 +14,18 @@ import java.util.List; import java.util.Map; import java.util.TreeSet; import java.util.Vector; + import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.data.RouterAddress; import net.i2p.data.RouterIdentity; import net.i2p.data.RouterInfo; -import net.i2p.data.i2np.DatabaseStoreMessage; import net.i2p.router.OutNetMessage; import net.i2p.router.RouterContext; -import net.i2p.router.transport.*; +import net.i2p.router.transport.CommSystemFacadeImpl; +import net.i2p.router.transport.Transport; +import net.i2p.router.transport.TransportBid; +import net.i2p.router.transport.TransportImpl; import net.i2p.util.Log; import net.i2p.util.SimpleTimer; diff --git a/router/java/src/net/i2p/router/transport/ntcp/Reader.java b/router/java/src/net/i2p/router/transport/ntcp/Reader.java index 24f678d180..4b4dc3db12 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/Reader.java +++ b/router/java/src/net/i2p/router/transport/ntcp/Reader.java @@ -1,7 +1,9 @@ package net.i2p.router.transport.ntcp; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.List; + import net.i2p.router.RouterContext; import net.i2p.util.I2PThread; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/transport/ntcp/Writer.java b/router/java/src/net/i2p/router/transport/ntcp/Writer.java index 968c81376d..29b7258167 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/Writer.java +++ b/router/java/src/net/i2p/router/transport/ntcp/Writer.java @@ -1,7 +1,8 @@ package net.i2p.router.transport.ntcp; -import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.List; + import net.i2p.router.RouterContext; import net.i2p.util.I2PThread; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/transport/tcp/ConnectionHandler.java b/router/java/src/net/i2p/router/transport/tcp/ConnectionHandler.java index a9ba87576f..892106f3de 100644 --- a/router/java/src/net/i2p/router/transport/tcp/ConnectionHandler.java +++ b/router/java/src/net/i2p/router/transport/tcp/ConnectionHandler.java @@ -9,9 +9,7 @@ import java.io.OutputStream; import java.net.InetAddress; import java.net.Socket; import java.net.SocketException; - import java.text.SimpleDateFormat; - import java.util.Date; import java.util.Properties; @@ -20,12 +18,12 @@ import net.i2p.crypto.AESOutputStream; import net.i2p.crypto.DHSessionKeyBuilder; import net.i2p.data.Base64; import net.i2p.data.ByteArray; -import net.i2p.data.DataHelper; import net.i2p.data.DataFormatException; +import net.i2p.data.DataHelper; import net.i2p.data.Hash; +import net.i2p.data.RouterInfo; import net.i2p.data.SessionKey; import net.i2p.data.Signature; -import net.i2p.data.RouterInfo; import net.i2p.router.Router; import net.i2p.router.RouterContext; import net.i2p.router.transport.BandwidthLimitedInputStream; diff --git a/router/java/src/net/i2p/router/transport/tcp/ConnectionRunner.java b/router/java/src/net/i2p/router/transport/tcp/ConnectionRunner.java index 934e7e1768..a9d88b8602 100644 --- a/router/java/src/net/i2p/router/transport/tcp/ConnectionRunner.java +++ b/router/java/src/net/i2p/router/transport/tcp/ConnectionRunner.java @@ -2,10 +2,11 @@ package net.i2p.router.transport.tcp; import java.io.IOException; import java.io.OutputStream; + import net.i2p.data.DataHelper; import net.i2p.data.RouterInfo; -import net.i2p.data.i2np.I2NPMessage; import net.i2p.data.i2np.DateMessage; +import net.i2p.data.i2np.I2NPMessage; import net.i2p.router.OutNetMessage; import net.i2p.router.RouterContext; import net.i2p.util.I2PThread; diff --git a/router/java/src/net/i2p/router/transport/tcp/MessageHandler.java b/router/java/src/net/i2p/router/transport/tcp/MessageHandler.java index 25daf815ec..cc1c1f5d9c 100644 --- a/router/java/src/net/i2p/router/transport/tcp/MessageHandler.java +++ b/router/java/src/net/i2p/router/transport/tcp/MessageHandler.java @@ -3,9 +3,9 @@ package net.i2p.router.transport.tcp; import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.data.RouterIdentity; -import net.i2p.data.i2np.I2NPMessageReader; -import net.i2p.data.i2np.I2NPMessage; import net.i2p.data.i2np.DateMessage; +import net.i2p.data.i2np.I2NPMessage; +import net.i2p.data.i2np.I2NPMessageReader; import net.i2p.router.Router; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/transport/tcp/PersistentConnectionTagManager.java b/router/java/src/net/i2p/router/transport/tcp/PersistentConnectionTagManager.java index 0c9c0d3c6d..83d647611e 100644 --- a/router/java/src/net/i2p/router/transport/tcp/PersistentConnectionTagManager.java +++ b/router/java/src/net/i2p/router/transport/tcp/PersistentConnectionTagManager.java @@ -5,14 +5,13 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; - import java.util.HashMap; import java.util.Iterator; import java.util.Map; import net.i2p.data.ByteArray; -import net.i2p.data.DataHelper; import net.i2p.data.DataFormatException; +import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.data.SessionKey; import net.i2p.router.RouterContext; diff --git a/router/java/src/net/i2p/router/transport/tcp/TCPConnection.java b/router/java/src/net/i2p/router/transport/tcp/TCPConnection.java index cedf134499..7758f6ffa1 100644 --- a/router/java/src/net/i2p/router/transport/tcp/TCPConnection.java +++ b/router/java/src/net/i2p/router/transport/tcp/TCPConnection.java @@ -3,9 +3,7 @@ package net.i2p.router.transport.tcp; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; - import java.net.Socket; - import java.util.ArrayList; import java.util.List; @@ -15,8 +13,8 @@ import net.i2p.data.RouterIdentity; import net.i2p.data.i2np.I2NPMessageReader; import net.i2p.router.OutNetMessage; import net.i2p.router.RouterContext; -import net.i2p.stat.RateStat; import net.i2p.stat.Rate; +import net.i2p.stat.RateStat; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/transport/tcp/TCPListener.java b/router/java/src/net/i2p/router/transport/tcp/TCPListener.java index 103ecdef98..961cb5cb2d 100644 --- a/router/java/src/net/i2p/router/transport/tcp/TCPListener.java +++ b/router/java/src/net/i2p/router/transport/tcp/TCPListener.java @@ -14,7 +14,6 @@ import java.net.ServerSocket; import java.net.Socket; import java.net.SocketException; import java.net.UnknownHostException; - import java.util.ArrayList; import java.util.List; diff --git a/router/java/src/net/i2p/router/transport/tcp/TCPTransport.java b/router/java/src/net/i2p/router/transport/tcp/TCPTransport.java index 3ea385916e..1f61eed9dd 100644 --- a/router/java/src/net/i2p/router/transport/tcp/TCPTransport.java +++ b/router/java/src/net/i2p/router/transport/tcp/TCPTransport.java @@ -2,6 +2,7 @@ package net.i2p.router.transport.tcp; import java.io.IOException; import java.io.Writer; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -11,8 +12,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import java.text.SimpleDateFormat; - import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.data.RouterAddress; @@ -20,9 +19,9 @@ import net.i2p.data.RouterIdentity; import net.i2p.data.RouterInfo; import net.i2p.router.OutNetMessage; import net.i2p.router.RouterContext; -import net.i2p.router.transport.TransportImpl; -import net.i2p.router.transport.TransportBid; import net.i2p.router.transport.Transport; +import net.i2p.router.transport.TransportBid; +import net.i2p.router.transport.TransportImpl; import net.i2p.util.I2PThread; import net.i2p.util.Log; 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 5161f111f7..bb35381ae7 100644 --- a/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java +++ b/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java @@ -4,8 +4,8 @@ import java.net.InetAddress; import java.net.UnknownHostException; import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Iterator; +import java.util.List; import java.util.Map; import net.i2p.crypto.DHSessionKeyBuilder; @@ -14,11 +14,9 @@ import net.i2p.data.Hash; import net.i2p.data.RouterAddress; import net.i2p.data.RouterIdentity; import net.i2p.data.SessionKey; -import net.i2p.data.Signature; import net.i2p.data.i2np.DatabaseStoreMessage; import net.i2p.data.i2np.DeliveryStatusMessage; import net.i2p.data.i2np.I2NPMessage; -import net.i2p.router.CommSystemFacade; import net.i2p.router.OutNetMessage; import net.i2p.router.Router; import net.i2p.router.RouterContext; diff --git a/router/java/src/net/i2p/router/transport/udp/InboundEstablishState.java b/router/java/src/net/i2p/router/transport/udp/InboundEstablishState.java index 6aa5fa656d..ababfa7c4c 100644 --- a/router/java/src/net/i2p/router/transport/udp/InboundEstablishState.java +++ b/router/java/src/net/i2p/router/transport/udp/InboundEstablishState.java @@ -2,9 +2,6 @@ package net.i2p.router.transport.udp; import java.io.ByteArrayInputStream; import java.io.IOException; -import java.net.InetAddress; -import java.util.ArrayList; -import java.util.List; import net.i2p.crypto.DHSessionKeyBuilder; import net.i2p.data.Base64; @@ -14,7 +11,6 @@ import net.i2p.data.DataHelper; import net.i2p.data.RouterIdentity; import net.i2p.data.SessionKey; import net.i2p.data.Signature; -import net.i2p.router.OutNetMessage; import net.i2p.router.RouterContext; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/transport/udp/InboundMessageFragments.java b/router/java/src/net/i2p/router/transport/udp/InboundMessageFragments.java index a8f54c21d8..cd0630a0a2 100644 --- a/router/java/src/net/i2p/router/transport/udp/InboundMessageFragments.java +++ b/router/java/src/net/i2p/router/transport/udp/InboundMessageFragments.java @@ -1,15 +1,10 @@ package net.i2p.router.transport.udp; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; import java.util.Map; import net.i2p.data.Hash; import net.i2p.router.RouterContext; import net.i2p.util.DecayingBloomFilter; -import net.i2p.util.I2PThread; import net.i2p.util.Log; /** 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 12fb716a65..bbbc35caba 100644 --- a/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java +++ b/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java @@ -1,11 +1,16 @@ package net.i2p.router.transport.udp; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; import net.i2p.data.Base64; -import net.i2p.data.SessionKey; -import net.i2p.data.RouterInfo; import net.i2p.data.RouterAddress; +import net.i2p.data.RouterInfo; +import net.i2p.data.SessionKey; import net.i2p.router.RouterContext; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/transport/udp/MessageReceiver.java b/router/java/src/net/i2p/router/transport/udp/MessageReceiver.java index 64e8a2d657..a6a75459ef 100644 --- a/router/java/src/net/i2p/router/transport/udp/MessageReceiver.java +++ b/router/java/src/net/i2p/router/transport/udp/MessageReceiver.java @@ -5,11 +5,10 @@ import java.util.List; import net.i2p.data.Base64; import net.i2p.data.ByteArray; -import net.i2p.data.DataFormatException; import net.i2p.data.i2np.I2NPMessage; -import net.i2p.data.i2np.I2NPMessageImpl; import net.i2p.data.i2np.I2NPMessageException; import net.i2p.data.i2np.I2NPMessageHandler; +import net.i2p.data.i2np.I2NPMessageImpl; import net.i2p.router.RouterContext; import net.i2p.util.ByteCache; import net.i2p.util.I2PThread; diff --git a/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState.java b/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState.java index a7649bfb80..fc424de5bf 100644 --- a/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState.java +++ b/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState.java @@ -1,7 +1,5 @@ package net.i2p.router.transport.udp; -import java.io.ByteArrayInputStream; -import java.io.IOException; import java.net.InetAddress; import java.util.ArrayList; import java.util.List; @@ -9,7 +7,6 @@ import java.util.List; import net.i2p.crypto.DHSessionKeyBuilder; import net.i2p.data.Base64; import net.i2p.data.ByteArray; -import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; import net.i2p.data.RouterIdentity; import net.i2p.data.SessionKey; diff --git a/router/java/src/net/i2p/router/transport/udp/OutboundMessageFragments.java b/router/java/src/net/i2p/router/transport/udp/OutboundMessageFragments.java index 31841ec3b6..c65bb458ee 100644 --- a/router/java/src/net/i2p/router/transport/udp/OutboundMessageFragments.java +++ b/router/java/src/net/i2p/router/transport/udp/OutboundMessageFragments.java @@ -1,17 +1,13 @@ package net.i2p.router.transport.udp; import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; import java.util.List; -import java.util.Map; import net.i2p.data.Hash; import net.i2p.data.RouterInfo; import net.i2p.data.i2np.I2NPMessage; import net.i2p.router.OutNetMessage; import net.i2p.router.RouterContext; -import net.i2p.util.I2PThread; import net.i2p.util.Log; /** 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 e170334dce..fc6896627e 100644 --- a/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java +++ b/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java @@ -1,10 +1,11 @@ package net.i2p.router.transport.udp; import java.util.Arrays; + +import net.i2p.I2PAppContext; import net.i2p.data.Base64; import net.i2p.data.ByteArray; import net.i2p.data.i2np.I2NPMessage; -import net.i2p.I2PAppContext; import net.i2p.router.OutNetMessage; import net.i2p.util.ByteCache; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java b/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java index fedc403b46..f00587bcd1 100644 --- a/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java +++ b/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java @@ -2,8 +2,8 @@ package net.i2p.router.transport.udp; import java.net.InetAddress; import java.net.UnknownHostException; -import java.util.Arrays; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.List; diff --git a/router/java/src/net/i2p/router/transport/udp/PacketHandler.java b/router/java/src/net/i2p/router/transport/udp/PacketHandler.java index e43ff66b3c..9e9cde1d34 100644 --- a/router/java/src/net/i2p/router/transport/udp/PacketHandler.java +++ b/router/java/src/net/i2p/router/transport/udp/PacketHandler.java @@ -1,11 +1,9 @@ package net.i2p.router.transport.udp; -import java.net.InetAddress; import java.util.ArrayList; import java.util.Date; import java.util.List; -import net.i2p.data.Base64; import net.i2p.router.Router; import net.i2p.router.RouterContext; import net.i2p.util.I2PThread; diff --git a/router/java/src/net/i2p/router/transport/udp/PacketPusher.java b/router/java/src/net/i2p/router/transport/udp/PacketPusher.java index 9ba115f850..8ec9cbb0d2 100644 --- a/router/java/src/net/i2p/router/transport/udp/PacketPusher.java +++ b/router/java/src/net/i2p/router/transport/udp/PacketPusher.java @@ -1,6 +1,5 @@ package net.i2p.router.transport.udp; -import net.i2p.router.OutNetMessage; import net.i2p.router.RouterContext; import net.i2p.util.I2PThread; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/transport/udp/PeerState.java b/router/java/src/net/i2p/router/transport/udp/PeerState.java index 6a61378ff7..3b9973f53a 100644 --- a/router/java/src/net/i2p/router/transport/udp/PeerState.java +++ b/router/java/src/net/i2p/router/transport/udp/PeerState.java @@ -1,5 +1,7 @@ package net.i2p.router.transport.udp; +import java.net.InetAddress; +import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -7,15 +9,11 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import java.net.InetAddress; -import java.net.UnknownHostException; - import net.i2p.data.Hash; import net.i2p.data.SessionKey; -import net.i2p.util.Log; -import net.i2p.router.RouterContext; import net.i2p.router.OutNetMessage; -import net.i2p.router.Job; +import net.i2p.router.RouterContext; +import net.i2p.util.Log; /** * Contain all of the state about a UDP connection to a peer. diff --git a/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java b/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java index 424b6e027b..7aa3c2fa16 100644 --- a/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java +++ b/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java @@ -2,22 +2,20 @@ package net.i2p.router.transport.udp; import java.net.InetAddress; import java.net.UnknownHostException; -import java.util.Arrays; - import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import net.i2p.router.CommSystemFacade; -import net.i2p.router.RouterContext; + import net.i2p.data.Base64; import net.i2p.data.DataHelper; -import net.i2p.data.Hash; import net.i2p.data.RouterInfo; import net.i2p.data.SessionKey; -import net.i2p.util.SimpleTimer; +import net.i2p.router.CommSystemFacade; +import net.i2p.router.RouterContext; import net.i2p.util.Log; +import net.i2p.util.SimpleTimer; /** * diff --git a/router/java/src/net/i2p/router/transport/udp/PeerTestState.java b/router/java/src/net/i2p/router/transport/udp/PeerTestState.java index a9870a15d9..57dc648d84 100644 --- a/router/java/src/net/i2p/router/transport/udp/PeerTestState.java +++ b/router/java/src/net/i2p/router/transport/udp/PeerTestState.java @@ -1,6 +1,7 @@ package net.i2p.router.transport.udp; import java.net.InetAddress; + import net.i2p.data.SessionKey; /** diff --git a/router/java/src/net/i2p/router/transport/udp/TimedWeightedPriorityMessageQueue.java b/router/java/src/net/i2p/router/transport/udp/TimedWeightedPriorityMessageQueue.java index 4d08348531..b28fb9101e 100644 --- a/router/java/src/net/i2p/router/transport/udp/TimedWeightedPriorityMessageQueue.java +++ b/router/java/src/net/i2p/router/transport/udp/TimedWeightedPriorityMessageQueue.java @@ -1,7 +1,6 @@ package net.i2p.router.transport.udp; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.List; diff --git a/router/java/src/net/i2p/router/transport/udp/UDPEndpoint.java b/router/java/src/net/i2p/router/transport/udp/UDPEndpoint.java index aefe18b8ba..14745e5523 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPEndpoint.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPEndpoint.java @@ -1,6 +1,5 @@ package net.i2p.router.transport.udp; -import java.io.IOException; import java.net.DatagramSocket; import java.net.InetAddress; import java.net.SocketException; diff --git a/router/java/src/net/i2p/router/transport/udp/UDPEndpointTest.java b/router/java/src/net/i2p/router/transport/udp/UDPEndpointTest.java index 3a08ac5528..756caef763 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPEndpointTest.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPEndpointTest.java @@ -1,8 +1,6 @@ package net.i2p.router.transport.udp; -import java.net.InetAddress; import java.net.SocketException; -import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/router/java/src/net/i2p/router/transport/udp/UDPFlooder.java b/router/java/src/net/i2p/router/transport/udp/UDPFlooder.java index 1f1ffe2342..dbcd8dfda4 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPFlooder.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPFlooder.java @@ -2,6 +2,7 @@ package net.i2p.router.transport.udp; import java.util.ArrayList; import java.util.List; + import net.i2p.data.RouterInfo; import net.i2p.data.i2np.DataMessage; import net.i2p.data.i2np.I2NPMessage; diff --git a/router/java/src/net/i2p/router/transport/udp/UDPPacket.java b/router/java/src/net/i2p/router/transport/udp/UDPPacket.java index a48fcdb8ea..46d8ae3c14 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPPacket.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPPacket.java @@ -2,18 +2,13 @@ package net.i2p.router.transport.udp; import java.net.DatagramPacket; import java.net.InetAddress; - -import java.util.Arrays; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import net.i2p.I2PAppContext; -import net.i2p.data.Base64; -import net.i2p.data.ByteArray; import net.i2p.data.DataHelper; -import net.i2p.data.Hash; import net.i2p.data.SessionKey; -import net.i2p.util.ByteCache; import net.i2p.util.Log; /** 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 f33bc20d56..7d1305c4d8 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java @@ -1,6 +1,7 @@ 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/UDPReceiver.java b/router/java/src/net/i2p/router/transport/udp/UDPReceiver.java index 61064162e8..bdb04a95a2 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPReceiver.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPReceiver.java @@ -2,15 +2,14 @@ package net.i2p.router.transport.udp; import java.io.IOException; import java.net.DatagramSocket; -import java.net.DatagramPacket; - import java.util.ArrayList; import java.util.List; + import net.i2p.router.RouterContext; import net.i2p.router.transport.FIFOBandwidthLimiter; -import net.i2p.util.SimpleTimer; import net.i2p.util.I2PThread; import net.i2p.util.Log; +import net.i2p.util.SimpleTimer; /** * Lowest level component to pull raw UDP datagrams off the wire as fast diff --git a/router/java/src/net/i2p/router/transport/udp/UDPSender.java b/router/java/src/net/i2p/router/transport/udp/UDPSender.java index 8b22d180da..5339587992 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPSender.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPSender.java @@ -1,12 +1,11 @@ package net.i2p.router.transport.udp; import java.io.IOException; -import java.net.DatagramSocket; import java.net.DatagramPacket; - +import java.net.DatagramSocket; import java.util.ArrayList; import java.util.List; -import net.i2p.data.Base64; + import net.i2p.router.RouterContext; import net.i2p.router.transport.FIFOBandwidthLimiter; import net.i2p.util.I2PThread; 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 4c051de02f..6191a64ce6 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java @@ -1,32 +1,37 @@ package net.i2p.router.transport.udp; -import java.net.InetAddress; -import java.net.SocketException; -import java.net.UnknownHostException; - import java.io.IOException; import java.io.Writer; - +import java.net.InetAddress; +import java.net.SocketException; +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; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.TreeSet; +import java.util.Vector; -import java.util.*; - -import net.i2p.data.Base64; import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.data.RouterAddress; -import net.i2p.data.RouterInfo; import net.i2p.data.RouterIdentity; +import net.i2p.data.RouterInfo; import net.i2p.data.SessionKey; -import net.i2p.data.i2np.I2NPMessage; import net.i2p.data.i2np.DatabaseStoreMessage; +import net.i2p.data.i2np.I2NPMessage; import net.i2p.router.CommSystemFacade; import net.i2p.router.OutNetMessage; -import net.i2p.router.RouterContext; import net.i2p.router.Router; +import net.i2p.router.RouterContext; import net.i2p.router.transport.Transport; -import net.i2p.router.transport.TransportImpl; import net.i2p.router.transport.TransportBid; +import net.i2p.router.transport.TransportImpl; import net.i2p.util.Log; import net.i2p.util.SimpleTimer; diff --git a/router/java/src/net/i2p/router/tunnel/BatchedPreprocessor.java b/router/java/src/net/i2p/router/tunnel/BatchedPreprocessor.java index 8aa6ec349a..6d2e7b7396 100644 --- a/router/java/src/net/i2p/router/tunnel/BatchedPreprocessor.java +++ b/router/java/src/net/i2p/router/tunnel/BatchedPreprocessor.java @@ -1,10 +1,8 @@ package net.i2p.router.tunnel; -import java.util.ArrayList; import java.util.List; import net.i2p.I2PAppContext; -import net.i2p.data.ByteArray; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/tunnel/BatchedRouterPreprocessor.java b/router/java/src/net/i2p/router/tunnel/BatchedRouterPreprocessor.java index 1f72cf47b3..0be137b451 100644 --- a/router/java/src/net/i2p/router/tunnel/BatchedRouterPreprocessor.java +++ b/router/java/src/net/i2p/router/tunnel/BatchedRouterPreprocessor.java @@ -1,6 +1,8 @@ package net.i2p.router.tunnel; -import java.util.*; +import java.util.List; +import java.util.Properties; + import net.i2p.router.RouterContext; /** diff --git a/router/java/src/net/i2p/router/tunnel/BuildMessageGenerator.java b/router/java/src/net/i2p/router/tunnel/BuildMessageGenerator.java index 49a978eef4..b6349ccecb 100644 --- a/router/java/src/net/i2p/router/tunnel/BuildMessageGenerator.java +++ b/router/java/src/net/i2p/router/tunnel/BuildMessageGenerator.java @@ -1,9 +1,19 @@ package net.i2p.router.tunnel; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + import net.i2p.I2PAppContext; -import net.i2p.data.*; -import net.i2p.data.i2np.*; +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; diff --git a/router/java/src/net/i2p/router/tunnel/BuildMessageProcessor.java b/router/java/src/net/i2p/router/tunnel/BuildMessageProcessor.java index a21261afa4..a578ee08ac 100644 --- a/router/java/src/net/i2p/router/tunnel/BuildMessageProcessor.java +++ b/router/java/src/net/i2p/router/tunnel/BuildMessageProcessor.java @@ -1,9 +1,14 @@ package net.i2p.router.tunnel; import net.i2p.I2PAppContext; -import net.i2p.data.*; -import net.i2p.data.i2np.*; -import net.i2p.router.RouterContext; +import net.i2p.data.Base64; +import net.i2p.data.ByteArray; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; +import net.i2p.data.PrivateKey; +import net.i2p.data.SessionKey; +import net.i2p.data.i2np.BuildRequestRecord; +import net.i2p.data.i2np.TunnelBuildMessage; import net.i2p.util.DecayingBloomFilter; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/tunnel/BuildMessageTest.java b/router/java/src/net/i2p/router/tunnel/BuildMessageTest.java index ec81405542..6e107418a0 100644 --- a/router/java/src/net/i2p/router/tunnel/BuildMessageTest.java +++ b/router/java/src/net/i2p/router/tunnel/BuildMessageTest.java @@ -1,9 +1,20 @@ package net.i2p.router.tunnel; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import net.i2p.I2PAppContext; -import net.i2p.data.*; -import net.i2p.data.i2np.*; +import net.i2p.data.Base64; +import net.i2p.data.ByteArray; +import net.i2p.data.Hash; +import net.i2p.data.PrivateKey; +import net.i2p.data.PublicKey; +import net.i2p.data.TunnelId; +import net.i2p.data.i2np.BuildRequestRecord; +import net.i2p.data.i2np.BuildResponseRecord; +import net.i2p.data.i2np.TunnelBuildMessage; +import net.i2p.data.i2np.TunnelBuildReplyMessage; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/tunnel/BuildReplyHandler.java b/router/java/src/net/i2p/router/tunnel/BuildReplyHandler.java index 7627f8069f..539d2d01ee 100644 --- a/router/java/src/net/i2p/router/tunnel/BuildReplyHandler.java +++ b/router/java/src/net/i2p/router/tunnel/BuildReplyHandler.java @@ -1,9 +1,14 @@ package net.i2p.router.tunnel; -import java.util.*; +import java.util.List; + import net.i2p.I2PAppContext; -import net.i2p.data.*; -import net.i2p.data.i2np.*; +import net.i2p.data.Base64; +import net.i2p.data.ByteArray; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; +import net.i2p.data.SessionKey; +import net.i2p.data.i2np.TunnelBuildReplyMessage; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/tunnel/FragmentedMessage.java b/router/java/src/net/i2p/router/tunnel/FragmentedMessage.java index 186843d815..78fba7e5b3 100644 --- a/router/java/src/net/i2p/router/tunnel/FragmentedMessage.java +++ b/router/java/src/net/i2p/router/tunnel/FragmentedMessage.java @@ -1,16 +1,17 @@ package net.i2p.router.tunnel; import java.io.IOException; -import java.io.OutputStream; import java.io.InputStream; +import java.io.OutputStream; + import net.i2p.I2PAppContext; import net.i2p.data.Base64; import net.i2p.data.ByteArray; import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.data.TunnelId; -import net.i2p.data.i2np.I2NPMessage; import net.i2p.data.i2np.DataMessage; +import net.i2p.data.i2np.I2NPMessage; import net.i2p.data.i2np.I2NPMessageHandler; import net.i2p.util.ByteCache; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/tunnel/HashSetIVValidator.java b/router/java/src/net/i2p/router/tunnel/HashSetIVValidator.java index 08f71f2a40..aea18dc3f6 100644 --- a/router/java/src/net/i2p/router/tunnel/HashSetIVValidator.java +++ b/router/java/src/net/i2p/router/tunnel/HashSetIVValidator.java @@ -1,6 +1,7 @@ package net.i2p.router.tunnel; import java.util.HashSet; + import net.i2p.data.ByteArray; import net.i2p.data.DataHelper; diff --git a/router/java/src/net/i2p/router/tunnel/HopProcessor.java b/router/java/src/net/i2p/router/tunnel/HopProcessor.java index 6a3201e0ce..f70cc11197 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.ByteArray; import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.util.ByteCache; diff --git a/router/java/src/net/i2p/router/tunnel/InboundEndpointProcessor.java b/router/java/src/net/i2p/router/tunnel/InboundEndpointProcessor.java index c0bd298ae6..0635afc0e2 100644 --- a/router/java/src/net/i2p/router/tunnel/InboundEndpointProcessor.java +++ b/router/java/src/net/i2p/router/tunnel/InboundEndpointProcessor.java @@ -3,9 +3,9 @@ package net.i2p.router.tunnel; import net.i2p.I2PAppContext; import net.i2p.data.ByteArray; import net.i2p.data.Hash; +import net.i2p.router.RouterContext; import net.i2p.util.ByteCache; import net.i2p.util.Log; -import net.i2p.router.RouterContext; /** * Receive the inbound tunnel message, removing all of the layers diff --git a/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java b/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java index 45db9536bc..65066e1335 100644 --- a/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java +++ b/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java @@ -1,16 +1,16 @@ package net.i2p.router.tunnel; import net.i2p.data.Hash; -import net.i2p.data.TunnelId; import net.i2p.data.Payload; +import net.i2p.data.TunnelId; import net.i2p.data.i2np.DataMessage; import net.i2p.data.i2np.DatabaseStoreMessage; -import net.i2p.data.i2np.DeliveryStatusMessage; import net.i2p.data.i2np.DeliveryInstructions; -import net.i2p.data.i2np.I2NPMessage; +import net.i2p.data.i2np.DeliveryStatusMessage; import net.i2p.data.i2np.GarlicMessage; -import net.i2p.data.i2np.TunnelGatewayMessage; +import net.i2p.data.i2np.I2NPMessage; import net.i2p.data.i2np.TunnelBuildReplyMessage; +import net.i2p.data.i2np.TunnelGatewayMessage; import net.i2p.router.ClientMessage; import net.i2p.router.RouterContext; import net.i2p.router.TunnelInfo; diff --git a/router/java/src/net/i2p/router/tunnel/OutboundMessageDistributor.java b/router/java/src/net/i2p/router/tunnel/OutboundMessageDistributor.java index 5bc09b883d..88e4973ed7 100644 --- a/router/java/src/net/i2p/router/tunnel/OutboundMessageDistributor.java +++ b/router/java/src/net/i2p/router/tunnel/OutboundMessageDistributor.java @@ -1,8 +1,8 @@ package net.i2p.router.tunnel; import net.i2p.data.Hash; -import net.i2p.data.TunnelId; import net.i2p.data.RouterInfo; +import net.i2p.data.TunnelId; import net.i2p.data.i2np.I2NPMessage; import net.i2p.data.i2np.TunnelGatewayMessage; import net.i2p.router.JobImpl; diff --git a/router/java/src/net/i2p/router/tunnel/PumpedTunnelGateway.java b/router/java/src/net/i2p/router/tunnel/PumpedTunnelGateway.java index 9335ae9ee7..2356028eee 100644 --- a/router/java/src/net/i2p/router/tunnel/PumpedTunnelGateway.java +++ b/router/java/src/net/i2p/router/tunnel/PumpedTunnelGateway.java @@ -7,10 +7,8 @@ import net.i2p.I2PAppContext; import net.i2p.data.Hash; import net.i2p.data.TunnelId; import net.i2p.data.i2np.I2NPMessage; -import net.i2p.data.i2np.TunnelGatewayMessage; import net.i2p.router.Router; import net.i2p.util.Log; -import net.i2p.util.SimpleTimer; /** * Serve as the gatekeeper for a tunnel, accepting messages, coallescing and/or diff --git a/router/java/src/net/i2p/router/tunnel/TrivialRouterPreprocessor.java b/router/java/src/net/i2p/router/tunnel/TrivialRouterPreprocessor.java index 62106b531f..ad7322cb61 100644 --- a/router/java/src/net/i2p/router/tunnel/TrivialRouterPreprocessor.java +++ b/router/java/src/net/i2p/router/tunnel/TrivialRouterPreprocessor.java @@ -1,6 +1,7 @@ package net.i2p.router.tunnel; import java.util.List; + import net.i2p.router.RouterContext; /** diff --git a/router/java/src/net/i2p/router/tunnel/TunnelCreatorConfig.java b/router/java/src/net/i2p/router/tunnel/TunnelCreatorConfig.java index 6eb3be0685..83f5fbf94e 100644 --- a/router/java/src/net/i2p/router/tunnel/TunnelCreatorConfig.java +++ b/router/java/src/net/i2p/router/tunnel/TunnelCreatorConfig.java @@ -1,13 +1,16 @@ package net.i2p.router.tunnel; -import java.util.*; import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; +import java.util.Locale; +import java.util.Properties; import net.i2p.data.Base64; import net.i2p.data.Hash; import net.i2p.data.TunnelId; -import net.i2p.router.TunnelInfo; import net.i2p.router.RouterContext; +import net.i2p.router.TunnelInfo; /** * Coordinate the info that the tunnel creator keeps track of, including what diff --git a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java index 1797b8c07f..ee96c6251d 100644 --- a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java +++ b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java @@ -7,17 +7,17 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import net.i2p.router.RouterContext; import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.data.TunnelId; import net.i2p.data.i2np.I2NPMessage; import net.i2p.data.i2np.TunnelDataMessage; import net.i2p.data.i2np.TunnelGatewayMessage; -import net.i2p.router.peermanager.PeerProfile; import net.i2p.router.JobImpl; import net.i2p.router.Router; +import net.i2p.router.RouterContext; import net.i2p.router.Service; +import net.i2p.router.peermanager.PeerProfile; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/tunnel/TunnelGatewayPumper.java b/router/java/src/net/i2p/router/tunnel/TunnelGatewayPumper.java index 494164726a..7e808199de 100644 --- a/router/java/src/net/i2p/router/tunnel/TunnelGatewayPumper.java +++ b/router/java/src/net/i2p/router/tunnel/TunnelGatewayPumper.java @@ -1,6 +1,8 @@ package net.i2p.router.tunnel; -import java.util.*; +import java.util.ArrayList; +import java.util.List; + import net.i2p.router.RouterContext; import net.i2p.util.I2PThread; 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 3f6b5ff907..0b009f7b16 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/BuildExecutor.java +++ b/router/java/src/net/i2p/router/tunnel/pool/BuildExecutor.java @@ -1,13 +1,16 @@ package net.i2p.router.tunnel.pool; -import java.util.*; -import net.i2p.data.*; -import net.i2p.data.i2np.*; -import net.i2p.router.*; -import net.i2p.router.tunnel.*; -import net.i2p.router.peermanager.TunnelHistory; -import net.i2p.util.Log; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import net.i2p.data.Hash; +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.StatManager; +import net.i2p.util.Log; /** * Single threaded controller of the tunnel creation process, spanning all tunnel pools. diff --git a/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java b/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java index 566234332c..d4cf0f2df3 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java +++ b/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java @@ -1,11 +1,30 @@ package net.i2p.router.tunnel.pool; -import java.util.*; -import net.i2p.data.*; -import net.i2p.data.i2np.*; -import net.i2p.router.*; -import net.i2p.router.tunnel.*; +import java.util.ArrayList; +import java.util.List; + +import net.i2p.data.Base64; +import net.i2p.data.ByteArray; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; +import net.i2p.data.RouterIdentity; +import net.i2p.data.RouterInfo; +import net.i2p.data.TunnelId; +import net.i2p.data.i2np.BuildRequestRecord; +import net.i2p.data.i2np.BuildResponseRecord; +import net.i2p.data.i2np.I2NPMessage; +import net.i2p.data.i2np.TunnelBuildMessage; +import net.i2p.data.i2np.TunnelBuildReplyMessage; +import net.i2p.data.i2np.TunnelGatewayMessage; +import net.i2p.router.HandlerJobBuilder; +import net.i2p.router.Job; +import net.i2p.router.JobImpl; +import net.i2p.router.OutNetMessage; +import net.i2p.router.RouterContext; import net.i2p.router.peermanager.TunnelHistory; +import net.i2p.router.tunnel.BuildMessageProcessor; +import net.i2p.router.tunnel.BuildReplyHandler; +import net.i2p.router.tunnel.HopConfig; 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/BuildRequestor.java b/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java index d1eb1e0772..c33a213de8 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java +++ b/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java @@ -1,13 +1,19 @@ package net.i2p.router.tunnel.pool; -import java.util.*; -import net.i2p.data.*; -import net.i2p.data.i2np.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import net.i2p.data.ByteArray; +import net.i2p.data.DataHelper; +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.router.OutNetMessage; import net.i2p.router.RouterContext; -import net.i2p.router.MessageSelector; -import net.i2p.router.JobImpl; -import net.i2p.router.ReplyJob; import net.i2p.router.TunnelInfo; import net.i2p.router.tunnel.BuildMessageGenerator; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/tunnel/pool/ClientPeerSelector.java b/router/java/src/net/i2p/router/tunnel/pool/ClientPeerSelector.java index a5c905f47e..a9199b690e 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/ClientPeerSelector.java +++ b/router/java/src/net/i2p/router/tunnel/pool/ClientPeerSelector.java @@ -1,6 +1,10 @@ package net.i2p.router.tunnel.pool; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import net.i2p.router.RouterContext; import net.i2p.router.TunnelPoolSettings; diff --git a/router/java/src/net/i2p/router/tunnel/pool/ExploratoryPeerSelector.java b/router/java/src/net/i2p/router/tunnel/pool/ExploratoryPeerSelector.java index 4ce344ea46..629a4b5245 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/ExploratoryPeerSelector.java +++ b/router/java/src/net/i2p/router/tunnel/pool/ExploratoryPeerSelector.java @@ -1,9 +1,12 @@ package net.i2p.router.tunnel.pool; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import net.i2p.router.RouterContext; import net.i2p.router.TunnelPoolSettings; -import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade; 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/HandleTunnelCreateMessageJob.java b/router/java/src/net/i2p/router/tunnel/pool/HandleTunnelCreateMessageJob.java index 9e186ea0a1..34fbca63bf 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/HandleTunnelCreateMessageJob.java +++ b/router/java/src/net/i2p/router/tunnel/pool/HandleTunnelCreateMessageJob.java @@ -3,8 +3,8 @@ package net.i2p.router.tunnel.pool; import net.i2p.data.Certificate; import net.i2p.data.DataHelper; import net.i2p.data.Hash; -import net.i2p.data.RouterInfo; import net.i2p.data.RouterIdentity; +import net.i2p.data.RouterInfo; import net.i2p.data.TunnelId; import net.i2p.data.i2np.DeliveryInstructions; import net.i2p.data.i2np.GarlicMessage; @@ -15,13 +15,13 @@ import net.i2p.data.i2np.TunnelGatewayMessage; import net.i2p.router.HandlerJobBuilder; import net.i2p.router.Job; import net.i2p.router.JobImpl; -import net.i2p.router.RouterContext; import net.i2p.router.Router; +import net.i2p.router.RouterContext; import net.i2p.router.message.GarlicMessageBuilder; import net.i2p.router.message.PayloadGarlicConfig; import net.i2p.router.message.SendMessageDirectJob; -import net.i2p.router.tunnel.HopConfig; import net.i2p.router.peermanager.TunnelHistory; +import net.i2p.router.tunnel.HopConfig; import net.i2p.util.Log; /** diff --git a/router/java/src/net/i2p/router/tunnel/pool/PooledTunnelCreatorConfig.java b/router/java/src/net/i2p/router/tunnel/pool/PooledTunnelCreatorConfig.java index a252e26a12..76f2c3c256 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/PooledTunnelCreatorConfig.java +++ b/router/java/src/net/i2p/router/tunnel/pool/PooledTunnelCreatorConfig.java @@ -1,6 +1,7 @@ package net.i2p.router.tunnel.pool; -import java.util.*; +import java.util.Properties; + import net.i2p.data.Hash; import net.i2p.router.Job; import net.i2p.router.RouterContext; diff --git a/router/java/src/net/i2p/router/tunnel/pool/SendGarlicMessageJob.java b/router/java/src/net/i2p/router/tunnel/pool/SendGarlicMessageJob.java index 9b8c3ebbb4..b55baa2ddf 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/SendGarlicMessageJob.java +++ b/router/java/src/net/i2p/router/tunnel/pool/SendGarlicMessageJob.java @@ -9,9 +9,9 @@ import net.i2p.data.TunnelId; import net.i2p.data.i2np.DeliveryInstructions; import net.i2p.data.i2np.GarlicMessage; import net.i2p.data.i2np.I2NPMessage; -import net.i2p.router.MessageSelector; 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; diff --git a/router/java/src/net/i2p/router/tunnel/pool/TestJob.java b/router/java/src/net/i2p/router/tunnel/pool/TestJob.java index 91d8a8044a..8b2332f37a 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TestJob.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TestJob.java @@ -6,8 +6,8 @@ import java.util.Set; import net.i2p.data.Certificate; import net.i2p.data.SessionKey; import net.i2p.data.SessionTag; -import net.i2p.data.i2np.DeliveryStatusMessage; import net.i2p.data.i2np.DeliveryInstructions; +import net.i2p.data.i2np.DeliveryStatusMessage; import net.i2p.data.i2np.GarlicMessage; import net.i2p.data.i2np.I2NPMessage; import net.i2p.router.JobImpl; @@ -16,8 +16,8 @@ import net.i2p.router.OutNetMessage; import net.i2p.router.ReplyJob; import net.i2p.router.RouterContext; import net.i2p.router.TunnelInfo; -import net.i2p.router.message.PayloadGarlicConfig; import net.i2p.router.message.GarlicMessageBuilder; +import net.i2p.router.message.PayloadGarlicConfig; import net.i2p.util.Log; class TestJob extends JobImpl { diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelMessageHandlerBuilder.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelMessageHandlerBuilder.java index c36d313539..8b5262dbdd 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelMessageHandlerBuilder.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelMessageHandlerBuilder.java @@ -3,8 +3,8 @@ package net.i2p.router.tunnel.pool; import net.i2p.data.Hash; import net.i2p.data.RouterIdentity; import net.i2p.data.i2np.I2NPMessage; -import net.i2p.data.i2np.TunnelGatewayMessage; import net.i2p.data.i2np.TunnelDataMessage; +import net.i2p.data.i2np.TunnelGatewayMessage; import net.i2p.router.HandlerJobBuilder; import net.i2p.router.Job; import net.i2p.router.JobImpl; diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java index b2012e1ad3..beb52ca41a 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java @@ -1,15 +1,24 @@ package net.i2p.router.tunnel.pool; -import java.util.*; import java.math.BigInteger; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashSet; +import java.util.List; +import java.util.Properties; +import java.util.Set; +import java.util.StringTokenizer; + import net.i2p.I2PAppContext; -import net.i2p.data.*; +import net.i2p.data.DataFormatException; +import net.i2p.data.Hash; +import net.i2p.data.RouterInfo; import net.i2p.router.Router; import net.i2p.router.RouterContext; import net.i2p.router.TunnelPoolSettings; import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade; import net.i2p.router.networkdb.kademlia.PeerSelector; -import net.i2p.router.peermanager.PeerProfile; import net.i2p.util.Log; /** 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 a1409e08ff..7267b26a1a 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java @@ -1,6 +1,5 @@ package net.i2p.router.tunnel.pool; -import java.util.Arrays; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -14,11 +13,9 @@ import net.i2p.data.Hash; import net.i2p.data.Lease; import net.i2p.data.LeaseSet; import net.i2p.data.TunnelId; - -import net.i2p.router.JobImpl; import net.i2p.router.RouterContext; -import net.i2p.router.TunnelPoolSettings; import net.i2p.router.TunnelInfo; +import net.i2p.router.TunnelPoolSettings; import net.i2p.router.tunnel.HopConfig; import net.i2p.stat.Rate; import net.i2p.stat.RateStat; 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 559b0241af..1c3e4b4135 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java @@ -8,12 +8,21 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import net.i2p.data.*; -import net.i2p.data.i2np.*; -import net.i2p.stat.RateStat; -import net.i2p.router.*; +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.LoadTestManager; +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.TunnelCreatorConfig; +import net.i2p.stat.RateStat; import net.i2p.util.I2PThread; import net.i2p.util.Log; diff --git a/router/java/test/net/i2p/data/i2np/DatabaseStoreMessageTest.java b/router/java/test/net/i2p/data/i2np/DatabaseStoreMessageTest.java index d2d0d9fd8c..9c42ee4f5d 100644 --- a/router/java/test/net/i2p/data/i2np/DatabaseStoreMessageTest.java +++ b/router/java/test/net/i2p/data/i2np/DatabaseStoreMessageTest.java @@ -8,15 +8,12 @@ package net.i2p.data.i2np; * */ -import java.util.Date; - import net.i2p.I2PAppContext; import net.i2p.data.DataFormatException; import net.i2p.data.DataStructure; -import net.i2p.data.StructureTest; import net.i2p.data.RouterInfo; import net.i2p.data.RouterInfoTest; -import net.i2p.data.i2np.DatabaseStoreMessage; +import net.i2p.data.StructureTest; import net.i2p.util.Clock; /** diff --git a/router/java/test/net/i2p/data/i2np/DeliveryInstructionsTest.java b/router/java/test/net/i2p/data/i2np/DeliveryInstructionsTest.java index c8cad9fe63..3d38706493 100644 --- a/router/java/test/net/i2p/data/i2np/DeliveryInstructionsTest.java +++ b/router/java/test/net/i2p/data/i2np/DeliveryInstructionsTest.java @@ -14,8 +14,6 @@ import net.i2p.data.Hash; import net.i2p.data.SessionKey; import net.i2p.data.StructureTest; import net.i2p.data.TunnelId; -import net.i2p.data.i2np.DeliveryInstructions; -import net.i2p.util.Log; /** * Test harness for loading / storing DeliveryInstructions objects diff --git a/router/java/test/net/i2p/data/i2np/I2NPMessageReaderTest.java b/router/java/test/net/i2p/data/i2np/I2NPMessageReaderTest.java index 00e97e6589..f00c67281a 100644 --- a/router/java/test/net/i2p/data/i2np/I2NPMessageReaderTest.java +++ b/router/java/test/net/i2p/data/i2np/I2NPMessageReaderTest.java @@ -13,13 +13,9 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; -import net.i2p.data.DataFormatException; -import net.i2p.data.i2np.DatabaseStoreMessage; -import net.i2p.data.i2np.I2NPMessage; -import net.i2p.data.i2np.I2NPMessageReader; -import net.i2p.router.RouterContext; - import junit.framework.TestCase; +import net.i2p.data.DataFormatException; +import net.i2p.router.RouterContext; /** * Test harness for loading / storing I2NP DatabaseStore message objects diff --git a/router/java/test/net/i2p/router/networkdb/kademlia/KBucketImplTest.java b/router/java/test/net/i2p/router/networkdb/kademlia/KBucketImplTest.java index 099b441cb2..25541a070e 100644 --- a/router/java/test/net/i2p/router/networkdb/kademlia/KBucketImplTest.java +++ b/router/java/test/net/i2p/router/networkdb/kademlia/KBucketImplTest.java @@ -8,13 +8,11 @@ package net.i2p.router.networkdb.kademlia; * */ +import junit.framework.TestCase; import net.i2p.I2PAppContext; -import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.util.RandomSource; -import junit.framework.TestCase; - /** * Test KBucketImpl * diff --git a/router/java/test/net/i2p/router/networkdb/kademlia/KBucketSetTest.java b/router/java/test/net/i2p/router/networkdb/kademlia/KBucketSetTest.java index c43645f0ce..6c9d542107 100644 --- a/router/java/test/net/i2p/router/networkdb/kademlia/KBucketSetTest.java +++ b/router/java/test/net/i2p/router/networkdb/kademlia/KBucketSetTest.java @@ -8,11 +8,9 @@ package net.i2p.router.networkdb.kademlia; * */ -import net.i2p.I2PAppContext; -import net.i2p.data.DataHelper; -import net.i2p.data.Hash; - import junit.framework.TestCase; +import net.i2p.I2PAppContext; +import net.i2p.data.Hash; /** * Test KBucketSet diff --git a/router/java/test/net/i2p/router/transport/BandwidthLimiterTest.java b/router/java/test/net/i2p/router/transport/BandwidthLimiterTest.java index 62987f8fbd..30d1571f1b 100644 --- a/router/java/test/net/i2p/router/transport/BandwidthLimiterTest.java +++ b/router/java/test/net/i2p/router/transport/BandwidthLimiterTest.java @@ -8,17 +8,14 @@ package net.i2p.router.transport; * */ -import net.i2p.router.RouterContext; -import net.i2p.util.Log; - import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; - -import java.util.Random; import java.util.Properties; +import java.util.Random; import junit.framework.TestCase; +import net.i2p.router.RouterContext; /** * Stress out the bandwidth limiter by running a series of push and pull tests diff --git a/router/java/test/net/i2p/router/tunnel/BatchedFragmentTest.java b/router/java/test/net/i2p/router/tunnel/BatchedFragmentTest.java index 86c26f1bce..a257d4305b 100644 --- a/router/java/test/net/i2p/router/tunnel/BatchedFragmentTest.java +++ b/router/java/test/net/i2p/router/tunnel/BatchedFragmentTest.java @@ -9,13 +9,8 @@ package net.i2p.router.tunnel; */ import java.util.ArrayList; + import net.i2p.I2PAppContext; -import net.i2p.data.Base64; -import net.i2p.data.Hash; -import net.i2p.data.TunnelId; -import net.i2p.data.i2np.DataMessage; -import net.i2p.data.i2np.I2NPMessage; -import net.i2p.util.Log; /** * Test the batching behavior of the preprocessor with one, two, or three diff --git a/router/java/test/net/i2p/router/tunnel/FragmentTest.java b/router/java/test/net/i2p/router/tunnel/FragmentTest.java index 84cc5b43b5..169f3a65ce 100644 --- a/router/java/test/net/i2p/router/tunnel/FragmentTest.java +++ b/router/java/test/net/i2p/router/tunnel/FragmentTest.java @@ -9,16 +9,14 @@ package net.i2p.router.tunnel; */ import java.util.ArrayList; + +import junit.framework.TestCase; import net.i2p.I2PAppContext; -import net.i2p.data.Base64; import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.data.TunnelId; import net.i2p.data.i2np.DataMessage; import net.i2p.data.i2np.I2NPMessage; -import net.i2p.util.Log; - -import junit.framework.TestCase; /** * Simple test to see if the fragmentation is working, testing the preprocessor, diff --git a/router/java/test/net/i2p/router/tunnel/InboundGatewayTest.java b/router/java/test/net/i2p/router/tunnel/InboundGatewayTest.java index 54e78f238e..413176b83d 100644 --- a/router/java/test/net/i2p/router/tunnel/InboundGatewayTest.java +++ b/router/java/test/net/i2p/router/tunnel/InboundGatewayTest.java @@ -11,16 +11,14 @@ package net.i2p.router.tunnel; import java.util.ArrayList; import java.util.List; +import junit.framework.TestCase; import net.i2p.I2PAppContext; -import net.i2p.data.Base64; import net.i2p.data.Hash; import net.i2p.data.TunnelId; import net.i2p.data.i2np.DataMessage; import net.i2p.data.i2np.I2NPMessage; import net.i2p.util.Log; -import junit.framework.TestCase; - /** * Quick unit test for base functionality of inbound tunnel * operation diff --git a/router/java/test/net/i2p/router/tunnel/InboundTest.java b/router/java/test/net/i2p/router/tunnel/InboundTest.java index b3ed18efe4..39a4ce051c 100644 --- a/router/java/test/net/i2p/router/tunnel/InboundTest.java +++ b/router/java/test/net/i2p/router/tunnel/InboundTest.java @@ -8,13 +8,10 @@ package net.i2p.router.tunnel; * */ +import junit.framework.TestCase; import net.i2p.I2PAppContext; -import net.i2p.data.Base64; import net.i2p.data.DataHelper; import net.i2p.data.Hash; -import net.i2p.util.Log; - -import junit.framework.TestCase; /** * Quick unit test for base functionality of inbound tunnel diff --git a/router/java/test/net/i2p/router/tunnel/OutboundGatewayTest.java b/router/java/test/net/i2p/router/tunnel/OutboundGatewayTest.java index f50f2c734e..88e78db433 100644 --- a/router/java/test/net/i2p/router/tunnel/OutboundGatewayTest.java +++ b/router/java/test/net/i2p/router/tunnel/OutboundGatewayTest.java @@ -11,15 +11,12 @@ package net.i2p.router.tunnel; import java.util.ArrayList; import java.util.List; +import junit.framework.TestCase; import net.i2p.I2PAppContext; -import net.i2p.data.Base64; import net.i2p.data.Hash; import net.i2p.data.TunnelId; import net.i2p.data.i2np.DataMessage; import net.i2p.data.i2np.I2NPMessage; -import net.i2p.util.Log; - -import junit.framework.TestCase; /** * Quick unit test for base functionality of outbound tunnel diff --git a/router/java/test/net/i2p/router/tunnel/OutboundTest.java b/router/java/test/net/i2p/router/tunnel/OutboundTest.java index 28cb1610be..3576496250 100644 --- a/router/java/test/net/i2p/router/tunnel/OutboundTest.java +++ b/router/java/test/net/i2p/router/tunnel/OutboundTest.java @@ -8,13 +8,10 @@ package net.i2p.router.tunnel; * */ +import junit.framework.TestCase; import net.i2p.I2PAppContext; -import net.i2p.data.Base64; import net.i2p.data.DataHelper; import net.i2p.data.Hash; -import net.i2p.util.Log; - -import junit.framework.TestCase; /** * Quick unit test for base functionality of outbound tunnel