Update of /cvsroot/freenet/freenet/src/freenet/transport
In directory sc8-pr-cvs1:/tmp/cvs-serv13416/src/freenet/transport
Modified Files:
tcpAddress.java ListenSelectorLoop.java tcpNIOListener.java
VoidTransport.java tcpListeningAddress.java
VoidListeningAddress.java ReadSelectorLoop.java
tcpTransport.java WriteSelectorLoop.java
Log Message:
No functional changes. Fix lots of warnings from Eclipse about imports. Should speed
up compilation slightly, beautify code slightly.
Index: tcpAddress.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/transport/tcpAddress.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -w -r1.16 -r1.17
--- tcpAddress.java 23 Sep 2003 00:55:10 -0000 1.16
+++ tcpAddress.java 30 Oct 2003 01:34:02 -0000 1.17
@@ -1,10 +1,13 @@
package freenet.transport;
-import freenet.*;
-import java.net.Socket;
import java.net.InetAddress;
import java.net.UnknownHostException;
-import java.io.IOException;
-import java.util.StringTokenizer;
+
+import freenet.Address;
+import freenet.BadAddressException;
+import freenet.ConnectFailedException;
+import freenet.Connection;
+import freenet.Core;
+import freenet.ListeningAddress;
/*
This code is part of the Java Adaptive Network Client by Ian Clarke.
Index: ListenSelectorLoop.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/transport/ListenSelectorLoop.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -w -r1.19 -r1.20
--- ListenSelectorLoop.java 9 Sep 2003 15:04:28 -0000 1.19
+++ ListenSelectorLoop.java 30 Oct 2003 01:34:02 -0000 1.20
@@ -2,14 +2,14 @@
package freenet.transport;
//hope this belongs here
-import java.nio.channels.*;
-import java.nio.ByteBuffer;
-import freenet.SelectorLoop;
-import java.net.Socket;
-import java.util.*;
import java.io.IOException;
-import freenet.NIOListener;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.ServerSocketChannel;
+import java.nio.channels.SocketChannel;
+import java.util.Iterator;
+
import freenet.Core;
+import freenet.NIOListener;
import freenet.support.Logger;
/**
Index: tcpNIOListener.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/transport/tcpNIOListener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- tcpNIOListener.java 19 Jun 2003 13:31:31 -0000 1.2
+++ tcpNIOListener.java 30 Oct 2003 01:34:02 -0000 1.3
@@ -1,10 +1,14 @@
package freenet.transport;
-import freenet.*;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+
+import freenet.ListenException;
+import freenet.ListeningAddress;
+import freenet.NIOListener;
+import freenet.SelectorLoop;
import freenet.interfaces.NIOInterface;
-import java.io.*;
-import java.net.*;
-import freenet.support.Logger;
-import java.nio.channels.*;
/**
Index: VoidTransport.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/transport/VoidTransport.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- VoidTransport.java 18 Nov 2002 22:21:02 -0000 1.4
+++ VoidTransport.java 30 Oct 2003 01:34:02 -0000 1.5
@@ -1,12 +1,13 @@
package freenet.transport;
-import freenet.*;
-import freenet.crypt.DSAPublicKey;
+import freenet.Address;
+import freenet.ListeningAddress;
+import freenet.Transport;
+
/**
* Void is the transport that is not.
*
* @author oskar
*/
-
public class VoidTransport implements Transport {
/**
Index: tcpListeningAddress.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/transport/tcpListeningAddress.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- tcpListeningAddress.java 23 Jul 2003 14:19:52 -0000 1.5
+++ tcpListeningAddress.java 30 Oct 2003 01:34:02 -0000 1.6
@@ -1,7 +1,10 @@
package freenet.transport;
-import freenet.*;
-import java.net.*;
-import java.io.IOException;
+import java.net.InetAddress;
+
+import freenet.ListenException;
+import freenet.Listener;
+import freenet.ListeningAddress;
+import freenet.NIOListener;
/*
This code is part of the Java Adaptive Network Client by Ian Clarke.
It is distributed under the GNU Public Licence (GPL) version 2. See
Index: VoidListeningAddress.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/transport/VoidListeningAddress.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -w -r1.1.1.1 -r1.2
--- VoidListeningAddress.java 13 Jan 2002 05:25:04 -0000 1.1.1.1
+++ VoidListeningAddress.java 30 Oct 2003 01:34:02 -0000 1.2
@@ -1,6 +1,7 @@
package freenet.transport;
-import freenet.*;
-import freenet.crypt.DSAPublicKey;
+import freenet.ListenException;
+import freenet.Listener;
+import freenet.ListeningAddress;
/**
* VoidListeningAddresses have no reason for life.
*
Index: ReadSelectorLoop.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/transport/ReadSelectorLoop.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -w -r1.61 -r1.62
--- ReadSelectorLoop.java 29 Oct 2003 10:34:56 -0000 1.61
+++ ReadSelectorLoop.java 30 Oct 2003 01:34:02 -0000 1.62
@@ -2,19 +2,20 @@
package freenet.transport;
//QUESTION: does this belong in this package?
-import java.nio.channels.*;
+import java.io.IOException;
import java.nio.ByteBuffer;
-import freenet.SelectorLoop;
-import freenet.Connection;
-import freenet.support.io.Bandwidth;
+import java.nio.channels.ClosedChannelException;
+import java.nio.channels.SelectableChannel;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.SocketChannel;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Map;
-// For logging
import freenet.Core;
import freenet.support.Logger;
-
-import java.net.Socket;
-import java.util.*;
-import java.io.IOException;
+import freenet.support.io.Bandwidth;
/**
* a loop that reads and processes message headers.
Index: tcpTransport.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/transport/tcpTransport.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- tcpTransport.java 18 Sep 2003 17:48:13 -0000 1.11
+++ tcpTransport.java 30 Oct 2003 01:34:02 -0000 1.12
@@ -1,10 +1,14 @@
package freenet.transport;
-import freenet.*;
-import freenet.support.Logger;
+import java.net.InetAddress;
import java.util.StringTokenizer;
-import java.io.IOException;
-import java.net.*;
+
+import freenet.Address;
+import freenet.BadAddressException;
+import freenet.Core;
+import freenet.ListeningAddress;
+import freenet.Transport;
+import freenet.support.Logger;
/** A tcpTransport is any Transport based on Sockets. Subclasses implementing
* this provide their own socket factories so that there can be a choice
Index: WriteSelectorLoop.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/transport/WriteSelectorLoop.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -w -r1.63 -r1.64
--- WriteSelectorLoop.java 21 Oct 2003 23:16:23 -0000 1.63
+++ WriteSelectorLoop.java 30 Oct 2003 01:34:02 -0000 1.64
@@ -5,16 +5,25 @@
package freenet.transport;
-import java.nio.channels.*;
-import java.nio.*;
-import java.util.*;
import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.ClosedChannelException;
+import java.nio.channels.IllegalBlockingModeException;
+import java.nio.channels.SelectableChannel;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.SocketChannel;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Vector;
+
import freenet.Core;
import freenet.support.BlockingQueue;
import freenet.support.Logger;
import freenet.support.io.Bandwidth;
-import freenet.support.sort.*;
-import freenet.support.Comparable;
+import freenet.support.sort.QuickSorter;
+import freenet.support.sort.SortAlgorithm;
+import freenet.support.sort.VectorSorter;
/**
* a loop that writes data to the network.
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
