Update of /cvsroot/freenet/freenet/src/freenet/node/states/request
In directory sc8-pr-cvs1:/tmp/cvs-serv13416/src/freenet/node/states/request
Modified Files:
RequestObject.java DataPending.java NoInsert.java
FeedbackToken.java RequestSendCallback.java Pending.java
RequestState.java InsertPending.java ReceivingInsert.java
SendingReply.java SendFinished.java TransferInsertPending.java
Log Message:
No functional changes. Fix lots of warnings from Eclipse about imports. Should speed
up compilation slightly, beautify code slightly.
Index: RequestObject.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/request/RequestObject.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- RequestObject.java 18 Sep 2003 17:48:12 -0000 1.2
+++ RequestObject.java 30 Oct 2003 01:34:08 -0000 1.3
@@ -1,7 +1,5 @@
package freenet.node.states.request;
-import freenet.node.*;
-import freenet.*;
-import freenet.support.*;
+import freenet.node.EventMessageObject;
/**
* Interface of generic non-message events in a Request chain.
Index: DataPending.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/request/DataPending.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -w -r1.21 -r1.22
--- DataPending.java 24 Oct 2003 19:38:19 -0000 1.21
+++ DataPending.java 30 Oct 2003 01:34:08 -0000 1.22
@@ -1,13 +1,23 @@
package freenet.node.states.request;
-import freenet.*;
-import freenet.node.*;
-import freenet.node.states.data.*;
-import freenet.node.ds.*;
-import freenet.message.*;
+import freenet.CommunicationException;
+import freenet.Core;
+import freenet.FieldSet;
+import freenet.Key;
+import freenet.Peer;
+import freenet.message.Accepted;
+import freenet.message.DataNotFound;
+import freenet.message.DataReply;
+import freenet.message.DataRequest;
+import freenet.message.QueryRejected;
+import freenet.message.QueryRestarted;
+import freenet.message.Request;
+import freenet.node.BadStateException;
+import freenet.node.Node;
+import freenet.node.NodeReference;
+import freenet.node.State;
+import freenet.node.StateException;
import freenet.support.Logger;
-import java.io.*;
-import freenet.support.io.*;
/**
* This is the state pertaining to DataRequests that are pending.
Index: NoInsert.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/request/NoInsert.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -w -r1.1.1.1 -r1.2
--- NoInsert.java 13 Jan 2002 05:24:49 -0000 1.1.1.1
+++ NoInsert.java 30 Oct 2003 01:34:08 -0000 1.2
@@ -1,5 +1,4 @@
package freenet.node.states.request;
-import freenet.support.*;
/**
* Message scheduled to indicate that the expected DataInsert has not been
Index: FeedbackToken.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/request/FeedbackToken.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- FeedbackToken.java 18 Sep 2003 17:48:12 -0000 1.9
+++ FeedbackToken.java 30 Oct 2003 01:34:08 -0000 1.10
@@ -1,8 +1,12 @@
package freenet.node.states.request;
-import freenet.*;
-import freenet.node.*;
-import java.io.*;
+import freenet.CommunicationException;
+import freenet.FieldSet;
+import freenet.MessageSendCallback;
+import freenet.Storables;
+import freenet.TrailerWriter;
+import freenet.node.Node;
+import freenet.node.NodeReference;
/**
* This is used to communicate back to the originator of a Request,
Index: RequestSendCallback.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/request/RequestSendCallback.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- RequestSendCallback.java 4 Oct 2003 01:17:06 -0000 1.5
+++ RequestSendCallback.java 30 Oct 2003 01:34:08 -0000 1.6
@@ -1,12 +1,11 @@
package freenet.node.states.request;
+import freenet.CommunicationException;
import freenet.MessageSendCallback;
-import freenet.support.Logger;
+import freenet.TrailerWriter;
import freenet.node.Node;
import freenet.node.State;
-import freenet.CommunicationException;
-import freenet.TrailerWriter;
-import java.io.OutputStream;
+import freenet.support.Logger;
public class RequestSendCallback implements MessageSendCallback {
String m;
Index: Pending.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/request/Pending.java,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -w -r1.78 -r1.79
--- Pending.java 27 Oct 2003 14:45:18 -0000 1.78
+++ Pending.java 30 Oct 2003 01:34:08 -0000 1.79
@@ -1,16 +1,39 @@
package freenet.node.states.request;
-import freenet.*;
+import java.io.IOException;
+
+import freenet.AuthenticationFailedException;
+import freenet.CommunicationException;
+import freenet.Core;
+import freenet.FieldSet;
+import freenet.Identity;
+import freenet.Key;
+import freenet.Message;
+import freenet.MessageObject;
+import freenet.Peer;
+import freenet.Presentation;
+import freenet.Storables;
+import freenet.TrailerWriter;
import freenet.fs.dir.BufferException;
-import freenet.node.*;
-import freenet.node.ds.*;
-import freenet.message.*;
-import freenet.node.states.data.*;
-import freenet.support.Fields;
+import freenet.message.Accepted;
+import freenet.message.DataReply;
+import freenet.message.QueryRejected;
+import freenet.message.QueryRestarted;
+import freenet.message.Request;
+import freenet.message.StoreData;
+import freenet.node.BadStateException;
+import freenet.node.Node;
+import freenet.node.NodeReference;
+import freenet.node.State;
+import freenet.node.ds.KeyCollisionException;
+import freenet.node.ds.KeyInputStream;
+import freenet.node.ds.StoreIOException;
+import freenet.node.states.data.DataReceived;
+import freenet.node.states.data.DataSent;
+import freenet.node.states.data.ReceiveData;
+import freenet.node.states.data.SendData;
import freenet.support.Logger;
-import freenet.support.io.*;
-import java.io.*;
-import java.util.Enumeration;
+import freenet.support.io.DataNotValidIOException;
/**
* This is the abstract superclass for states pertaining to Insert and
Index: RequestState.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/request/RequestState.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -w -r1.18 -r1.19
--- RequestState.java 18 Oct 2003 18:55:22 -0000 1.18
+++ RequestState.java 30 Oct 2003 01:34:08 -0000 1.19
@@ -1,12 +1,18 @@
package freenet.node.states.request;
-import freenet.*;
-import freenet.node.*;
+import freenet.CommunicationException;
+import freenet.Core;
+import freenet.FieldSet;
+import freenet.Key;
+import freenet.Message;
+import freenet.MessageSendCallback;
+import freenet.Peer;
+import freenet.node.Node;
+import freenet.node.State;
import freenet.node.rt.Routing;
import freenet.node.rt.TerminatableRouting;
import freenet.support.Fields;
import freenet.support.Logger;
-import java.util.Enumeration;
/** This class is basically just a data struct with all the variables
* needed to process a request chain, and some utility methods.
Index: InsertPending.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/request/InsertPending.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -w -r1.24 -r1.25
--- InsertPending.java 27 Oct 2003 14:45:18 -0000 1.24
+++ InsertPending.java 30 Oct 2003 01:34:08 -0000 1.25
@@ -1,14 +1,32 @@
package freenet.node.states.request;
-import freenet.*;
+import java.io.IOException;
+
+import freenet.CommunicationException;
+import freenet.Core;
+import freenet.FieldSet;
+import freenet.Key;
+import freenet.Peer;
+import freenet.TrailerWriter;
import freenet.fs.dir.BufferException;
-import freenet.node.*;
-import freenet.node.ds.*;
-import freenet.message.*;
-import freenet.support.io.*;
-import freenet.node.states.data.*;
+import freenet.message.Accepted;
+import freenet.message.DataInsert;
+import freenet.message.DataReply;
+import freenet.message.InsertReply;
+import freenet.message.InsertRequest;
+import freenet.message.QueryAborted;
+import freenet.message.QueryRejected;
+import freenet.message.QueryRestarted;
+import freenet.message.Request;
+import freenet.node.BadStateException;
+import freenet.node.Node;
+import freenet.node.NodeReference;
+import freenet.node.State;
+import freenet.node.StateException;
+import freenet.node.ds.KeyCollisionException;
+import freenet.node.ds.KeyInputStream;
+import freenet.node.states.data.SendData;
import freenet.support.Logger;
-import java.io.*;
/**
* The state that an insert is in when newly begun, before the DataInsert
Index: ReceivingInsert.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/request/ReceivingInsert.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -w -r1.23 -r1.24
--- ReceivingInsert.java 7 Oct 2003 00:47:30 -0000 1.23
+++ ReceivingInsert.java 30 Oct 2003 01:34:08 -0000 1.24
@@ -1,13 +1,19 @@
package freenet.node.states.request;
-import freenet.*;
-import freenet.node.*;
-import freenet.message.*;
-import freenet.node.states.data.*;
+import java.io.IOException;
+
+import freenet.CommunicationException;
+import freenet.Core;
+import freenet.Presentation;
+import freenet.node.BadStateException;
+import freenet.node.Node;
+import freenet.node.State;
+import freenet.node.StateException;
import freenet.node.ds.KeyCollisionException;
import freenet.node.rt.Routing;
+import freenet.node.states.data.DataReceived;
+import freenet.node.states.data.ReceiveData;
import freenet.support.Logger;
-import java.io.IOException;
/**
* State for the terminating node on an insert chain that is only
Index: SendingReply.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/request/SendingReply.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -w -r1.23 -r1.24
--- SendingReply.java 18 Oct 2003 18:55:22 -0000 1.23
+++ SendingReply.java 30 Oct 2003 01:34:08 -0000 1.24
@@ -1,12 +1,16 @@
package freenet.node.states.request;
-import freenet.*;
-import freenet.node.*;
+import freenet.CommunicationException;
+import freenet.Core;
+import freenet.Presentation;
+import freenet.message.DataInsert;
+import freenet.node.BadStateException;
+import freenet.node.Node;
+import freenet.node.State;
import freenet.node.rt.Routing;
-import freenet.node.states.data.*;
-import freenet.message.*;
-import freenet.support.*;
-import java.io.*;
+import freenet.node.states.data.DataSent;
+import freenet.node.states.data.SendData;
+import freenet.support.Logger;
/**
* This is the State pertaining to Data Requests sending data from the
Index: SendFinished.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/request/SendFinished.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- SendFinished.java 15 Oct 2003 21:15:49 -0000 1.10
+++ SendFinished.java 30 Oct 2003 01:34:08 -0000 1.11
@@ -1,13 +1,12 @@
package freenet.node.states.request;
+import freenet.CommunicationException;
import freenet.Core;
import freenet.MessageSendCallback;
-import freenet.support.Logger;
+import freenet.TrailerWriter;
import freenet.node.Node;
import freenet.node.State;
-import freenet.CommunicationException;
-import freenet.TrailerWriter;
-import java.io.OutputStream;
+import freenet.support.Logger;
/** Message Object for async send callback
* @see RequestSendCallback */
Index: TransferInsertPending.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/request/TransferInsertPending.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -w -r1.19 -r1.20
--- TransferInsertPending.java 6 Oct 2003 15:20:18 -0000 1.19
+++ TransferInsertPending.java 30 Oct 2003 01:34:08 -0000 1.20
@@ -1,13 +1,25 @@
package freenet.node.states.request;
-import freenet.*;
-import freenet.node.*;
-import freenet.node.ds.*;
-import freenet.message.*;
-import freenet.support.io.*;
-import freenet.node.states.data.*;
+import java.io.IOException;
+
+import freenet.Core;
+import freenet.Presentation;
+import freenet.message.Accepted;
+import freenet.message.DataReply;
+import freenet.message.InsertReply;
+import freenet.message.InsertRequest;
+import freenet.message.QueryAborted;
+import freenet.message.QueryRejected;
+import freenet.message.QueryRestarted;
+import freenet.node.BadStateException;
+import freenet.node.Node;
+import freenet.node.State;
+import freenet.node.StateException;
+import freenet.node.StateTransition;
+import freenet.node.ds.KeyInputStream;
+import freenet.node.states.data.DataReceived;
+import freenet.node.states.data.ReceiveData;
import freenet.support.Logger;
-import java.io.*;
/**
* The state an insert is in once the DataInsert has been received,
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
