diff --git a/src/java/org/apache/lucene/analysis/Token.java b/src/java/org/apache/lucene/analysis/Token.java index 98cb24e9a41..c2d4f949c33 100644 --- a/src/java/org/apache/lucene/analysis/Token.java +++ b/src/java/org/apache/lucene/analysis/Token.java @@ -54,8 +54,6 @@ package org.apache.lucene.analysis; * . */ -import org.apache.lucene.index.TermPositions; - /** A Token is an occurence of a term from the text of a field. It consists of a term's text, the start and end offset of the term in the text of the field, and a type string. diff --git a/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java b/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java index 8d5146b129b..997acd2d26a 100644 --- a/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java +++ b/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java @@ -55,7 +55,6 @@ package org.apache.lucene.analysis.de; */ import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.LowerCaseFilter; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.standard.StandardFilter; @@ -164,7 +163,7 @@ public class GermanAnalyzer extends Analyzer * Creates a TokenStream which tokenizes all the text in the provided Reader. * * @return A TokenStream build from a StandardTokenizer filtered with - * StandardFilter, StopFilter, GermanStemFilter and LowerCaseFilter + * StandardFilter, StopFilter, GermanStemFilter */ public TokenStream tokenStream( String fieldName, Reader reader ) { diff --git a/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java b/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java index 39dfc29f7e0..a20e3a67c08 100644 --- a/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java +++ b/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java @@ -55,13 +55,9 @@ package org.apache.lucene.analysis.ru; */ import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.LowerCaseFilter; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.standard.StandardFilter; -import org.apache.lucene.analysis.standard.StandardTokenizer; -import java.io.File; import java.io.Reader; import java.util.Hashtable; diff --git a/src/java/org/apache/lucene/analysis/ru/RussianStemFilter.java b/src/java/org/apache/lucene/analysis/ru/RussianStemFilter.java index 99f859d6da7..b9ad2175b36 100644 --- a/src/java/org/apache/lucene/analysis/ru/RussianStemFilter.java +++ b/src/java/org/apache/lucene/analysis/ru/RussianStemFilter.java @@ -58,7 +58,6 @@ import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import java.io.IOException; -import java.util.Hashtable; /** * A filter that stems Russian words. The implementation was inspired by GermanStemFilter. diff --git a/src/java/org/apache/lucene/document/Document.java b/src/java/org/apache/lucene/document/Document.java index f72d8a77836..c40bfcfcb77 100644 --- a/src/java/org/apache/lucene/document/Document.java +++ b/src/java/org/apache/lucene/document/Document.java @@ -58,9 +58,6 @@ import java.util.Enumeration; import java.util.List; import java.util.ArrayList; -import org.apache.lucene.index.IndexReader; -import org.apache.lucene.search.Hits; - /** Documents are the unit of indexing and search. * * A Document is a set of fields. Each field has a name and a textual value. diff --git a/src/java/org/apache/lucene/document/Field.java b/src/java/org/apache/lucene/document/Field.java index 82759bf2f3d..35abdb08e00 100644 --- a/src/java/org/apache/lucene/document/Field.java +++ b/src/java/org/apache/lucene/document/Field.java @@ -56,9 +56,6 @@ package org.apache.lucene.document; import java.io.Reader; import java.util.Date; -import org.apache.lucene.index.IndexReader; -import org.apache.lucene.search.Similarity; -import org.apache.lucene.search.Hits; /** A field is a section of a Document. Each field has two parts, a name and a diff --git a/src/java/org/apache/lucene/index/FieldsReader.java b/src/java/org/apache/lucene/index/FieldsReader.java index ff4cfac4f92..5682d06716d 100644 --- a/src/java/org/apache/lucene/index/FieldsReader.java +++ b/src/java/org/apache/lucene/index/FieldsReader.java @@ -54,8 +54,6 @@ package org.apache.lucene.index; * . */ -import java.util.Enumeration; -import java.util.Hashtable; import java.io.IOException; import org.apache.lucene.store.Directory; diff --git a/src/java/org/apache/lucene/index/FieldsWriter.java b/src/java/org/apache/lucene/index/FieldsWriter.java index b2ea31de18b..a36d652a614 100644 --- a/src/java/org/apache/lucene/index/FieldsWriter.java +++ b/src/java/org/apache/lucene/index/FieldsWriter.java @@ -55,7 +55,6 @@ package org.apache.lucene.index; */ import java.util.Enumeration; -import java.util.Hashtable; import java.io.IOException; import org.apache.lucene.store.Directory; diff --git a/src/java/org/apache/lucene/index/IndexReader.java b/src/java/org/apache/lucene/index/IndexReader.java index f2905f71550..202d504c511 100644 --- a/src/java/org/apache/lucene/index/IndexReader.java +++ b/src/java/org/apache/lucene/index/IndexReader.java @@ -62,7 +62,6 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; import org.apache.lucene.store.Lock; import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; /** IndexReader is an abstract class, providing an interface for accessing an index. Search of an index is done entirely through this abstract interface, diff --git a/src/java/org/apache/lucene/index/IndexWriter.java b/src/java/org/apache/lucene/index/IndexWriter.java index 846776db5b3..a80b3ecfc66 100644 --- a/src/java/org/apache/lucene/index/IndexWriter.java +++ b/src/java/org/apache/lucene/index/IndexWriter.java @@ -68,7 +68,6 @@ import org.apache.lucene.store.OutputStream; import org.apache.lucene.search.Similarity; import org.apache.lucene.document.Document; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.search.Similarity; /** diff --git a/src/java/org/apache/lucene/index/SegmentMerger.java b/src/java/org/apache/lucene/index/SegmentMerger.java index d0fd86acc9d..81a48bbad68 100644 --- a/src/java/org/apache/lucene/index/SegmentMerger.java +++ b/src/java/org/apache/lucene/index/SegmentMerger.java @@ -60,8 +60,6 @@ import java.io.IOException; import org.apache.lucene.store.Directory; import org.apache.lucene.store.OutputStream; import org.apache.lucene.store.InputStream; -import org.apache.lucene.document.Document; -import org.apache.lucene.util.PriorityQueue; import org.apache.lucene.util.BitVector; final class SegmentMerger { diff --git a/src/java/org/apache/lucene/index/TermDocs.java b/src/java/org/apache/lucene/index/TermDocs.java index dc1d9cf01d5..653da8db791 100644 --- a/src/java/org/apache/lucene/index/TermDocs.java +++ b/src/java/org/apache/lucene/index/TermDocs.java @@ -55,7 +55,6 @@ package org.apache.lucene.index; */ import java.io.IOException; -import org.apache.lucene.document.Document; /** TermDocs provides an interface for enumerating <document, frequency> pairs for a term.

The document portion names each document containing diff --git a/src/java/org/apache/lucene/index/TermInfosReader.java b/src/java/org/apache/lucene/index/TermInfosReader.java index c4e767136c3..7d8e2730559 100644 --- a/src/java/org/apache/lucene/index/TermInfosReader.java +++ b/src/java/org/apache/lucene/index/TermInfosReader.java @@ -57,7 +57,6 @@ package org.apache.lucene.index; import java.io.IOException; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.InputStream; /** This stores a monotonically increasing set of pairs in a * Directory. Pairs are accessed either by Term or by ordinal position the diff --git a/src/java/org/apache/lucene/index/TermPositions.java b/src/java/org/apache/lucene/index/TermPositions.java index f0b17901043..aa8e2505cc8 100644 --- a/src/java/org/apache/lucene/index/TermPositions.java +++ b/src/java/org/apache/lucene/index/TermPositions.java @@ -55,8 +55,6 @@ package org.apache.lucene.index; */ import java.io.IOException; -import org.apache.lucene.document.Document; - /** * TermPositions provides an interface for enumerating the <document, diff --git a/src/java/org/apache/lucene/search/DefaultSimilarity.java b/src/java/org/apache/lucene/search/DefaultSimilarity.java index e541f058ab9..ba04386327d 100644 --- a/src/java/org/apache/lucene/search/DefaultSimilarity.java +++ b/src/java/org/apache/lucene/search/DefaultSimilarity.java @@ -54,8 +54,6 @@ package org.apache.lucene.search; * . */ -import org.apache.lucene.document.Document; - /** Expert: Default scoring implementation. */ public class DefaultSimilarity extends Similarity { /** Implemented as 1/sqrt(numTerms). */ diff --git a/src/java/org/apache/lucene/search/ExactPhraseScorer.java b/src/java/org/apache/lucene/search/ExactPhraseScorer.java index 32f941d4c70..3c2facc3da4 100644 --- a/src/java/org/apache/lucene/search/ExactPhraseScorer.java +++ b/src/java/org/apache/lucene/search/ExactPhraseScorer.java @@ -55,7 +55,6 @@ package org.apache.lucene.search; */ import java.io.IOException; -import java.util.Vector; import org.apache.lucene.util.*; import org.apache.lucene.index.*; diff --git a/src/java/org/apache/lucene/search/FuzzyTermEnum.java b/src/java/org/apache/lucene/search/FuzzyTermEnum.java index f4e4232b350..c69cf50d9a9 100644 --- a/src/java/org/apache/lucene/search/FuzzyTermEnum.java +++ b/src/java/org/apache/lucene/search/FuzzyTermEnum.java @@ -57,7 +57,6 @@ package org.apache.lucene.search; import java.io.IOException; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.Term; -import org.apache.lucene.index.TermEnum; /** Subclass of FilteredTermEnum for enumerating all terms that are similiar to the specified filter term. diff --git a/src/java/org/apache/lucene/search/Hits.java b/src/java/org/apache/lucene/search/Hits.java index 1588e720e53..5a6d9709ff3 100644 --- a/src/java/org/apache/lucene/search/Hits.java +++ b/src/java/org/apache/lucene/search/Hits.java @@ -56,9 +56,8 @@ package org.apache.lucene.search; import java.io.IOException; import java.util.Vector; -import java.util.BitSet; + import org.apache.lucene.document.Document; -import org.apache.lucene.index.IndexReader; /** A ranked list of documents, used to hold search results. */ public final class Hits { diff --git a/src/java/org/apache/lucene/search/IndexSearcher.java b/src/java/org/apache/lucene/search/IndexSearcher.java index 86a8496035d..5b665faa9d7 100644 --- a/src/java/org/apache/lucene/search/IndexSearcher.java +++ b/src/java/org/apache/lucene/search/IndexSearcher.java @@ -61,7 +61,6 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.Term; -import org.apache.lucene.util.PriorityQueue; /** Implements search over a single IndexReader. * diff --git a/src/java/org/apache/lucene/search/MultiSearcher.java b/src/java/org/apache/lucene/search/MultiSearcher.java index fdc26b72a9e..8b8f583f123 100644 --- a/src/java/org/apache/lucene/search/MultiSearcher.java +++ b/src/java/org/apache/lucene/search/MultiSearcher.java @@ -55,11 +55,9 @@ package org.apache.lucene.search; */ import java.io.IOException; -import java.util.Vector; import org.apache.lucene.document.Document; import org.apache.lucene.index.Term; -import org.apache.lucene.util.PriorityQueue; /** Implements search over a set of Searchables. * diff --git a/src/java/org/apache/lucene/search/MultiTermQuery.java b/src/java/org/apache/lucene/search/MultiTermQuery.java index 2acb27e15a6..a8aa55679ce 100644 --- a/src/java/org/apache/lucene/search/MultiTermQuery.java +++ b/src/java/org/apache/lucene/search/MultiTermQuery.java @@ -55,10 +55,9 @@ package org.apache.lucene.search; */ import java.io.IOException; -import java.util.Vector; + import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.Term; -import org.apache.lucene.index.TermEnum; /** * A {@link Query} that matches documents containing a subset of terms provided diff --git a/src/java/org/apache/lucene/search/PhrasePrefixQuery.java b/src/java/org/apache/lucene/search/PhrasePrefixQuery.java index c90d14c60d5..a6bd9ff920c 100644 --- a/src/java/org/apache/lucene/search/PhrasePrefixQuery.java +++ b/src/java/org/apache/lucene/search/PhrasePrefixQuery.java @@ -62,7 +62,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MultipleTermPositions; import org.apache.lucene.index.Term; import org.apache.lucene.index.TermPositions; -import org.apache.lucene.index.TermDocs; import org.apache.lucene.search.Query; /** diff --git a/src/java/org/apache/lucene/search/PhraseQuery.java b/src/java/org/apache/lucene/search/PhraseQuery.java index 5c2bb4f1350..d192ffbf568 100644 --- a/src/java/org/apache/lucene/search/PhraseQuery.java +++ b/src/java/org/apache/lucene/search/PhraseQuery.java @@ -58,7 +58,6 @@ import java.io.IOException; import java.util.Vector; import org.apache.lucene.index.Term; -import org.apache.lucene.index.TermDocs; import org.apache.lucene.index.TermPositions; import org.apache.lucene.index.IndexReader; diff --git a/src/java/org/apache/lucene/search/PhraseScorer.java b/src/java/org/apache/lucene/search/PhraseScorer.java index f316c4621b0..c49131fa760 100644 --- a/src/java/org/apache/lucene/search/PhraseScorer.java +++ b/src/java/org/apache/lucene/search/PhraseScorer.java @@ -55,7 +55,7 @@ package org.apache.lucene.search; */ import java.io.IOException; -import java.util.Vector; + import org.apache.lucene.util.*; import org.apache.lucene.index.*; diff --git a/src/java/org/apache/lucene/search/PrefixQuery.java b/src/java/org/apache/lucene/search/PrefixQuery.java index b8a6c66a7a3..a38b85f281e 100644 --- a/src/java/org/apache/lucene/search/PrefixQuery.java +++ b/src/java/org/apache/lucene/search/PrefixQuery.java @@ -55,9 +55,9 @@ package org.apache.lucene.search; */ import java.io.IOException; + import org.apache.lucene.index.Term; import org.apache.lucene.index.TermEnum; -import org.apache.lucene.index.TermDocs; import org.apache.lucene.index.IndexReader; /** A Query that matches documents containing terms with a specified prefix. */ diff --git a/src/java/org/apache/lucene/search/RangeQuery.java b/src/java/org/apache/lucene/search/RangeQuery.java index 6eaa1af9568..dbe377efdbe 100644 --- a/src/java/org/apache/lucene/search/RangeQuery.java +++ b/src/java/org/apache/lucene/search/RangeQuery.java @@ -55,9 +55,9 @@ package org.apache.lucene.search; */ import java.io.IOException; + import org.apache.lucene.index.Term; import org.apache.lucene.index.TermEnum; -import org.apache.lucene.index.TermDocs; import org.apache.lucene.index.IndexReader; /** A Query that matches documents within an exclusive range. */ diff --git a/src/java/org/apache/lucene/search/RemoteSearchable.java b/src/java/org/apache/lucene/search/RemoteSearchable.java index 62474f1ab42..1921610bc3d 100644 --- a/src/java/org/apache/lucene/search/RemoteSearchable.java +++ b/src/java/org/apache/lucene/search/RemoteSearchable.java @@ -55,15 +55,15 @@ package org.apache.lucene.search; */ import java.io.IOException; -import org.apache.lucene.document.Document; -import org.apache.lucene.index.Term; -import org.apache.lucene.index.IndexReader; import java.rmi.Naming; import java.rmi.RemoteException; import java.rmi.RMISecurityManager; import java.rmi.server.UnicastRemoteObject; +import org.apache.lucene.document.Document; +import org.apache.lucene.index.Term; + /** A remote searchable implementation. */ public class RemoteSearchable extends UnicastRemoteObject diff --git a/src/java/org/apache/lucene/search/Searchable.java b/src/java/org/apache/lucene/search/Searchable.java index fdef0d28086..111fd9d8f1a 100644 --- a/src/java/org/apache/lucene/search/Searchable.java +++ b/src/java/org/apache/lucene/search/Searchable.java @@ -55,9 +55,9 @@ package org.apache.lucene.search; */ import java.io.IOException; + import org.apache.lucene.document.Document; import org.apache.lucene.index.Term; -import org.apache.lucene.index.IndexReader; /** The interface for search implementations. * diff --git a/src/java/org/apache/lucene/search/Searcher.java b/src/java/org/apache/lucene/search/Searcher.java index 5cf9a3e33ed..63c5a3333e2 100644 --- a/src/java/org/apache/lucene/search/Searcher.java +++ b/src/java/org/apache/lucene/search/Searcher.java @@ -55,9 +55,6 @@ package org.apache.lucene.search; */ import java.io.IOException; -import org.apache.lucene.document.Document; -import org.apache.lucene.index.Term; -import org.apache.lucene.index.IndexReader; /** An abstract base class for search implementations. * Implements some common utility methods. diff --git a/src/java/org/apache/lucene/search/Similarity.java b/src/java/org/apache/lucene/search/Similarity.java index 2b522b5fd91..67cbc9d4838 100644 --- a/src/java/org/apache/lucene/search/Similarity.java +++ b/src/java/org/apache/lucene/search/Similarity.java @@ -56,11 +56,8 @@ package org.apache.lucene.search; import java.io.IOException; import java.util.Vector; + import org.apache.lucene.index.Term; -import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; -import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.IndexWriter; /** Expert: Scoring API. *

Subclasses implement search scoring. diff --git a/src/java/org/apache/lucene/search/SloppyPhraseScorer.java b/src/java/org/apache/lucene/search/SloppyPhraseScorer.java index effce5f1343..28975ea624a 100644 --- a/src/java/org/apache/lucene/search/SloppyPhraseScorer.java +++ b/src/java/org/apache/lucene/search/SloppyPhraseScorer.java @@ -55,7 +55,7 @@ package org.apache.lucene.search; */ import java.io.IOException; -import java.util.Vector; + import org.apache.lucene.util.*; import org.apache.lucene.index.*; diff --git a/src/java/org/apache/lucene/search/TermScorer.java b/src/java/org/apache/lucene/search/TermScorer.java index 4e1c20f0a63..d14d8f76d20 100644 --- a/src/java/org/apache/lucene/search/TermScorer.java +++ b/src/java/org/apache/lucene/search/TermScorer.java @@ -55,7 +55,7 @@ package org.apache.lucene.search; */ import java.io.IOException; -import org.apache.lucene.index.Term; + import org.apache.lucene.index.TermDocs; final class TermScorer extends Scorer { diff --git a/src/java/org/apache/lucene/search/WildcardTermEnum.java b/src/java/org/apache/lucene/search/WildcardTermEnum.java index 80da98f69eb..9af4de9837a 100644 --- a/src/java/org/apache/lucene/search/WildcardTermEnum.java +++ b/src/java/org/apache/lucene/search/WildcardTermEnum.java @@ -55,9 +55,9 @@ package org.apache.lucene.search; */ import java.io.IOException; + import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.Term; -import org.apache.lucene.index.TermEnum; /** * Subclass of FilteredTermEnum for enumerating all terms that match the diff --git a/src/java/org/apache/lucene/store/FSDirectory.java b/src/java/org/apache/lucene/store/FSDirectory.java index 91c97cce730..94ed97001d5 100644 --- a/src/java/org/apache/lucene/store/FSDirectory.java +++ b/src/java/org/apache/lucene/store/FSDirectory.java @@ -57,7 +57,6 @@ package org.apache.lucene.store; import java.io.IOException; import java.io.File; import java.io.RandomAccessFile; -import java.io.FileNotFoundException; import java.util.Hashtable; import org.apache.lucene.util.Constants;