Index: analysis/de/GermanAnalyzer.java
===================================================================
RCS file: /home/cvspublic/jakarta-lucene/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java,v
retrieving revision 1.16
diff -u -r1.16 GermanAnalyzer.java
--- analysis/de/GermanAnalyzer.java	30 May 2004 20:24:20 -0000	1.16
+++ analysis/de/GermanAnalyzer.java	9 Jul 2004 22:18:57 -0000
@@ -26,7 +26,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.Reader;
-import java.io.IOException;
 import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.Set;
Index: analysis/standard/StandardTokenizer.jj
===================================================================
RCS file: /home/cvspublic/jakarta-lucene/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.jj,v
retrieving revision 1.6
diff -u -r1.6 StandardTokenizer.jj
--- analysis/standard/StandardTokenizer.jj	22 Dec 2003 22:12:24 -0000	1.6
+++ analysis/standard/StandardTokenizer.jj	9 Jul 2004 22:18:58 -0000
@@ -65,8 +65,6 @@
 
 package org.apache.lucene.analysis.standard;
 
-import java.io.*;
-
 /** A grammar-based tokenizer constructed with JavaCC.
  *
  * <p> This should be a good tokenizer for most European-language documents.
Index: analysis/standard/StandardTokenizerTokenManager.java
===================================================================
RCS file: /home/cvspublic/jakarta-lucene/src/java/org/apache/lucene/analysis/standard/StandardTokenizerTokenManager.java,v
retrieving revision 1.4
diff -u -r1.4 StandardTokenizerTokenManager.java
--- analysis/standard/StandardTokenizerTokenManager.java	22 Dec 2003 22:12:24 -0000	1.4
+++ analysis/standard/StandardTokenizerTokenManager.java	9 Jul 2004 22:19:00 -0000
@@ -1,6 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. StandardTokenizerTokenManager.java */
 package org.apache.lucene.analysis.standard;
-import java.io.*;
 
 public class StandardTokenizerTokenManager implements StandardTokenizerConstants
 {
Index: index/CompoundFileReader.java
===================================================================
RCS file: /home/cvspublic/jakarta-lucene/src/java/org/apache/lucene/index/CompoundFileReader.java,v
retrieving revision 1.5
diff -u -r1.5 CompoundFileReader.java
--- index/CompoundFileReader.java	29 Mar 2004 22:48:02 -0000	1.5
+++ index/CompoundFileReader.java	9 Jul 2004 22:19:01 -0000
@@ -19,10 +19,8 @@
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.InputStream;
 import org.apache.lucene.store.OutputStream;
-import org.apache.lucene.store.FSDirectory;
 import org.apache.lucene.store.Lock;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.io.IOException;
 
 
Index: index/DocumentWriter.java
===================================================================
RCS file: /home/cvspublic/jakarta-lucene/src/java/org/apache/lucene/index/DocumentWriter.java,v
retrieving revision 1.11
diff -u -r1.11 DocumentWriter.java
--- index/DocumentWriter.java	16 Apr 2004 10:15:20 -0000	1.11
+++ index/DocumentWriter.java	9 Jul 2004 22:19:01 -0000
@@ -323,7 +323,7 @@
         float norm = fieldBoosts[n] * similarity.lengthNorm(fi.name, fieldLengths[n]);
         OutputStream norms = directory.createFile(segment + ".f" + n);
         try {
-          norms.writeByte(similarity.encodeNorm(norm));
+          norms.writeByte(Similarity.encodeNorm(norm));
         } finally {
           norms.close();
         }
Index: index/SegmentMergeInfo.java
===================================================================
RCS file: /home/cvspublic/jakarta-lucene/src/java/org/apache/lucene/index/SegmentMergeInfo.java,v
retrieving revision 1.3
diff -u -r1.3 SegmentMergeInfo.java
--- index/SegmentMergeInfo.java	29 Mar 2004 22:48:02 -0000	1.3
+++ index/SegmentMergeInfo.java	9 Jul 2004 22:19:02 -0000
@@ -17,7 +17,6 @@
  */
 
 import java.io.IOException;
-import org.apache.lucene.util.BitVector;
 
 final class SegmentMergeInfo {
   Term term;
Index: index/SegmentReader.java
===================================================================
RCS file: /home/cvspublic/jakarta-lucene/src/java/org/apache/lucene/index/SegmentReader.java,v
retrieving revision 1.22
diff -u -r1.22 SegmentReader.java
--- index/SegmentReader.java	16 Apr 2004 12:44:43 -0000	1.22
+++ index/SegmentReader.java	9 Jul 2004 22:19:02 -0000
@@ -27,7 +27,6 @@
 import org.apache.lucene.document.Document;
 import org.apache.lucene.store.InputStream;
 import org.apache.lucene.store.OutputStream;
-import org.apache.lucene.store.Lock;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.util.BitVector;
 
Index: index/SegmentTermVector.java
===================================================================
RCS file: /home/cvspublic/jakarta-lucene/src/java/org/apache/lucene/index/SegmentTermVector.java,v
retrieving revision 1.2
diff -u -r1.2 SegmentTermVector.java
--- index/SegmentTermVector.java	24 Feb 2004 19:46:43 -0000	1.2
+++ index/SegmentTermVector.java	9 Jul 2004 22:19:02 -0000
@@ -1,5 +1,4 @@
 package org.apache.lucene.index;
-import java.io.IOException;
 import java.util.*;
 
 /**
Index: index/TermFreqVector.java
===================================================================
RCS file: /home/cvspublic/jakarta-lucene/src/java/org/apache/lucene/index/TermFreqVector.java,v
retrieving revision 1.2
diff -u -r1.2 TermFreqVector.java
--- index/TermFreqVector.java	24 Feb 2004 19:46:43 -0000	1.2
+++ index/TermFreqVector.java	9 Jul 2004 22:19:03 -0000
@@ -1,7 +1,5 @@
 package org.apache.lucene.index;
 
-import java.io.IOException;
-
 /** Provides access to stored term vector of 
  *  a document field.
  */
Index: search/FilteredTermEnum.java
===================================================================
RCS file: /home/cvspublic/jakarta-lucene/src/java/org/apache/lucene/search/FilteredTermEnum.java,v
retrieving revision 1.4
diff -u -r1.4 FilteredTermEnum.java
--- search/FilteredTermEnum.java	11 May 2004 17:23:21 -0000	1.4
+++ search/FilteredTermEnum.java	9 Jul 2004 22:19:05 -0000
@@ -17,7 +17,6 @@
  */
 
 import java.io.IOException;
-import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.index.TermEnum;
 
Index: search/SortComparator.java
===================================================================
RCS file: /home/cvspublic/jakarta-lucene/src/java/org/apache/lucene/search/SortComparator.java,v
retrieving revision 1.1
diff -u -r1.1 SortComparator.java
--- search/SortComparator.java	19 May 2004 23:05:27 -0000	1.1
+++ search/SortComparator.java	9 Jul 2004 22:19:05 -0000
@@ -1,12 +1,8 @@
 package org.apache.lucene.search;
 
 import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.Term;
-import org.apache.lucene.index.TermDocs;
-import org.apache.lucene.index.TermEnum;
 
 import java.io.IOException;
-import java.io.Serializable;
 
 /**
  * Abstract base class for sorting hits returned by a Query.
Index: search/spans/NearSpans.java
===================================================================
RCS file: /home/cvspublic/jakarta-lucene/src/java/org/apache/lucene/search/spans/NearSpans.java,v
retrieving revision 1.6
diff -u -r1.6 NearSpans.java
--- search/spans/NearSpans.java	11 May 2004 19:38:41 -0000	1.6
+++ search/spans/NearSpans.java	9 Jul 2004 22:19:06 -0000
@@ -20,7 +20,6 @@
 
 import java.util.List;
 import java.util.ArrayList;
-import java.util.Iterator;
 
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.util.PriorityQueue;
Index: search/spans/SpanScorer.java
===================================================================
RCS file: /home/cvspublic/jakarta-lucene/src/java/org/apache/lucene/search/spans/SpanScorer.java,v
retrieving revision 1.2
diff -u -r1.2 SpanScorer.java
--- search/spans/SpanScorer.java	2 Feb 2004 13:27:52 -0000	1.2
+++ search/spans/SpanScorer.java	9 Jul 2004 22:19:06 -0000
@@ -18,9 +18,7 @@
 
 import java.io.IOException;
 
-import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.search.Weight;
-import org.apache.lucene.search.Searcher;
 import org.apache.lucene.search.Scorer;
 import org.apache.lucene.search.Explanation;
 import org.apache.lucene.search.Similarity;