Update of /cvsroot/freenet/freenet/src/freenet/support
In directory sc8-pr-cvs1:/tmp/cvs-serv13416/src/freenet/support
Modified Files:
FileLoggerHook.java Skiplist.java TempBucketFactory.java
URLDecoder.java SimpleDataObjectStore.java SpyInputStream.java
BufferLoggerHook.java Logger.java FileBucketFactory.java
BlockingQueue.java SpyOutputStream.java ArrayBucket.java
AbstractBinaryTree.java TempFileBucket.java RedBlackTree.java
Log Message:
No functional changes. Fix lots of warnings from Eclipse about imports. Should speed
up compilation slightly, beautify code slightly.
Index: FileLoggerHook.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/FileLoggerHook.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -w -r1.35 -r1.36
--- FileLoggerHook.java 16 Oct 2003 01:04:01 -0000 1.35
+++ FileLoggerHook.java 30 Oct 2003 01:34:01 -0000 1.36
@@ -1,14 +1,19 @@
package freenet.support;
-import freenet.*;
-import java.io.*;
-import java.util.StringTokenizer;
-import java.util.Vector;
+import java.io.ByteArrayOutputStream;
+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.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
-import java.util.Calendar;
import java.util.LinkedList;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
+import java.util.StringTokenizer;
+import java.util.Vector;
/**
* Converted the old StandardLogger to Ian's loggerhook interface.
Index: Skiplist.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/Skiplist.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- Skiplist.java 19 Jun 2003 13:31:25 -0000 1.5
+++ Skiplist.java 30 Oct 2003 01:34:01 -0000 1.6
@@ -1,8 +1,6 @@
package freenet.support;
import java.util.Random;
-import java.util.Enumeration;
-import java.util.NoSuchElementException;
/**
* This an implementation of the BinaryTree interface backed by a SkipList.
Index: TempBucketFactory.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/TempBucketFactory.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- TempBucketFactory.java 27 Oct 2003 14:45:16 -0000 1.10
+++ TempBucketFactory.java 30 Oct 2003 01:34:01 -0000 1.11
@@ -1,11 +1,9 @@
package freenet.support;
-import freenet.*;
-import freenet.support.*;
+import java.io.File;
+import java.io.IOException;
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import freenet.Core;
/*
* This code is part of fproxy, an HTTP proxy server for Freenet.
Index: URLDecoder.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/URLDecoder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- URLDecoder.java 23 Mar 2002 22:29:26 -0000 1.2
+++ URLDecoder.java 30 Oct 2003 01:34:01 -0000 1.3
@@ -1,5 +1,4 @@
package freenet.support;
-import java.text.*;
/*
This code is part of the Java Adaptive Network Client by Ian Clarke.
Index: SimpleDataObjectStore.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/SimpleDataObjectStore.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -w -r1.15 -r1.16
--- SimpleDataObjectStore.java 18 Oct 2003 17:59:20 -0000 1.15
+++ SimpleDataObjectStore.java 30 Oct 2003 01:34:01 -0000 1.16
@@ -1,13 +1,21 @@
/* -*- Mode: java; c-basic-indent: 4; tab-width: 4 -*- */
package freenet.support;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+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.util.Enumeration;
+
import freenet.Core;
-import freenet.support.Comparator;
-import freenet.support.sort.*;
import freenet.fs.dir.FileNumber;
import freenet.fs.dir.FilePattern;
-//import java.util.Hashtable;
-import java.util.Enumeration;
-import java.io.*;
/**
* A simple DataObjectStore implementation backed by a skiplist that
Index: SpyInputStream.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/SpyInputStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- SpyInputStream.java 23 Jan 2003 22:25:29 -0000 1.1
+++ SpyInputStream.java 30 Oct 2003 01:34:01 -0000 1.2
@@ -1,10 +1,7 @@
package freenet.support;
-import freenet.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.InputStream;
////////////////////////////////////////////////////////////
// The purpose of all of this gobbledeygook is to
Index: BufferLoggerHook.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/BufferLoggerHook.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- BufferLoggerHook.java 30 Dec 2002 21:24:40 -0000 1.3
+++ BufferLoggerHook.java 30 Oct 2003 01:34:01 -0000 1.4
@@ -1,12 +1,9 @@
package freenet.support;
-import java.util.StringTokenizer;
-
/**
* A LoggerHook that buffers the last N log statements as objects.
* @author oskar
*/
-
public class BufferLoggerHook extends LoggerHook {
public static class LogEntry {
Index: Logger.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/Logger.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- Logger.java 18 Sep 2003 17:48:13 -0000 1.11
+++ Logger.java 30 Oct 2003 01:34:01 -0000 1.12
@@ -1,8 +1,7 @@
package freenet.support;
-import freenet.Core;
-import java.io.PrintStream;
-import java.util.Vector;
import java.util.Enumeration;
+import java.util.Vector;
+
/**
* A class that takes logging messages and distributes them to LoggerHooks.
* It implements LoggerHook itself, so that instances can be chained (just
Index: FileBucketFactory.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/FileBucketFactory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- FileBucketFactory.java 7 Mar 2003 01:22:44 -0000 1.8
+++ FileBucketFactory.java 30 Oct 2003 01:34:01 -0000 1.9
@@ -1,10 +1,10 @@
package freenet.support;
-import freenet.Core;
-import java.util.Vector;
-import java.util.Enumeration;
-import java.io.IOException;
import java.io.File;
+import java.io.IOException;
+import java.util.Vector;
+
+import freenet.Core;
public class FileBucketFactory implements BucketFactory {
Index: BlockingQueue.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/BlockingQueue.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -w -r1.20 -r1.21
--- BlockingQueue.java 14 Oct 2003 16:33:56 -0000 1.20
+++ BlockingQueue.java 30 Oct 2003 01:34:01 -0000 1.21
@@ -1,8 +1,7 @@
package freenet.support;
-import freenet.*;
+import java.util.LinkedList;
-import java.util.*;
-import java.util.logging.LogManager;
+import freenet.Core;
/*
This code is part of the Java Adaptive Network Client by Ian Clarke.
Index: SpyOutputStream.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/SpyOutputStream.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- SpyOutputStream.java 23 Jun 2003 15:24:16 -0000 1.3
+++ SpyOutputStream.java 30 Oct 2003 01:34:01 -0000 1.4
@@ -1,10 +1,8 @@
package freenet.support;
-import freenet.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
/*
* This code is part of fproxy, an HTTP proxy server for Freenet.
Index: ArrayBucket.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/ArrayBucket.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- ArrayBucket.java 21 Mar 2003 23:14:11 -0000 1.4
+++ ArrayBucket.java 30 Oct 2003 01:34:01 -0000 1.5
@@ -1,8 +1,11 @@
package freenet.support;
-import freenet.*;
-import java.io.*;
-import java.util.Vector;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.util.Enumeration;
+import java.util.Vector;
/**
* A bucket that stores data in the memory.
Index: AbstractBinaryTree.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/AbstractBinaryTree.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- AbstractBinaryTree.java 5 Mar 2002 21:01:38 -0000 1.3
+++ AbstractBinaryTree.java 30 Oct 2003 01:34:01 -0000 1.4
@@ -1,7 +1,7 @@
package freenet.support;
-import java.io.*;
-import freenet.support.BinaryTree.Node;
+import java.io.IOException;
+import java.io.PrintWriter;
public abstract class AbstractBinaryTree implements BinaryTree {
Index: TempFileBucket.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/TempFileBucket.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -w -r1.17 -r1.18
--- TempFileBucket.java 18 Sep 2003 17:48:13 -0000 1.17
+++ TempFileBucket.java 30 Oct 2003 01:34:01 -0000 1.18
@@ -1,13 +1,12 @@
package freenet.support;
-import freenet.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Vector;
import freenet.Core;
-// for logging. FileBucket uses Core.randSource as well as Core.logger, "fix" that
first :)
import freenet.support.io.NullInputStream;
/*
Index: RedBlackTree.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/RedBlackTree.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- RedBlackTree.java 4 Jul 2003 06:15:39 -0000 1.3
+++ RedBlackTree.java 30 Oct 2003 01:34:01 -0000 1.4
@@ -32,6 +32,7 @@
package freenet.support;
+import freenet.support.AbstractBinaryTree.AbstractNode;
import freenet.support.BinaryTree.Node;
/**
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs