lucene-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From uschind...@apache.org
Subject svn commit: r830661 [3/4] - in /lucene/java/trunk/src/java/org/apache/lucene: analysis/ analysis/standard/ analysis/tokenattributes/ document/ index/ messages/ search/ search/function/ search/payloads/ search/spans/ store/ util/
Date Wed, 28 Oct 2009 16:16:53 GMT
Modified: lucene/java/trunk/src/java/org/apache/lucene/search/CachingSpanFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/CachingSpanFilter.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/CachingSpanFilter.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/CachingSpanFilter.java Wed Oct 28 16:16:46 2009
@@ -42,6 +42,7 @@
     this.filter = filter;
   }
 
+  @Override
   public DocIdSet getDocIdSet(IndexReader reader) throws IOException {
     SpanFilterResult result = getCachedResult(reader);
     return result != null ? result.getDocIdSet() : null;
@@ -64,19 +65,23 @@
   }
 
 
+  @Override
   public SpanFilterResult bitSpans(IndexReader reader) throws IOException {
     return getCachedResult(reader);
   }
 
+  @Override
   public String toString() {
     return "CachingSpanFilter("+filter+")";
   }
 
+  @Override
   public boolean equals(Object o) {
     if (!(o instanceof CachingSpanFilter)) return false;
     return this.filter.equals(((CachingSpanFilter)o).filter);
   }
 
+  @Override
   public int hashCode() {
     return filter.hashCode() ^ 0x1117BF25;
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/CachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/CachingWrapperFilter.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/CachingWrapperFilter.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/CachingWrapperFilter.java Wed Oct 28 16:16:46 2009
@@ -61,6 +61,7 @@
     }
   }
   
+  @Override
   public DocIdSet getDocIdSet(IndexReader reader) throws IOException {
     if (cache == null) {
       cache = new WeakHashMap<IndexReader, DocIdSet>();
@@ -86,15 +87,18 @@
     return docIdSet;
   }
 
+  @Override
   public String toString() {
     return "CachingWrapperFilter("+filter+")";
   }
 
+  @Override
   public boolean equals(Object o) {
     if (!(o instanceof CachingWrapperFilter)) return false;
     return this.filter.equals(((CachingWrapperFilter)o).filter);
   }
 
+  @Override
   public int hashCode() {
     return filter.hashCode() ^ 0x1117BF25;  
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/ComplexExplanation.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/ComplexExplanation.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/ComplexExplanation.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/ComplexExplanation.java Wed Oct 28 16:16:46 2009
@@ -52,11 +52,13 @@
    * </p>
    * @see #getMatch
    */
+  @Override
   public boolean isMatch() {
     Boolean m = getMatch();
     return (null != m ? m.booleanValue() : super.isMatch());
   }
 
+  @Override
   protected String getSummary() {
     if (null == getMatch())
       return super.getSummary();

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/DefaultSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/DefaultSimilarity.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/DefaultSimilarity.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/DefaultSimilarity.java Wed Oct 28 16:16:46 2009
@@ -31,6 +31,7 @@
    *
    *  <p><b>WARNING</b>: This API is new and experimental, and may suddenly
    *  change.</p> */
+  @Override
   public float computeNorm(String field, FieldInvertState state) {
     final int numTerms;
     if (discountOverlaps)
@@ -41,31 +42,37 @@
   }
   
   /** Implemented as <code>1/sqrt(numTerms)</code>. */
+  @Override
   public float lengthNorm(String fieldName, int numTerms) {
     return (float)(1.0 / Math.sqrt(numTerms));
   }
   
   /** Implemented as <code>1/sqrt(sumOfSquaredWeights)</code>. */
+  @Override
   public float queryNorm(float sumOfSquaredWeights) {
     return (float)(1.0 / Math.sqrt(sumOfSquaredWeights));
   }
 
   /** Implemented as <code>sqrt(freq)</code>. */
+  @Override
   public float tf(float freq) {
     return (float)Math.sqrt(freq);
   }
     
   /** Implemented as <code>1 / (distance + 1)</code>. */
+  @Override
   public float sloppyFreq(int distance) {
     return 1.0f / (distance + 1);
   }
     
   /** Implemented as <code>log(numDocs/(docFreq+1)) + 1</code>. */
+  @Override
   public float idf(int docFreq, int numDocs) {
     return (float)(Math.log(numDocs/(double)(docFreq+1)) + 1.0);
   }
     
   /** Implemented as <code>overlap / maxOverlap</code>. */
+  @Override
   public float coord(int overlap, int maxOverlap) {
     return overlap / (float)maxOverlap;
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/DocIdSet.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/DocIdSet.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/DocIdSet.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/DocIdSet.java Wed Oct 28 16:16:46 2009
@@ -29,8 +29,11 @@
   public static final DocIdSet EMPTY_DOCIDSET = new DocIdSet() {
     
     private final DocIdSetIterator iterator = new DocIdSetIterator() {
+      @Override
       public int advance(int target) throws IOException { return NO_MORE_DOCS; }
+      @Override
       public int docID() { return NO_MORE_DOCS; }
+      @Override
       public int nextDoc() throws IOException { return NO_MORE_DOCS; }
     };
     

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/ExactPhraseScorer.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/ExactPhraseScorer.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/ExactPhraseScorer.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/ExactPhraseScorer.java Wed Oct 28 16:16:46 2009
@@ -27,6 +27,7 @@
     super(weight, tps, offsets, similarity, norms);
   }
 
+  @Override
   protected final float phraseFreq() throws IOException {
     // sort list with pq
     pq.clear();

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/Explanation.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/Explanation.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/Explanation.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/Explanation.java Wed Oct 28 16:16:46 2009
@@ -82,6 +82,7 @@
   }
 
   /** Render an explanation as text. */
+  @Override
   public String toString() {
     return toString(0);
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/FieldCache.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/FieldCache.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/FieldCache.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/FieldCache.java Wed Oct 28 16:16:46 2009
@@ -154,6 +154,7 @@
     protected Object readResolve() {
       return DEFAULT_BYTE_PARSER;
     }
+    @Override
     public String toString() { 
       return FieldCache.class.getName()+".DEFAULT_BYTE_PARSER"; 
     }
@@ -167,6 +168,7 @@
     protected Object readResolve() {
       return DEFAULT_SHORT_PARSER;
     }
+    @Override
     public String toString() { 
       return FieldCache.class.getName()+".DEFAULT_SHORT_PARSER"; 
     }
@@ -180,6 +182,7 @@
     protected Object readResolve() {
       return DEFAULT_INT_PARSER;
     }
+    @Override
     public String toString() { 
       return FieldCache.class.getName()+".DEFAULT_INT_PARSER"; 
     }
@@ -193,6 +196,7 @@
     protected Object readResolve() {
       return DEFAULT_FLOAT_PARSER;
     }
+    @Override
     public String toString() { 
       return FieldCache.class.getName()+".DEFAULT_FLOAT_PARSER"; 
     }
@@ -206,6 +210,7 @@
     protected Object readResolve() {
       return DEFAULT_LONG_PARSER;
     }
+    @Override
     public String toString() { 
       return FieldCache.class.getName()+".DEFAULT_LONG_PARSER"; 
     }
@@ -219,6 +224,7 @@
     protected Object readResolve() {
       return DEFAULT_DOUBLE_PARSER;
     }
+    @Override
     public String toString() { 
       return FieldCache.class.getName()+".DEFAULT_DOUBLE_PARSER"; 
     }
@@ -238,6 +244,7 @@
     protected Object readResolve() {
       return NUMERIC_UTILS_INT_PARSER;
     }
+    @Override
     public String toString() { 
       return FieldCache.class.getName()+".NUMERIC_UTILS_INT_PARSER"; 
     }
@@ -257,6 +264,7 @@
     protected Object readResolve() {
       return NUMERIC_UTILS_FLOAT_PARSER;
     }
+    @Override
     public String toString() { 
       return FieldCache.class.getName()+".NUMERIC_UTILS_FLOAT_PARSER"; 
     }
@@ -276,6 +284,7 @@
     protected Object readResolve() {
       return NUMERIC_UTILS_LONG_PARSER;
     }
+    @Override
     public String toString() { 
       return FieldCache.class.getName()+".NUMERIC_UTILS_LONG_PARSER"; 
     }
@@ -295,6 +304,7 @@
     protected Object readResolve() {
       return NUMERIC_UTILS_DOUBLE_PARSER;
     }
+    @Override
     public String toString() { 
       return FieldCache.class.getName()+".NUMERIC_UTILS_DOUBLE_PARSER"; 
     }
@@ -528,6 +538,7 @@
     }
     
     
+    @Override
     public String toString() {
       StringBuilder b = new StringBuilder();
       b.append("'").append(getReaderKey()).append("'=>");

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/FieldCacheImpl.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/FieldCacheImpl.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/FieldCacheImpl.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/FieldCacheImpl.java Wed Oct 28 16:16:46 2009
@@ -107,10 +107,15 @@
 //         }
 
     }
+    @Override
     public Object getReaderKey() { return readerKey; }
+    @Override
     public String getFieldName() { return fieldName; }
+    @Override
     public Class<?> getCacheType() { return cacheType; }
+    @Override
     public Object getCustom() { return custom; }
+    @Override
     public Object getValue() { return value; }
   }
 
@@ -212,6 +217,7 @@
     }
 
     /** Two of these are equal iff they reference the same field and type. */
+    @Override
     public boolean equals (Object o) {
       if (o instanceof Entry) {
         Entry other = (Entry) o;
@@ -227,6 +233,7 @@
     }
 
     /** Composes a hashcode based on the field and type. */
+    @Override
     public int hashCode() {
       return field.hashCode() ^ (custom==null ? 0 : custom.hashCode());
     }
@@ -247,6 +254,7 @@
     ByteCache(FieldCache wrapper) {
       super(wrapper);
     }
+    @Override
     protected Object createValue(IndexReader reader, Entry entryKey)
         throws IOException {
       Entry entry = entryKey;
@@ -293,6 +301,7 @@
       super(wrapper);
     }
 
+    @Override
     protected Object createValue(IndexReader reader, Entry entryKey)
         throws IOException {
       Entry entry =  entryKey;
@@ -339,6 +348,7 @@
       super(wrapper);
     }
 
+    @Override
     protected Object createValue(IndexReader reader, Entry entryKey)
         throws IOException {
       Entry entry = entryKey;
@@ -396,6 +406,7 @@
       super(wrapper);
     }
 
+    @Override
     protected Object createValue(IndexReader reader, Entry entryKey)
         throws IOException {
       Entry entry = entryKey;
@@ -450,6 +461,7 @@
       super(wrapper);
     }
 
+    @Override
     protected Object createValue(IndexReader reader, Entry entry)
         throws IOException {
       String field = entry.field;
@@ -504,6 +516,7 @@
       super(wrapper);
     }
 
+    @Override
     protected Object createValue(IndexReader reader, Entry entryKey)
         throws IOException {
       Entry entry = entryKey;
@@ -553,6 +566,7 @@
       super(wrapper);
     }
 
+    @Override
     protected Object createValue(IndexReader reader, Entry entryKey)
         throws IOException {
       String field = StringHelper.intern(entryKey.field);
@@ -588,6 +602,7 @@
       super(wrapper);
     }
 
+    @Override
     protected Object createValue(IndexReader reader, Entry entryKey)
         throws IOException {
       String field = StringHelper.intern(entryKey.field);

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/FieldCacheRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/FieldCacheRangeFilter.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/FieldCacheRangeFilter.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/FieldCacheRangeFilter.java Wed Oct 28 16:16:46 2009
@@ -70,6 +70,7 @@
   }
   
   /** This method is implemented for each data type */
+  @Override
   public abstract DocIdSet getDocIdSet(IndexReader reader) throws IOException;
 
   /**
@@ -79,6 +80,7 @@
    */
   public static FieldCacheRangeFilter<String> newStringRange(String field, String lowerVal, String upperVal, boolean includeLower, boolean includeUpper) {
     return new FieldCacheRangeFilter<String>(field, null, lowerVal, upperVal, includeLower, includeUpper) {
+      @Override
       public DocIdSet getDocIdSet(IndexReader reader) throws IOException {
         final FieldCache.StringIndex fcsi = FieldCache.DEFAULT.getStringIndex(reader, field);
         final int lowerPoint = fcsi.binarySearchLookup(lowerVal);
@@ -120,6 +122,7 @@
         // for this DocIdSet, we never need to use TermDocs,
         // because deleted docs have an order of 0 (null entry in StringIndex)
         return new FieldCacheDocIdSet(reader, false) {
+          @Override
           final boolean matchDoc(int doc) {
             return fcsi.order[doc] >= inclusiveLowerPoint && fcsi.order[doc] <= inclusiveUpperPoint;
           }
@@ -144,6 +147,7 @@
    */
   public static FieldCacheRangeFilter<Byte> newByteRange(String field, FieldCache.ByteParser parser, Byte lowerVal, Byte upperVal, boolean includeLower, boolean includeUpper) {
     return new FieldCacheRangeFilter<Byte>(field, parser, lowerVal, upperVal, includeLower, includeUpper) {
+      @Override
       public DocIdSet getDocIdSet(IndexReader reader) throws IOException {
         final byte inclusiveLowerPoint, inclusiveUpperPoint;
         if (lowerVal != null) {
@@ -169,6 +173,7 @@
         final byte[] values = FieldCache.DEFAULT.getBytes(reader, field, (FieldCache.ByteParser) parser);
         // we only request the usage of termDocs, if the range contains 0
         return new FieldCacheDocIdSet(reader, (inclusiveLowerPoint <= 0 && inclusiveUpperPoint >= 0)) {
+          @Override
           boolean matchDoc(int doc) {
             return values[doc] >= inclusiveLowerPoint && values[doc] <= inclusiveUpperPoint;
           }
@@ -193,6 +198,7 @@
    */
   public static FieldCacheRangeFilter<Short> newShortRange(String field, FieldCache.ShortParser parser, Short lowerVal, Short upperVal, boolean includeLower, boolean includeUpper) {
     return new FieldCacheRangeFilter<Short>(field, parser, lowerVal, upperVal, includeLower, includeUpper) {
+      @Override
       public DocIdSet getDocIdSet(IndexReader reader) throws IOException {
         final short inclusiveLowerPoint, inclusiveUpperPoint;
         if (lowerVal != null) {
@@ -218,6 +224,7 @@
         final short[] values = FieldCache.DEFAULT.getShorts(reader, field, (FieldCache.ShortParser) parser);
         // we only request the usage of termDocs, if the range contains 0
         return new FieldCacheDocIdSet(reader, (inclusiveLowerPoint <= 0 && inclusiveUpperPoint >= 0)) {
+          @Override
           boolean matchDoc(int doc) {
             return values[doc] >= inclusiveLowerPoint && values[doc] <= inclusiveUpperPoint;
           }
@@ -242,6 +249,7 @@
    */
   public static FieldCacheRangeFilter<Integer> newIntRange(String field, FieldCache.IntParser parser, Integer lowerVal, Integer upperVal, boolean includeLower, boolean includeUpper) {
     return new FieldCacheRangeFilter<Integer>(field, parser, lowerVal, upperVal, includeLower, includeUpper) {
+      @Override
       public DocIdSet getDocIdSet(IndexReader reader) throws IOException {
         final int inclusiveLowerPoint, inclusiveUpperPoint;
         if (lowerVal != null) {
@@ -267,6 +275,7 @@
         final int[] values = FieldCache.DEFAULT.getInts(reader, field, (FieldCache.IntParser) parser);
         // we only request the usage of termDocs, if the range contains 0
         return new FieldCacheDocIdSet(reader, (inclusiveLowerPoint <= 0 && inclusiveUpperPoint >= 0)) {
+          @Override
           boolean matchDoc(int doc) {
             return values[doc] >= inclusiveLowerPoint && values[doc] <= inclusiveUpperPoint;
           }
@@ -291,6 +300,7 @@
    */
   public static FieldCacheRangeFilter<Long> newLongRange(String field, FieldCache.LongParser parser, Long lowerVal, Long upperVal, boolean includeLower, boolean includeUpper) {
     return new FieldCacheRangeFilter<Long>(field, parser, lowerVal, upperVal, includeLower, includeUpper) {
+      @Override
       public DocIdSet getDocIdSet(IndexReader reader) throws IOException {
         final long inclusiveLowerPoint, inclusiveUpperPoint;
         if (lowerVal != null) {
@@ -316,6 +326,7 @@
         final long[] values = FieldCache.DEFAULT.getLongs(reader, field, (FieldCache.LongParser) parser);
         // we only request the usage of termDocs, if the range contains 0
         return new FieldCacheDocIdSet(reader, (inclusiveLowerPoint <= 0L && inclusiveUpperPoint >= 0L)) {
+          @Override
           boolean matchDoc(int doc) {
             return values[doc] >= inclusiveLowerPoint && values[doc] <= inclusiveUpperPoint;
           }
@@ -340,6 +351,7 @@
    */
   public static FieldCacheRangeFilter<Float> newFloatRange(String field, FieldCache.FloatParser parser, Float lowerVal, Float upperVal, boolean includeLower, boolean includeUpper) {
     return new FieldCacheRangeFilter<Float>(field, parser, lowerVal, upperVal, includeLower, includeUpper) {
+      @Override
       public DocIdSet getDocIdSet(IndexReader reader) throws IOException {
         // we transform the floating point numbers to sortable integers
         // using NumericUtils to easier find the next bigger/lower value
@@ -369,6 +381,7 @@
         final float[] values = FieldCache.DEFAULT.getFloats(reader, field, (FieldCache.FloatParser) parser);
         // we only request the usage of termDocs, if the range contains 0
         return new FieldCacheDocIdSet(reader, (inclusiveLowerPoint <= 0.0f && inclusiveUpperPoint >= 0.0f)) {
+          @Override
           boolean matchDoc(int doc) {
             return values[doc] >= inclusiveLowerPoint && values[doc] <= inclusiveUpperPoint;
           }
@@ -393,6 +406,7 @@
    */
   public static FieldCacheRangeFilter<Double> newDoubleRange(String field, FieldCache.DoubleParser parser, Double lowerVal, Double upperVal, boolean includeLower, boolean includeUpper) {
     return new FieldCacheRangeFilter<Double>(field, parser, lowerVal, upperVal, includeLower, includeUpper) {
+      @Override
       public DocIdSet getDocIdSet(IndexReader reader) throws IOException {
         // we transform the floating point numbers to sortable integers
         // using NumericUtils to easier find the next bigger/lower value
@@ -422,6 +436,7 @@
         final double[] values = FieldCache.DEFAULT.getDoubles(reader, field, (FieldCache.DoubleParser) parser);
         // we only request the usage of termDocs, if the range contains 0
         return new FieldCacheDocIdSet(reader, (inclusiveLowerPoint <= 0.0 && inclusiveUpperPoint >= 0.0)) {
+          @Override
           boolean matchDoc(int doc) {
             return values[doc] >= inclusiveLowerPoint && values[doc] <= inclusiveUpperPoint;
           }
@@ -430,6 +445,7 @@
     };
   }
   
+  @Override
   public final String toString() {
     final StringBuilder sb = new StringBuilder(field).append(":");
     return sb.append(includeLower ? '[' : '{')
@@ -440,6 +456,7 @@
       .toString();
   }
 
+  @Override
   public final boolean equals(Object o) {
     if (this == o) return true;
     if (!(o instanceof FieldCacheRangeFilter)) return false;
@@ -455,6 +472,7 @@
     return true;
   }
   
+  @Override
   public final int hashCode() {
     int h = field.hashCode();
     h ^= (lowerVal != null) ? lowerVal.hashCode() : 550356204;
@@ -516,10 +534,12 @@
         return new DocIdSetIterator() {
           private int doc = -1;
           
+          @Override
           public int docID() {
             return doc;
           }
           
+          @Override
           public int nextDoc() throws IOException {
             do {
               if (!termDocs.next())
@@ -528,6 +548,7 @@
             return doc;
           }
           
+          @Override
           public int advance(int target) throws IOException {
             if (!termDocs.skipTo(target))
               return doc = NO_MORE_DOCS;
@@ -544,10 +565,12 @@
         return new DocIdSetIterator() {
           private int doc = -1;
           
+          @Override
           public int docID() {
             return doc;
           }
           
+          @Override
           public int nextDoc() {
             try {
               do {
@@ -559,6 +582,7 @@
             }
           }
           
+          @Override
           public int advance(int target) {
             try {
               doc = target;

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/FieldCacheTermsFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/FieldCacheTermsFilter.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/FieldCacheTermsFilter.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/FieldCacheTermsFilter.java Wed Oct 28 16:16:46 2009
@@ -106,6 +106,7 @@
     return FieldCache.DEFAULT;
   }
 
+  @Override
   public DocIdSet getDocIdSet(IndexReader reader) throws IOException {
     return new FieldCacheTermsFilterDocIdSet(getFieldCache().getStringIndex(reader, field));
   }
@@ -140,10 +141,12 @@
     protected class FieldCacheTermsFilterDocIdSetIterator extends DocIdSetIterator {
       private int doc = -1;
 
+      @Override
       public int docID() {
         return doc;
       }
 
+      @Override
       public int nextDoc() {
         try {
           while (!openBitSet.fastGet(fcsi.order[++doc])) {}
@@ -153,6 +156,7 @@
         return doc;
       }
 
+      @Override
       public int advance(int target) {
         try {
           doc = target;

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/FieldComparator.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/FieldComparator.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/FieldComparator.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/FieldComparator.java Wed Oct 28 16:16:46 2009
@@ -178,26 +178,32 @@
       this.parser = (ByteParser) parser;
     }
 
+    @Override
     public int compare(int slot1, int slot2) {
       return values[slot1] - values[slot2];
     }
 
+    @Override
     public int compareBottom(int doc) {
       return bottom - currentReaderValues[doc];
     }
 
+    @Override
     public void copy(int slot, int doc) {
       values[slot] = currentReaderValues[doc];
     }
 
+    @Override
     public void setNextReader(IndexReader reader, int docBase) throws IOException {
       currentReaderValues = FieldCache.DEFAULT.getBytes(reader, field, parser);
     }
     
+    @Override
     public void setBottom(final int bottom) {
       this.bottom = values[bottom];
     }
 
+    @Override
     public Comparable value(int slot) {
       return Byte.valueOf(values[slot]);
     }
@@ -213,20 +219,24 @@
       docIDs = new int[numHits];
     }
 
+    @Override
     public int compare(int slot1, int slot2) {
       // No overflow risk because docIDs are non-negative
       return docIDs[slot1] - docIDs[slot2];
     }
 
+    @Override
     public int compareBottom(int doc) {
       // No overflow risk because docIDs are non-negative
       return bottom - (docBase + doc);
     }
 
+    @Override
     public void copy(int slot, int doc) {
       docIDs[slot] = docBase + doc;
     }
 
+    @Override
     public void setNextReader(IndexReader reader, int docBase) {
       // TODO: can we "map" our docIDs to the current
       // reader? saves having to then subtract on every
@@ -234,10 +244,12 @@
       this.docBase = docBase;
     }
     
+    @Override
     public void setBottom(final int bottom) {
       this.bottom = docIDs[bottom];
     }
 
+    @Override
     public Comparable value(int slot) {
       return Integer.valueOf(docIDs[slot]);
     }
@@ -258,6 +270,7 @@
       this.parser = (DoubleParser) parser;
     }
 
+    @Override
     public int compare(int slot1, int slot2) {
       final double v1 = values[slot1];
       final double v2 = values[slot2];
@@ -270,6 +283,7 @@
       }
     }
 
+    @Override
     public int compareBottom(int doc) {
       final double v2 = currentReaderValues[doc];
       if (bottom > v2) {
@@ -281,18 +295,22 @@
       }
     }
 
+    @Override
     public void copy(int slot, int doc) {
       values[slot] = currentReaderValues[doc];
     }
 
+    @Override
     public void setNextReader(IndexReader reader, int docBase) throws IOException {
       currentReaderValues = FieldCache.DEFAULT.getDoubles(reader, field, parser);
     }
     
+    @Override
     public void setBottom(final int bottom) {
       this.bottom = values[bottom];
     }
 
+    @Override
     public Comparable value(int slot) {
       return Double.valueOf(values[slot]);
     }
@@ -313,6 +331,7 @@
       this.parser = (FloatParser) parser;
     }
 
+    @Override
     public int compare(int slot1, int slot2) {
       // TODO: are there sneaky non-branch ways to compute
       // sign of float?
@@ -327,6 +346,7 @@
       }
     }
 
+    @Override
     public int compareBottom(int doc) {
       // TODO: are there sneaky non-branch ways to compute
       // sign of float?
@@ -340,18 +360,22 @@
       }
     }
 
+    @Override
     public void copy(int slot, int doc) {
       values[slot] = currentReaderValues[doc];
     }
 
+    @Override
     public void setNextReader(IndexReader reader, int docBase) throws IOException {
       currentReaderValues = FieldCache.DEFAULT.getFloats(reader, field, parser);
     }
     
+    @Override
     public void setBottom(final int bottom) {
       this.bottom = values[bottom];
     }
 
+    @Override
     public Comparable value(int slot) {
       return Float.valueOf(values[slot]);
     }
@@ -372,6 +396,7 @@
       this.parser = (IntParser) parser;
     }
 
+    @Override
     public int compare(int slot1, int slot2) {
       // TODO: there are sneaky non-branch ways to compute
       // -1/+1/0 sign
@@ -388,6 +413,7 @@
       }
     }
 
+    @Override
     public int compareBottom(int doc) {
       // TODO: there are sneaky non-branch ways to compute
       // -1/+1/0 sign
@@ -403,18 +429,22 @@
       }
     }
 
+    @Override
     public void copy(int slot, int doc) {
       values[slot] = currentReaderValues[doc];
     }
 
+    @Override
     public void setNextReader(IndexReader reader, int docBase) throws IOException {
       currentReaderValues = FieldCache.DEFAULT.getInts(reader, field, parser);
     }
     
+    @Override
     public void setBottom(final int bottom) {
       this.bottom = values[bottom];
     }
 
+    @Override
     public Comparable value(int slot) {
       return Integer.valueOf(values[slot]);
     }
@@ -435,6 +465,7 @@
       this.parser = (LongParser) parser;
     }
 
+    @Override
     public int compare(int slot1, int slot2) {
       // TODO: there are sneaky non-branch ways to compute
       // -1/+1/0 sign
@@ -449,6 +480,7 @@
       }
     }
 
+    @Override
     public int compareBottom(int doc) {
       // TODO: there are sneaky non-branch ways to compute
       // -1/+1/0 sign
@@ -462,18 +494,22 @@
       }
     }
 
+    @Override
     public void copy(int slot, int doc) {
       values[slot] = currentReaderValues[doc];
     }
 
+    @Override
     public void setNextReader(IndexReader reader, int docBase) throws IOException {
       currentReaderValues = FieldCache.DEFAULT.getLongs(reader, field, parser);
     }
     
+    @Override
     public void setBottom(final int bottom) {
       this.bottom = values[bottom];
     }
 
+    @Override
     public Comparable value(int slot) {
       return Long.valueOf(values[slot]);
     }
@@ -494,34 +530,41 @@
       scores = new float[numHits];
     }
 
+    @Override
     public int compare(int slot1, int slot2) {
       final float score1 = scores[slot1];
       final float score2 = scores[slot2];
       return score1 > score2 ? -1 : (score1 < score2 ? 1 : 0);
     }
 
+    @Override
     public int compareBottom(int doc) throws IOException {
       float score = scorer.score();
       return bottom > score ? -1 : (bottom < score ? 1 : 0);
     }
 
+    @Override
     public void copy(int slot, int doc) throws IOException {
       scores[slot] = scorer.score();
     }
 
+    @Override
     public void setNextReader(IndexReader reader, int docBase) {
     }
     
+    @Override
     public void setBottom(final int bottom) {
       this.bottom = scores[bottom];
     }
 
+    @Override
     public void setScorer(Scorer scorer) {
       // wrap with a ScoreCachingWrappingScorer so that successive calls to
       // score() will not incur score computation over and over again.
       this.scorer = new ScoreCachingWrappingScorer(scorer);
     }
     
+    @Override
     public Comparable value(int slot) {
       return Float.valueOf(scores[slot]);
     }
@@ -542,26 +585,32 @@
       this.parser = (ShortParser) parser;
     }
 
+    @Override
     public int compare(int slot1, int slot2) {
       return values[slot1] - values[slot2];
     }
 
+    @Override
     public int compareBottom(int doc) {
       return bottom - currentReaderValues[doc];
     }
 
+    @Override
     public void copy(int slot, int doc) {
       values[slot] = currentReaderValues[doc];
     }
 
+    @Override
     public void setNextReader(IndexReader reader, int docBase) throws IOException {
       currentReaderValues = FieldCache.DEFAULT.getShorts(reader, field, parser);
     }
     
+    @Override
     public void setBottom(final int bottom) {
       this.bottom = values[bottom];
     }
 
+    @Override
     public Comparable value(int slot) {
       return Short.valueOf(values[slot]);
     }
@@ -583,6 +632,7 @@
       collator = Collator.getInstance(locale);
     }
 
+    @Override
     public int compare(int slot1, int slot2) {
       final String val1 = values[slot1];
       final String val2 = values[slot2];
@@ -597,6 +647,7 @@
       return collator.compare(val1, val2);
     }
 
+    @Override
     public int compareBottom(int doc) {
       final String val2 = currentReaderValues[doc];
       if (bottom == null) {
@@ -610,18 +661,22 @@
       return collator.compare(bottom, val2);
     }
 
+    @Override
     public void copy(int slot, int doc) {
       values[slot] = currentReaderValues[doc];
     }
 
+    @Override
     public void setNextReader(IndexReader reader, int docBase) throws IOException {
       currentReaderValues = FieldCache.DEFAULT.getStrings(reader, field);
     }
     
+    @Override
     public void setBottom(final int bottom) {
       this.bottom = values[bottom];
     }
 
+    @Override
     public Comparable value(int slot) {
       return values[slot];
     }
@@ -662,6 +717,7 @@
       this.field = field;
     }
 
+    @Override
     public int compare(int slot1, int slot2) {
       if (readerGen[slot1] == readerGen[slot2]) {
         int cmp = ords[slot1] - ords[slot2];
@@ -683,6 +739,7 @@
       return val1.compareTo(val2);
     }
 
+    @Override
     public int compareBottom(int doc) {
       assert bottomSlot != -1;
       int order = this.order[doc];
@@ -734,6 +791,7 @@
       ords[slot] = index;
     }
 
+    @Override
     public void copy(int slot, int doc) {
       final int ord = order[doc];
       ords[slot] = ord;
@@ -742,6 +800,7 @@
       readerGen[slot] = currentReaderGen;
     }
 
+    @Override
     public void setNextReader(IndexReader reader, int docBase) throws IOException {
       StringIndex currentReaderValues = FieldCache.DEFAULT.getStringIndex(reader, field);
       currentReaderGen++;
@@ -754,6 +813,7 @@
       }
     }
     
+    @Override
     public void setBottom(final int bottom) {
       bottomSlot = bottom;
       if (readerGen[bottom] != currentReaderGen) {
@@ -765,6 +825,7 @@
       bottomValue = values[bottom];
     }
 
+    @Override
     public Comparable value(int slot) {
       return values[slot];
     }
@@ -798,6 +859,7 @@
       this.field = field;
     }
 
+    @Override
     public int compare(int slot1, int slot2) {
       final String val1 = values[slot1];
       final String val2 = values[slot2];
@@ -813,6 +875,7 @@
       return val1.compareTo(val2);
     }
 
+    @Override
     public int compareBottom(int doc) {
       final String val2 = currentReaderValues[doc];
       if (bottom == null) {
@@ -826,18 +889,22 @@
       return bottom.compareTo(val2);
     }
 
+    @Override
     public void copy(int slot, int doc) {
       values[slot] = currentReaderValues[doc];
     }
 
+    @Override
     public void setNextReader(IndexReader reader, int docBase) throws IOException {
       currentReaderValues = FieldCache.DEFAULT.getStrings(reader, field);
     }
     
+    @Override
     public void setBottom(final int bottom) {
       this.bottom = values[bottom];
     }
 
+    @Override
     public Comparable value(int slot) {
       return values[slot];
     }

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/FieldDoc.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/FieldDoc.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/FieldDoc.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/FieldDoc.java Wed Oct 28 16:16:46 2009
@@ -38,37 +38,38 @@
  */
 public class FieldDoc extends ScoreDoc {
 
-	/** Expert: The values which are used to sort the referenced document.
-	 * The order of these will match the original sort criteria given by a
-	 * Sort object.  Each Object will be either an Integer, Float or String,
-	 * depending on the type of values in the terms of the original field.
-	 * @see Sort
-	 * @see Searcher#search(Query,Filter,int,Sort)
-	 */
-	public Comparable[] fields;
+  /** Expert: The values which are used to sort the referenced document.
+   * The order of these will match the original sort criteria given by a
+   * Sort object.  Each Object will be either an Integer, Float or String,
+   * depending on the type of values in the terms of the original field.
+   * @see Sort
+   * @see Searcher#search(Query,Filter,int,Sort)
+   */
+  public Comparable[] fields;
 
-	/** Expert: Creates one of these objects with empty sort information. */
-	public FieldDoc (int doc, float score) {
-		super (doc, score);
-	}
+  /** Expert: Creates one of these objects with empty sort information. */
+  public FieldDoc (int doc, float score) {
+    super (doc, score);
+  }
 
-	/** Expert: Creates one of these objects with the given sort information. */
-	public FieldDoc (int doc, float score, Comparable[] fields) {
-		super (doc, score);
-		this.fields = fields;
-	}
-	
-	// A convenience method for debugging.
-	public String toString() {
-	  // super.toString returns the doc and score information, so just add the
+  /** Expert: Creates one of these objects with the given sort information. */
+  public FieldDoc (int doc, float score, Comparable[] fields) {
+    super (doc, score);
+    this.fields = fields;
+  }
+  
+  // A convenience method for debugging.
+  @Override
+  public String toString() {
+    // super.toString returns the doc and score information, so just add the
           // fields information
-	  StringBuilder sb = new StringBuilder(super.toString());
-	  sb.append("[");
-	  for (int i = 0; i < fields.length; i++) {
+    StringBuilder sb = new StringBuilder(super.toString());
+    sb.append("[");
+    for (int i = 0; i < fields.length; i++) {
             sb.append(fields[i]).append(", ");
           }
-	  sb.setLength(sb.length() - 2); // discard last ", "
-	  sb.append("]");
-	  return super.toString();
-	}
+    sb.setLength(sb.length() - 2); // discard last ", "
+    sb.append("]");
+    return super.toString();
+  }
 }

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/FieldValueHitQueue.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/FieldValueHitQueue.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/FieldValueHitQueue.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/FieldValueHitQueue.java Wed Oct 28 16:16:46 2009
@@ -47,6 +47,7 @@
       this.score = score;
     }
     
+    @Override
     public String toString() {
       return "slot:" + slot + " docID:" + docID + " score=" + score;
     }
@@ -84,6 +85,7 @@
      * @param b ScoreDoc
      * @return <code>true</code> if document <code>a</code> should be sorted after document <code>b</code>.
      */
+    @Override
     protected boolean lessThan(final Entry hitA, final Entry hitB) {
 
       assert hitA != hitB;
@@ -121,6 +123,7 @@
       initialize(size);
     }
   
+    @Override
     protected boolean lessThan(final Entry hitA, final Entry hitB) {
 
       assert hitA != hitB;
@@ -190,6 +193,7 @@
   protected final FieldComparator[] comparators;
   protected final int[] reverseMul;
 
+  @Override
   protected abstract boolean lessThan (final Entry a, final Entry b);
 
   /**

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/FilteredDocIdSet.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/FilteredDocIdSet.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/FilteredDocIdSet.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/FilteredDocIdSet.java Wed Oct 28 16:16:46 2009
@@ -70,6 +70,7 @@
   @Override
   public DocIdSetIterator iterator() throws IOException {
     return new FilteredDocIdSetIterator(_innerSet.iterator()) {
+      @Override
       protected boolean match(int docid) throws IOException {
         return FilteredDocIdSet.this.match(docid);
       }

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/FilteredDocIdSetIterator.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/FilteredDocIdSetIterator.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/FilteredDocIdSetIterator.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/FilteredDocIdSetIterator.java Wed Oct 28 16:16:46 2009
@@ -49,10 +49,12 @@
    */
   abstract protected boolean match(int doc) throws IOException;
 	
+  @Override
   public int docID() {
     return doc;
   }
   
+  @Override
   public int nextDoc() throws IOException {
     while ((doc = _innerIter.nextDoc()) != NO_MORE_DOCS) {
       if (match(doc)) {
@@ -62,6 +64,7 @@
     return doc;
   }
   
+  @Override
   public int advance(int target) throws IOException {
     doc = _innerIter.advance(target);
     if (doc != NO_MORE_DOCS) {

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/FilteredQuery.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/FilteredQuery.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/FilteredQuery.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/FilteredQuery.java Wed Oct 28 16:16:46 2009
@@ -58,6 +58,7 @@
    * Returns a Weight that applies the filter to the enclosed query's Weight.
    * This is accomplished by overriding the Scorer returned by the Weight.
    */
+  @Override
   public Weight createWeight(final Searcher searcher) throws IOException {
     final Weight weight = query.createWeight (searcher);
     final Similarity similarity = query.getSimilarity(searcher);

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/FilteredTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/FilteredTermEnum.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/FilteredTermEnum.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/FilteredTermEnum.java Wed Oct 28 16:16:46 2009
@@ -60,6 +60,7 @@
      * 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() {
         if (currentTerm == null) return -1;
         assert actualEnum != null;
@@ -67,6 +68,7 @@
     }
     
     /** Increments the enumeration to the next element.  True if one exists. */
+    @Override
     public boolean next() throws IOException {
         if (actualEnum == null) return false; // the actual enumerator is not initialized!
         currentTerm = null;
@@ -87,11 +89,13 @@
     
     /** Returns the current Term in the enumeration.
      * Returns null if no Term matches or all terms have been enumerated. */
+    @Override
     public Term term() {
         return currentTerm;
     }
     
     /** Closes the enumeration to further activity, freeing resources.  */
+    @Override
     public void close() throws IOException {
         if (actualEnum != null) actualEnum.close();
         currentTerm = null;

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/FuzzyQuery.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/FuzzyQuery.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/FuzzyQuery.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/FuzzyQuery.java Wed Oct 28 16:16:46 2009
@@ -109,6 +109,7 @@
     return prefixLength;
   }
 
+  @Override
   protected FilteredTermEnum getEnum(IndexReader reader) throws IOException {
     return new FuzzyTermEnum(reader, getTerm(), minimumSimilarity, prefixLength);
   }
@@ -120,6 +121,7 @@
     return term;
   }
 
+  @Override
   public void setRewriteMethod(RewriteMethod method) {
     throw new UnsupportedOperationException("FuzzyQuery cannot change rewrite method");
   }
@@ -172,6 +174,7 @@
     return query;
   }
     
+  @Override
   public String toString(String field) {
     StringBuilder buffer = new StringBuilder();
     if (!term.field().equals(field)) {

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/FuzzyTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/FuzzyTermEnum.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/FuzzyTermEnum.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/FuzzyTermEnum.java Wed Oct 28 16:16:46 2009
@@ -125,6 +125,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 termCompare(Term term) {
     if (field == term.field() && term.text().startsWith(prefix)) {
         final String target = term.text().substring(prefix.length());
@@ -136,11 +137,13 @@
   }
   
   /** {@inheritDoc} */
+  @Override
   public final float difference() {
     return (similarity - minimumSimilarity) * scale_factor;
   }
   
   /** {@inheritDoc} */
+  @Override
   public final boolean endEnum() {
     return endEnum;
   }
@@ -271,6 +274,7 @@
   }
 
   /** {@inheritDoc} */
+  @Override
   public void close() throws IOException {
     p = d = null;
     searchTerm = null;

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/HitQueue.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/HitQueue.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/HitQueue.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/HitQueue.java Wed Oct 28 16:16:46 2009
@@ -68,6 +68,7 @@
   }
 
   // Returns null if prePopulate is false.
+  @Override
   protected ScoreDoc getSentinelObject() {
     // Always set the doc Id to MAX_VALUE so that it won't be favored by
     // lessThan. This generally should not happen since if score is not NEG_INF,
@@ -75,6 +76,7 @@
     return !prePopulate ? null : new ScoreDoc(Integer.MAX_VALUE, Float.NEGATIVE_INFINITY);
   }
   
+  @Override
   protected final boolean lessThan(ScoreDoc hitA, ScoreDoc hitB) {
     if (hitA.score == hitB.score)
       return hitA.doc > hitB.doc; 

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/IndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/IndexSearcher.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/IndexSearcher.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/IndexSearcher.java Wed Oct 28 16:16:46 2009
@@ -116,17 +116,20 @@
    * If the IndexReader was supplied implicitly by specifying a directory, then
    * the IndexReader gets closed.
    */
+  @Override
   public void close() throws IOException {
     if(closeReader)
       reader.close();
   }
 
   // inherit javadoc
+  @Override
   public int docFreq(Term term) throws IOException {
     return reader.docFreq(term);
   }
 
   // inherit javadoc
+  @Override
   public Document doc(int i) throws CorruptIndexException, IOException {
     return reader.document(i);
   }
@@ -137,11 +140,13 @@
   }
   
   // inherit javadoc
+  @Override
   public int maxDoc() throws IOException {
     return reader.maxDoc();
   }
 
   // inherit javadoc
+  @Override
   public TopDocs search(Weight weight, Filter filter, final int nDocs) throws IOException {
 
     if (nDocs <= 0) {
@@ -153,6 +158,7 @@
     return collector.topDocs();
   }
 
+  @Override
   public TopFieldDocs search(Weight weight, Filter filter,
       final int nDocs, Sort sort) throws IOException {
     return search(weight, filter, nDocs, sort, true);
@@ -186,6 +192,7 @@
     return (TopFieldDocs) collector.topDocs();
   }
 
+  @Override
   public void search(Weight weight, Filter filter, Collector collector)
       throws IOException {
     
@@ -251,6 +258,7 @@
     }
   }
 
+  @Override
   public Query rewrite(Query original) throws IOException {
     Query query = original;
     for (Query rewrittenQuery = query.rewrite(reader); rewrittenQuery != query;
@@ -260,6 +268,7 @@
     return query;
   }
 
+  @Override
   public Explanation explain(Weight weight, int doc) throws IOException {
     int n = ReaderUtil.subIndex(doc, docStarts);
     int deBasedDoc = doc - docStarts[n];

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/MultiSearcher.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/MultiSearcher.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/MultiSearcher.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/MultiSearcher.java Wed Oct 28 16:16:46 2009
@@ -52,6 +52,7 @@
       setSimilarity(similarity);
     }
 
+    @Override
     public int docFreq(Term term) {
       int df;
       try {
@@ -63,6 +64,7 @@
       return df;
     }
 
+    @Override
     public int[] docFreqs(Term[] terms) {
       int[] result = new int[terms.length];
       for (int i = 0; i < terms.length; i++) {
@@ -71,10 +73,12 @@
       return result;
     }
 
+    @Override
     public int maxDoc() {
       return maxDoc;
     }
 
+    @Override
     public Query rewrite(Query query) {
       // this is a bit of a hack. We know that a query which
       // creates a Weight based on this Dummy-Searcher is
@@ -83,10 +87,12 @@
       return query;
     }
 
+    @Override
     public void close() {
       throw new UnsupportedOperationException();
     }
 
+    @Override
     public Document doc(int i) {
       throw new UnsupportedOperationException();
     }
@@ -95,18 +101,22 @@
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Explanation explain(Weight weight,int doc) {
       throw new UnsupportedOperationException();
     }
 
+    @Override
     public void search(Weight weight, Filter filter, Collector results) {
       throw new UnsupportedOperationException();
     }
     
+    @Override
     public TopDocs search(Weight weight,Filter filter,int n) {
       throw new UnsupportedOperationException();
     }
 
+    @Override
     public TopFieldDocs search(Weight weight,Filter filter,int n,Sort sort) {
       throw new UnsupportedOperationException();
     }
@@ -138,11 +148,13 @@
   }
 
   // inherit javadoc
+  @Override
   public void close() throws IOException {
     for (int i = 0; i < searchables.length; i++)
       searchables[i].close();
   }
 
+  @Override
   public int docFreq(Term term) throws IOException {
     int docFreq = 0;
     for (int i = 0; i < searchables.length; i++)
@@ -151,6 +163,7 @@
   }
 
   // inherit javadoc
+  @Override
   public Document doc(int n) throws CorruptIndexException, IOException {
     int i = subSearcher(n);			  // find searcher index
     return searchables[i].doc(n - starts[i]);	  // dispatch to searcher
@@ -174,10 +187,12 @@
     return n - starts[subSearcher(n)];
   }
 
+  @Override
   public int maxDoc() throws IOException {
     return maxDoc;
   }
 
+  @Override
   public TopDocs search(Weight weight, Filter filter, int nDocs)
       throws IOException {
 
@@ -205,6 +220,7 @@
     return new TopDocs(totalHits, scoreDocs, maxScore);
   }
 
+  @Override
   public TopFieldDocs search (Weight weight, Filter filter, int n, Sort sort)
   throws IOException {
     FieldDocSortedHitQueue hq = null;
@@ -247,6 +263,7 @@
   }
 
   // inherit javadoc
+  @Override
   public void search(Weight weight, Filter filter, final Collector collector)
   throws IOException {
     for (int i = 0; i < searchables.length; i++) {
@@ -254,15 +271,19 @@
       final int start = starts[i];
       
       final Collector hc = new Collector() {
+        @Override
         public void setScorer(Scorer scorer) throws IOException {
           collector.setScorer(scorer);
         }
+        @Override
         public void collect(int doc) throws IOException {
           collector.collect(doc);
         }
+        @Override
         public void setNextReader(IndexReader reader, int docBase) throws IOException {
           collector.setNextReader(reader, start + docBase);
         }
+        @Override
         public boolean acceptsDocsOutOfOrder() {
           return collector.acceptsDocsOutOfOrder();
         }
@@ -272,6 +293,7 @@
     }
   }
 
+  @Override
   public Query rewrite(Query original) throws IOException {
     Query[] queries = new Query[searchables.length];
     for (int i = 0; i < searchables.length; i++) {
@@ -280,6 +302,7 @@
     return queries[0].combine(queries);
   }
 
+  @Override
   public Explanation explain(Weight weight, int doc) throws IOException {
     int i = subSearcher(doc);			  // find searcher index
     return searchables[i].explain(weight, doc - starts[i]); // dispatch to searcher
@@ -300,6 +323,7 @@
    *
    * @return rewritten queries
    */
+  @Override
   protected Weight createWeight(Query original) throws IOException {
     // step 1
     Query rewrittenQuery = rewrite(original);

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/MultiTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/MultiTermQuery.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/MultiTermQuery.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/MultiTermQuery.java Wed Oct 28 16:16:46 2009
@@ -67,6 +67,7 @@
   }
 
   private static final class ConstantScoreFilterRewrite extends RewriteMethod implements Serializable {
+    @Override
     public Query rewrite(IndexReader reader, MultiTermQuery query) {
       Query result = new ConstantScoreQuery(new MultiTermQueryWrapperFilter<MultiTermQuery>(query));
       result.setBoost(query.getBoost());
@@ -94,6 +95,7 @@
   public final static RewriteMethod CONSTANT_SCORE_FILTER_REWRITE = new ConstantScoreFilterRewrite();
 
   private static class ScoringBooleanQueryRewrite extends RewriteMethod implements Serializable {
+    @Override
     public Query rewrite(IndexReader reader, MultiTermQuery query) throws IOException {
 
       FilteredTermEnum enumerator = query.getEnum(reader);
@@ -138,6 +140,7 @@
   public final static RewriteMethod SCORING_BOOLEAN_QUERY_REWRITE = new ScoringBooleanQueryRewrite();
 
   private static class ConstantScoreBooleanQueryRewrite extends ScoringBooleanQueryRewrite implements Serializable {
+    @Override
     public Query rewrite(IndexReader reader, MultiTermQuery query) throws IOException {
       // strip the scores off
       Query result = new ConstantScoreQuery(new QueryWrapperFilter(super.rewrite(reader, query)));
@@ -146,6 +149,7 @@
     }
 
     // Make sure we are still a singleton even after deserializing
+    @Override
     protected Object readResolve() {
       return CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE;
     }
@@ -212,6 +216,7 @@
       return docCountPercent;
     }
 
+    @Override
     public Query rewrite(IndexReader reader, MultiTermQuery query) throws IOException {
       // Get the enum and start visiting terms.  If we
       // exhaust the enum before hitting either of the
@@ -361,6 +366,7 @@
     numberOfTerms += inc;
   }
 
+  @Override
   public Query rewrite(IndexReader reader) throws IOException {
     return rewriteMethod.rewrite(reader, this);
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java Wed Oct 28 16:16:46 2009
@@ -142,6 +142,7 @@
       // else fill into a OpenBitSet
       final OpenBitSet bitSet = new OpenBitSet(reader.maxDoc());
       new TermGenerator() {
+        @Override
         public void handleDoc(int doc) {
           bitSet.set(doc);
         }

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/ParallelMultiSearcher.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/ParallelMultiSearcher.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/ParallelMultiSearcher.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/ParallelMultiSearcher.java Wed Oct 28 16:16:46 2009
@@ -32,7 +32,7 @@
 
   private Searchable[] searchables;
   private int[] starts;
-	
+
   /** Creates a searchable which searches <i>searchables</i>. */
   public ParallelMultiSearcher(Searchable... searchables) throws IOException {
     super(searchables);
@@ -43,6 +43,7 @@
   /**
    * TODO: parallelize this one too
    */
+  @Override
   public int docFreq(Term term) throws IOException {
     return super.docFreq(term);
   }
@@ -52,6 +53,7 @@
    * Searchable, waits for each search to complete and merge
    * the results back together.
    */
+  @Override
   public TopDocs search(Weight weight, Filter filter, int nDocs)
     throws IOException {
     HitQueue hq = new HitQueue(nDocs, false);
@@ -97,6 +99,7 @@
    * Searchable, waits for each search to complete and merges
    * the results back together.
    */
+  @Override
   public TopFieldDocs search(Weight weight, Filter filter, int nDocs, Sort sort)
     throws IOException {
     // don't specify the fields - we'll wait to do this until we get results
@@ -153,6 +156,7 @@
   * 
   * TODO: parallelize this one too
   */
+  @Override
   public void search(Weight weight, Filter filter, final Collector collector)
    throws IOException {
    for (int i = 0; i < searchables.length; i++) {
@@ -160,15 +164,22 @@
      final int start = starts[i];
 
      final Collector hc = new Collector() {
+       @Override
        public void setScorer(Scorer scorer) throws IOException {
          collector.setScorer(scorer);
        }
+       
+       @Override
        public void collect(int doc) throws IOException {
          collector.collect(doc);
        }
+       
+       @Override
        public void setNextReader(IndexReader reader, int docBase) throws IOException {
          collector.setNextReader(reader, start + docBase);
        }
+       
+       @Override
        public boolean acceptsDocsOutOfOrder() {
          return collector.acceptsDocsOutOfOrder();
        }
@@ -176,12 +187,13 @@
      
      searchables[i].search(weight, filter, hc);
    }
- }
+  }
 
   /*
    * TODO: this one could be parallelized too
    * @see org.apache.lucene.search.Searchable#rewrite(org.apache.lucene.search.Query)
    */
+  @Override
   public Query rewrite(Query original) throws IOException {
     return super.rewrite(original);
   }
@@ -230,6 +242,7 @@
     this.sort = sort;
   }
 
+  @Override
   @SuppressWarnings ("unchecked")
   public void run() {
     try {

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/PhraseQueue.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/PhraseQueue.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/PhraseQueue.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/PhraseQueue.java Wed Oct 28 16:16:46 2009
@@ -24,6 +24,7 @@
     initialize(size);
   }
 
+  @Override
   protected final boolean lessThan(PhrasePositions pp1, PhrasePositions pp2) {
     if (pp1.doc == pp2.doc) 
       if (pp1.position == pp2.position)

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/PositiveScoresOnlyCollector.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/PositiveScoresOnlyCollector.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/PositiveScoresOnlyCollector.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/PositiveScoresOnlyCollector.java Wed Oct 28 16:16:46 2009
@@ -35,16 +35,19 @@
     this.c = c;
   }
   
+  @Override
   public void collect(int doc) throws IOException {
     if (scorer.score() > 0) {
       c.collect(doc);
     }
   }
 
+  @Override
   public void setNextReader(IndexReader reader, int docBase) throws IOException {
     c.setNextReader(reader, docBase);
   }
 
+  @Override
   public void setScorer(Scorer scorer) throws IOException {
     // Set a ScoreCachingWrappingScorer in case the wrapped Collector will call
     // score() also.
@@ -52,6 +55,7 @@
     c.setScorer(this.scorer);
   }
 
+  @Override
   public boolean acceptsDocsOutOfOrder() {
     return c.acceptsDocsOutOfOrder();
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/PrefixFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/PrefixFilter.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/PrefixFilter.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/PrefixFilter.java Wed Oct 28 16:16:46 2009
@@ -32,6 +32,7 @@
   public Term getPrefix() { return query.getPrefix(); }
 
   /** Prints a user-readable version of this query. */
+  @Override
   public String toString () {
     StringBuilder buffer = new StringBuilder();
     buffer.append("PrefixFilter(");

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/PrefixQuery.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/PrefixQuery.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/PrefixQuery.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/PrefixQuery.java Wed Oct 28 16:16:46 2009
@@ -40,6 +40,7 @@
   /** Returns the prefix of this query. */
   public Term getPrefix() { return prefix; }
   
+  @Override
   protected FilteredTermEnum getEnum(IndexReader reader) throws IOException {
     return new PrefixTermEnum(reader, prefix);
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/PrefixTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/PrefixTermEnum.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/PrefixTermEnum.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/PrefixTermEnum.java Wed Oct 28 16:16:46 2009
@@ -41,10 +41,12 @@
     setEnum(reader.terms(new Term(prefix.field(), prefix.text())));
   }
 
+  @Override
   public float difference() {
     return 1.0f;
   }
 
+  @Override
   protected boolean endEnum() {
     return endEnum;
   }
@@ -53,6 +55,7 @@
       return prefix;
   }
 
+  @Override
   protected boolean termCompare(Term term) {
     if (term.field() == prefix.field() && term.text().startsWith(prefix.text())) {                                                                              
       return true;

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/Query.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/Query.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/Query.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/Query.java Wed Oct 28 16:16:46 2009
@@ -78,6 +78,7 @@
   public abstract String toString(String field);
 
   /** Prints a query to a string. */
+  @Override
   public String toString() {
     return toString("");
   }
@@ -204,6 +205,7 @@
   }
 
   /** Returns a clone of this query. */
+  @Override
   public Object clone() {
     try {
       return super.clone();
@@ -212,6 +214,7 @@
     }
   }
 
+  @Override
   public int hashCode() {
     final int prime = 31;
     int result = 1;
@@ -219,6 +222,7 @@
     return result;
   }
 
+  @Override
   public boolean equals(Object obj) {
     if (this == obj)
       return true;

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/QueryTermVector.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/QueryTermVector.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/QueryTermVector.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/QueryTermVector.java Wed Oct 28 16:16:46 2009
@@ -106,6 +106,7 @@
     }
   }
   
+  @Override
   public final String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append('{');

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/ScoreDoc.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/ScoreDoc.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/ScoreDoc.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/ScoreDoc.java Wed Oct 28 16:16:46 2009
@@ -35,6 +35,7 @@
   }
   
   // A convenience method for debugging.
+  @Override
   public String toString() {
     return "doc=" + doc + " score=" + score;
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/SimilarityDelegator.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/SimilarityDelegator.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/SimilarityDelegator.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/SimilarityDelegator.java Wed Oct 28 16:16:46 2009
@@ -34,34 +34,42 @@
     this.delegee = delegee;
   }
 
+  @Override
   public float computeNorm(String fieldName, FieldInvertState state) {
     return delegee.computeNorm(fieldName, state);
   }
   
+  @Override
   public float lengthNorm(String fieldName, int numTerms) {
     return delegee.lengthNorm(fieldName, numTerms);
   }
   
+  @Override
   public float queryNorm(float sumOfSquaredWeights) {
     return delegee.queryNorm(sumOfSquaredWeights);
   }
 
+  @Override
   public float tf(float freq) {
     return delegee.tf(freq);
   }
     
+  @Override
   public float sloppyFreq(int distance) {
     return delegee.sloppyFreq(distance);
   }
     
+  @Override
   public float idf(int docFreq, int numDocs) {
     return delegee.idf(docFreq, numDocs);
   }
     
+  @Override
   public float coord(int overlap, int maxOverlap) {
     return delegee.coord(overlap, maxOverlap);
   }
 
+  @Override
   public float scorePayload(int docId, String fieldName, int start, int end, byte [] payload, int offset, int length) {
     return delegee.scorePayload(docId, fieldName, start, end, payload, offset, length);
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/SloppyPhraseScorer.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/SloppyPhraseScorer.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/SloppyPhraseScorer.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/SloppyPhraseScorer.java Wed Oct 28 16:16:46 2009
@@ -52,6 +52,7 @@
      * would get same score as "g f"~2, although "c b"~2 could be matched twice.
      * We may want to fix this in the future (currently not, for performance reasons).
      */
+    @Override
     protected final float phraseFreq() throws IOException {
         int end = initPhrasePositions();
         

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/Sort.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/Sort.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/Sort.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/Sort.java Wed Oct 28 16:16:46 2009
@@ -151,6 +151,7 @@
     return fields;
   }
 
+  @Override
   public String toString() {
     StringBuilder buffer = new StringBuilder();
 
@@ -164,6 +165,7 @@
   }
 
   /** Returns true if <code>o</code> is equal to this. */
+  @Override
   public boolean equals(Object o) {
     if (this == o) return true;
     if (!(o instanceof Sort)) return false;
@@ -172,6 +174,7 @@
   }
 
   /** Returns a hash code value for this object. */
+  @Override
   public int hashCode() {
     return 0x45aaf665 + Arrays.hashCode(fields);
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/SortField.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/SortField.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/SortField.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/SortField.java Wed Oct 28 16:16:46 2009
@@ -260,6 +260,7 @@
     return reverse;
   }
 
+  @Override
   public String toString() {
     StringBuilder buffer = new StringBuilder();
     switch (type) {
@@ -323,6 +324,7 @@
    *  {@link FieldComparatorSource} or {@link
    *  FieldCache.Parser} was provided, it must properly
    *  implement equals (unless a singleton is always used). */
+  @Override
   public boolean equals(Object o) {
     if (this == o) return true;
     if (!(o instanceof SortField)) return false;
@@ -342,6 +344,7 @@
    *  FieldCache.Parser} was provided, it must properly
    *  implement hashCode (unless a singleton is always
    *  used). */
+  @Override
   public int hashCode() {
     int hash=type^0x346565dd + Boolean.valueOf(reverse).hashCode()^0xaf5998bb;
     if (field != null) hash += field.hashCode()^0xff5685dd;

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/SpanQueryFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/SpanQueryFilter.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/SpanQueryFilter.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/SpanQueryFilter.java Wed Oct 28 16:16:46 2009
@@ -54,11 +54,13 @@
     this.query = query;
   }
 
+  @Override
   public DocIdSet getDocIdSet(IndexReader reader) throws IOException {
     SpanFilterResult result = bitSpans(reader);
     return result.getDocIdSet();
   }
 
+  @Override
   public SpanFilterResult bitSpans(IndexReader reader) throws IOException {
 
     final OpenBitSet bits = new OpenBitSet(reader.maxDoc());
@@ -86,14 +88,17 @@
     return query;
   }
 
+  @Override
   public String toString() {
     return "SpanQueryFilter(" + query + ")";
   }
 
+  @Override
   public boolean equals(Object o) {
     return o instanceof SpanQueryFilter && this.query.equals(((SpanQueryFilter) o).query);
   }
 
+  @Override
   public int hashCode() {
     return query.hashCode() ^ 0x923F64B9;
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/TermRangeTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/TermRangeTermEnum.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/TermRangeTermEnum.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/TermRangeTermEnum.java Wed Oct 28 16:16:46 2009
@@ -93,14 +93,17 @@
     setEnum(reader.terms(new Term(this.field, startTermText)));
   }
 
+  @Override
   public float difference() {
     return 1.0f;
   }
 
+  @Override
   protected boolean endEnum() {
     return endEnum;
   }
 
+  @Override
   protected boolean termCompare(Term term) {
     if (collator == null) {
       // Use Unicode code point ordering

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/TimeLimitingCollector.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/TimeLimitingCollector.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/TimeLimitingCollector.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/TimeLimitingCollector.java Wed Oct 28 16:16:46 2009
@@ -70,6 +70,7 @@
       this.setDaemon( true );
     }
 
+    @Override
     public void run() {
       while (true) {
         // TODO: Use System.nanoTime() when Lucene moves to Java SE 5.
@@ -194,6 +195,7 @@
    * @throws TimeExceededException
    *           if the time allowed has exceeded.
    */
+  @Override
   public void collect(final int doc) throws IOException {
     long time = TIMER_THREAD.getMilliseconds();
     if (timeout < time) {
@@ -208,14 +210,17 @@
     collector.collect(doc);
   }
   
+  @Override
   public void setNextReader(IndexReader reader, int base) throws IOException {
     collector.setNextReader(reader, base);
   }
   
+  @Override
   public void setScorer(Scorer scorer) throws IOException {
     collector.setScorer(scorer);
   }
 
+  @Override
   public boolean acceptsDocsOutOfOrder() {
     return collector.acceptsDocsOutOfOrder();
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/TopFieldCollector.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/TopFieldCollector.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/TopFieldCollector.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/TopFieldCollector.java Wed Oct 28 16:16:46 2009
@@ -63,6 +63,7 @@
       bottom = pq.updateTop();
     }
 
+    @Override
     public void collect(int doc) throws IOException {
       ++totalHits;
       if (queueFull) {
@@ -89,11 +90,13 @@
       }
     }
     
+    @Override
     public void setNextReader(IndexReader reader, int docBase) throws IOException {
       this.docBase = docBase;
       comparator.setNextReader(reader, docBase);
     }
     
+    @Override
     public void setScorer(Scorer scorer) throws IOException {
       comparator.setScorer(scorer);
     }
@@ -113,6 +116,7 @@
       super(queue, numHits, fillFields);
     }
     
+    @Override
     public void collect(int doc) throws IOException {
       ++totalHits;
       if (queueFull) {
@@ -138,6 +142,7 @@
       }
     }
     
+    @Override
     public boolean acceptsDocsOutOfOrder() {
       return true;
     }
@@ -164,6 +169,7 @@
       bottom = pq.updateTop();
     }
 
+    @Override
     public void collect(int doc) throws IOException {
       ++totalHits;
       if (queueFull) {
@@ -196,6 +202,7 @@
       }
     }
     
+    @Override
     public void setScorer(Scorer scorer) throws IOException {
       this.scorer = scorer;
       comparator.setScorer(scorer);
@@ -217,6 +224,7 @@
       super(queue, numHits, fillFields);
     }
     
+    @Override
     public void collect(int doc) throws IOException {
       ++totalHits;
       if (queueFull) {
@@ -248,6 +256,7 @@
       }
     }
     
+    @Override
     public boolean acceptsDocsOutOfOrder() {
       return true;
     }
@@ -276,6 +285,7 @@
       bottom =  pq.updateTop();
     }
 
+    @Override
     public void collect(int doc) throws IOException {
       final float score = scorer.score();
       if (score > maxScore) {
@@ -307,6 +317,7 @@
 
     }
     
+    @Override
     public void setScorer(Scorer scorer) throws IOException {
       this.scorer = scorer;
       super.setScorer(scorer);
@@ -326,6 +337,7 @@
       super(queue, numHits, fillFields);
     }
     
+    @Override
     public void collect(int doc) throws IOException {
       final float score = scorer.score();
       if (score > maxScore) {
@@ -355,6 +367,7 @@
       }
     }
     
+    @Override
     public boolean acceptsDocsOutOfOrder() {
       return true;
     }
@@ -383,6 +396,7 @@
       bottom = pq.updateTop();
     }
 
+    @Override
     public void collect(int doc) throws IOException {
       ++totalHits;
       if (queueFull) {
@@ -429,6 +443,7 @@
       }
     }
 
+    @Override
     public void setNextReader(IndexReader reader, int docBase) throws IOException {
       this.docBase = docBase;
       for (int i = 0; i < comparators.length; i++) {
@@ -436,6 +451,7 @@
       }
     }
 
+    @Override
     public void setScorer(Scorer scorer) throws IOException {
       // set the scorer on all comparators
       for (int i = 0; i < comparators.length; i++) {
@@ -457,6 +473,7 @@
       super(queue, numHits, fillFields);
     }
     
+    @Override
     public void collect(int doc) throws IOException {
       ++totalHits;
       if (queueFull) {
@@ -505,6 +522,7 @@
       }
     }
     
+    @Override
     public boolean acceptsDocsOutOfOrder() {
       return true;
     }
@@ -532,6 +550,7 @@
       bottom =  pq.updateTop();
     }
 
+    @Override
     public void collect(int doc) throws IOException {
       final float score = scorer.score();
       if (score > maxScore) {
@@ -582,6 +601,7 @@
       }
     }
 
+    @Override
     public void setScorer(Scorer scorer) throws IOException {
       this.scorer = scorer;
       super.setScorer(scorer);
@@ -601,6 +621,7 @@
       super(queue, numHits, fillFields);
     }
     
+    @Override
     public void collect(int doc) throws IOException {
       final float score = scorer.score();
       if (score > maxScore) {
@@ -653,6 +674,7 @@
       }
     }
     
+    @Override
     public boolean acceptsDocsOutOfOrder() {
       return true;
     }
@@ -678,6 +700,7 @@
       bottom = pq.updateTop();
     }
 
+    @Override
     public void collect(int doc) throws IOException {
       ++totalHits;
       if (queueFull) {
@@ -729,6 +752,7 @@
       }
     }
 
+    @Override
     public void setScorer(Scorer scorer) throws IOException {
       this.scorer = scorer;
       super.setScorer(scorer);
@@ -749,6 +773,7 @@
       super(queue, numHits, fillFields);
     }
     
+    @Override
     public void collect(int doc) throws IOException {
       ++totalHits;
       if (queueFull) {
@@ -802,11 +827,13 @@
       }
     }
 
+    @Override
     public void setScorer(Scorer scorer) throws IOException {
       this.scorer = scorer;
       super.setScorer(scorer);
     }
     
+    @Override
     public boolean acceptsDocsOutOfOrder() {
       return true;
     }
@@ -934,6 +961,7 @@
    * topDocs(int, int) calls them to return the results.
    */
 
+  @Override
   protected void populateResults(ScoreDoc[] results, int howMany) {
     if (fillFields) {
       // avoid casting if unnecessary.
@@ -949,6 +977,7 @@
     }
   }
   
+  @Override
   protected TopDocs newTopDocs(ScoreDoc[] results, int start) {
     if (results == null) {
       results = EMPTY_SCOREDOCS;
@@ -960,6 +989,7 @@
     return new TopFieldDocs(totalHits, results, ((FieldValueHitQueue) pq).getFields(), maxScore);
   }
   
+  @Override
   public boolean acceptsDocsOutOfOrder() {
     return false;
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/TopScoreDocCollector.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/TopScoreDocCollector.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/TopScoreDocCollector.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/TopScoreDocCollector.java Wed Oct 28 16:16:46 2009
@@ -42,6 +42,7 @@
       super(numHits);
     }
     
+    @Override
     public void collect(int doc) throws IOException {
       float score = scorer.score();
       totalHits++;
@@ -56,6 +57,7 @@
       pqTop = pq.updateTop();
     }
     
+    @Override
     public boolean acceptsDocsOutOfOrder() {
       return false;
     }
@@ -67,6 +69,7 @@
       super(numHits);
     }
     
+    @Override
     public void collect(int doc) throws IOException {
       float score = scorer.score();
       totalHits++;
@@ -79,6 +82,7 @@
       pqTop = pq.updateTop();
     }
     
+    @Override
     public boolean acceptsDocsOutOfOrder() {
       return true;
     }
@@ -116,6 +120,7 @@
     pqTop = pq.top();
   }
 
+  @Override
   protected TopDocs newTopDocs(ScoreDoc[] results, int start) {
     if (results == null) {
       return EMPTY_TOPDOCS;
@@ -136,10 +141,12 @@
     return new TopDocs(totalHits, results, maxScore);
   }
   
+  @Override
   public void setNextReader(IndexReader reader, int base) {
     docBase = base;
   }
   
+  @Override
   public void setScorer(Scorer scorer) throws IOException {
     this.scorer = scorer;
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/WildcardQuery.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/WildcardQuery.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/WildcardQuery.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/WildcardQuery.java Wed Oct 28 16:16:46 2009
@@ -50,6 +50,7 @@
         && (text.indexOf('*') == text.length() - 1);
   }
 
+  @Override
   protected FilteredTermEnum getEnum(IndexReader reader) throws IOException {
     if (termContainsWildcard)
       return new WildcardTermEnum(reader, getTerm());

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/WildcardTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/WildcardTermEnum.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/WildcardTermEnum.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/WildcardTermEnum.java Wed Oct 28 16:16:46 2009
@@ -65,6 +65,7 @@
     setEnum(reader.terms(new Term(searchTerm.field(), pre)));
   }
 
+  @Override
   protected final boolean termCompare(Term term) {
     if (field == term.field()) {
       String searchText = term.text();
@@ -76,10 +77,12 @@
     return false;
   }
 
+  @Override
   public float difference() {
     return 1.0f;
   }
 
+  @Override
   public final boolean endEnum() {
     return endEnum;
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/function/ByteFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/function/ByteFieldSource.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/function/ByteFieldSource.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/function/ByteFieldSource.java Wed Oct 28 16:16:46 2009
@@ -66,27 +66,33 @@
   }
 
   /*(non-Javadoc) @see org.apache.lucene.search.function.ValueSource#description() */
+  @Override
   public String description() {
     return "byte(" + super.description() + ')';
   }
 
   /*(non-Javadoc) @see org.apache.lucene.search.function.FieldCacheSource#getCachedValues(org.apache.lucene.search.FieldCache, java.lang.String, org.apache.lucene.index.IndexReader) */
+  @Override
   public DocValues getCachedFieldValues (FieldCache cache, String field, IndexReader reader) throws IOException {
     final byte[] arr = cache.getBytes(reader, field, parser);
     return new DocValues() {
       /*(non-Javadoc) @see org.apache.lucene.search.function.DocValues#floatVal(int) */
+      @Override
       public float floatVal(int doc) { 
         return (float) arr[doc]; 
       }
       /*(non-Javadoc) @see org.apache.lucene.search.function.DocValues#intVal(int) */
+      @Override
       public  int intVal(int doc) { 
         return arr[doc]; 
       }
       /*(non-Javadoc) @see org.apache.lucene.search.function.DocValues#toString(int) */
+      @Override
       public String toString(int doc) { 
         return  description() + '=' + intVal(doc);  
       }
       /*(non-Javadoc) @see org.apache.lucene.search.function.DocValues#getInnerArray() */
+      @Override
       Object getInnerArray() {
         return arr;
       }
@@ -94,6 +100,7 @@
   }
 
   /*(non-Javadoc) @see org.apache.lucene.search.function.FieldCacheSource#cachedFieldSourceEquals(org.apache.lucene.search.function.FieldCacheSource) */
+  @Override
   public boolean cachedFieldSourceEquals(FieldCacheSource o) {
     if (o.getClass() !=  ByteFieldSource.class) {
       return false;
@@ -105,6 +112,7 @@
   }
 
   /*(non-Javadoc) @see org.apache.lucene.search.function.FieldCacheSource#cachedFieldSourceHashCode() */
+  @Override
   public int cachedFieldSourceHashCode() {
     return parser==null ? 
       Byte.class.hashCode() : parser.getClass().hashCode();

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/function/FieldCacheSource.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/function/FieldCacheSource.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/function/FieldCacheSource.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/function/FieldCacheSource.java Wed Oct 28 16:16:46 2009
@@ -60,11 +60,13 @@
   }
 
   /* (non-Javadoc) @see org.apache.lucene.search.function.ValueSource#getValues(org.apache.lucene.index.IndexReader) */
+  @Override
   public final DocValues getValues(IndexReader reader) throws IOException {
     return getCachedFieldValues(FieldCache.DEFAULT, field, reader);
   }
 
   /* (non-Javadoc) @see org.apache.lucene.search.function.ValueSource#description() */
+  @Override
   public String description() {
     return field;
   }
@@ -78,6 +80,7 @@
   public abstract DocValues getCachedFieldValues(FieldCache cache, String field, IndexReader reader) throws IOException;
 
   /*(non-Javadoc) @see java.lang.Object#equals(java.lang.Object) */
+  @Override
   public final boolean equals(Object o) {
     if (!(o instanceof FieldCacheSource)) {
       return false;
@@ -89,6 +92,7 @@
   }
 
   /*(non-Javadoc) @see java.lang.Object#hashCode() */
+  @Override
   public final int hashCode() {
     return 
       field.hashCode() +

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/function/FieldScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/function/FieldScoreQuery.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/function/FieldScoreQuery.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/function/FieldScoreQuery.java Wed Oct 28 16:16:46 2009
@@ -90,6 +90,7 @@
       this.typeName = name;
     }
     /*(non-Javadoc) @see java.lang.Object#toString() */
+    @Override
     public String toString() {
       return getClass().getName()+"::"+typeName;
     }



Mime
View raw message