Update of /cvsroot/freenet/freenet/src/freenet/node/states/FCP
In directory sc8-pr-cvs1:/tmp/cvs-serv13416/src/freenet/node/states/FCP
Modified Files:
NewFECEncodeSegment.java NewClientPut.java ClientPutToken.java
ClientGetToken.java NewInvertPrivateKey.java
NewFECSegmentSplitFile.java FCPFeedbackToken.java
NewGetSize.java NewInfo.java NewGenerateCHK.java
NewGenerateSHA1.java NewFECMakeMetadata.java
Log Message:
No functional changes. Fix lots of warnings from Eclipse about imports. Should speed
up compilation slightly, beautify code slightly.
Index: NewFECEncodeSegment.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewFECEncodeSegment.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- NewFECEncodeSegment.java 4 Oct 2003 01:17:02 -0000 1.7
+++ NewFECEncodeSegment.java 30 Oct 2003 01:34:02 -0000 1.8
@@ -1,18 +1,30 @@
package freenet.node.states.FCP;
-import freenet.*;
-import freenet.support.Logger;
+import java.io.DataInputStream;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import freenet.Core;
+import freenet.MessageObject;
+import freenet.PeerHandler;
+import freenet.SendFailedException;
+import freenet.TrailerWriter;
+import freenet.TrailerWriterOutputStream;
+import freenet.message.client.BlocksEncoded;
+import freenet.message.client.DataChunk;
+import freenet.message.client.Failed;
+import freenet.message.client.FEC.FECEncodeSegment;
+import freenet.message.client.FEC.SegmentHeader;
+import freenet.node.BadStateException;
+import freenet.node.Node;
+import freenet.node.State;
import freenet.support.Bucket;
import freenet.support.BucketFactory;
import freenet.support.BucketTools;
+import freenet.support.Logger;
import freenet.support.io.ReadInputStream;
-import freenet.client.FECTools;
-
-import freenet.node.*;
-import freenet.message.client.*;
-import freenet.message.client.FEC.*;
-
-import java.io.*;
public class NewFECEncodeSegment extends NewClientRequest {
Index: NewClientPut.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewClientPut.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- NewClientPut.java 27 Oct 2003 14:45:19 -0000 1.11
+++ NewClientPut.java 30 Oct 2003 01:34:02 -0000 1.12
@@ -1,15 +1,33 @@
package freenet.node.states.FCP;
-import freenet.*;
-import freenet.node.*;
-import freenet.node.states.request.*;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import freenet.FieldSet;
+import freenet.Key;
+import freenet.KeyException;
+import freenet.MessageObject;
+import freenet.PeerHandler;
+import freenet.client.AbstractClientKey;
+import freenet.client.Base64;
+import freenet.client.ClientKey;
+import freenet.client.ClientSVK;
+import freenet.client.FreenetURI;
import freenet.message.DataInsert;
-import freenet.message.client.*;
-import freenet.client.*;
-import freenet.support.*;
-import freenet.support.io.*;
-import freenet.crypt.*;
-import java.io.*;
+import freenet.message.client.ClientPut;
+import freenet.message.client.Failed;
+import freenet.message.client.URIError;
+import freenet.node.BadStateException;
+import freenet.node.Node;
+import freenet.node.State;
+import freenet.node.StateException;
+import freenet.node.states.request.FeedbackToken;
+import freenet.node.states.request.InsertPending;
+import freenet.node.states.request.RequestInitiator;
+import freenet.support.Bucket;
+import freenet.support.Logger;
+import freenet.support.io.DiscontinueInputStream;
+import freenet.support.io.FreeBucketInputStream;
/**
* This is the state pertaining to InsertRequests in their
Index: ClientPutToken.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/ClientPutToken.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- ClientPutToken.java 4 Oct 2003 01:16:59 -0000 1.6
+++ ClientPutToken.java 30 Oct 2003 01:34:02 -0000 1.7
@@ -1,10 +1,17 @@
package freenet.node.states.FCP;
-import freenet.*;
-import freenet.message.client.*;
-import freenet.node.*;
+import freenet.FieldSet;
+import freenet.MessageSendCallback;
+import freenet.PeerHandler;
+import freenet.SendFailedException;
+import freenet.Storables;
+import freenet.TrailerWriter;
+import freenet.message.client.KeyCollision;
+import freenet.message.client.Pending;
+import freenet.message.client.Success;
+import freenet.node.Node;
+import freenet.node.NodeReference;
import freenet.support.Fields;
-import java.io.*;
/** This is the FeedbackToken given to the InsertRequestInitiator.
* @author tavin
Index: ClientGetToken.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/ClientGetToken.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- ClientGetToken.java 13 Oct 2003 15:42:01 -0000 1.12
+++ ClientGetToken.java 30 Oct 2003 01:34:02 -0000 1.13
@@ -1,16 +1,37 @@
package freenet.node.states.FCP;
-import freenet.*;
-import freenet.node.*;
-import freenet.message.client.*;
-import freenet.client.*;
-import freenet.crypt.*;
-import freenet.support.io.*;
-import freenet.support.Logger;
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import freenet.Core;
+import freenet.FieldSet;
+import freenet.KeyException;
+import freenet.MessageSendCallback;
+import freenet.OutputStreamTrailerWriter;
+import freenet.PeerHandler;
+import freenet.SendFailedException;
+import freenet.Storables;
+import freenet.TrailerWriter;
+import freenet.TrailerWriterOutputStream;
+import freenet.client.ClientKey;
+import freenet.client.Document;
+import freenet.client.FreenetURI;
+import freenet.message.client.ClientMessage;
+import freenet.message.client.DataChunk;
+import freenet.message.client.DataFound;
+import freenet.message.client.Failed;
+import freenet.message.client.MetadataHint;
+import freenet.message.client.URIError;
+import freenet.node.Node;
+import freenet.node.NodeReference;
import freenet.support.Bucket;
import freenet.support.BucketFactory;
+import freenet.support.Logger;
+import freenet.support.io.CBStripOutputStream;
+import freenet.support.io.CopyingOutputStream;
+import freenet.support.io.DataChunkOutputStream;
+import freenet.support.io.DataNotValidIOException;
/** Serves as a communication relay between the state chain and
* the FCP client after a ClientGet has been initiated.
Index: NewInvertPrivateKey.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewInvertPrivateKey.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- NewInvertPrivateKey.java 4 Oct 2003 01:17:05 -0000 1.2
+++ NewInvertPrivateKey.java 30 Oct 2003 01:34:02 -0000 1.3
@@ -1,12 +1,18 @@
package freenet.node.states.FCP;
-import freenet.*;
-import freenet.node.*;
-import freenet.message.client.*;
-import freenet.support.*;
-import freenet.client.*;
-import freenet.crypt.*;
-import java.io.*;
+import freenet.FieldSet;
+import freenet.MessageObject;
+import freenet.PeerHandler;
+import freenet.client.AbstractClientKey;
+import freenet.client.ClientSSK;
+import freenet.client.FreenetURI;
+import freenet.message.client.Failed;
+import freenet.message.client.InvertPrivateKey;
+import freenet.message.client.Success;
+import freenet.node.BadStateException;
+import freenet.node.Node;
+import freenet.node.State;
+import freenet.support.Logger;
/** State to handle the FCP command to invert a private key to its
* public value.
Index: NewFECSegmentSplitFile.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewFECSegmentSplitFile.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- NewFECSegmentSplitFile.java 4 Oct 2003 01:17:02 -0000 1.3
+++ NewFECSegmentSplitFile.java 30 Oct 2003 01:34:02 -0000 1.4
@@ -1,15 +1,19 @@
package freenet.node.states.FCP;
-import freenet.*;
-import freenet.node.*;
-import freenet.message.client.*;
-import freenet.message.client.FEC.*;
-import freenet.support.Bucket;
-import freenet.support.BucketFactory;
-import freenet.support.BucketTools;
+import java.io.OutputStream;
+import freenet.MessageObject;
+import freenet.PeerHandler;
import freenet.client.FECTools;
-import java.io.*;
+import freenet.message.client.Failed;
+import freenet.message.client.FEC.BlockMap;
+import freenet.message.client.FEC.FECSegmentSplitFile;
+import freenet.message.client.FEC.SegmentHeader;
+import freenet.node.BadStateException;
+import freenet.node.Node;
+import freenet.node.State;
+import freenet.support.Bucket;
+import freenet.support.BucketFactory;
public class NewFECSegmentSplitFile extends NewClientRequest {
Index: FCPFeedbackToken.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/FCPFeedbackToken.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- FCPFeedbackToken.java 4 Oct 2003 01:17:00 -0000 1.7
+++ FCPFeedbackToken.java 30 Oct 2003 01:34:02 -0000 1.8
@@ -1,10 +1,17 @@
package freenet.node.states.FCP;
-import freenet.*;
-import freenet.message.client.*;
-import freenet.node.states.request.FeedbackToken;
+import freenet.FieldSet;
+import freenet.MessageSendCallback;
+import freenet.PeerHandler;
+import freenet.SendFailedException;
+import freenet.TrailerWriter;
+import freenet.message.client.ClientMessage;
+import freenet.message.client.DataNotFound;
+import freenet.message.client.Failed;
+import freenet.message.client.Restarted;
+import freenet.message.client.RouteNotFound;
import freenet.node.Node;
-import java.io.*;
+import freenet.node.states.request.FeedbackToken;
/** FeedbackToken to translate the results from the node's request states
* to FCP responses.
Index: NewGetSize.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewGetSize.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- NewGetSize.java 4 Oct 2003 01:17:03 -0000 1.2
+++ NewGetSize.java 30 Oct 2003 01:34:02 -0000 1.3
@@ -1,15 +1,17 @@
package freenet.node.states.FCP;
-import freenet.*;
-import freenet.node.*;
-import freenet.node.states.request.*;
-import freenet.message.DataInsert;
-import freenet.message.client.*;
-import freenet.client.*;
-import freenet.support.*;
-import freenet.support.io.*;
-import freenet.crypt.*;
-import java.io.*;
+import freenet.FieldSet;
+import freenet.KeyException;
+import freenet.MessageObject;
+import freenet.PeerHandler;
+import freenet.client.ComputeSizeRequest;
+import freenet.client.FreenetURI;
+import freenet.message.client.GetSize;
+import freenet.message.client.Success;
+import freenet.message.client.URIError;
+import freenet.node.BadStateException;
+import freenet.node.Node;
+import freenet.node.State;
/** This is the state pertaining to GetSize's in their
* initial state
Index: NewInfo.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewInfo.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- NewInfo.java 18 Oct 2003 00:17:56 -0000 1.9
+++ NewInfo.java 30 Oct 2003 01:34:02 -0000 1.10
@@ -1,17 +1,21 @@
/* -*- Mode: java; c-basic-indent: 4; tab-width: 4 -*- */
package freenet.node.states.FCP;
-import freenet.*;
-import freenet.node.*;
-import freenet.support.*;
-import freenet.support.io.*;
-import freenet.message.client.*;
-import freenet.fs.dir.NativeFSDirectory;
-import freenet.transport.tcpAddress;
+import freenet.Core;
+import freenet.FieldSet;
+import freenet.MessageObject;
+import freenet.PeerHandler;
import freenet.diagnostics.Diagnostics;
+import freenet.fs.dir.NativeFSDirectory;
+import freenet.message.client.ClientInfo;
+import freenet.message.client.NodeInfo;
+import freenet.node.BadStateException;
+import freenet.node.Main;
+import freenet.node.Node;
+import freenet.node.State;
import freenet.node.ds.FSDataStore;
-
-import java.util.*;
+import freenet.support.Fields;
+import freenet.transport.tcpAddress;
public class NewInfo extends NewClientRequest {
Index: NewGenerateCHK.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewGenerateCHK.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- NewGenerateCHK.java 4 Oct 2003 01:17:03 -0000 1.3
+++ NewGenerateCHK.java 30 Oct 2003 01:34:02 -0000 1.4
@@ -1,12 +1,20 @@
package freenet.node.states.FCP;
-import freenet.*;
-import freenet.node.*;
-import freenet.message.client.*;
-import freenet.support.*;
-import freenet.client.*;
-import freenet.crypt.*;
-import java.io.*;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import freenet.FieldSet;
+import freenet.MessageObject;
+import freenet.PeerHandler;
+import freenet.client.ClientCHK;
+import freenet.message.client.Failed;
+import freenet.message.client.GenerateCHK;
+import freenet.message.client.Success;
+import freenet.node.BadStateException;
+import freenet.node.Node;
+import freenet.node.State;
+import freenet.support.Bucket;
+import freenet.support.Logger;
public class NewGenerateCHK extends NewClientRequest {
Index: NewGenerateSHA1.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewGenerateSHA1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- NewGenerateSHA1.java 4 Oct 2003 01:17:03 -0000 1.3
+++ NewGenerateSHA1.java 30 Oct 2003 01:34:02 -0000 1.4
@@ -1,12 +1,17 @@
package freenet.node.states.FCP;
-import freenet.*;
-import freenet.node.*;
-import freenet.message.client.*;
-import freenet.support.*;
-import freenet.client.*;
-import freenet.crypt.*;
-import java.io.*;
+import freenet.FieldSet;
+import freenet.MessageObject;
+import freenet.PeerHandler;
+import freenet.crypt.SHA1;
+import freenet.crypt.Util;
+import freenet.message.client.Failed;
+import freenet.message.client.GenerateSHA1;
+import freenet.message.client.Success;
+import freenet.node.BadStateException;
+import freenet.node.Node;
+import freenet.node.State;
+import freenet.support.Logger;
public class NewGenerateSHA1 extends NewClientRequest {
Index: NewFECMakeMetadata.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewFECMakeMetadata.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- NewFECMakeMetadata.java 4 Oct 2003 01:17:02 -0000 1.4
+++ NewFECMakeMetadata.java 30 Oct 2003 01:34:02 -0000 1.5
@@ -1,15 +1,21 @@
package freenet.node.states.FCP;
-import freenet.*;
-import freenet.node.*;
-import freenet.message.client.*;
-import freenet.message.client.FEC.*;
-import freenet.support.io.ReadInputStream;
+import java.io.InputStream;
+
+import freenet.FieldSet;
+import freenet.MessageObject;
+import freenet.PeerHandler;
+import freenet.message.client.Failed;
+import freenet.message.client.MadeMetadata;
+import freenet.message.client.FEC.BlockMap;
+import freenet.message.client.FEC.FECMakeMetadata;
+import freenet.message.client.FEC.SegmentHeader;
+import freenet.node.BadStateException;
+import freenet.node.Node;
+import freenet.node.State;
import freenet.support.Bucket;
import freenet.support.BucketFactory;
-import freenet.support.BucketTools;
-import freenet.client.FECTools;
-import java.io.*;
+import freenet.support.io.ReadInputStream;
public class NewFECMakeMetadata extends NewClientRequest {
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
