Update of /cvsroot/freenet/freenet/src/freenet/fs/dir
In directory sc8-pr-cvs1:/tmp/cvs-serv13416/src/freenet/fs/dir
Modified Files:
FSConsole.java DirectoryIDFilePattern.java KeyMap.java
FSDirectory.java FragmentPositionMap.java FragmentManager.java
FSDirectoryCheck.java LossyDirectory.java
NativeFSDirectory.java LRUMap.java TicketMap.java
FragmentMap.java FragmentSizeMap.java
Log Message:
No functional changes. Fix lots of warnings from Eclipse about imports. Should speed
up compilation slightly, beautify code slightly.
Index: FSConsole.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/fs/dir/FSConsole.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- FSConsole.java 26 Jul 2002 03:04:39 -0000 1.5
+++ FSConsole.java 30 Oct 2003 01:34:06 -0000 1.6
@@ -1,14 +1,18 @@
package freenet.fs.dir;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.text.DateFormat;
+import java.util.Date;
+import java.util.Enumeration;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import freenet.fs.acct.Fragment;
import freenet.node.Node;
import freenet.support.Fields;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import java.io.*;
-import java.util.Enumeration;
-import java.util.Date;
-import java.text.DateFormat;
/**
* Debug console for the FSDirectory.
Index: DirectoryIDFilePattern.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/fs/dir/DirectoryIDFilePattern.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- DirectoryIDFilePattern.java 27 Sep 2002 20:14:20 -0000 1.4
+++ DirectoryIDFilePattern.java 30 Oct 2003 01:34:07 -0000 1.5
@@ -1,7 +1,5 @@
package freenet.fs.dir;
-import freenet.Core;
-
public class DirectoryIDFilePattern implements FilePattern {
protected final int[] dirID;
Index: KeyMap.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/fs/dir/KeyMap.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -w -r1.1.1.1 -r1.2
--- KeyMap.java 13 Jan 2002 05:24:35 -0000 1.1.1.1
+++ KeyMap.java 30 Oct 2003 01:34:07 -0000 1.2
@@ -1,12 +1,16 @@
package freenet.fs.dir;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
import freenet.fs.acct.AccountingProcess;
-import freenet.fs.acct.sys.*;
-import freenet.support.*;
+import freenet.fs.acct.sys.AccountingTree;
+import freenet.fs.acct.sys.AccountingTreeMarshal;
+import freenet.fs.acct.sys.AccountingTreeNode;
+import freenet.support.Cache;
import freenet.support.Comparable;
-import freenet.support.BinaryTree.Node;
-import java.io.*;
-import java.util.Enumeration;
+import freenet.support.Walk;
/**
* A binary tree that maps FileNumber to 64-bit ticket ID.
Index: FSDirectory.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/fs/dir/FSDirectory.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- FSDirectory.java 21 Oct 2003 01:52:36 -0000 1.12
+++ FSDirectory.java 30 Oct 2003 01:34:07 -0000 1.13
@@ -1,19 +1,30 @@
package freenet.fs.dir;
-import freenet.Core;
-import freenet.fs.*;
-import freenet.fs.FileSystem;
-import freenet.fs.acct.*;
-import freenet.fs.acct.sys.AccountingTreeCheck;
-import freenet.fs.acct.fsck.FaultAnalysis;
-import freenet.support.*;
-import freenet.support.BinaryTree.Node;
-import freenet.crypt.Digest;
-import java.io.*;
+import java.io.FilterInputStream;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
import java.text.DateFormat;
import java.util.Date;
-import java.util.Vector;
import java.util.Enumeration;
+import java.util.Vector;
+
+import freenet.crypt.Digest;
+import freenet.fs.FileSystem;
+import freenet.fs.ReadLock;
+import freenet.fs.WriteLock;
+import freenet.fs.acct.AccountingInitializer;
+import freenet.fs.acct.AccountingTable;
+import freenet.fs.acct.Fragment;
+import freenet.fs.acct.SharedAccountingInitializer;
+import freenet.fs.acct.SingleAccountingProcess;
+import freenet.support.Cache;
+import freenet.support.LRUCache;
+import freenet.support.Walk;
+import freenet.support.WalkEnumeration;
+import freenet.support.BinaryTree.Node;
/**
* An implementation of the Directory that uses freenet.fs.Filesystem
Index: FragmentPositionMap.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/fs/dir/FragmentPositionMap.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- FragmentPositionMap.java 4 Feb 2002 15:04:02 -0000 1.2
+++ FragmentPositionMap.java 30 Oct 2003 01:34:07 -0000 1.3
@@ -1,14 +1,16 @@
package freenet.fs.dir;
-import freenet.fs.acct.*;
-import freenet.fs.acct.Fragment.ComparatorBySize;
-import freenet.fs.acct.Fragment.ComparatorByPos;
-import freenet.fs.acct.sys.*;
-import freenet.support.*;
-import freenet.support.Comparable;
-import freenet.support.BinaryTree.Node;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
import java.util.Vector;
-import java.io.*;
+
+import freenet.fs.acct.AccountingProcess;
+import freenet.fs.acct.Fragment;
+import freenet.fs.acct.sys.AccountingTreeMarshal;
+import freenet.fs.acct.sys.AccountingTreeNode;
+import freenet.support.Cache;
+import freenet.support.Comparable;
/**
* Maintains a set of position-ordered fragments with the ticket IDs they
Index: FragmentManager.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/fs/dir/FragmentManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- FragmentManager.java 10 Feb 2002 03:45:16 -0000 1.3
+++ FragmentManager.java 30 Oct 2003 01:34:07 -0000 1.4
@@ -1,8 +1,8 @@
package freenet.fs.dir;
-import freenet.fs.acct.Fragment;
-import freenet.support.BinaryTree.Node;
import java.util.Vector;
+
+import freenet.fs.acct.Fragment;
/**
* Maintains a map of free and allocated Fragments.
Index: FSDirectoryCheck.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/fs/dir/FSDirectoryCheck.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- FSDirectoryCheck.java 10 Feb 2002 12:11:03 -0000 1.1
+++ FSDirectoryCheck.java 30 Oct 2003 01:34:07 -0000 1.2
@@ -1,12 +1,19 @@
package freenet.fs.dir;
-import freenet.fs.acct.fsck.*;
-import freenet.fs.acct.*;
-import freenet.fs.acct.sys.*;
-import freenet.support.*;
-import freenet.support.BinaryTree.Node;
-import java.util.Vector;
import java.io.IOException;
+import java.util.Vector;
+
+import freenet.fs.acct.AccountingInitializer;
+import freenet.fs.acct.AccountingTable;
+import freenet.fs.acct.Fragment;
+import freenet.fs.acct.SharedAccountingInitializer;
+import freenet.fs.acct.SingleAccountingProcess;
+import freenet.fs.acct.fsck.Fault;
+import freenet.fs.acct.fsck.FaultAnalysis;
+import freenet.fs.acct.sys.AccountingTreeCheck;
+import freenet.support.Cache;
+import freenet.support.LRUCache;
+import freenet.support.Walk;
/**
* Performs various syntactic and semantic consistency checks
Index: LossyDirectory.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/fs/dir/LossyDirectory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- LossyDirectory.java 20 Jun 2003 20:45:27 -0000 1.8
+++ LossyDirectory.java 30 Oct 2003 01:34:07 -0000 1.9
@@ -1,9 +1,11 @@
package freenet.fs.dir;
-import freenet.support.*;
import java.io.IOException;
-import java.util.Enumeration;
+
import freenet.Core;
+import freenet.support.EnumerationWalk;
+import freenet.support.Logger;
+import freenet.support.Walk;
/**
* The LossyDirectory attempts to automatically free space to
Index: NativeFSDirectory.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/fs/dir/NativeFSDirectory.java,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -w -r1.166 -r1.167
--- NativeFSDirectory.java 27 Oct 2003 14:45:18 -0000 1.166
+++ NativeFSDirectory.java 30 Oct 2003 01:34:07 -0000 1.167
@@ -1,37 +1,45 @@
/* -*- Mode: java; c-basic-indent: 4; tab-width: 4 -*- */
package freenet.fs.dir;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.EOFException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.util.EmptyStackException;
import java.util.Enumeration;
-import java.util.Iterator;
import java.util.Hashtable;
+import java.util.Iterator;
import java.util.Stack;
import java.util.StringTokenizer;
import java.util.Vector;
-import java.util.SortedMap;
-import java.io.*;
import freenet.Core;
-import freenet.support.Logger;
-import freenet.support.Fields;
-import freenet.support.Walk;
-import freenet.support.WalkEnumeration;
+import freenet.Key;
+import freenet.Storables;
+import freenet.config.Config;
+import freenet.config.Params;
import freenet.support.Checkpointed;
+import freenet.support.Fields;
+import freenet.support.IteratorEnumeration;
import freenet.support.KeyHistogram;
import freenet.support.KeySizeHistogram;
-import freenet.support.io.NullOutputStream;
+import freenet.support.Logger;
+import freenet.support.PooledRandomAccessFile;
+import freenet.support.RandomAccessFilePool;
import freenet.support.ReversibleSortedMap;
import freenet.support.SkiplistWithHashMap;
-import freenet.support.IteratorEnumeration;
-import freenet.support.RandomAccessFilePool;
-import freenet.support.PooledRandomAccessFile;
-
-import freenet.Key;
-import freenet.Storables;
-import freenet.config.Config;
-import freenet.config.Params;
-import freenet.support.io.ReadInputStream;
+import freenet.support.Walk;
+import freenet.support.WalkEnumeration;
import freenet.support.io.CountedInputStream;
+import freenet.support.io.NullOutputStream;
+import freenet.support.io.ReadInputStream;
/**
* A Directory implementation that drops everything
Index: LRUMap.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/fs/dir/LRUMap.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- LRUMap.java 22 Jan 2002 09:07:13 -0000 1.2
+++ LRUMap.java 30 Oct 2003 01:34:07 -0000 1.3
@@ -1,12 +1,16 @@
package freenet.fs.dir;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
import freenet.fs.acct.AccountingProcess;
-import freenet.fs.acct.sys.*;
-import freenet.support.*;
+import freenet.fs.acct.sys.AccountingTree;
+import freenet.fs.acct.sys.AccountingTreeMarshal;
+import freenet.fs.acct.sys.AccountingTreeNode;
+import freenet.support.Cache;
import freenet.support.Comparable;
-import freenet.support.BinaryTree.Node;
-import java.io.*;
-import java.util.Enumeration;
+import freenet.support.Walk;
/**
* Orders FileNumber keys by timestamp.
Index: TicketMap.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/fs/dir/TicketMap.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- TicketMap.java 5 Mar 2002 21:01:38 -0000 1.3
+++ TicketMap.java 30 Oct 2003 01:34:07 -0000 1.4
@@ -1,10 +1,12 @@
package freenet.fs.dir;
-import freenet.fs.acct.*;
-import freenet.fs.acct.sys.*;
-import freenet.support.*;
-import freenet.support.BinaryTree.Node;
-import java.util.Enumeration;
+import freenet.fs.acct.AccountingProcess;
+import freenet.fs.acct.sys.AccountingTree;
+import freenet.fs.acct.sys.AccountingTreeNode;
+import freenet.support.Cache;
+import freenet.support.NullCache;
+import freenet.support.UnlimitedCache;
+import freenet.support.Walk;
/**
* A map of Ticket objects. Used by the TicketManager.
Index: FragmentMap.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/fs/dir/FragmentMap.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- FragmentMap.java 5 Mar 2002 21:01:38 -0000 1.4
+++ FragmentMap.java 30 Oct 2003 01:34:07 -0000 1.5
@@ -1,9 +1,13 @@
package freenet.fs.dir;
-import freenet.fs.acct.*;
-import freenet.fs.acct.sys.*;
-import freenet.support.*;
-import freenet.support.BinaryTree.Node;
+import freenet.fs.acct.AccountingProcess;
+import freenet.fs.acct.Fragment;
+import freenet.fs.acct.sys.AccountingTree;
+import freenet.fs.acct.sys.AccountingTreeMarshal;
+import freenet.fs.acct.sys.AccountingTreeNode;
+import freenet.support.BinaryTree;
+import freenet.support.Cache;
+import freenet.support.Walk;
/**
* An AccountingTree where the elements are Fragment instances.
Index: FragmentSizeMap.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/fs/dir/FragmentSizeMap.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- FragmentSizeMap.java 4 Feb 2002 15:04:03 -0000 1.2
+++ FragmentSizeMap.java 30 Oct 2003 01:34:07 -0000 1.3
@@ -1,13 +1,15 @@
package freenet.fs.dir;
-import freenet.fs.acct.*;
-import freenet.fs.acct.Fragment.ComparatorBySize;
-import freenet.fs.acct.Fragment.ComparatorByPos;
-import freenet.fs.acct.sys.*;
-import freenet.support.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import freenet.fs.acct.AccountingProcess;
+import freenet.fs.acct.Fragment;
+import freenet.fs.acct.sys.AccountingTreeMarshal;
+import freenet.fs.acct.sys.AccountingTreeNode;
+import freenet.support.Cache;
import freenet.support.Comparable;
-import freenet.support.BinaryTree.Node;
-import java.io.*;
/**
* Maintains a set of size-ordered fragments for finding best fits
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
