Update of /cvsroot/freenet/freenet/src/freenet/client
In directory sc8-pr-cvs1:/tmp/cvs-serv13416/src/freenet/client

Modified Files:
        DecodeSegmentRequest.java ClientCore.java AutoRequester.java 
        GetRequestProcess.java FECTools.java ClientMessageHandler.java 
        InvertPrivateKeyProcess.java FECDecoder.java Document.java 
        SplitFileRequestProcess.java ControlRequestProcess.java 
        SplitFileStatus.java SplitFileInsertProcess.java 
        SplitFilePutRequest.java SplitFileGetRequest.java 
        VirtualClient.java SplitFileInsertManager.java FCPClient.java 
        FreenetURI.java SegmentFileRequest.java FECEncoder.java 
        InvertPrivateKeyRequest.java EncodeSegmentRequest.java 
        PutRequest.java 
Log Message:
No functional changes. Fix lots of warnings from Eclipse about imports. Should speed 
up compilation slightly, beautify code slightly.

Index: DecodeSegmentRequest.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/DecodeSegmentRequest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- DecodeSegmentRequest.java   19 Jan 2003 07:37:25 -0000      1.3
+++ DecodeSegmentRequest.java   30 Oct 2003 01:34:03 -0000      1.4
@@ -1,9 +1,7 @@
 package freenet.client;
 
-import freenet.support.Bucket;
-import freenet.client.metadata.SplitFile;
-import freenet.message.client.FEC.BlockMap;
 import freenet.message.client.FEC.SegmentHeader;
+import freenet.support.Bucket;
 
 /** Represents a request to FEC decode a segment
  *  of a SplitFile. 

Index: ClientCore.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/ClientCore.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- ClientCore.java     27 Oct 2003 14:45:18 -0000      1.5
+++ ClientCore.java     30 Oct 2003 01:34:03 -0000      1.6
@@ -1,17 +1,33 @@
 package freenet.client;
 
-import java.io.*;
-import java.net.BindException;
-import freenet.*;
-import freenet.node.NodeReference;
-import freenet.interfaces.Interface;
-import freenet.session.LinkManager;
+import freenet.Address;
+import freenet.Authentity;
+import freenet.Core;
+import freenet.DSAAuthentity;
+import freenet.ListenException;
+import freenet.OpenConnectionManager;
+import freenet.Peer;
+import freenet.Presentation;
+import freenet.PresentationHandler;
+import freenet.SessionHandler;
+import freenet.Ticker;
+import freenet.TransportHandler;
 import freenet.crypt.Global;
-import freenet.support.*;
-import freenet.message.*;
+import freenet.message.Accepted;
+import freenet.message.DataInsert;
+import freenet.message.DataNotFound;
+import freenet.message.DataReply;
+import freenet.message.InsertReply;
+import freenet.message.QueryAborted;
+import freenet.message.QueryRejected;
+import freenet.message.QueryRestarted;
+import freenet.message.StoreData;
+import freenet.message.VoidMessage;
+import freenet.node.NodeReference;
 import freenet.presentation.FNPRawMessage;
-import freenet.presentation.FreenetProtocol;
-import freenet.thread.*;
+import freenet.session.LinkManager;
+import freenet.thread.FastThreadFactory;
+import freenet.thread.ThreadFactory;
 
 /**
  * This is an implementation of Core the for use by the clients. It is 

Index: AutoRequester.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/AutoRequester.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -w -r1.36 -r1.37
--- AutoRequester.java  18 Sep 2003 17:48:05 -0000      1.36
+++ AutoRequester.java  30 Oct 2003 01:34:03 -0000      1.37
@@ -1,18 +1,23 @@
 package freenet.client;
-import freenet.BadAddressException;
-import freenet.transport.TCP;
-import freenet.client.metadata.*;
-import freenet.support.TempBucketFactory;
-import freenet.support.Bucket;
+import java.util.Vector;
 
+import freenet.BadAddressException;
 import freenet.Core;
-import freenet.support.Logger;
-import freenet.client.listeners.EventLogger;
-import freenet.client.listeners.DoneListener;
 import freenet.client.events.StateReachedEvent;
-
-import java.lang.Throwable;
-import java.util.Vector;
+import freenet.client.listeners.DoneListener;
+import freenet.client.metadata.DateRedirect;
+import freenet.client.metadata.DocumentCommand;
+import freenet.client.metadata.InfoPart;
+import freenet.client.metadata.InvalidPartException;
+import freenet.client.metadata.Metadata;
+import freenet.client.metadata.MetadataSettings;
+import freenet.client.metadata.MimeTypeUtils;
+import freenet.client.metadata.Redirect;
+import freenet.client.metadata.SplitFile;
+import freenet.support.Bucket;
+import freenet.support.Logger;
+import freenet.support.TempBucketFactory;
+import freenet.transport.TCP;
 
 
 /**

Index: GetRequestProcess.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/GetRequestProcess.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -w -r1.31 -r1.32
--- GetRequestProcess.java      19 Sep 2003 20:51:13 -0000      1.31
+++ GetRequestProcess.java      30 Oct 2003 01:34:03 -0000      1.32
@@ -1,33 +1,39 @@
 package freenet.client;
-import freenet.client.listeners.DoneListener;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Vector;
+import java.util.jar.JarEntry;
+import java.util.jar.JarInputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipException;
+import java.util.zip.ZipFile;
+
+import freenet.Core;
+import freenet.Key;
+import freenet.KeyException;
+import freenet.client.events.DataNotFoundEvent;
+import freenet.client.events.DocumentNotValidEvent;
+import freenet.client.events.ErrorEvent;
+import freenet.client.events.ExceptionEvent;
+import freenet.client.events.RedirectFollowedEvent;
+import freenet.client.events.StateReachedEvent;
 import freenet.client.listeners.CollectingEventListener;
-import freenet.client.metadata.Metadata;
-import freenet.client.metadata.MetadataSettings;
+import freenet.client.listeners.DoneListener;
 import freenet.client.metadata.DocumentCommand;
 import freenet.client.metadata.InvalidPartException;
+import freenet.client.metadata.Metadata;
+import freenet.client.metadata.MetadataSettings;
+import freenet.support.ArrayBucket;
 import freenet.support.Bucket;
-import freenet.support.BucketTools;
 import freenet.support.BucketFactory;
-import freenet.support.ArrayBucket;
+import freenet.support.BucketTools;
 import freenet.support.FileBucket;
+import freenet.support.Logger;
 import freenet.support.TempBucketFactory;
-import freenet.support.io.DataNotValidIOException;
 import freenet.support.io.LimitedInputStream;
-import freenet.client.events.GeneratedURIEvent;
-import freenet.client.events.RedirectFollowedEvent;
-import freenet.client.events.StateReachedEvent;
-import freenet.client.events.ExceptionEvent;
-import freenet.client.events.ErrorEvent;
-import freenet.client.events.DocumentNotValidEvent;
-import freenet.client.events.DataNotFoundEvent;
-import freenet.Key;
-import freenet.KeyException;
-import java.io.*;
-import java.util.Vector;
-import java.util.zip.*;
-import java.util.jar.*;
-import freenet.Core; // for logging
-import freenet.support.Logger;
 /**
  * Handeles a series of requests to fill a bucket by traversing down
  * metadata redirections.

Index: FECTools.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/FECTools.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- FECTools.java       3 Jul 2003 03:33:42 -0000       1.12
+++ FECTools.java       30 Oct 2003 01:34:03 -0000      1.13
@@ -1,21 +1,26 @@
 package freenet.client;
 
-import freenet.Core;
-import freenet.FieldSet;
-import freenet.config.Params;
-import freenet.support.*;
-import freenet.message.client.FEC.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InterruptedIOException;
+import java.io.OutputStream;
+import java.util.Enumeration;
+import java.util.Hashtable;
 
+import freenet.Core;
+import freenet.client.metadata.DocumentCommand;
+import freenet.client.metadata.InfoPart;
+import freenet.client.metadata.InvalidPartException;
 import freenet.client.metadata.Metadata;
 import freenet.client.metadata.MetadataSettings;
 import freenet.client.metadata.SplitFile;
-import freenet.client.metadata.InfoPart;
-import freenet.client.metadata.DocumentCommand;
-import freenet.client.metadata.InvalidPartException;
-
-import java.io.*;
-import java.util.Hashtable;
-import java.util.Enumeration;
+import freenet.config.Params;
+import freenet.message.client.FEC.BlockMap;
+import freenet.message.client.FEC.SegmentHeader;
+import freenet.support.Bucket;
+import freenet.support.BucketFactory;
+import freenet.support.BucketTools;
+import freenet.support.Logger;
 
 
 /**

Index: ClientMessageHandler.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/ClientMessageHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- ClientMessageHandler.java   14 Oct 2003 00:43:14 -0000      1.5
+++ ClientMessageHandler.java   30 Oct 2003 01:34:03 -0000      1.6
@@ -1,10 +1,12 @@
 package freenet.client;
-import freenet.*;
-import freenet.support.Logger;
-import freenet.message.*;
+import java.io.PrintStream;
 import java.util.Hashtable;
 import java.util.Vector;
-import java.io.PrintStream;
+
+import freenet.Core;
+import freenet.MessageHandler;
+import freenet.MessageObject;
+import freenet.support.Logger;
 
 /**
  * A MessageHandler specifically for the Freenet default clients. It 

Index: InvertPrivateKeyProcess.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/InvertPrivateKeyProcess.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- InvertPrivateKeyProcess.java        9 Apr 2003 23:00:37 -0000       1.1
+++ InvertPrivateKeyProcess.java        30 Oct 2003 01:34:03 -0000      1.2
@@ -1,5 +1,4 @@
 package freenet.client;
-import freenet.support.Bucket;
 /**
  * Single request process for computing inverting a private SSK 
  * key to it's public value..

Index: FECDecoder.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/FECDecoder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- FECDecoder.java     14 Sep 2002 22:42:17 -0000      1.3
+++ FECDecoder.java     30 Oct 2003 01:34:03 -0000      1.4
@@ -1,9 +1,9 @@
 package freenet.client;
 
+import java.io.IOException;
+
 import freenet.support.Bucket;
 import freenet.support.BucketFactory;
-import freenet.client.metadata.SplitFile;
-import java.io.IOException;
 
 /*
   This code is distributed under the GNU Public Licence (GPL)

Index: Document.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/Document.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- Document.java       21 May 2003 17:06:23 -0000      1.4
+++ Document.java       30 Oct 2003 01:34:03 -0000      1.5
@@ -1,12 +1,22 @@
 package freenet.client;
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.math.BigInteger;
+import java.util.Vector;
+
 import freenet.Key;
-import freenet.crypt.*;
-import freenet.crypt.ciphers.*;
+import freenet.crypt.BlockCipher;
+import freenet.crypt.CipherInputStream;
+import freenet.crypt.CipherOutputStream;
+import freenet.crypt.DecipherOutputStream;
+import freenet.crypt.EncipherInputStream;
+import freenet.crypt.PCFBMode;
+import freenet.crypt.SHA1;
+import freenet.crypt.Util;
 import freenet.support.io.DataNotValidIOException;
-import java.util.*;
-import java.io.*;
-import java.math.BigInteger;
 
 /*
   This code is part of the Java Adaptive Network Client by Ian Clarke. 

Index: SplitFileRequestProcess.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/SplitFileRequestProcess.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- SplitFileRequestProcess.java        3 Jul 2003 03:33:42 -0000       1.8
+++ SplitFileRequestProcess.java        30 Oct 2003 01:34:03 -0000      1.9
@@ -6,8 +6,6 @@
 import freenet.support.Bucket;
 import freenet.support.BucketFactory;
 
-import java.io.IOException;
-
 /**
  * A request process that retrieves and FEC decodes 
  * SplitFiles.

Index: ControlRequestProcess.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/ControlRequestProcess.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- ControlRequestProcess.java  8 Sep 2003 17:03:03 -0000       1.11
+++ ControlRequestProcess.java  30 Oct 2003 01:34:03 -0000      1.12
@@ -1,17 +1,14 @@
 package freenet.client;
+import freenet.Core;
 import freenet.client.listeners.DoneListener;
-import freenet.client.metadata.Metadata;
-import freenet.client.metadata.MetadataSettings;
-import freenet.client.metadata.InvalidPartException;
 import freenet.client.metadata.DocumentCommand;
+import freenet.client.metadata.InvalidPartException;
+import freenet.client.metadata.Metadata;
 import freenet.client.metadata.MetadataPart;
+import freenet.client.metadata.MetadataSettings;
 import freenet.support.Bucket;
 import freenet.support.BucketFactory;
-import freenet.support.ArrayBucket;
-import freenet.client.events.GeneratedURIEvent;
-import freenet.Core;
 import freenet.support.Logger;
-import java.io.IOException;
 /**
  * Shared superclass for requestprocesses that follow control documents.
  *

Index: SplitFileStatus.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/SplitFileStatus.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -w -r1.17 -r1.18
--- SplitFileStatus.java        11 Jul 2003 02:18:17 -0000      1.17
+++ SplitFileStatus.java        30 Oct 2003 01:34:03 -0000      1.18
@@ -1,8 +1,7 @@
 package freenet.client;
 
-import freenet.message.client.FEC.SegmentHeader;
-import freenet.client.*;
 import freenet.client.events.*;
+import freenet.message.client.FEC.SegmentHeader;
 
 /**
  * A listener that collects information about the progress

Index: SplitFileInsertProcess.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/SplitFileInsertProcess.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- SplitFileInsertProcess.java 3 Jul 2003 03:33:42 -0000       1.5
+++ SplitFileInsertProcess.java 30 Oct 2003 01:34:03 -0000      1.6
@@ -3,11 +3,8 @@
 import freenet.client.metadata.Metadata;
 import freenet.client.metadata.MetadataSettings;
 import freenet.client.metadata.SplitFile;
-//import freenet.support.Bucket;
-import freenet.support.FileBucket;
 import freenet.support.BucketFactory;
-
-import java.io.IOException;
+import freenet.support.FileBucket;
 
 /**
  * A request process that segments, encodes and inserts 

Index: SplitFilePutRequest.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/SplitFilePutRequest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- SplitFilePutRequest.java    19 Jan 2003 07:37:25 -0000      1.2
+++ SplitFilePutRequest.java    30 Oct 2003 01:34:03 -0000      1.3
@@ -1,12 +1,9 @@
 package freenet.client;
 
-import freenet.client.metadata.Metadata;
 import freenet.client.metadata.MetadataSettings;
 import freenet.client.metadata.SplitFile;
-
-import freenet.support.FileBucket;
 import freenet.support.BucketFactory;
-import java.net.MalformedURLException;
+import freenet.support.FileBucket;
 
 /** Represents a request to encode and
  *  insert a FEC SplitFile. 

Index: SplitFileGetRequest.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/SplitFileGetRequest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- SplitFileGetRequest.java    17 Apr 2003 18:05:39 -0000      1.4
+++ SplitFileGetRequest.java    30 Oct 2003 01:34:03 -0000      1.5
@@ -1,10 +1,8 @@
 package freenet.client;
 
 import freenet.client.metadata.SplitFile;
-
 import freenet.support.Bucket;
 import freenet.support.BucketFactory;
-import java.net.MalformedURLException;
 
 /** Represents a request to retrieve a
  * and decode a FEC encoded SplitFile. 

Index: VirtualClient.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/VirtualClient.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -r1.13 -r1.14
--- VirtualClient.java  29 Jun 2003 00:49:47 -0000      1.13
+++ VirtualClient.java  30 Oct 2003 01:34:03 -0000      1.14
@@ -1,22 +1,30 @@
 package freenet.client;
 
-import freenet.node.Node;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.reflect.Method;
+import java.util.Enumeration;
+import java.util.Random;
+
 import freenet.Core;
-import freenet.Identity;
-import freenet.Key;
-import freenet.KeyException;
-import freenet.client.events.*;
-import freenet.client.metadata.*;
+import freenet.client.events.ExceptionEvent;
+import freenet.client.events.GeneratedKeyPairEvent;
+import freenet.client.events.GeneratedURIEvent;
+import freenet.client.events.StateReachedEvent;
 import freenet.client.listeners.CollectingEventListener;
-import freenet.crypt.*;
-import freenet.support.*;
-import freenet.message.client.FEC.SegmentHeader;
+import freenet.client.metadata.DocumentCommand;
+import freenet.client.metadata.Metadata;
+import freenet.client.metadata.MetadataSettings;
+import freenet.crypt.SHA1;
+import freenet.crypt.Util;
 import freenet.message.client.FEC.BlockMap;
-
-import java.io.*;
-import java.util.Random;
-import java.util.Enumeration;
-import java.lang.reflect.Method;
+import freenet.message.client.FEC.SegmentHeader;
+import freenet.node.Node;
+import freenet.support.Bucket;
+import freenet.support.BucketFactory;
+import freenet.support.BucketTools;
+import freenet.support.Logger;
 
 /** VirtualClient knows how to deal with client Requests that don't need
   * to go over the wire, such as ComputeCHKRequest and ComputeSVKRequest.

Index: SplitFileInsertManager.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/SplitFileInsertManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- SplitFileInsertManager.java 3 Jul 2003 03:33:42 -0000       1.8
+++ SplitFileInsertManager.java 30 Oct 2003 01:34:03 -0000      1.9
@@ -1,21 +1,27 @@
 package freenet.client;
 
-import freenet.client.events.*;
-import freenet.support.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
+import freenet.Core;
+import freenet.client.events.BlockQueuedEvent;
+import freenet.client.events.CollisionEvent;
+import freenet.client.events.ExceptionEvent;
+import freenet.client.events.SegmentEncodedEvent;
+import freenet.client.events.SegmentEncodingEvent;
+import freenet.client.events.SegmentInsertFinishedEvent;
+import freenet.client.events.SegmentInsertStartedEvent;
+import freenet.client.events.SplitFileEvent;
+import freenet.client.events.SplitFileStartedEvent;
 import freenet.client.metadata.Metadata;
 import freenet.client.metadata.MetadataSettings;
 import freenet.client.metadata.SplitFile;
-
-import freenet.message.client.FEC.SegmentHeader;
 import freenet.message.client.FEC.BlockMap;
-
-import freenet.Core; // for logging. It is reasonable to assume we have a Core here.
-
-import java.io.File;
-import java.io.OutputStream;
-import java.io.InputStream;
-import java.io.IOException;
-import java.util.Vector;
+import freenet.message.client.FEC.SegmentHeader;
+import freenet.support.Bucket;
+import freenet.support.BucketTools;
+import freenet.support.NullBucket;
 
 /**
  * Helper class handles segmenting, encoding and inserting 

Index: FCPClient.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/FCPClient.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -w -r1.19 -r1.20
--- FCPClient.java      24 Oct 2003 02:24:57 -0000      1.19
+++ FCPClient.java      30 Oct 2003 01:34:03 -0000      1.20
@@ -1,23 +1,52 @@
 package freenet.client;
 
-import freenet.*;
-import freenet.client.events.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InterruptedIOException;
+import java.io.OutputStream;
+import java.io.SequenceInputStream;
+import java.math.BigInteger;
+import java.util.Enumeration;
+import java.util.Vector;
+
+import freenet.Address;
+import freenet.Connection;
+import freenet.FieldSet;
+import freenet.InvalidMessageException;
+import freenet.KeyException;
+import freenet.Presentation;
+import freenet.RawMessage;
+import freenet.client.events.CollisionEvent;
+import freenet.client.events.DataNotFoundEvent;
+import freenet.client.events.ErrorEvent;
+import freenet.client.events.ExceptionEvent;
+import freenet.client.events.GeneratedKeyPairEvent;
+import freenet.client.events.GeneratedURIEvent;
+import freenet.client.events.InvertedPrivateKeyEvent;
+import freenet.client.events.PendingEvent;
+import freenet.client.events.RestartedEvent;
+import freenet.client.events.RouteNotFoundEvent;
+import freenet.client.events.StateReachedEvent;
+import freenet.client.events.TransferStartedEvent;
 import freenet.client.listeners.CollectingEventListener;
-import freenet.client.metadata.*;
+import freenet.client.metadata.DocumentCommand;
+import freenet.client.metadata.Metadata;
+import freenet.client.metadata.MetadataSettings;
+import freenet.crypt.DSAPrivateKey;
 import freenet.message.client.FEC.BlockMap;
 import freenet.message.client.FEC.SegmentHeader;
-import freenet.crypt.*;
-import freenet.presentation.*;
-import freenet.session.*;
-import freenet.support.*;
-import freenet.support.io.ReadInputStream;
-import freenet.support.io.WriteOutputStream;
+import freenet.presentation.ClientProtocol;
+import freenet.session.LinkManager;
+import freenet.session.PlainLinkManager;
+import freenet.support.Bucket;
+import freenet.support.Fields;
+import freenet.support.FileBucket;
+import freenet.support.TempBucketFactory;
 import freenet.support.io.BucketInputStream;
-import java.io.*;
-import java.net.*;
-import java.math.BigInteger;
-import java.util.Enumeration;
-import java.util.Vector;
+import freenet.support.io.WriteOutputStream;
 
 
 /** 

Index: FreenetURI.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/FreenetURI.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- FreenetURI.java     19 Sep 2003 18:45:13 -0000      1.4
+++ FreenetURI.java     30 Oct 2003 01:34:03 -0000      1.5
@@ -1,10 +1,12 @@
 package freenet.client;
 
-import freenet.*;
-import freenet.support.Loader;
-import java.util.*;
 import java.net.MalformedURLException;
-import java.lang.reflect.InvocationTargetException;
+import java.util.Enumeration;
+import java.util.NoSuchElementException;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
+import freenet.FieldSet;
 
 /**
  * FreenetURI handles parsing and creation of the Freenet URI format, defined 

Index: SegmentFileRequest.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/SegmentFileRequest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- SegmentFileRequest.java     2 Dec 2002 03:06:08 -0000       1.1
+++ SegmentFileRequest.java     30 Oct 2003 01:34:03 -0000      1.2
@@ -1,6 +1,5 @@
 package freenet.client;
 
-import freenet.message.client.FEC.BlockMap;
 import freenet.message.client.FEC.SegmentHeader;
 
 /** Represents a request to segment a file

Index: FECEncoder.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/FECEncoder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- FECEncoder.java     19 Feb 2003 04:39:10 -0000      1.3
+++ FECEncoder.java     30 Oct 2003 01:34:03 -0000      1.4
@@ -1,9 +1,9 @@
 package freenet.client;
 
+import java.io.IOException;
+
 import freenet.support.Bucket;
 import freenet.support.BucketFactory;
-import freenet.client.metadata.SplitFile;
-import java.io.IOException;
 
 /*
   This code is distributed under the GNU Public Licence (GPL)

Index: InvertPrivateKeyRequest.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/InvertPrivateKeyRequest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- InvertPrivateKeyRequest.java        9 Apr 2003 23:00:39 -0000       1.1
+++ InvertPrivateKeyRequest.java        30 Oct 2003 01:34:03 -0000      1.2
@@ -1,7 +1,5 @@
 package freenet.client;
 
-import freenet.support.Bucket;
-
 /** Represents a request to calculate a public SSK from
  * a private one. (InvertPrivateKey in FCP)
  * @author giannij

Index: EncodeSegmentRequest.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/EncodeSegmentRequest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- EncodeSegmentRequest.java   11 Jan 2003 22:53:06 -0000      1.2
+++ EncodeSegmentRequest.java   30 Oct 2003 01:34:03 -0000      1.3
@@ -1,10 +1,8 @@
 package freenet.client;
 
+import freenet.message.client.FEC.SegmentHeader;
 import freenet.support.Bucket;
 import freenet.support.BucketTools;
-import freenet.client.metadata.SplitFile;
-import freenet.message.client.FEC.BlockMap;
-import freenet.message.client.FEC.SegmentHeader;
 
 /** Represents a request to FEC encode a segment
  *  of a SplitFile. 

Index: PutRequest.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/PutRequest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- PutRequest.java     2 Apr 2003 19:45:30 -0000       1.5
+++ PutRequest.java     30 Oct 2003 01:34:03 -0000      1.6
@@ -1,10 +1,10 @@
 package freenet.client;
 
-import freenet.support.Bucket;
+import java.net.MalformedURLException;
+
 import freenet.keys.SVK;
+import freenet.support.Bucket;
 import freenet.support.NullBucket;
-import java.io.InputStream;
-import java.net.MalformedURLException;
 
 /** Represents a request to insert a file.
   * @author tavin

_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs

Reply via email to