lucene-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From markrmil...@apache.org
Subject svn commit: r831556 [2/2] - in /lucene/java/branches/flex_1458/src/java/org/apache/lucene: index/ index/codecs/ index/codecs/intblock/ index/codecs/preflex/ index/codecs/pulsing/ index/codecs/sep/ index/codecs/standard/ queryParser/ search/ search/payl...
Date Sat, 31 Oct 2009 15:39:28 GMT
Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardDocsWriter.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardDocsWriter.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardDocsWriter.java
(original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardDocsWriter.java
Sat Oct 31 15:39:26 2009
@@ -72,6 +72,7 @@
     posWriter = new StandardPositionsWriter(state, this);
   }
 
+  @Override
   public void start(IndexOutput termsOut) throws IOException {
     this.termsOut = termsOut;
     Codec.writeHeader(termsOut, CODEC, VERSION_CURRENT);
@@ -80,6 +81,7 @@
     posWriter.start(termsOut);
   }
 
+  @Override
   public void startTerm() {
     freqStart = out.getFilePointer();
     if (!omitTermFreqAndPositions) {
@@ -93,6 +95,7 @@
 
   // Currently, this instance is re-used across fields, so
   // our parent calls setField whenever the field changes
+  @Override
   public void setField(FieldInfo fieldInfo) {
     this.fieldInfo = fieldInfo;
     omitTermFreqAndPositions = fieldInfo.omitTermFreqAndPositions;
@@ -107,6 +110,7 @@
 
   /** Adds a new doc in this term.  If this returns null
    *  then we just skip consuming positions/payloads. */
+  @Override
   public PositionsConsumer addDoc(int docID, int termDocFreq) throws IOException {
 
     final int delta = docID - lastDocID;
@@ -155,6 +159,7 @@
   }
 
   /** Called when we are done adding docs to this term */
+  @Override
   public void finishTerm(int docCount, boolean isIndexTerm) throws IOException {
     // nocommit -- wasteful we are counting this in two places?
     assert docCount == df;
@@ -193,6 +198,7 @@
     count = 0;
   }
 
+  @Override
   public void close() throws IOException {
     if (Codec.DEBUG) {
       System.out.println("docs writer close pointer=" + out.getFilePointer());

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardPositionsReader.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardPositionsReader.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardPositionsReader.java
(original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardPositionsReader.java
Sat Oct 31 15:39:26 2009
@@ -41,6 +41,7 @@
     proxIn = dir.openInput(IndexFileNames.segmentFileName(segmentInfo.name, StandardCodec.PROX_EXTENSION),
readBufferSize);
   }
 
+  @Override
   public void start(IndexInput termsIn) throws IOException {
     this.termsIn = termsIn;
 
@@ -53,10 +54,12 @@
     }
   }
 
+  @Override
   public Reader reader(FieldInfo fieldInfo, IndexInput termsIn) {
     return new TermsDictReader(termsIn, fieldInfo);
   }
 
+  @Override
   public void close() throws IOException {
     if (proxIn != null) {
       proxIn.close();
@@ -74,6 +77,7 @@
       this.fieldInfo = fieldInfo;
     }
 
+    @Override
     public void readTerm(int docFreq, boolean isIndexTerm) throws IOException {
       // mxx
       if (Codec.DEBUG) {
@@ -100,6 +104,7 @@
 
     SegmentPositionsEnum positions;
 
+    @Override
     public PositionsEnum positions() throws IOException {
 
       if (positions == null)
@@ -181,6 +186,7 @@
         position = 0;
       }
 
+      @Override
       public int next() throws IOException {
 
         if (Codec.DEBUG)
@@ -219,10 +225,12 @@
         return position;
       }
 
+      @Override
       public int getPayloadLength() {
         return payloadLength;
       }
 
+      @Override
       public byte[] getPayload(byte[] data, int offset) throws IOException {
 
         if (!payloadPending)
@@ -245,6 +253,7 @@
         return retArray;
       }
       
+      @Override
       public boolean hasPayload() {
         return payloadPending && payloadLength > 0;
       }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardPositionsWriter.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardPositionsWriter.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardPositionsWriter.java
(original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardPositionsWriter.java
Sat Oct 31 15:39:26 2009
@@ -59,6 +59,7 @@
       out = null;
   }
 
+  @Override
   public void start(IndexOutput termsOut) throws IOException {
     this.termsOut = termsOut;
     Codec.writeHeader(termsOut, CODEC, VERSION_CURRENT);
@@ -67,6 +68,7 @@
   long proxStart;
   long lastProxStart;
 
+  @Override
   public void startTerm() {
     proxStart = out.getFilePointer();
     lastPayloadLength = -1;
@@ -76,6 +78,7 @@
   int lastPosition;
 
   /** Add a new position & payload */
+  @Override
   public void addPosition(int position, byte[] payload, int payloadOffset, int payloadLength)
throws IOException {
     assert !omitTermFreqAndPositions: "omitTermFreqAndPositions is true";
     assert out != null;
@@ -120,10 +123,12 @@
   }
 
   /** Called when we are done adding positions & payloads */
+  @Override
   public void finishDoc() {       
     lastPosition = 0;
   }
 
+  @Override
   public void finishTerm(boolean isIndexTerm) throws IOException {
     assert !omitTermFreqAndPositions;
 
@@ -142,6 +147,7 @@
     lastProxStart = proxStart;
   }
 
+  @Override
   public void close() throws IOException {
     if (out != null) {
       out.close();

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardTermsDictReader.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardTermsDictReader.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardTermsDictReader.java
(original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardTermsDictReader.java
Sat Oct 31 15:39:26 2009
@@ -113,10 +113,12 @@
     this.indexReader = indexReader;
   }
 
+  @Override
   public void loadTermsIndex() throws IOException {
     indexReader.loadTermsIndex();
   }
 
+  @Override
   public void close() throws IOException {
     try {
       try {
@@ -148,6 +150,7 @@
     return new TermFieldsEnum();
   }
 
+  @Override
   public Terms terms(String field) throws IOException {
     if (Codec.DEBUG) {
       System.out.println("stdr.terms field=" + field + " found=" + fields.get(field));
@@ -164,6 +167,7 @@
       it = fields.values().iterator();
     }
 
+    @Override
     public String next() {
       if (Codec.DEBUG) {
         System.out.println("stdr.tfe.next seg=" + segment);
@@ -181,6 +185,7 @@
       }
     }
     
+    @Override
     public TermsEnum terms() throws IOException {
       return current.iterator();
     }
@@ -201,6 +206,7 @@
       this.indexReader = fieldIndexReader;
     }
 
+    @Override
     public int docFreq(TermRef text) throws IOException {
       ThreadResources resources = getThreadResources();
       if (resources.termsEnum.seek(text) == TermsEnum.SeekStatus.FOUND) {
@@ -224,10 +230,12 @@
       return resources;
     }
     
+    @Override
     public TermsEnum iterator() throws IOException {
       return new SegmentTermsEnum();
     }
 
+    @Override
     public long getUniqueTermCount() {
       return numTerms;
     }
@@ -259,6 +267,7 @@
        *  text; returns SeekStatus.FOUND if the exact term
        *  is found, SeekStatus.NOT_FOUND if a different term
        *  was found, SeekStatus.END if we hit EOF */
+      @Override
       public SeekStatus seek(TermRef term) throws IOException {
         ReuseLRUCache<TermRef, CacheEntry> cache = null;
         CacheEntry entry = null;
@@ -378,6 +387,7 @@
         return SeekStatus.END;
       }
 
+      @Override
       public SeekStatus seek(long pos) throws IOException {
         if (pos >= numTerms) {
           return SeekStatus.END;
@@ -405,14 +415,17 @@
         return SeekStatus.FOUND;
       }
 
+      @Override
       public TermRef term() {
         return bytesReader.term;
       }
 
+      @Override
       public long ord() {
         return termUpto;
       }
 
+      @Override
       public TermRef next() throws IOException {
         if (termUpto >= numTerms) {
           return null;
@@ -445,10 +458,12 @@
         return bytesReader.term;
       }
 
+      @Override
       public int docFreq() {
         return docFreq;
       }
 
+      @Override
       public DocsEnum docs(Bits skipDocs) throws IOException {
         // nocommit
         if (Codec.DEBUG) {
@@ -519,6 +534,7 @@
       this.cacheSize = cacheSize;
     }
 
+    @Override
     protected boolean removeEldestEntry(Map.Entry<K, V> eldest) {
       boolean remove = size() > ReuseLRUCache.this.cacheSize;
       if (remove) {

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardTermsDictWriter.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardTermsDictWriter.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardTermsDictWriter.java
(original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardTermsDictWriter.java
Sat Oct 31 15:39:26 2009
@@ -91,6 +91,7 @@
     consumer.start(out);                          // have consumer write its format/header
   }
 
+  @Override
   public TermsConsumer addField(FieldInfo field) {
     if (Codec.DEBUG) {
       System.out.println("stdw.addField: field=" + field.name);
@@ -103,6 +104,7 @@
     return terms;
   }
   
+  @Override
   public void close() throws IOException {
 
     if (Codec.DEBUG)
@@ -166,6 +168,7 @@
       }
     }
     
+    @Override
     public DocsConsumer startTerm(char[] text, int start) throws IOException {
       consumer.startTerm();
       if (Codec.DEBUG) {
@@ -180,6 +183,7 @@
       return consumer;
     }
 
+    @Override
     public void finishTerm(char[] text, int start, int numDocs) throws IOException {
 
       // mxx
@@ -215,6 +219,7 @@
     }
 
     // Finishes all terms in this field
+    @Override
     public void finish() {
     }
   }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/queryParser/MultiFieldQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/queryParser/MultiFieldQueryParser.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/queryParser/MultiFieldQueryParser.java
(original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/queryParser/MultiFieldQueryParser.java
Sat Oct 31 15:39:26 2009
@@ -96,6 +96,7 @@
     this.fields = fields;
   }
   
+  @Override
   protected Query getFieldQuery(String field, String queryText, int slop) throws ParseException
{
     if (field == null) {
       List<BooleanClause> clauses = new ArrayList<BooleanClause>();
@@ -132,11 +133,13 @@
   }
   
 
+  @Override
   protected Query getFieldQuery(String field, String queryText) throws ParseException {
     return getFieldQuery(field, queryText, 0);
   }
 
 
+  @Override
   protected Query getFuzzyQuery(String field, String termStr, float minSimilarity) throws
ParseException
   {
     if (field == null) {
@@ -150,6 +153,7 @@
     return super.getFuzzyQuery(field, termStr, minSimilarity);
   }
 
+  @Override
   protected Query getPrefixQuery(String field, String termStr) throws ParseException
   {
     if (field == null) {
@@ -163,6 +167,7 @@
     return super.getPrefixQuery(field, termStr);
   }
 
+  @Override
   protected Query getWildcardQuery(String field, String termStr) throws ParseException {
     if (field == null) {
       List<BooleanClause> clauses = new ArrayList<BooleanClause>();
@@ -176,6 +181,7 @@
   }
 
  
+  @Override
   protected Query getRangeQuery(String field, String part1, String part2, boolean inclusive)
throws ParseException {
     if (field == null) {
       List<BooleanClause> clauses = new ArrayList<BooleanClause>();

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java
(original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java
Sat Oct 31 15:39:26 2009
@@ -140,6 +140,7 @@
     }
 
     /* Create the scorer used to score our associated DisjunctionMaxQuery */
+    @Override
     public Scorer scorer(IndexReader reader, boolean scoreDocsInOrder,
         boolean topScorer) throws IOException {
       Scorer[] scorers = new Scorer[weights.size()];
@@ -186,6 +187,7 @@
   /** Optimize our representation and our subqueries representations
    * @param reader the IndexReader we query
    * @return an optimized copy of us (which may not be a copy if there is nothing to optimize)
*/
+  @Override
   public Query rewrite(IndexReader reader) throws IOException {
     int numDisjunctions = disjuncts.size();
     if (numDisjunctions == 1) {
@@ -231,6 +233,7 @@
    * @param field the field to which we are applied
    * @return a string that shows what we do, of the form "(disjunct1 | disjunct2 | ... |
disjunctn)^boost"
    */
+  @Override
   public String toString(String field) {
     StringBuilder buffer = new StringBuilder();
     buffer.append("(");

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/DisjunctionSumScorer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/DisjunctionSumScorer.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/DisjunctionSumScorer.java
(original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/DisjunctionSumScorer.java
Sat Oct 31 15:39:26 2009
@@ -110,6 +110,7 @@
   /** Scores and collects all matching documents.
    * @param collector The collector to which all matching documents are passed through.
    */
+  @Override
   public void score(Collector collector) throws IOException {
     collector.setScorer(this);
     while (nextDoc() != NO_MORE_DOCS) {
@@ -124,6 +125,7 @@
    * @param max Do not score documents past this.
    * @return true if more matching documents may remain.
    */
+  @Override
   protected boolean score(Collector collector, int max, int firstDocID) throws IOException
{
     // firstDocID is ignored since nextDoc() sets 'currentDoc'
     collector.setScorer(this);
@@ -136,6 +138,7 @@
     return true;
   }
 
+  @Override
   public int nextDoc() throws IOException {
     if (scorerDocQueue.size() < minimumNrMatchers || !advanceAfterCurrent()) {
       currentDoc = NO_MORE_DOCS;
@@ -190,8 +193,10 @@
   /** Returns the score of the current document matching the query.
    * Initially invalid, until {@link #next()} is called the first time.
    */
+  @Override
   public float score() throws IOException { return currentScore; }
    
+  @Override
   public int docID() {
     return currentDoc;
   }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/DocIdSet.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/DocIdSet.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/DocIdSet.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/DocIdSet.java Sat Oct
31 15:39:26 2009
@@ -37,10 +37,12 @@
       public int nextDoc() throws IOException { return NO_MORE_DOCS; }
     };
     
+    @Override
     public DocIdSetIterator iterator() {
       return iterator;
     }
     
+    @Override
     public boolean isCacheable() {
       return true;
     }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FieldCacheRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FieldCacheRangeFilter.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FieldCacheRangeFilter.java
(original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FieldCacheRangeFilter.java
Sat Oct 31 15:39:26 2009
@@ -519,10 +519,12 @@
     /**
      * this DocIdSet is cacheable, if it can ignore deletions
      */
+    @Override
     public boolean isCacheable() {
       return canIgnoreDeletedDocs || !reader.hasDeletions();
     }
 
+    @Override
     public DocIdSetIterator iterator() throws IOException {
       // Synchronization needed because deleted docs BitVector
       // can change after call to hasDeletions until TermDocs creation.

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FieldCacheTermsFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FieldCacheTermsFilter.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FieldCacheTermsFilter.java
(original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FieldCacheTermsFilter.java
Sat Oct 31 15:39:26 2009
@@ -127,11 +127,13 @@
       }
     }
 
+    @Override
     public DocIdSetIterator iterator() {
       return new FieldCacheTermsFilterDocIdSetIterator();
     }
 
     /** This DocIdSet implementation is cacheable. */
+    @Override
     public boolean isCacheable() {
       return true;
     }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FilteredDocIdSet.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FilteredDocIdSet.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FilteredDocIdSet.java
(original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FilteredDocIdSet.java
Sat Oct 31 15:39:26 2009
@@ -50,6 +50,7 @@
   }
   
   /** This DocIdSet implementation is cacheable if the inner set is cacheable. */
+  @Override
   public boolean isCacheable() {
     return _innerSet.isCacheable();
   }
@@ -67,6 +68,7 @@
    * @see FilteredDocIdSetIterator
    */
   // @Override
+  @Override
   public DocIdSetIterator iterator() throws IOException {
     return new FilteredDocIdSetIterator(_innerSet.iterator()) {
       @Override

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FilteredTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FilteredTermsEnum.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FilteredTermsEnum.java
(original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FilteredTermsEnum.java
Sat Oct 31 15:39:26 2009
@@ -76,6 +76,7 @@
     }
   }
 
+  @Override
   public TermRef term() throws IOException {
     assert actualEnum != null;
     return actualEnum.term();
@@ -85,12 +86,14 @@
    * Returns the docFreq of the current Term in the enumeration.
    * Returns -1 if no Term matches or all terms have been enumerated.
    */
+  @Override
   public int docFreq() {
     assert actualEnum != null;
     return actualEnum.docFreq();
   }
     
   /** Increments the enumeration to the next element.  True if one exists. */
+  @Override
   public TermRef next() throws IOException {
     assert actualEnum != null;
     while (true) {
@@ -106,10 +109,12 @@
     }
   }
 
+  @Override
   public SeekStatus seek(TermRef term) throws IOException {
     return finishSeek(actualEnum.seek(term));
   }
 
+  @Override
   public SeekStatus seek(long ord) throws IOException {
     return finishSeek(actualEnum.seek(ord));
   }
@@ -132,10 +137,12 @@
     }
   }
 
+  @Override
   public long ord() throws IOException {
     return actualEnum.ord();
   }
 
+  @Override
   public DocsEnum docs(Bits bits) throws IOException {
     return actualEnum.docs(bits);
   }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FuzzyTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FuzzyTermsEnum.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FuzzyTermsEnum.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FuzzyTermsEnum.java Sat
Oct 31 15:39:26 2009
@@ -137,6 +137,7 @@
 
   private final TermRef prefixTermRef;
 
+  @Override
   public String field() {
     return field;
   }
@@ -145,6 +146,7 @@
    * The termCompare method in FuzzyTermEnum uses Levenshtein distance to 
    * calculate the distance between the given term and the comparing term. 
    */
+  @Override
   protected final boolean accept(TermRef term) {
     if (term.startsWith(prefixTermRef)) {
       // TODO: costly that we create intermediate String:
@@ -156,10 +158,12 @@
     }
   }
   
+  @Override
   public final float difference() {
     return (float)((similarity - minimumSimilarity) * scale_factor);
   }
   
+  @Override
   public final boolean empty() {
     return empty;
   }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/MultiPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/MultiPhraseQuery.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/MultiPhraseQuery.java
(original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/MultiPhraseQuery.java
Sat Oct 31 15:39:26 2009
@@ -410,6 +410,7 @@
       return (DocsEnumWrapper) top();
     }
 
+    @Override
     public final boolean lessThan(Object a, Object b) {
       return ((DocsEnumWrapper) a).doc < ((DocsEnumWrapper) b).doc;
     }
@@ -478,10 +479,12 @@
     unionPositionsEnum = new UnionPositionsEnum();
   }
 
+  @Override
   public PositionsEnum positions() {
     return unionPositionsEnum;
   }
 
+  @Override
   public final int next() throws IOException {
     if (_queue.size() == 0) {
       return NO_MORE_DOCS;
@@ -521,23 +524,28 @@
 
   private class UnionPositionsEnum extends PositionsEnum {
 
+    @Override
     public int next() {
       return _posList.next();
     }
 
+    @Override
     public int getPayloadLength() {
       throw new UnsupportedOperationException();
     }
 
+    @Override
     public byte[] getPayload(byte[] data, int offset) {
       throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean hasPayload() {
       throw new UnsupportedOperationException();
     }
   }
 
+  @Override
   public final int advance(int target) throws IOException {
     while (_queue.peek() != null && target > _queue.peek().doc) {
       DocsEnumWrapper docs = (DocsEnumWrapper) _queue.pop();
@@ -549,6 +557,7 @@
     return next();
   }
 
+  @Override
   public final int freq() {
     return _freq;
   }
@@ -557,6 +566,7 @@
    * Not implemented.
    * @throws UnsupportedOperationException
    */
+  @Override
   public int read(int[] arg0, int[] arg1) throws IOException {
     throw new UnsupportedOperationException();
   }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/NumericRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/NumericRangeQuery.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/NumericRangeQuery.java
(original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/NumericRangeQuery.java
Sat Oct 31 15:39:26 2009
@@ -307,6 +307,7 @@
     return new NumericRangeTermEnum(reader);
   }
 
+  @Override
   protected FilteredTermsEnum getTermsEnum(final IndexReader reader) throws IOException {
     return new NumericRangeTermsEnum(reader);
   }
@@ -592,6 +593,7 @@
           
           NumericUtils.splitLongRange(new NumericUtils.LongRangeBuilder() {
             //@Override
+            @Override
             public final void addRange(String minPrefixCoded, String maxPrefixCoded) {
               rangeBounds.add(minPrefixCoded);
               rangeBounds.add(maxPrefixCoded);
@@ -627,6 +629,7 @@
           
           NumericUtils.splitIntRange(new NumericUtils.IntRangeBuilder() {
             //@Override
+            @Override
             public final void addRange(String minPrefixCoded, String maxPrefixCoded) {
               rangeBounds.add(minPrefixCoded);
               rangeBounds.add(maxPrefixCoded);
@@ -655,6 +658,7 @@
       return empty;
     }
 
+    @Override
     public String field() {
       return field;
     }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/PrefixTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/PrefixTermsEnum.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/PrefixTermsEnum.java
(original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/PrefixTermsEnum.java
Sat Oct 31 15:39:26 2009
@@ -50,14 +50,17 @@
     }
   }
 
+  @Override
   public String field() {
     return prefix.field();
   }
 
+  @Override
   public float difference() {
     return 1.0f;
   }
 
+  @Override
   public boolean empty() {
     return empty;
   }
@@ -66,6 +69,7 @@
     return prefix;
   }
 
+  @Override
   protected boolean accept(TermRef term) {
     return term.startsWith(prefixRef);
   }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/QueryWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/QueryWrapperFilter.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/QueryWrapperFilter.java
(original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/QueryWrapperFilter.java
Sat Oct 31 15:39:26 2009
@@ -44,26 +44,32 @@
     this.query = query;
   }
 
+  @Override
   public DocIdSet getDocIdSet(final IndexReader reader) throws IOException {
     final Weight weight = query.weight(new IndexSearcher(reader));
     return new DocIdSet() {
+      @Override
       public DocIdSetIterator iterator() throws IOException {
         return weight.scorer(reader, true, false);
       }
+      @Override
       public boolean isCacheable() { return false; }
     };
   }
 
+  @Override
   public String toString() {
     return "QueryWrapperFilter(" + query + ")";
   }
 
+  @Override
   public boolean equals(Object o) {
     if (!(o instanceof QueryWrapperFilter))
       return false;
     return this.query.equals(((QueryWrapperFilter)o).query);
   }
 
+  @Override
   public int hashCode() {
     return query.hashCode() ^ 0x923F64B9;
   }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/TermRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/TermRangeQuery.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/TermRangeQuery.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/TermRangeQuery.java Sat
Oct 31 15:39:26 2009
@@ -130,6 +130,7 @@
   /** Returns the collator used to determine range inclusion, if any. */
   public Collator getCollator() { return collator; }
   
+  @Override
   protected FilteredTermEnum getEnum(IndexReader reader) throws IOException {
     return new TermRangeTermEnum(reader, field, lowerTerm,
         upperTerm, includeLower, includeUpper, collator);
@@ -139,6 +140,7 @@
     return field;
   }
 
+  @Override
   protected FilteredTermsEnum getTermsEnum(IndexReader reader) throws IOException {
     return new TermRangeTermsEnum(reader, field,
                                   lowerTerm, upperTerm,
@@ -147,6 +149,7 @@
   }
 
   /** Prints a user-readable version of this query. */
+  @Override
   public String toString(String field) {
       StringBuilder buffer = new StringBuilder();
       if (!getField().equals(field)) {
@@ -163,6 +166,7 @@
   }
 
   //@Override
+  @Override
   public int hashCode() {
     final int prime = 31;
     int result = super.hashCode();
@@ -176,6 +180,7 @@
   }
 
   //@Override
+  @Override
   public boolean equals(Object obj) {
     if (this == obj)
       return true;

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/TermRangeTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/TermRangeTermsEnum.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/TermRangeTermsEnum.java
(original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/TermRangeTermsEnum.java
Sat Oct 31 15:39:26 2009
@@ -111,18 +111,22 @@
     }
   }
 
+  @Override
   public float difference() {
     return 1.0f;
   }
 
+  @Override
   public boolean empty() {
     return empty;
   }
 
+  @Override
   public String field() {
     return field;
   }
 
+  @Override
   protected boolean accept(TermRef term) {
     if (collator == null) {
       // Use Unicode code point ordering

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/WildcardQuery.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/WildcardQuery.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/WildcardQuery.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/WildcardQuery.java Sat
Oct 31 15:39:26 2009
@@ -51,6 +51,7 @@
   }
   
   // nocommit: needs singletermenum stuff
+  @Override
   protected FilteredTermsEnum getTermsEnum(IndexReader reader) throws IOException {
     return new WildcardTermsEnum(reader, getTerm());
   }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/WildcardTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/WildcardTermsEnum.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/WildcardTermsEnum.java
(original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/WildcardTermsEnum.java
Sat Oct 31 15:39:26 2009
@@ -77,10 +77,12 @@
     }
   }
 
+  @Override
   public String field() {
     return searchTerm.field();
   }
 
+  @Override
   protected final boolean accept(TermRef term) {
     if (term.startsWith(preTermRef)) {
       // TODO: would be better, but trickier, to not have to
@@ -92,10 +94,12 @@
     return false;
   }
 
+  @Override
   public float difference() {
     return 1.0f;
   }
 
+  @Override
   public final boolean empty() {
     return empty;
   }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java
(original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java
Sat Oct 31 15:39:26 2009
@@ -66,10 +66,12 @@
     this.function = function;
   }
 
+  @Override
   public Weight createWeight(Searcher searcher) throws IOException {
     return new PayloadNearSpanWeight(this, searcher);
   }
 
+  @Override
   public Object clone() {
     int sz = clauses.size();
     SpanQuery[] newClauses = new SpanQuery[sz];
@@ -83,6 +85,7 @@
     return boostingNearQuery;
   }
 
+  @Override
   public String toString(String field) {
     StringBuilder buffer = new StringBuilder();
     buffer.append("payloadNear([");
@@ -104,6 +107,7 @@
   }
 
   // @Override
+  @Override
   public int hashCode() {
     final int prime = 31;
     int result = super.hashCode();
@@ -113,6 +117,7 @@
   }
 
   // @Override
+  @Override
   public boolean equals(Object obj) {
     if (this == obj)
       return true;
@@ -145,6 +150,7 @@
           similarity, reader.norms(query.getField()));
     }
 
+    @Override
     public Scorer scorer(IndexReader reader, boolean scoreDocsInOrder,
         boolean topScorer) throws IOException {
       return new PayloadNearSpanScorer(query.getSpans(reader), this,
@@ -217,12 +223,14 @@
       return super.setFreqCurrentDoc();
     }
 
+    @Override
     public float score() throws IOException {
 
       return super.score()
           * function.docScore(doc, fieldName, payloadsSeen, payloadScore);
     }
 
+    @Override
     protected Explanation explain(int doc) throws IOException {
       Explanation result = new Explanation();
       Explanation nonPayloadExpl = super.explain(doc);

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/OpenBitSet.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/OpenBitSet.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/OpenBitSet.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/OpenBitSet.java Sat Oct
31 15:39:26 2009
@@ -112,11 +112,13 @@
     this.wlen = numWords;
   }
   
+  @Override
   public DocIdSetIterator iterator() {
     return new OpenBitSetIterator(bits, wlen);
   }
 
   /** This DocIdSet implementation is cacheable. */
+  @Override
   public boolean isCacheable() {
     return true;
   }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/SimpleStringInterner.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/SimpleStringInterner.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/SimpleStringInterner.java
(original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/SimpleStringInterner.java
Sat Oct 31 15:39:26 2009
@@ -47,6 +47,7 @@
   }
 
   // @Override
+  @Override
   public String intern(String s) {
     int h = s.hashCode();
     // In the future, it may be worth augmenting the string hash

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/SortedVIntList.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/SortedVIntList.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/SortedVIntList.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/SortedVIntList.java Sat
Oct 31 15:39:26 2009
@@ -181,6 +181,7 @@
   }
 
   /** This DocIdSet implementation is cacheable. */
+  @Override
   public boolean isCacheable() {
     return true;
   }
@@ -188,6 +189,7 @@
   /**
    * @return    An iterator over the sorted integers.
    */
+  @Override
   public DocIdSetIterator iterator() {
     return new DocIdSetIterator() {
       int bytePos = 0;



Mime
View raw message