Update of /cvsroot/freenet/freenet/src/freenet/node
In directory sc8-pr-cvs1:/tmp/cvs-serv13416/src/freenet/node
Modified Files:
EventMessageObject.java NodeReference.java
SmartFailureTable.java Node.java WatchMe.java
FailureTable.java StateChain.java LoadStats.java Main.java
NodeConfigUpdater.java
Log Message:
No functional changes. Fix lots of warnings from Eclipse about imports. Should speed
up compilation slightly, beautify code slightly.
Index: EventMessageObject.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/EventMessageObject.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- EventMessageObject.java 18 Sep 2003 17:48:09 -0000 1.2
+++ EventMessageObject.java 30 Oct 2003 01:34:02 -0000 1.3
@@ -1,6 +1,6 @@
package freenet.node;
-import freenet.*;
-import freenet.support.*;
+import freenet.support.Schedulable;
+import freenet.support.TickerToken;
/**
* Interface of generic non-message events in the node.
Index: NodeReference.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/NodeReference.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -w -r1.29 -r1.30
--- NodeReference.java 23 Oct 2003 00:09:41 -0000 1.29
+++ NodeReference.java 30 Oct 2003 01:34:02 -0000 1.30
@@ -1,17 +1,34 @@
package freenet.node;
-import freenet.*;
+import java.math.BigInteger;
+import java.util.Enumeration;
+
+import freenet.Address;
+import freenet.BadAddressException;
+import freenet.Core;
+import freenet.DSAAuthentity;
+import freenet.DSAIdentity;
+import freenet.FieldSet;
+import freenet.Identity;
+import freenet.KeyException;
+import freenet.Peer;
+import freenet.Presentation;
+import freenet.PresentationHandler;
+import freenet.SessionHandler;
+import freenet.Transport;
+import freenet.TransportHandler;
+import freenet.Version;
+import freenet.client.ClientSSK;
import freenet.client.FreenetURI;
-import freenet.client.Base64;
-import freenet.support.*;
-import freenet.crypt.*;
+import freenet.crypt.DSAPublicKey;
+import freenet.crypt.DSASignature;
+import freenet.crypt.Digest;
+import freenet.crypt.SHA1;
+import freenet.keys.SVK;
import freenet.session.LinkManager;
+import freenet.support.Fields;
+import freenet.support.Logger;
import freenet.transport.VoidAddress;
-import freenet.keys.SVK;
-import freenet.client.ClientSSK;
-import java.util.Enumeration;
-import java.math.BigInteger;
-import java.net.MalformedURLException;
/**
* References contains names from which Address objects can be resolved.
Index: SmartFailureTable.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/SmartFailureTable.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- SmartFailureTable.java 28 Oct 2003 17:48:37 -0000 1.3
+++ SmartFailureTable.java 30 Oct 2003 01:34:02 -0000 1.4
@@ -1,17 +1,8 @@
package freenet.node;
-import freenet.Core;
-import freenet.Key;
-import freenet.support.Checkpointed;
-import freenet.support.Heap;
-import freenet.support.Heap.Element;
-import freenet.support.sort.ArraySorter;
-import freenet.support.sort.QuickSorter;
-
+import java.util.LinkedList;
-import java.util.*;
-
-import java.io.PrintWriter;
+import freenet.Key;
/**
* Keeps track of more keys than the standart failure table as discussed
Index: Node.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/Node.java,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -w -r1.233 -r1.234
--- Node.java 28 Oct 2003 05:09:57 -0000 1.233
+++ Node.java 30 Oct 2003 01:34:02 -0000 1.234
@@ -1,29 +1,54 @@
/* -*- Mode: java; c-basic-indent: 4; indent-tabs-mode: nil -*- */
package freenet.node;
-import freenet.*;
-import freenet.crypt.*;
-import freenet.config.*;
-import freenet.support.*;
-import freenet.support.io.*;
-import freenet.fs.dir.Directory;
-import freenet.node.ds.*;
-import freenet.node.rt.*;
-import freenet.presentation.FreenetProtocol;
-import freenet.transport.*;
-import freenet.session.*;
-import freenet.diagnostics.*;
-import freenet.thread.ThreadFactory;
-import freenet.interfaces.Interface;
-import freenet.node.states.maintenance.*;
+import java.io.File;
+import java.text.NumberFormat;
+import java.util.Enumeration;
+
+import freenet.Address;
+import freenet.Authentity;
+import freenet.CommunicationException;
+import freenet.Core;
+import freenet.CoreException;
+import freenet.DSAAuthentity;
+import freenet.DSAIdentity;
+import freenet.FieldSet;
+import freenet.Identity;
+import freenet.Key;
+import freenet.KeyException;
+import freenet.Message;
+import freenet.MessageSendCallback;
+import freenet.Peer;
+import freenet.PeerHandler;
+import freenet.Presentation;
+import freenet.PresentationHandler;
+import freenet.SessionHandler;
+import freenet.TrailerWriter;
+import freenet.TransportHandler;
+import freenet.Version;
+import freenet.client.BackgroundInserter;
import freenet.client.ClientFactory;
-import freenet.client.InternalClient;
import freenet.client.FECTools;
-import freenet.client.BackgroundInserter;
-import java.text.NumberFormat;
-import java.util.*;
-import java.net.*;
-import java.io.*;
+import freenet.client.InternalClient;
+import freenet.config.Config;
+import freenet.config.Params;
+import freenet.config.RandomPortOption;
+import freenet.diagnostics.Diagnostics;
+import freenet.fs.dir.Directory;
+import freenet.node.ds.DataStore;
+import freenet.node.rt.RTDiagSnapshot;
+import freenet.node.rt.RoutingTable;
+import freenet.session.LinkManager;
+import freenet.support.Bucket;
+import freenet.support.BucketFactory;
+import freenet.support.Fields;
+import freenet.support.LimitCounter;
+import freenet.support.Logger;
+import freenet.support.io.Bandwidth;
+import freenet.thread.ThreadFactory;
+import freenet.transport.tcpAddress;
+import freenet.transport.tcpConnection;
+import freenet.transport.tcpListener;
/*
This code is part of the Java Adaptive Network Client by Ian Clarke.
Index: WatchMe.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/WatchMe.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -r1.14 -r1.15
--- WatchMe.java 1 Apr 2003 01:35:06 -0000 1.14
+++ WatchMe.java 30 Oct 2003 01:34:02 -0000 1.15
@@ -1,14 +1,19 @@
/* -*- Mode: java; c-basic-indent: 4; tab-width: 4 -*- */
package freenet.node;
-import java.io.*;
-import java.net.*;
-import java.text.*;
-import java.util.*;
-import freenet.*;
-import freenet.config.*;
-import freenet.node.states.maintenance.*;
-import freenet.support.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.net.Socket;
+import java.net.URL;
+
+import freenet.Core;
+import freenet.config.Params;
+import freenet.support.Checkpointed;
+import freenet.support.Logger;
/**
* Encapsulates "WatchMe" functionality for monitoring node behavior
Index: FailureTable.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/FailureTable.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -r1.13 -r1.14
--- FailureTable.java 28 Oct 2003 17:48:37 -0000 1.13
+++ FailureTable.java 30 Oct 2003 01:34:02 -0000 1.14
@@ -1,5 +1,9 @@
package freenet.node;
+import java.io.PrintWriter;
+import java.util.Date;
+import java.util.Hashtable;
+
import freenet.Core;
import freenet.Key;
import freenet.support.Checkpointed;
@@ -7,15 +11,6 @@
import freenet.support.Heap.Element;
import freenet.support.sort.ArraySorter;
import freenet.support.sort.QuickSorter;
-
-
-import java.util.Hashtable;
-import java.util.Date;
-
-import java.util.Enumeration;
-import java.util.Random;
-
-import java.io.PrintWriter;
/**
* Keeps track of keys that have been failed recently, and automatically
Index: StateChain.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/StateChain.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -w -r1.23 -r1.24
--- StateChain.java 14 Oct 2003 00:43:14 -0000 1.23
+++ StateChain.java 30 Oct 2003 01:34:02 -0000 1.24
@@ -1,16 +1,13 @@
package freenet.node;
-import freenet.MessageObject;
-import freenet.support.Logger;
-import freenet.support.Fields;
-import freenet.support.Comparable;
-
-import java.util.Vector;
-import java.util.Enumeration;
-import java.util.Date;
import java.io.PrintStream;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.Vector;
import freenet.Core;
+import freenet.MessageObject;
+import freenet.support.Fields;
import freenet.support.Logger;
/**
Index: LoadStats.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/LoadStats.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -w -r1.37 -r1.38
--- LoadStats.java 28 Oct 2003 05:09:57 -0000 1.37
+++ LoadStats.java 30 Oct 2003 01:34:02 -0000 1.38
@@ -1,24 +1,29 @@
/* -*- Mode: java; c-basic-indent: 4; indent-tabs-mode: nil -*- */
package freenet.node;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.text.NumberFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Enumeration;
+
import freenet.Core;
import freenet.diagnostics.Diagnostics;
import freenet.diagnostics.DiagnosticsCategory;
-import freenet.Identity;
-import freenet.support.*;
-import freenet.support.sort.*;
-import freenet.support.Comparable;
import freenet.fs.dir.FileNumber;
-
-import java.text.NumberFormat;
-import java.text.SimpleDateFormat;
-import java.util.Hashtable;
-import java.util.Enumeration;
-import java.util.Date;
-import java.io.PrintWriter;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
+import freenet.support.Checkpointed;
+import freenet.support.Comparable;
+import freenet.support.Comparator;
+import freenet.support.DataObject;
+import freenet.support.DataObjectStore;
+import freenet.support.DataObjectUnloadedException;
+import freenet.support.DoublyLinkedListImpl;
+import freenet.support.Logger;
+import freenet.support.sort.ArraySorter;
+import freenet.support.sort.QuickSorter;
/*
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: Main.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/Main.java,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -w -r1.283 -r1.284
--- Main.java 28 Oct 2003 05:09:57 -0000 1.283
+++ Main.java 30 Oct 2003 01:34:02 -0000 1.284
@@ -1,48 +1,170 @@
/* -*- Mode: java; c-basic-indent: 4; indent-tabs-mode: nil -*- */
package freenet.node;
-import freenet.*;
-import freenet.diagnostics.*;
-import freenet.thread.*;
-import freenet.interfaces.*;
-import freenet.interfaces.servlet.*;
-import freenet.client.events.*;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.EOFException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.lang.reflect.Method;
+import java.math.BigInteger;
+import java.net.InetAddress;
+import java.security.Security;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.LinkedList;
+import java.util.Random;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
+import javax.servlet.Servlet;
+import javax.servlet.http.HttpServlet;
+
+import freenet.Address;
+import freenet.Authentity;
+import freenet.BadAddressException;
+import freenet.ContactCounter;
+import freenet.Core;
+import freenet.DSAAuthentity;
+import freenet.DSAIdentity;
+import freenet.FieldSet;
+import freenet.Identity;
+import freenet.Key;
+import freenet.KeyException;
+import freenet.ListenException;
+import freenet.ListeningAddress;
+import freenet.MessageHandler;
+import freenet.OpenConnectionManager;
+import freenet.PresentationHandler;
+import freenet.SessionHandler;
+import freenet.Ticker;
+import freenet.Transport;
+import freenet.TransportHandler;
+import freenet.Version;
+import freenet.client.AutoBackoffNodeRequester;
+import freenet.client.FECTools;
import freenet.client.FreenetURI;
import freenet.client.InsertURI;
import freenet.client.InternalClient;
-import freenet.config.*;
-import freenet.crypt.*;
-import freenet.fs.*;
-import freenet.fs.FileSystem; // java.io has one too
-import freenet.fs.dir.*;
-import freenet.support.*;
-import freenet.support.io.*;
-import freenet.node.ds.*;
-import freenet.node.rt.*;
-import freenet.node.states.maintenance.*;
-import freenet.node.states.announcing.Announcing;
-import freenet.message.*;
-import freenet.message.client.*;
-import freenet.message.client.FEC.*;
-import freenet.client.FECTools;
+import freenet.client.events.CollisionEvent;
+import freenet.config.Config;
+import freenet.config.Params;
+import freenet.config.Setup;
+import freenet.crypt.BlockCipher;
+import freenet.crypt.DSAGroup;
import freenet.crypt.Global;
-import freenet.presentation.*;
-import freenet.session.*;
+import freenet.crypt.SHA1;
+import freenet.crypt.Util;
+import freenet.diagnostics.AutoPoll;
+import freenet.diagnostics.Diagnostics;
+import freenet.diagnostics.DiagnosticsCategory;
+import freenet.diagnostics.DiagnosticsCheckpoint;
+import freenet.diagnostics.DiagnosticsException;
+import freenet.diagnostics.StandardDiagnostics;
+import freenet.fs.EncryptedFileSystem;
+import freenet.fs.FileSystem;
+import freenet.fs.RAFStorage;
+import freenet.fs.Storage;
+import freenet.fs.dir.Buffer;
+import freenet.fs.dir.Directory;
+import freenet.fs.dir.FSDirectory;
+import freenet.fs.dir.FileNumber;
+import freenet.fs.dir.LossyDirectory;
+import freenet.fs.dir.NativeFSDirectory;
+import freenet.interfaces.ConnectionRunner;
+import freenet.interfaces.FreenetConnectionRunner;
+import freenet.interfaces.LocalNIOInterface;
+import freenet.interfaces.NIOInterface;
+import freenet.interfaces.PublicNIOInterface;
+import freenet.interfaces.Service;
+import freenet.interfaces.ServiceException;
+import freenet.interfaces.ServiceLoader;
+import freenet.interfaces.servlet.SingleHttpServletContainer;
+import freenet.message.Accepted;
+import freenet.message.AnnouncementComplete;
+import freenet.message.AnnouncementExecute;
+import freenet.message.AnnouncementFailed;
+import freenet.message.AnnouncementReply;
+import freenet.message.DataInsert;
+import freenet.message.DataReply;
+import freenet.message.DataRequest;
+import freenet.message.Identify;
+import freenet.message.InsertReply;
+import freenet.message.InsertRequest;
+import freenet.message.NodeAnnouncement;
+import freenet.message.QueryAborted;
+import freenet.message.QueryRejected;
+import freenet.message.QueryRestarted;
+import freenet.message.StoreData;
+import freenet.message.VoidMessage;
+import freenet.message.client.ClientGet;
+import freenet.message.client.ClientHello;
+import freenet.message.client.ClientInfo;
+import freenet.message.client.ClientPut;
+import freenet.message.client.GenerateCHK;
+import freenet.message.client.GenerateSHA1;
+import freenet.message.client.GenerateSVKPair;
+import freenet.message.client.GetDiagnostics;
+import freenet.message.client.Illegal;
+import freenet.message.client.InvertPrivateKey;
+import freenet.message.client.FEC.FECDecodeSegment;
+import freenet.message.client.FEC.FECEncodeSegment;
+import freenet.message.client.FEC.FECMakeMetadata;
+import freenet.message.client.FEC.FECSegmentFile;
+import freenet.message.client.FEC.FECSegmentSplitFile;
+import freenet.node.ds.DataStore;
+import freenet.node.ds.FSDataStore;
+import freenet.node.rt.CPAlgoRoutingTable;
+import freenet.node.rt.DataObjectRoutingStore;
+import freenet.node.rt.DecayingRunningAverage;
+import freenet.node.rt.FilterRoutingTable;
+import freenet.node.rt.NGRoutingTable;
+import freenet.node.rt.NodeEstimatorFactory;
+import freenet.node.rt.ResponseTimeEstimator;
+import freenet.node.rt.RoutingTable;
+import freenet.node.rt.RunningAverageFactory;
+import freenet.node.rt.StandardNodeEstimatorFactory;
+import freenet.node.rt.StoredRoutingTable;
+import freenet.node.rt.TimeEstimatorFactory;
+import freenet.node.states.announcing.Announcing;
+import freenet.node.states.maintenance.Checkpoint;
+import freenet.presentation.ClientProtocol;
+import freenet.presentation.FCPRawMessage;
+import freenet.presentation.FNPRawMessage;
+import freenet.presentation.FreenetProtocol;
+import freenet.session.FnpLinkManager;
+import freenet.session.PlainLinkManager;
+import freenet.support.ArrayBucket;
+import freenet.support.Bucket;
+import freenet.support.BucketFactory;
+import freenet.support.BufferLoggerHook;
+import freenet.support.Checkpointed;
+import freenet.support.Fields;
+import freenet.support.FileLoggerHook;
+import freenet.support.KeyHistogram;
+import freenet.support.Logger;
+import freenet.support.SimpleDataObjectStore;
+import freenet.support.TempBucketFactory;
+import freenet.support.TempBucketHook;
+import freenet.support.io.CommentedReadInputStream;
+import freenet.support.io.ParseIOException;
+import freenet.support.io.ReadInputStream;
+import freenet.support.io.WriteOutputStream;
+import freenet.thread.FastThreadFactory;
+import freenet.thread.QThreadFactory;
+import freenet.thread.ThreadFactory;
+import freenet.thread.YThreadFactory;
import freenet.transport.TCP;
-import freenet.transport.tcpTransport;
-import freenet.transport.tcpConnection;
import freenet.transport.tcpAddress;
-import freenet.transport.ReadSelectorLoop;
-import freenet.transport.WriteSelectorLoop;
-import java.lang.reflect.Method;
-import java.util.*;
-import java.net.*;
-import java.io.*;
-import java.math.BigInteger;
-import javax.servlet.Servlet;
-import javax.servlet.http.HttpServlet;
-import java.security.Security;
-import freenet.client.AutoBackoffNodeRequester;
+import freenet.transport.tcpConnection;
+import freenet.transport.tcpTransport;
/**
* This contains the execution code for starting a node. Moved from Node.java
Index: NodeConfigUpdater.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/NodeConfigUpdater.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -r1.14 -r1.15
--- NodeConfigUpdater.java 18 Sep 2003 17:48:09 -0000 1.14
+++ NodeConfigUpdater.java 30 Oct 2003 01:34:03 -0000 1.15
@@ -1,19 +1,18 @@
package freenet.node;
-import java.io.File;
-import java.util.Hashtable;
-import java.util.Enumeration;
-import freenet.*;
-import freenet.config.*;
-import freenet.support.*;
-import freenet.fs.dir.NativeFSDirectory;
-import freenet.node.Main;
-import freenet.node.states.maintenance.Checkpoint;
-
-import java.util.Iterator;
-import java.util.HashSet;
import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
import java.util.StringTokenizer;
+
+import freenet.Core;
+import freenet.config.Option;
+import freenet.config.Params;
+import freenet.fs.dir.NativeFSDirectory;
+import freenet.node.states.maintenance.Checkpoint;
+import freenet.support.Checkpointed;
+import freenet.support.Logger;
+import freenet.support.LoggerHook;
/**
* Checks the config file for updates, and if found, applies what it can
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
