From b59aa1fb69ad6cbaebeb029f3a80f15f6e06238e Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 4 Jan 2014 22:10:10 +0000 Subject: [PATCH] move I2PSocketOptionsImpl from mini to impl --- .../net/i2p/client/streaming/impl/ConnectionOptions.java | 1 - .../i2p/client/streaming/impl}/I2PSocketOptionsImpl.java | 6 ++++-- .../java/src/net/i2p/client/streaming/impl/TCBShare.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) rename apps/{ministreaming/java/src/net/i2p/client/streaming => streaming/java/src/net/i2p/client/streaming/impl}/I2PSocketOptionsImpl.java (98%) diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionOptions.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionOptions.java index 68196e6d1..fe4c5d0c3 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionOptions.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionOptions.java @@ -1,7 +1,6 @@ package net.i2p.client.streaming.impl; import net.i2p.client.streaming.I2PSocketOptions; -import net.i2p.client.streaming.I2PSocketOptionsImpl; import java.util.Collections; import java.util.HashSet; diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketOptionsImpl.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketOptionsImpl.java similarity index 98% rename from apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketOptionsImpl.java rename to apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketOptionsImpl.java index a4053111e..0c077cccd 100644 --- a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketOptionsImpl.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketOptionsImpl.java @@ -1,12 +1,14 @@ -package net.i2p.client.streaming; +package net.i2p.client.streaming.impl; import java.util.Properties; +import net.i2p.client.streaming.I2PSocketOptions; + /** * Define the configuration for streaming and verifying data on the socket. * Use I2PSocketManager.buildOptions() to get one of these. */ -public class I2PSocketOptionsImpl implements I2PSocketOptions { +class I2PSocketOptionsImpl implements I2PSocketOptions { private long _connectTimeout; private long _readTimeout; private long _writeTimeout; diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/TCBShare.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/TCBShare.java index e5150b3d1..ba788a3e9 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/TCBShare.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/TCBShare.java @@ -10,7 +10,7 @@ import net.i2p.data.Destination; import net.i2p.util.Log; import net.i2p.util.SimpleTimer2; -import static net.i2p.client.streaming.I2PSocketOptionsImpl.getDouble; +import static net.i2p.client.streaming.impl.I2PSocketOptionsImpl.getDouble; /** * Share important TCP Control Block parameters across Connections