You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@lucene.apache.org by ot...@apache.org on 2004/07/10 08:19:01 UTC

cvs commit: jakarta-lucene/src/test/org/apache/lucene/search TestFilteredQuery.java

otis        2004/07/09 23:19:01

  Modified:    src/java/org/apache/lucene/analysis/de GermanAnalyzer.java
               src/java/org/apache/lucene/analysis/standard
                        StandardTokenizer.jj
                        StandardTokenizerTokenManager.java
               src/java/org/apache/lucene/index CompoundFileReader.java
                        DocumentWriter.java SegmentMergeInfo.java
                        SegmentReader.java SegmentTermVector.java
                        TermFreqVector.java
               src/java/org/apache/lucene/search FilteredTermEnum.java
                        SortComparator.java
               src/java/org/apache/lucene/search/spans NearSpans.java
                        SpanScorer.java
               src/test/org/apache/lucene/search TestFilteredQuery.java
  Log:
  - Removed extra imports: http://issues.apache.org/bugzilla/show_bug.cgi?id=30016
  
  Revision  Changes    Path
  1.17      +1 -2      jakarta-lucene/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java
  
  Index: GermanAnalyzer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-lucene/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- GermanAnalyzer.java	30 May 2004 20:24:20 -0000	1.16
  +++ GermanAnalyzer.java	10 Jul 2004 06:19:01 -0000	1.17
  @@ -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;
  
  
  
  1.7       +0 -2      jakarta-lucene/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.jj
  
  Index: StandardTokenizer.jj
  ===================================================================
  RCS file: /home/cvs/jakarta-lucene/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.jj,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- StandardTokenizer.jj	22 Dec 2003 22:12:24 -0000	1.6
  +++ StandardTokenizer.jj	10 Jul 2004 06:19:01 -0000	1.7
  @@ -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.
  
  
  
  1.5       +0 -1      jakarta-lucene/src/java/org/apache/lucene/analysis/standard/StandardTokenizerTokenManager.java
  
  Index: StandardTokenizerTokenManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-lucene/src/java/org/apache/lucene/analysis/standard/StandardTokenizerTokenManager.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- StandardTokenizerTokenManager.java	22 Dec 2003 22:12:24 -0000	1.4
  +++ StandardTokenizerTokenManager.java	10 Jul 2004 06:19:01 -0000	1.5
  @@ -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
   {
  
  
  
  1.6       +1 -3      jakarta-lucene/src/java/org/apache/lucene/index/CompoundFileReader.java
  
  Index: CompoundFileReader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-lucene/src/java/org/apache/lucene/index/CompoundFileReader.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CompoundFileReader.java	29 Mar 2004 22:48:02 -0000	1.5
  +++ CompoundFileReader.java	10 Jul 2004 06:19:01 -0000	1.6
  @@ -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;
   
   
  
  
  
  1.12      +1 -1      jakarta-lucene/src/java/org/apache/lucene/index/DocumentWriter.java
  
  Index: DocumentWriter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-lucene/src/java/org/apache/lucene/index/DocumentWriter.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- DocumentWriter.java	16 Apr 2004 10:15:20 -0000	1.11
  +++ DocumentWriter.java	10 Jul 2004 06:19:01 -0000	1.12
  @@ -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();
           }
  
  
  
  1.4       +0 -1      jakarta-lucene/src/java/org/apache/lucene/index/SegmentMergeInfo.java
  
  Index: SegmentMergeInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-lucene/src/java/org/apache/lucene/index/SegmentMergeInfo.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SegmentMergeInfo.java	29 Mar 2004 22:48:02 -0000	1.3
  +++ SegmentMergeInfo.java	10 Jul 2004 06:19:01 -0000	1.4
  @@ -17,7 +17,6 @@
    */
   
   import java.io.IOException;
  -import org.apache.lucene.util.BitVector;
   
   final class SegmentMergeInfo {
     Term term;
  
  
  
  1.23      +1 -2      jakarta-lucene/src/java/org/apache/lucene/index/SegmentReader.java
  
  Index: SegmentReader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-lucene/src/java/org/apache/lucene/index/SegmentReader.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- SegmentReader.java	16 Apr 2004 12:44:43 -0000	1.22
  +++ SegmentReader.java	10 Jul 2004 06:19:01 -0000	1.23
  @@ -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;
   
  
  
  
  1.3       +0 -1      jakarta-lucene/src/java/org/apache/lucene/index/SegmentTermVector.java
  
  Index: SegmentTermVector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-lucene/src/java/org/apache/lucene/index/SegmentTermVector.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SegmentTermVector.java	24 Feb 2004 19:46:43 -0000	1.2
  +++ SegmentTermVector.java	10 Jul 2004 06:19:01 -0000	1.3
  @@ -1,5 +1,4 @@
   package org.apache.lucene.index;
  -import java.io.IOException;
   import java.util.*;
   
   /**
  
  
  
  1.3       +0 -2      jakarta-lucene/src/java/org/apache/lucene/index/TermFreqVector.java
  
  Index: TermFreqVector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-lucene/src/java/org/apache/lucene/index/TermFreqVector.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TermFreqVector.java	24 Feb 2004 19:46:43 -0000	1.2
  +++ TermFreqVector.java	10 Jul 2004 06:19:01 -0000	1.3
  @@ -1,7 +1,5 @@
   package org.apache.lucene.index;
   
  -import java.io.IOException;
  -
   /** Provides access to stored term vector of 
    *  a document field.
    */
  
  
  
  1.5       +0 -1      jakarta-lucene/src/java/org/apache/lucene/search/FilteredTermEnum.java
  
  Index: FilteredTermEnum.java
  ===================================================================
  RCS file: /home/cvs/jakarta-lucene/src/java/org/apache/lucene/search/FilteredTermEnum.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FilteredTermEnum.java	11 May 2004 17:23:21 -0000	1.4
  +++ FilteredTermEnum.java	10 Jul 2004 06:19:01 -0000	1.5
  @@ -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;
   
  
  
  
  1.2       +1 -5      jakarta-lucene/src/java/org/apache/lucene/search/SortComparator.java
  
  Index: SortComparator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-lucene/src/java/org/apache/lucene/search/SortComparator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SortComparator.java	19 May 2004 23:05:27 -0000	1.1
  +++ SortComparator.java	10 Jul 2004 06:19:01 -0000	1.2
  @@ -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.
  
  
  
  1.7       +0 -1      jakarta-lucene/src/java/org/apache/lucene/search/spans/NearSpans.java
  
  Index: NearSpans.java
  ===================================================================
  RCS file: /home/cvs/jakarta-lucene/src/java/org/apache/lucene/search/spans/NearSpans.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- NearSpans.java	11 May 2004 19:38:41 -0000	1.6
  +++ NearSpans.java	10 Jul 2004 06:19:01 -0000	1.7
  @@ -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;
  
  
  
  1.3       +0 -2      jakarta-lucene/src/java/org/apache/lucene/search/spans/SpanScorer.java
  
  Index: SpanScorer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-lucene/src/java/org/apache/lucene/search/spans/SpanScorer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SpanScorer.java	2 Feb 2004 13:27:52 -0000	1.2
  +++ SpanScorer.java	10 Jul 2004 06:19:01 -0000	1.3
  @@ -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;
  
  
  
  1.5       +3 -2      jakarta-lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java
  
  Index: TestFilteredQuery.java
  ===================================================================
  RCS file: /home/cvs/jakarta-lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TestFilteredQuery.java	13 May 2004 09:54:12 -0000	1.4
  +++ TestFilteredQuery.java	10 Jul 2004 06:19:01 -0000	1.5
  @@ -128,4 +128,5 @@
       assertEquals(2, hits.length());
     }
   
  -}
  \ No newline at end of file
  +}
  +
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: lucene-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: lucene-dev-help@jakarta.apache.org