From 01753f5aeaef4d9a6ec5469970e960a1f1ff0d83 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Fri, 14 Aug 2009 04:36:06 +0000
Subject: [PATCH]     * Ministreaming: Cleanups, deprecation, move demos out of
 the lib

---
 .../i2p/client/streaming/I2PServerSocketImpl.java    |  1 +
 .../src/net/i2p/client/streaming/I2PSocketImpl.java  |  1 +
 .../client/streaming/I2PSocketManagerFactory.java    | 12 ++++++------
 .../i2p/client/streaming/I2PSocketManagerImpl.java   |  1 +
 .../net/i2p/client/streaming/StreamSinkClient.java   |  0
 .../net/i2p/client/streaming/StreamSinkSend.java     |  0
 .../net/i2p/client/streaming/StreamSinkServer.java   |  0
 7 files changed, 9 insertions(+), 6 deletions(-)
 rename apps/ministreaming/java/{src => test}/net/i2p/client/streaming/StreamSinkClient.java (100%)
 rename apps/ministreaming/java/{src => test}/net/i2p/client/streaming/StreamSinkSend.java (100%)
 rename apps/ministreaming/java/{src => test}/net/i2p/client/streaming/StreamSinkServer.java (100%)

diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PServerSocketImpl.java b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PServerSocketImpl.java
index 41d49af03..2e0609f56 100644
--- a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PServerSocketImpl.java
+++ b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PServerSocketImpl.java
@@ -15,6 +15,7 @@ import net.i2p.util.Log;
  * and pull from a queue populated by various threads (each of whom have their own
  * timeout)
  *
+ * @deprecated use I2PServerSocketFull
  */
 class I2PServerSocketImpl implements I2PServerSocket {
     private final static Log _log = new Log(I2PServerSocketImpl.class);
diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketImpl.java b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketImpl.java
index 5f96f092d..98c0a2cbf 100644
--- a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketImpl.java
+++ b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketImpl.java
@@ -17,6 +17,7 @@ import net.i2p.util.Log;
 /**
  * Initial stub implementation for the socket
  *
+ * @deprecated use I2PSocketFull
  */
 class I2PSocketImpl implements I2PSocket {
     private final static Log _log = new Log(I2PSocketImpl.class);
diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java
index 374ec35ce..393cf1ae2 100644
--- a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java
+++ b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java
@@ -158,12 +158,12 @@ public class I2PSocketManagerFactory {
     }
 
     private static I2PSocketManager createManager(I2PSession session, Properties opts, String name) {
-        if (false) {
-            I2PSocketManagerImpl mgr = new I2PSocketManagerImpl();
-            mgr.setSession(session);
+        //if (false) {
+            //I2PSocketManagerImpl mgr = new I2PSocketManagerImpl();
+            //mgr.setSession(session);
             //mgr.setDefaultOptions(new I2PSocketOptions());
-            return mgr;
-        } else {
+            //return mgr;
+        //} else {
             String classname = opts.getProperty(PROP_MANAGER, DEFAULT_MANAGER);
             if (classname != null) {
                 try {
@@ -190,7 +190,7 @@ public class I2PSocketManagerFactory {
             } else {
                 throw new IllegalStateException("No manager class specified");
             }
-        }
+        //}
         
     }
 
diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerImpl.java b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerImpl.java
index 863c59cd5..e01b28fb0 100644
--- a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerImpl.java
+++ b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerImpl.java
@@ -36,6 +36,7 @@ import net.i2p.util.Log;
  * I2PSocketManager, it should not attempt to call I2PSession's setSessionListener
  * or receive any messages with its .receiveMessage
  *
+ * @deprecated use I2PSocketManagerFull
  */
 class I2PSocketManagerImpl implements I2PSocketManager, I2PSessionListener {
     private I2PAppContext _context;
diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkClient.java b/apps/ministreaming/java/test/net/i2p/client/streaming/StreamSinkClient.java
similarity index 100%
rename from apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkClient.java
rename to apps/ministreaming/java/test/net/i2p/client/streaming/StreamSinkClient.java
diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkSend.java b/apps/ministreaming/java/test/net/i2p/client/streaming/StreamSinkSend.java
similarity index 100%
rename from apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkSend.java
rename to apps/ministreaming/java/test/net/i2p/client/streaming/StreamSinkSend.java
diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkServer.java b/apps/ministreaming/java/test/net/i2p/client/streaming/StreamSinkServer.java
similarity index 100%
rename from apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkServer.java
rename to apps/ministreaming/java/test/net/i2p/client/streaming/StreamSinkServer.java