reverted changes to mstreaming and streaming

apps/ministreaming/java/src/net/i2p/client/streaming/I2PServerSocket.java

@@ -30,37 +30,6 @@ public interface I2PServerSocket {
      */
     public I2PSocket accept() throws I2PException, ConnectException, SocketTimeoutException;
 
-    /**
-     * accept(timeout) waits timeout ms for a socket connecting. If a socket is
-     * not available during the timeout, return null. accept(0) behaves like accept() 
-     *
-     * @param timeout in ms
-     *
-     * @return a connected I2PSocket, or null
-     *
-     * @throws I2PException if there is a problem with reading a new socket
-     *         from the data available (aka the I2PSession closed, etc)
-     * @throws ConnectException if the I2PServerSocket is closed
-     * @throws InterruptedException if thread is interrupted while waiting
-     */
-    public I2PSocket accept(long timeout) throws I2PException, ConnectException, InterruptedException;
-
-    /**
-     * Wait until there is a socket waiting for acception or the timeout is
-     * reached.
-     * 
-     * @param timeoutMs timeout in ms. If ms is 0, wait forever.
-     *
-     * @return true if a socket is available, false if not
-     *
-     * @throws I2PException if there is a problem with reading a new socket
-     *         from the data available (aka the I2PSession closed, etc)
-     * @throws ConnectException if the I2PServerSocket is closed
-     * @throws InterruptedException if the thread is interrupted before
-     *         completion
-     */
-    public void waitIncoming(long timeoutMs) throws I2PException, ConnectException, InterruptedException;
-
     /**
      * Set Sock Option accept timeout
      * @param x timeout in ms