Update of /cvsroot/freenet/freenet/src/freenet/node/rt
In directory sc8-pr-cvs1:/tmp/cvs-serv13416/src/freenet/node/rt
Modified Files:
TreeRoutingTable.java NGRouting.java NGRoutingTable.java
StandardNodeEstimator.java DecayingRunningAverage.java
NodeEstimator.java FFTTimeEstimator.java
ResponseTimeEstimator.java CPAlgoRoutingTable.java
RoutingStore.java StoredRoutingTable.java TreeRouting.java
StandardNodeEstimatorFactory.java NodeEstimatorFactory.java
Routing.java
Log Message:
No functional changes. Fix lots of warnings from Eclipse about imports. Should speed
up compilation slightly, beautify code slightly.
Index: TreeRoutingTable.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/TreeRoutingTable.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -w -r1.27 -r1.28
--- TreeRoutingTable.java 22 Oct 2003 22:07:16 -0000 1.27
+++ TreeRoutingTable.java 30 Oct 2003 01:34:06 -0000 1.28
@@ -1,18 +1,20 @@
package freenet.node.rt;
-import freenet.Key;
-import freenet.Identity;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Random;
+
import freenet.Core;
+import freenet.Identity;
+import freenet.Key;
import freenet.Version;
import freenet.node.NodeReference;
-import freenet.support.*;
-import freenet.support.Comparable;
+import freenet.support.BinaryTree;
+import freenet.support.Logger;
+import freenet.support.MetricWalk;
+import freenet.support.Skiplist;
import freenet.support.BinaryTree.Node;
-//import freenet.support.RedBlackTree.RBNodeImpl;
import freenet.support.Skiplist.SkipNodeImpl;
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.Random;
/**
* The basic core of a routing table that routes by walking
Index: NGRouting.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/NGRouting.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- NGRouting.java 25 Oct 2003 18:28:00 -0000 1.10
+++ NGRouting.java 30 Oct 2003 01:34:06 -0000 1.11
@@ -1,12 +1,11 @@
package freenet.node.rt;
-import freenet.Identity;
-import freenet.node.NodeReference;
import freenet.Core;
-import freenet.support.Logger;
+import freenet.Identity;
import freenet.Key;
import freenet.node.Node;
-import java.util.Hashtable;
+import freenet.node.NodeReference;
+import freenet.support.Logger;
/**
* Iterates over a provided NodeEstimator[]
Index: NGRoutingTable.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/NGRoutingTable.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -w -r1.20 -r1.21
--- NGRoutingTable.java 29 Oct 2003 21:53:23 -0000 1.20
+++ NGRoutingTable.java 30 Oct 2003 01:34:06 -0000 1.21
@@ -1,22 +1,33 @@
/* -*- Mode: java; c-basic-indent: 4; tab-width: 4 -*- */
package freenet.node.rt;
-import freenet.Key;
-import freenet.Identity;
-import freenet.Core;
-import freenet.node.NodeReference;
-import freenet.node.Node;
-import freenet.node.Main;
-import freenet.support.*;
-import freenet.support.sort.*;
-import freenet.support.Comparable;
-import freenet.Version;
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
import java.util.Enumeration;
-import java.util.Random;
-import java.util.Vector;
import java.util.HashSet;
import java.util.Hashtable;
+import java.util.Vector;
+
+import freenet.Core;
+import freenet.Identity;
+import freenet.Key;
+import freenet.Version;
+import freenet.node.Main;
+import freenet.node.Node;
+import freenet.node.NodeReference;
+import freenet.support.Checkpointed;
+import freenet.support.Comparable;
+import freenet.support.DataObjectUnloadedException;
+import freenet.support.Logger;
+import freenet.support.SimpleStringMap;
+import freenet.support.StringMap;
+import freenet.support.sort.ArraySorter;
+import freenet.support.sort.QuickSorter;
/**
* Routing table based on NodeEstimators
Index: StandardNodeEstimator.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/StandardNodeEstimator.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- StandardNodeEstimator.java 29 Oct 2003 21:53:23 -0000 1.12
+++ StandardNodeEstimator.java 30 Oct 2003 01:34:06 -0000 1.13
@@ -1,19 +1,17 @@
/* -*- Mode: java; c-basic-indent: 4; tab-width: 4 -*- */
package freenet.node.rt;
-import freenet.Key;
-import freenet.support.DataObject;
-import freenet.support.Comparable;
-import freenet.support.StringMap;
-import freenet.support.SimpleStringMap;
-import freenet.node.NodeReference;
-import freenet.Core;
-import freenet.support.Logger;
-import freenet.support.DataObjectPending;
-import java.io.DataOutputStream;
import java.io.DataInputStream;
+import java.io.DataOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
+
+import freenet.Core;
+import freenet.Key;
+import freenet.node.NodeReference;
+import freenet.support.DataObjectPending;
+import freenet.support.Logger;
+import freenet.support.SimpleStringMap;
class StandardNodeEstimator extends NodeEstimator {
// Apologies for the notation, but read the estimator function!
Index: DecayingRunningAverage.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/DecayingRunningAverage.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- DecayingRunningAverage.java 25 Oct 2003 18:28:00 -0000 1.5
+++ DecayingRunningAverage.java 30 Oct 2003 01:34:06 -0000 1.6
@@ -1,11 +1,11 @@
package freenet.node.rt;
-import freenet.support.DataObject;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
import freenet.Core;
import freenet.support.Logger;
-import java.io.IOException;
-import java.io.DataOutputStream;
-import java.io.DataInputStream;
public class DecayingRunningAverage implements RunningAverage {
double currentVal;
Index: NodeEstimator.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/NodeEstimator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- NodeEstimator.java 27 Oct 2003 15:06:06 -0000 1.5
+++ NodeEstimator.java 30 Oct 2003 01:34:06 -0000 1.6
@@ -1,15 +1,12 @@
/* -*- Mode: java; c-basic-indent: 4; tab-width: 4 -*- */
package freenet.node.rt;
-import freenet.Key;
-import freenet.Identity;
-import freenet.support.DataObject;
-import freenet.support.Comparable;
-import freenet.support.StringMap;
-import freenet.node.NodeReference;
-import java.io.DataOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
+
+import freenet.Key;
+import freenet.node.NodeReference;
+import freenet.support.DataObject;
abstract class NodeEstimator implements DataObject {
NodeReference ref;
Index: FFTTimeEstimator.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/FFTTimeEstimator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- FFTTimeEstimator.java 29 Oct 2003 21:53:23 -0000 1.3
+++ FFTTimeEstimator.java 30 Oct 2003 01:34:06 -0000 1.4
@@ -1,17 +1,8 @@
package freenet.node.rt;
-import freenet.Key;
-import freenet.Core;
-import freenet.support.Logger;
-import freenet.support.DataObjectPending;
-import freenet.support.graph.*;
-import freenet.support.sort.*;
-import java.util.Random;
-import java.math.BigInteger;
import java.math.BigDecimal;
-import java.io.DataOutputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.io.OutputStream;
+import java.math.BigInteger;
+
+import freenet.Key;
public class FFTTimeEstimator extends ResponseTimeEstimator {
Index: ResponseTimeEstimator.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/ResponseTimeEstimator.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -w -r1.16 -r1.17
--- ResponseTimeEstimator.java 29 Oct 2003 22:49:48 -0000 1.16
+++ ResponseTimeEstimator.java 30 Oct 2003 01:34:06 -0000 1.17
@@ -1,21 +1,22 @@
package freenet.node.rt;
-import freenet.Key;
-import freenet.Core;
-import freenet.node.rt.TimeEstimator.HTMLReportTool;
-import freenet.support.Logger;
-import freenet.support.DataObjectPending;
-import freenet.support.graph.*;
-import freenet.support.sort.*;
-
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Random;
-import java.math.BigInteger;
-import java.math.BigDecimal;
-import java.io.DataOutputStream;
import java.io.DataInputStream;
+import java.io.DataOutputStream;
import java.io.IOException;
import java.io.OutputStream;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Enumeration;
+import java.util.Random;
+
+import freenet.Core;
+import freenet.Key;
+import freenet.support.Logger;
+import freenet.support.graph.Bitmap;
+import freenet.support.graph.BitmapEncoder;
+import freenet.support.graph.Color;
+import freenet.support.graph.DibEncoder;
+import freenet.support.sort.QuickSorter;
+import freenet.support.sort.Sortable;
// class Key {
// byte[] b;
Index: CPAlgoRoutingTable.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/CPAlgoRoutingTable.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -w -r1.57 -r1.58
--- CPAlgoRoutingTable.java 25 Oct 2003 00:45:35 -0000 1.57
+++ CPAlgoRoutingTable.java 30 Oct 2003 01:34:06 -0000 1.58
@@ -1,46 +1,38 @@
package freenet.node.rt;
-import freenet.BadAddressException;
-import freenet.Address;
-import freenet.Key;
-import freenet.Identity;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Random;
+import java.util.Vector;
+
+import freenet.Core;
import freenet.FieldSet;
+import freenet.Identity;
+import freenet.Key;
import freenet.KeyException;
+import freenet.client.AutoBackoffNodeRequester;
import freenet.client.FreenetURI;
import freenet.client.InternalClient;
-import freenet.crypt.DSAPublicKey;
-import freenet.node.NodeReference;
-import freenet.node.Node;
-import freenet.node.Main;
-import freenet.client.AutoBackoffNodeRequester;
import freenet.node.BadReferenceException;
+import freenet.node.Node;
+import freenet.node.NodeReference;
import freenet.node.states.maintenance.Checkpoint;
-import freenet.support.Bucket;
import freenet.support.ArrayBucket;
-import freenet.support.io.ReadInputStream;
+import freenet.support.Bucket;
+import freenet.support.Comparable;
import freenet.support.DataObject;
import freenet.support.DataObjectPending;
import freenet.support.DataObjectUnloadedException;
-import freenet.support.StringMap;
-import freenet.support.SimpleStringMap;
-import freenet.support.sort.*;
-import freenet.support.Comparable;
-import freenet.support.Fields;
-import freenet.transport.TCP;
-import freenet.Transport;
-import freenet.TransportHandler;
-import freenet.transport.tcpAddress;
-import freenet.Core;
import freenet.support.Logger;
-
-import java.util.Random;
-import java.util.Vector;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import freenet.support.SimpleStringMap;
+import freenet.support.StringMap;
+import freenet.support.io.ReadInputStream;
+import freenet.support.sort.ArraySorter;
+import freenet.support.sort.HeapSorter;
/**
* RoutingTable implementation which uses the tested CP
Index: RoutingStore.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/RoutingStore.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- RoutingStore.java 26 Jul 2003 21:36:29 -0000 1.3
+++ RoutingStore.java 30 Oct 2003 01:34:06 -0000 1.4
@@ -1,9 +1,9 @@
package freenet.node.rt;
+import java.util.Enumeration;
+
import freenet.Identity;
import freenet.node.NodeReference;
-import java.util.Enumeration;
-import java.io.IOException;
/**
* The RoutingStore collects NodeReferences and other information about
Index: StoredRoutingTable.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/StoredRoutingTable.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- StoredRoutingTable.java 22 Oct 2003 22:07:16 -0000 1.8
+++ StoredRoutingTable.java 30 Oct 2003 01:34:06 -0000 1.9
@@ -1,16 +1,16 @@
/* -*- Mode: java; c-basic-indent: 4; tab-width: 4 -*- */
package freenet.node.rt;
-import freenet.Key;
-import freenet.Identity;
+import java.io.IOException;
+import java.util.Enumeration;
+
import freenet.Core;
+import freenet.Identity;
+import freenet.node.Node;
import freenet.node.NodeReference;
-import freenet.support.*;
import freenet.support.Comparable;
-import freenet.node.Node;
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.Random;
+import freenet.support.Heap;
+import freenet.support.Logger;
/**
* Routing table based on a routingStore
Index: TreeRouting.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/TreeRouting.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -w -r1.27 -r1.28
--- TreeRouting.java 21 Oct 2003 01:52:36 -0000 1.27
+++ TreeRouting.java 30 Oct 2003 01:34:06 -0000 1.28
@@ -1,14 +1,13 @@
package freenet.node.rt;
+import java.util.Hashtable;
+
+import freenet.Core;
import freenet.Identity;
import freenet.node.NodeReference;
-import freenet.support.Walk;
-import freenet.support.BinaryTree.Node;
-import freenet.support.MetricWalk;
-import freenet.Core;
import freenet.support.Logger;
-import freenet.Key;
-import java.util.Hashtable;
+import freenet.support.MetricWalk;
+import freenet.support.BinaryTree.Node;
/**
* This iterates over a metric walk of Reference nodes in the binary tree.
Index: StandardNodeEstimatorFactory.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/rt/StandardNodeEstimatorFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- StandardNodeEstimatorFactory.java 30 Aug 2003 23:16:52 -0000 1.2
+++ StandardNodeEstimatorFactory.java 30 Oct 2003 01:34:06 -0000 1.3
@@ -1,16 +1,11 @@
/* -*- Mode: java; c-basic-indent: 4; tab-width: 4 -*- */
package freenet.node.rt;
+import java.io.IOException;
+
import freenet.Key;
-import freenet.Identity;
-import freenet.Core;
import freenet.node.NodeReference;
-import freenet.support.*;
-import freenet.support.Comparable;
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.Random;
-import java.util.Vector;
+import freenet.support.DataObjectPending;
/**
* Factory interface for StandardNodeEstimators
Index: NodeEstimatorFactory.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/NodeEstimatorFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- NodeEstimatorFactory.java 30 Aug 2003 23:16:52 -0000 1.2
+++ NodeEstimatorFactory.java 30 Oct 2003 01:34:06 -0000 1.3
@@ -1,16 +1,11 @@
/* -*- Mode: java; c-basic-indent: 4; tab-width: 4 -*- */
package freenet.node.rt;
+import java.io.IOException;
+
import freenet.Key;
-import freenet.Identity;
-import freenet.Core;
import freenet.node.NodeReference;
-import freenet.support.*;
-import freenet.support.Comparable;
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.Random;
-import java.util.Vector;
+import freenet.support.DataObjectPending;
/**
* Factory interface for NodeEstimators
Index: Routing.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/Routing.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- Routing.java 2 Sep 2003 21:37:32 -0000 1.8
+++ Routing.java 30 Oct 2003 01:34:06 -0000 1.9
@@ -2,7 +2,6 @@
import freenet.Identity;
import freenet.node.NodeReference;
-import freenet.Key;
/**
* Supplies a sequence of NodeReferences in order of routing
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
