From 9640e938958a025f7452b31f74de0ef6e2ddb876 Mon Sep 17 00:00:00 2001 From: shendaras Date: Wed, 30 Jun 2004 13:21:15 +0000 Subject: [PATCH] imports shendaras --- .../src/net/i2p/heartbeat/I2PAdapter.java | 3 +- .../client/streaming/I2PSocketManager.java | 1 - .../src/net/i2p/client/I2PSessionImpl2.java | 2 +- .../src/net/i2p/crypto/DummyDSAEngine.java | 3 -- core/java/src/net/i2p/data/Hash.java | 9 +++--- .../src/net/i2p/util/NativeBigInteger.java | 19 ++++++----- .../i2p/router/SubmitMessageHistoryJob.java | 3 +- .../java/src/net/i2p/router/TunnelInfo.java | 1 - .../router/client/ClientConnectionRunner.java | 4 +-- .../client/ClientMessageEventListener.java | 2 -- .../i2p/router/client/MessageReceivedJob.java | 2 -- .../net/i2p/router/client/ReportAbuseJob.java | 2 -- .../i2p/router/client/RequestLeaseSetJob.java | 1 - .../net/i2p/router/message/SendGarlicJob.java | 1 - .../networkdb/kademlia/KBucketImpl.java | 3 -- .../KademliaNetworkDatabaseFacade.java | 7 ++-- .../i2p/router/peermanager/PeerTestJob.java | 32 +++++++++---------- .../router/transport/BandwidthLimiter.java | 2 -- .../transport/OutboundMessageRegistry.java | 1 - .../transport/TrivialBandwidthLimiter.java | 2 +- .../tcp/RestrictiveTCPConnection.java | 4 --- .../router/tunnelmanager/TunnelBuilder.java | 1 - 22 files changed, 38 insertions(+), 67 deletions(-) diff --git a/apps/heartbeat/java/src/net/i2p/heartbeat/I2PAdapter.java b/apps/heartbeat/java/src/net/i2p/heartbeat/I2PAdapter.java index c0a1d522f..e0fab90d7 100644 --- a/apps/heartbeat/java/src/net/i2p/heartbeat/I2PAdapter.java +++ b/apps/heartbeat/java/src/net/i2p/heartbeat/I2PAdapter.java @@ -6,12 +6,11 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; -import java.util.Arrays; import java.util.Date; import java.util.Properties; -import net.i2p.I2PException; import net.i2p.I2PAppContext; +import net.i2p.I2PException; import net.i2p.client.I2PClient; import net.i2p.client.I2PClientFactory; import net.i2p.client.I2PSession; diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java index 0226b476d..c869f00f4 100644 --- a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java +++ b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java @@ -23,7 +23,6 @@ import net.i2p.client.I2PSessionListener; import net.i2p.data.Base64; import net.i2p.data.DataFormatException; import net.i2p.data.Destination; -import net.i2p.stat.StatManager; import net.i2p.util.Log; diff --git a/core/java/src/net/i2p/client/I2PSessionImpl2.java b/core/java/src/net/i2p/client/I2PSessionImpl2.java index 85af20561..2e797d2e9 100644 --- a/core/java/src/net/i2p/client/I2PSessionImpl2.java +++ b/core/java/src/net/i2p/client/I2PSessionImpl2.java @@ -9,8 +9,8 @@ package net.i2p.client; * */ -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.util.HashSet; import java.util.Iterator; import java.util.Properties; diff --git a/core/java/src/net/i2p/crypto/DummyDSAEngine.java b/core/java/src/net/i2p/crypto/DummyDSAEngine.java index d7e5c6499..0140b2335 100644 --- a/core/java/src/net/i2p/crypto/DummyDSAEngine.java +++ b/core/java/src/net/i2p/crypto/DummyDSAEngine.java @@ -1,12 +1,9 @@ package net.i2p.crypto; import net.i2p.I2PAppContext; -import net.i2p.data.Hash; import net.i2p.data.Signature; import net.i2p.data.SigningPrivateKey; import net.i2p.data.SigningPublicKey; -import net.i2p.util.Log; -import net.i2p.util.NativeBigInteger; /** * Stub that offers no authentication. diff --git a/core/java/src/net/i2p/data/Hash.java b/core/java/src/net/i2p/data/Hash.java index 721b57763..92779dc73 100644 --- a/core/java/src/net/i2p/data/Hash.java +++ b/core/java/src/net/i2p/data/Hash.java @@ -12,14 +12,13 @@ package net.i2p.data; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; - -import net.i2p.util.Log; - -import java.util.Map; import java.util.HashMap; -import java.util.Set; import java.util.HashSet; import java.util.Iterator; +import java.util.Map; +import java.util.Set; + +import net.i2p.util.Log; /** * Defines the hash as defined by the I2P data structure spec. diff --git a/core/java/src/net/i2p/util/NativeBigInteger.java b/core/java/src/net/i2p/util/NativeBigInteger.java index c8b538929..bf4d66faf 100644 --- a/core/java/src/net/i2p/util/NativeBigInteger.java +++ b/core/java/src/net/i2p/util/NativeBigInteger.java @@ -8,18 +8,17 @@ package net.i2p.util; * */ -import java.math.BigInteger; -import java.util.Random; -import java.security.SecureRandom; - -import java.net.URL; import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.io.FileOutputStream; -import java.io.FileInputStream; -import java.io.InputStream; -import java.io.IOException; 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.math.BigInteger; +import java.net.URL; +import java.security.SecureRandom; +import java.util.Random; /** *

BigInteger that takes advantage of the jbigi library for the modPow operation, diff --git a/router/java/src/net/i2p/router/SubmitMessageHistoryJob.java b/router/java/src/net/i2p/router/SubmitMessageHistoryJob.java index e23b9bc07..6107158bb 100644 --- a/router/java/src/net/i2p/router/SubmitMessageHistoryJob.java +++ b/router/java/src/net/i2p/router/SubmitMessageHistoryJob.java @@ -4,12 +4,11 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; +import net.i2p.router.transport.BandwidthLimitedInputStream; import net.i2p.util.HTTPSendData; import net.i2p.util.I2PThread; import net.i2p.util.Log; -import net.i2p.router.transport.BandwidthLimitedInputStream; - /** * Job that, if its allowed to, will submit the data gathered by the MessageHistory * component to some URL so that the network can be debugged more easily. By default diff --git a/router/java/src/net/i2p/router/TunnelInfo.java b/router/java/src/net/i2p/router/TunnelInfo.java index 98a4c233a..371e4fba3 100644 --- a/router/java/src/net/i2p/router/TunnelInfo.java +++ b/router/java/src/net/i2p/router/TunnelInfo.java @@ -30,7 +30,6 @@ import net.i2p.data.i2np.TunnelConfigurationSessionKey; import net.i2p.data.i2np.TunnelSessionKey; import net.i2p.data.i2np.TunnelSigningPrivateKey; import net.i2p.data.i2np.TunnelSigningPublicKey; - 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 0ed0cf2fa..41efbcbc4 100644 --- a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java +++ b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java @@ -11,9 +11,9 @@ package net.i2p.router.client; import java.io.IOException; import java.io.OutputStream; import java.net.Socket; +import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; -import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; @@ -33,9 +33,9 @@ import net.i2p.data.i2cp.SessionId; import net.i2p.router.Job; import net.i2p.router.JobImpl; import net.i2p.router.RouterContext; +import net.i2p.util.I2PThread; import net.i2p.util.Log; import net.i2p.util.RandomSource; -import net.i2p.util.I2PThread; /** * Bridge the router and the client - managing state for a client. diff --git a/router/java/src/net/i2p/router/client/ClientMessageEventListener.java b/router/java/src/net/i2p/router/client/ClientMessageEventListener.java index a86c7b2e9..a470ef73f 100644 --- a/router/java/src/net/i2p/router/client/ClientMessageEventListener.java +++ b/router/java/src/net/i2p/router/client/ClientMessageEventListener.java @@ -8,8 +8,6 @@ package net.i2p.router.client; * */ -import java.io.IOException; - import net.i2p.data.Payload; import net.i2p.data.i2cp.CreateLeaseSetMessage; import net.i2p.data.i2cp.CreateSessionMessage; diff --git a/router/java/src/net/i2p/router/client/MessageReceivedJob.java b/router/java/src/net/i2p/router/client/MessageReceivedJob.java index f12fb42ea..46edd9549 100644 --- a/router/java/src/net/i2p/router/client/MessageReceivedJob.java +++ b/router/java/src/net/i2p/router/client/MessageReceivedJob.java @@ -8,8 +8,6 @@ package net.i2p.router.client; * */ -import java.io.IOException; - import net.i2p.data.Destination; import net.i2p.data.Payload; import net.i2p.data.i2cp.I2CPMessageException; diff --git a/router/java/src/net/i2p/router/client/ReportAbuseJob.java b/router/java/src/net/i2p/router/client/ReportAbuseJob.java index 2d68ce585..abf57e215 100644 --- a/router/java/src/net/i2p/router/client/ReportAbuseJob.java +++ b/router/java/src/net/i2p/router/client/ReportAbuseJob.java @@ -8,8 +8,6 @@ package net.i2p.router.client; * */ -import java.io.IOException; - import net.i2p.data.i2cp.AbuseReason; import net.i2p.data.i2cp.AbuseSeverity; import net.i2p.data.i2cp.I2CPMessageException; diff --git a/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java b/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java index 8195ef4a4..f35b7faa6 100644 --- a/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java +++ b/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java @@ -8,7 +8,6 @@ package net.i2p.router.client; * */ -import java.io.IOException; import java.util.Date; import net.i2p.data.LeaseSet; diff --git a/router/java/src/net/i2p/router/message/SendGarlicJob.java b/router/java/src/net/i2p/router/message/SendGarlicJob.java index 993b67e84..bdb84cbc4 100644 --- a/router/java/src/net/i2p/router/message/SendGarlicJob.java +++ b/router/java/src/net/i2p/router/message/SendGarlicJob.java @@ -18,7 +18,6 @@ import net.i2p.router.JobImpl; import net.i2p.router.MessageSelector; import net.i2p.router.OutNetMessage; import net.i2p.router.ReplyJob; -import net.i2p.router.Router; import net.i2p.router.RouterContext; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java b/router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java index 5cb084a71..9e13b9a58 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java @@ -11,9 +11,6 @@ package net.i2p.router.networkdb.kademlia; import java.math.BigInteger; import java.util.HashSet; import java.util.Set; -import java.util.HashMap; -import java.util.Map; -import java.util.Iterator; 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 6fe9c12fe..1dc81456c 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java @@ -8,6 +8,9 @@ package net.i2p.router.networkdb.kademlia; * */ +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; import java.util.Collection; import java.util.Date; import java.util.HashMap; @@ -35,10 +38,6 @@ import net.i2p.router.networkdb.DatabaseStoreMessageHandler; import net.i2p.router.networkdb.PublishLocalRouterInfoJob; import net.i2p.util.Log; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.File; - /** * Kademlia based version of the network database * diff --git a/router/java/src/net/i2p/router/peermanager/PeerTestJob.java b/router/java/src/net/i2p/router/peermanager/PeerTestJob.java index f13c5df20..556b77605 100644 --- a/router/java/src/net/i2p/router/peermanager/PeerTestJob.java +++ b/router/java/src/net/i2p/router/peermanager/PeerTestJob.java @@ -1,27 +1,27 @@ package net.i2p.router.peermanager; -import net.i2p.data.Hash; -import net.i2p.data.RouterInfo; -import net.i2p.data.TunnelId; -import net.i2p.data.i2np.DeliveryStatusMessage; -import net.i2p.data.i2np.DatabaseStoreMessage; -import net.i2p.data.i2np.I2NPMessage; -import net.i2p.router.JobImpl; -import net.i2p.router.RouterContext; -import net.i2p.router.TunnelInfo; -import net.i2p.router.ReplyJob; -import net.i2p.router.MessageSelector; -import net.i2p.router.PeerSelectionCriteria; -import net.i2p.router.TunnelSelectionCriteria; -import net.i2p.router.message.SendTunnelMessageJob; -import net.i2p.util.Log; - import java.util.Date; import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; +import net.i2p.data.Hash; +import net.i2p.data.RouterInfo; +import net.i2p.data.TunnelId; +import net.i2p.data.i2np.DatabaseStoreMessage; +import net.i2p.data.i2np.DeliveryStatusMessage; +import net.i2p.data.i2np.I2NPMessage; +import net.i2p.router.JobImpl; +import net.i2p.router.MessageSelector; +import net.i2p.router.PeerSelectionCriteria; +import net.i2p.router.ReplyJob; +import net.i2p.router.RouterContext; +import net.i2p.router.TunnelInfo; +import net.i2p.router.TunnelSelectionCriteria; +import net.i2p.router.message.SendTunnelMessageJob; +import net.i2p.util.Log; + /** * Grab some peers that we want to test and probe them briefly to get some * more accurate and up to date performance data. This delegates the peer diff --git a/router/java/src/net/i2p/router/transport/BandwidthLimiter.java b/router/java/src/net/i2p/router/transport/BandwidthLimiter.java index 7b192f9a4..978481606 100644 --- a/router/java/src/net/i2p/router/transport/BandwidthLimiter.java +++ b/router/java/src/net/i2p/router/transport/BandwidthLimiter.java @@ -9,8 +9,6 @@ package net.i2p.router.transport; */ import net.i2p.data.RouterIdentity; -import net.i2p.router.RouterContext; -import net.i2p.util.Log; /** * Coordinate the bandwidth limiting across all classes of peers. diff --git a/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java b/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java index 83220a702..0bead0c3b 100644 --- a/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java +++ b/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java @@ -10,7 +10,6 @@ package net.i2p.router.transport; import java.util.ArrayList; import java.util.Date; -import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; diff --git a/router/java/src/net/i2p/router/transport/TrivialBandwidthLimiter.java b/router/java/src/net/i2p/router/transport/TrivialBandwidthLimiter.java index 2b7950f01..d0e6ea95e 100644 --- a/router/java/src/net/i2p/router/transport/TrivialBandwidthLimiter.java +++ b/router/java/src/net/i2p/router/transport/TrivialBandwidthLimiter.java @@ -10,8 +10,8 @@ package net.i2p.router.transport; import net.i2p.data.RouterIdentity; import net.i2p.router.RouterContext; -import net.i2p.util.Log; import net.i2p.util.I2PThread; +import net.i2p.util.Log; /** * Coordinate the bandwidth limiting across all classes of peers. Currently diff --git a/router/java/src/net/i2p/router/transport/tcp/RestrictiveTCPConnection.java b/router/java/src/net/i2p/router/transport/tcp/RestrictiveTCPConnection.java index e239a2d73..e98b374c9 100644 --- a/router/java/src/net/i2p/router/transport/tcp/RestrictiveTCPConnection.java +++ b/router/java/src/net/i2p/router/transport/tcp/RestrictiveTCPConnection.java @@ -10,8 +10,6 @@ package net.i2p.router.transport.tcp; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.BufferedOutputStream; -import java.io.BufferedInputStream; import java.io.IOException; import java.math.BigInteger; import java.net.Socket; @@ -24,8 +22,6 @@ import net.i2p.data.DataHelper; import net.i2p.data.RouterIdentity; import net.i2p.router.Router; import net.i2p.router.RouterContext; -import net.i2p.router.transport.BandwidthLimitedInputStream; -import net.i2p.router.transport.BandwidthLimitedOutputStream; import net.i2p.util.I2PThread; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/tunnelmanager/TunnelBuilder.java b/router/java/src/net/i2p/router/tunnelmanager/TunnelBuilder.java index 0a4239457..84a671df3 100644 --- a/router/java/src/net/i2p/router/tunnelmanager/TunnelBuilder.java +++ b/router/java/src/net/i2p/router/tunnelmanager/TunnelBuilder.java @@ -20,7 +20,6 @@ import net.i2p.data.SessionKey; import net.i2p.data.SigningPrivateKey; import net.i2p.data.SigningPublicKey; import net.i2p.data.TunnelId; -import net.i2p.data.i2np.I2NPMessage; import net.i2p.router.ClientTunnelSettings; import net.i2p.router.PeerSelectionCriteria; import net.i2p.router.RouterContext;