Update of /cvsroot/freenet/freenet/src/freenet/interfaces
In directory sc8-pr-cvs1:/tmp/cvs-serv13416/src/freenet/interfaces
Modified Files:
FreenetConnectionRunner.java Interface.java
LocalHTTPInterface.java BaseLocalNIOInterface.java
LocalNIOInterface.java NIOInterface.java
Log Message:
No functional changes. Fix lots of warnings from Eclipse about imports. Should speed
up compilation slightly, beautify code slightly.
Index: FreenetConnectionRunner.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/interfaces/FreenetConnectionRunner.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -w -r1.17 -r1.18
--- FreenetConnectionRunner.java 15 Oct 2003 21:15:48 -0000 1.17
+++ FreenetConnectionRunner.java 30 Oct 2003 01:34:09 -0000 1.18
@@ -1,16 +1,25 @@
package freenet.interfaces;
-import freenet.*;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.Socket;
+
+import freenet.CommunicationException;
+import freenet.Connection;
+import freenet.ConnectionHandler;
+import freenet.Core;
+import freenet.NegotiationFailedException;
+import freenet.OpenConnectionManager;
+import freenet.Presentation;
+import freenet.PresentationHandler;
+import freenet.SessionHandler;
+import freenet.node.Node;
+import freenet.session.Link;
+import freenet.session.LinkManager;
import freenet.support.Logger;
import freenet.support.io.NIOInputStream;
-import freenet.session.*;
-import freenet.node.Main;
-import freenet.node.Node;
import freenet.transport.tcpConnection;
-import java.io.*;
-import java.nio.*;
-import java.nio.channels.*;
-import java.net.*;
/**
* Runs connections using standard Freenet
Index: Interface.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/interfaces/Interface.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -r1.13 -r1.14
--- Interface.java 18 Sep 2003 17:48:08 -0000 1.13
+++ Interface.java 30 Oct 2003 01:34:09 -0000 1.14
@@ -1,11 +1,17 @@
package freenet.interfaces;
-import freenet.*;
-import freenet.thread.*;
-import freenet.support.Logger;
-import java.io.*;
-import java.util.Vector;
+import java.io.IOException;
+import java.io.InterruptedIOException;
import java.util.Enumeration;
+import java.util.Vector;
+
+import freenet.Connection;
+import freenet.Core;
+import freenet.ListenException;
+import freenet.Listener;
+import freenet.ListeningAddress;
+import freenet.Transport;
+import freenet.support.Logger;
/**
* An interface receives incoming connections from a Freenet peer
Index: LocalHTTPInterface.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/interfaces/LocalHTTPInterface.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- LocalHTTPInterface.java 5 Sep 2003 03:32:43 -0000 1.7
+++ LocalHTTPInterface.java 30 Oct 2003 01:34:09 -0000 1.8
@@ -1,32 +1,32 @@
/* -*- Mode: java; c-basic-indent: 4; tab-width: 4 -*- */
package freenet.interfaces;
-import freenet.transport.TCP;
-import freenet.Connection;
-import freenet.ListeningAddress;
-import freenet.ListenException;
-import freenet.BadAddressException;
-import java.net.InetAddress;
-import freenet.config.Params;
-import freenet.transport.ReadSelectorLoop;
-import freenet.transport.WriteSelectorLoop;
-import freenet.transport.NIOReader;
-import freenet.transport.NIOWriter;
-import freenet.transport.tcpConnection;
-import freenet.interfaces.servlet.MultipleHttpServletContainer;
-import freenet.Core;
-import freenet.node.Main;
-import freenet.support.Logger;
-import freenet.support.servlet.*;
-import freenet.support.servlet.http.*;
-import freenet.support.io.NIOInputStream;
import java.io.IOException;
import java.net.Socket;
import java.nio.ByteBuffer;
import java.nio.channels.SocketChannel;
import java.util.Vector;
-import javax.servlet.*;
-import javax.servlet.http.*;
+
+import javax.servlet.Servlet;
+import javax.servlet.ServletException;
+import javax.servlet.UnavailableException;
+import javax.servlet.http.HttpServletResponse;
+
+import freenet.Connection;
+import freenet.Core;
+import freenet.ListenException;
+import freenet.ListeningAddress;
+import freenet.interfaces.servlet.MultipleHttpServletContainer;
+import freenet.support.Logger;
+import freenet.support.io.NIOInputStream;
+import freenet.support.servlet.http.HttpServletRequestImpl;
+import freenet.support.servlet.http.SessionHolder;
+import freenet.support.servlet.http.SessionHolderImpl;
+import freenet.transport.NIOReader;
+import freenet.transport.NIOWriter;
+import freenet.transport.ReadSelectorLoop;
+import freenet.transport.WriteSelectorLoop;
+import freenet.transport.tcpConnection;
public class LocalHTTPInterface extends BaseLocalNIOInterface {
Index: BaseLocalNIOInterface.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/interfaces/BaseLocalNIOInterface.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- BaseLocalNIOInterface.java 26 Sep 2003 08:14:06 -0000 1.7
+++ BaseLocalNIOInterface.java 30 Oct 2003 01:34:09 -0000 1.8
@@ -1,12 +1,17 @@
package freenet.interfaces;
-import freenet.*;
-import freenet.thread.ThreadFactory;
-import freenet.transport.*;
-import freenet.support.*;
-import freenet.config.Params;
import java.net.InetAddress;
-import java.io.IOException;
+
+import freenet.Address;
+import freenet.Connection;
+import freenet.Core;
+import freenet.ListenException;
+import freenet.ListeningAddress;
+import freenet.NIOListener;
+import freenet.support.Fields;
+import freenet.support.Logger;
+import freenet.transport.tcpAddress;
+import freenet.transport.tcpListeningAddress;
/**
* A BaseLocalNIOInterface is connected to by clients
Index: LocalNIOInterface.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/interfaces/LocalNIOInterface.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- LocalNIOInterface.java 17 Oct 2003 03:53:10 -0000 1.8
+++ LocalNIOInterface.java 30 Oct 2003 01:34:09 -0000 1.9
@@ -1,19 +1,17 @@
/* -*- Mode: java; c-basic-indent: 4; tab-width: 4 -*- */
package freenet.interfaces;
-import freenet.thread.ThreadFactory;
-import freenet.transport.tcpConnection;
-import freenet.transport.TCP;
-import freenet.Connection;
-import freenet.ListeningAddress;
-import freenet.ListenException;
-import freenet.BadAddressException;
import java.net.InetAddress;
-import freenet.config.Params;
import java.util.LinkedList;
+
+import freenet.BadAddressException;
+import freenet.Connection;
import freenet.Core;
-import freenet.node.Main; // for RSL
+import freenet.ListenException;
+import freenet.ListeningAddress;
+import freenet.config.Params;
import freenet.support.Logger;
-import java.io.IOException;
+import freenet.thread.ThreadFactory;
+import freenet.transport.TCP;
public final class LocalNIOInterface extends BaseLocalNIOInterface {
Index: NIOInterface.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/interfaces/NIOInterface.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- NIOInterface.java 22 Jul 2003 17:39:24 -0000 1.7
+++ NIOInterface.java 30 Oct 2003 01:34:09 -0000 1.8
@@ -1,12 +1,19 @@
package freenet.interfaces;
-import freenet.*;
-import freenet.thread.*;
-import freenet.transport.*;
-import freenet.support.Logger;
-import java.io.*;
-import java.util.Vector;
+import java.io.IOException;
import java.util.Enumeration;
+import java.util.Vector;
+
+import freenet.Connection;
+import freenet.Core;
+import freenet.ListenException;
+import freenet.ListeningAddress;
+import freenet.NIOListener;
+import freenet.SelectorLoop;
+import freenet.Transport;
+import freenet.support.Logger;
+import freenet.transport.tcpConnection;
+import freenet.transport.tcpNIOListener;
/**
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
