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 [4/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/function/FloatFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/function/FloatFieldSource.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/function/FloatFieldSource.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/function/FloatFieldSource.java Wed Oct 28 16:16:46 2009
@@ -66,23 +66,28 @@
   }
 
   /*(non-Javadoc) @see org.apache.lucene.search.function.ValueSource#description() */
+  @Override
   public String description() {
     return "float(" + 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 float[] arr = cache.getFloats(reader, field, parser);
     return new DocValues() {
       /*(non-Javadoc) @see org.apache.lucene.search.function.DocValues#floatVal(int) */
+      @Override
       public float floatVal(int doc) {
         return arr[doc];      
       }
       /*(non-Javadoc) @see org.apache.lucene.search.function.DocValues#toString(int) */
+      @Override
       public String toString(int doc) { 
         return  description() + '=' + arr[doc];  
       }
       /*(non-Javadoc) @see org.apache.lucene.search.function.DocValues#getInnerArray() */
+      @Override
       Object getInnerArray() {
         return arr;
       }
@@ -90,6 +95,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() !=  FloatFieldSource.class) {
       return false;
@@ -101,6 +107,7 @@
   }
 
   /*(non-Javadoc) @see org.apache.lucene.search.function.FieldCacheSource#cachedFieldSourceHashCode() */
+  @Override
   public int cachedFieldSourceHashCode() {
     return parser==null ? 
       Float.class.hashCode() : parser.getClass().hashCode();

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/function/IntFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/function/IntFieldSource.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/function/IntFieldSource.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/function/IntFieldSource.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 "int(" + 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 int[] arr = cache.getInts(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() !=  IntFieldSource.class) {
       return false;
@@ -105,6 +112,7 @@
   }
 
   /*(non-Javadoc) @see org.apache.lucene.search.function.FieldCacheSource#cachedFieldSourceHashCode() */
+  @Override
   public int cachedFieldSourceHashCode() {
     return parser==null ? 
       Integer.class.hashCode() : parser.getClass().hashCode();

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/function/MultiValueSource.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/function/MultiValueSource.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/function/MultiValueSource.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/function/MultiValueSource.java Wed Oct 28 16:16:46 2009
@@ -42,6 +42,7 @@
     this.other = other;
   }
 
+  @Override
   public DocValues getValues(IndexReader reader) throws IOException {
 
     IndexReader[] subReaders = reader.getSequentialSubReaders();
@@ -54,10 +55,12 @@
     }
   }
 
+  @Override
   public String description() {
     return other.description();
   }
 
+  @Override
   public boolean equals(Object o) {
     if (o instanceof MultiValueSource) {
       return ((MultiValueSource) o).other.equals(other);
@@ -66,6 +69,7 @@
     }
   }
 
+  @Override
   public int hashCode() {
     return 31 * other.hashCode();
   }
@@ -86,36 +90,43 @@
       }
     }
     
+    @Override
     public float floatVal(int doc) {
       final int n = ReaderUtil.subIndex(doc, docStarts);
       return docValues[n].floatVal(doc-docStarts[n]);
     }
 
+    @Override
     public int intVal(int doc) {
       final int n = ReaderUtil.subIndex(doc, docStarts);
       return docValues[n].intVal(doc-docStarts[n]);
     }
 
+    @Override
     public long longVal(int doc) {
       final int n = ReaderUtil.subIndex(doc, docStarts);
       return docValues[n].longVal(doc-docStarts[n]);
     }
 
+    @Override
     public double doubleVal(int doc) {
       final int n = ReaderUtil.subIndex(doc, docStarts);
       return docValues[n].doubleVal(doc-docStarts[n]);
     }
 
+    @Override
     public String strVal(int doc) {
       final int n = ReaderUtil.subIndex(doc, docStarts);
       return docValues[n].strVal(doc-docStarts[n]);
     }
 
+    @Override
     public String toString(int doc) {
       final int n = ReaderUtil.subIndex(doc, docStarts);
       return docValues[n].toString(doc-docStarts[n]);
     }
 
+    @Override
     public Explanation explain(int doc) {
       final int n = ReaderUtil.subIndex(doc, docStarts);
       return docValues[n].explain(doc-docStarts[n]);

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/function/OrdFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/function/OrdFieldSource.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/function/OrdFieldSource.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/function/OrdFieldSource.java Wed Oct 28 16:16:46 2009
@@ -67,28 +67,34 @@
   }
 
   /*(non-Javadoc) @see org.apache.lucene.search.function.ValueSource#description() */
+  @Override
   public String description() {
     return "ord(" + field + ')';
   }
 
   /*(non-Javadoc) @see org.apache.lucene.search.function.ValueSource#getValues(org.apache.lucene.index.IndexReader) */
+  @Override
   public DocValues getValues(IndexReader reader) throws IOException {
     final int[] arr = FieldCache.DEFAULT.getStringIndex(reader, field).order;
     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#strVal(int) */
+      @Override
       public String strVal(int doc) {
         // the string value of the ordinal, not the string itself
         return Integer.toString(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;
       }
@@ -96,6 +102,7 @@
   }
 
   /*(non-Javadoc) @see java.lang.Object#equals(java.lang.Object) */
+  @Override
   public boolean equals(Object o) {
     if (o.getClass() !=  OrdFieldSource.class) return false;
     OrdFieldSource other = (OrdFieldSource)o;
@@ -105,6 +112,7 @@
   private static final int hcode = OrdFieldSource.class.hashCode();
   
   /*(non-Javadoc) @see java.lang.Object#hashCode() */
+  @Override
   public int hashCode() {
     return hcode + field.hashCode();
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/function/ReverseOrdFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/function/ReverseOrdFieldSource.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/function/ReverseOrdFieldSource.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/function/ReverseOrdFieldSource.java Wed Oct 28 16:16:46 2009
@@ -68,11 +68,13 @@
   }
 
   /*(non-Javadoc) @see org.apache.lucene.search.function.ValueSource#description() */
+  @Override
   public String description() {
     return "rord("+field+')';
   }
 
   /*(non-Javadoc) @see org.apache.lucene.search.function.ValueSource#getValues(org.apache.lucene.index.IndexReader) */
+  @Override
   public DocValues getValues(IndexReader reader) throws IOException {
     final FieldCache.StringIndex sindex = FieldCache.DEFAULT.getStringIndex(reader, field);
 
@@ -81,23 +83,28 @@
 
     return new DocValues() {
       /*(non-Javadoc) @see org.apache.lucene.search.function.DocValues#floatVal(int) */
+      @Override
       public float floatVal(int doc) {
         return (float)(end - arr[doc]);
       }
       /* (non-Javadoc) @see org.apache.lucene.search.function.DocValues#intVal(int) */
+      @Override
       public int intVal(int doc) {
         return end - arr[doc];
       }
       /* (non-Javadoc) @see org.apache.lucene.search.function.DocValues#strVal(int) */
+      @Override
       public String strVal(int doc) {
         // the string value of the ordinal, not the string itself
         return Integer.toString(intVal(doc));
       }
       /*(non-Javadoc) @see org.apache.lucene.search.function.DocValues#toString(int) */
+      @Override
       public String toString(int doc) {
         return description() + '=' + strVal(doc);
       }
       /*(non-Javadoc) @see org.apache.lucene.search.function.DocValues#getInnerArray() */
+      @Override
       Object getInnerArray() {
         return arr;
       }
@@ -105,6 +112,7 @@
   }
 
   /*(non-Javadoc) @see java.lang.Object#equals(java.lang.Object) */
+  @Override
   public boolean equals(Object o) {
     if (o.getClass() !=  ReverseOrdFieldSource.class) return false;
     ReverseOrdFieldSource other = (ReverseOrdFieldSource)o;
@@ -114,6 +122,7 @@
   private static final int hcode = ReverseOrdFieldSource.class.hashCode();
   
   /*(non-Javadoc) @see java.lang.Object#hashCode() */
+  @Override
   public int hashCode() {
     return hcode + field.hashCode();
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/function/ShortFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/function/ShortFieldSource.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/function/ShortFieldSource.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/function/ShortFieldSource.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 "short(" + 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 short[] arr = cache.getShorts(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() !=  ShortFieldSource.class) {
       return false;
@@ -105,6 +112,7 @@
   }
 
   /*(non-Javadoc) @see org.apache.lucene.search.function.FieldCacheSource#cachedFieldSourceHashCode() */
+  @Override
   public int cachedFieldSourceHashCode() {
     return parser==null ? 
       Short.class.hashCode() : parser.getClass().hashCode();

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/function/ValueSource.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/function/ValueSource.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/function/ValueSource.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/function/ValueSource.java Wed Oct 28 16:16:46 2009
@@ -54,6 +54,7 @@
   public abstract String description();
 
   /* (non-Javadoc) @see java.lang.Object#toString() */
+  @Override
   public String toString() {
     return description();
   }
@@ -62,12 +63,14 @@
    * Needed for possible caching of query results - used by {@link ValueSourceQuery#equals(Object)}.
    * @see Object#equals(Object)
    */
+  @Override
   public abstract boolean equals(Object o);
 
   /**
    * Needed for possible caching of query results - used by {@link ValueSourceQuery#hashCode()}.
    * @see Object#hashCode()
    */
+  @Override
   public abstract int hashCode();
   
 }

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/payloads/AveragePayloadFunction.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/payloads/AveragePayloadFunction.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/payloads/AveragePayloadFunction.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/payloads/AveragePayloadFunction.java Wed Oct 28 16:16:46 2009
@@ -26,14 +26,17 @@
  **/
 public class AveragePayloadFunction extends PayloadFunction{
 
+  @Override
   public float currentScore(int docId, String field, int start, int end, int numPayloadsSeen, float currentScore, float currentPayloadScore) {
     return currentPayloadScore + currentScore;
   }
 
+  @Override
   public float docScore(int docId, String field, int numPayloadsSeen, float payloadScore) {
     return numPayloadsSeen > 0 ? (payloadScore / numPayloadsSeen) : 1;
   }
 
+  @Override
   public int hashCode() {
     final int prime = 31;
     int result = 1;
@@ -41,6 +44,7 @@
     return result;
   }
 
+  @Override
   public boolean equals(Object obj) {
     if (this == obj)
       return true;

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/payloads/MaxPayloadFunction.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/payloads/MaxPayloadFunction.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/payloads/MaxPayloadFunction.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/payloads/MaxPayloadFunction.java Wed Oct 28 16:16:46 2009
@@ -25,14 +25,17 @@
  *
  **/
 public class MaxPayloadFunction extends PayloadFunction {
+  @Override
   public float currentScore(int docId, String field, int start, int end, int numPayloadsSeen, float currentScore, float currentPayloadScore) {
     return Math.max(currentPayloadScore, currentScore);
   }
 
+  @Override
   public float docScore(int docId, String field, int numPayloadsSeen, float payloadScore) {
     return numPayloadsSeen > 0 ? payloadScore : 1;
   }
   
+  @Override
   public int hashCode() {
     final int prime = 31;
     int result = 1;
@@ -40,6 +43,7 @@
     return result;
   }
 
+  @Override
   public boolean equals(Object obj) {
     if (this == obj)
       return true;

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/payloads/MinPayloadFunction.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/payloads/MinPayloadFunction.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/payloads/MinPayloadFunction.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/payloads/MinPayloadFunction.java Wed Oct 28 16:16:46 2009
@@ -23,14 +23,17 @@
  **/
 public class MinPayloadFunction extends PayloadFunction {
 
+    @Override
     public float currentScore(int docId, String field, int start, int end, int numPayloadsSeen, float currentScore, float currentPayloadScore) {
     return Math.min(currentPayloadScore, currentScore);
   }
 
+  @Override
   public float docScore(int docId, String field, int numPayloadsSeen, float payloadScore) {
     return numPayloadsSeen > 0 ? payloadScore : 1;
   }
   
+  @Override
   public int hashCode() {
     final int prime = 31;
     int result = 1;
@@ -38,6 +41,7 @@
     return result;
   }
 
+  @Override
   public boolean equals(Object obj) {
     if (this == obj)
       return true;

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/payloads/PayloadFunction.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/payloads/PayloadFunction.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/payloads/PayloadFunction.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/payloads/PayloadFunction.java Wed Oct 28 16:16:46 2009
@@ -56,8 +56,10 @@
    */
   public abstract float docScore(int docId, String field, int numPayloadsSeen, float payloadScore);
   
+  @Override
   public abstract int hashCode();
   
+  @Override
   public abstract boolean equals(Object o);
 
 }

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java Wed Oct 28 16:16:46 2009
@@ -203,6 +203,7 @@
     }
 
     //
+    @Override
     protected boolean setFreqCurrentDoc() throws IOException {
       if (!more) {
         return false;

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java Wed Oct 28 16:16:46 2009
@@ -79,6 +79,7 @@
     this.field = maskedField;
   }
 
+  @Override
   public String getField() {
     return field;
   }
@@ -90,22 +91,27 @@
   // :NOTE: getBoost and setBoost are not proxied to the maskedQuery
   // ...this is done to be more consistent with things like SpanFirstQuery
   
+  @Override
   public Spans getSpans(IndexReader reader) throws IOException {
     return maskedQuery.getSpans(reader);
   }
 
+  @Override
   public void extractTerms(Set<Term> terms) {
     maskedQuery.extractTerms(terms);
   }  
 
+  @Override
   public Weight createWeight(Searcher searcher) throws IOException {
     return maskedQuery.createWeight(searcher);
   }
 
+  @Override
   public Similarity getSimilarity(Searcher searcher) {
     return maskedQuery.getSimilarity(searcher);
   }
 
+  @Override
   public Query rewrite(IndexReader reader) throws IOException {
     FieldMaskingSpanQuery clone = null;
 
@@ -122,6 +128,7 @@
     }
   }
 
+  @Override
   public String toString(String field) {
     StringBuilder buffer = new StringBuilder();
     buffer.append("mask(");
@@ -133,6 +140,7 @@
     return buffer.toString();
   }
   
+  @Override
   public boolean equals(Object o) {
     if (!(o instanceof FieldMaskingSpanQuery))
       return false;
@@ -143,6 +151,7 @@
 
   }
   
+  @Override
   public int hashCode() {
     return getMaskedQuery().hashCode()
       ^ getField().hashCode()

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java Wed Oct 28 16:16:46 2009
@@ -101,12 +101,15 @@
   }
 
   // inherit javadocs
+  @Override
   public int doc() { return matchDoc; }
 
   // inherit javadocs
+  @Override
   public int start() { return matchStart; }
 
   // inherit javadocs
+  @Override
   public int end() { return matchEnd; }
   
   public Spans[] getSubSpans() {
@@ -115,16 +118,19 @@
 
   // TODO: Remove warning after API has been finalized
   // TODO: Would be nice to be able to lazy load payloads
+  @Override
   public Collection<byte[]> getPayload() throws IOException {
     return matchPayload;
   }
 
   // TODO: Remove warning after API has been finalized
- public boolean isPayloadAvailable() {
+  @Override
+  public boolean isPayloadAvailable() {
     return matchPayload.isEmpty() == false;
   }
 
   // inherit javadocs
+  @Override
   public boolean next() throws IOException {
     if (firstTime) {
       firstTime = false;
@@ -143,6 +149,7 @@
   }
 
   // inherit javadocs
+  @Override
   public boolean skipTo(int target) throws IOException {
     if (firstTime) {
       firstTime = false;
@@ -327,6 +334,7 @@
     return match; // ordered and allowed slop
   }
 
+  @Override
   public String toString() {
     return getClass().getName() + "("+query.toString()+")@"+
       (firstTime?"START":(more?(doc()+":"+start()+"-"+end()):"END"));

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java Wed Oct 28 16:16:46 2009
@@ -56,6 +56,7 @@
       initialize(size);
     }
     
+    @Override
     protected final boolean lessThan(SpansCell spans1, SpansCell spans2) {
       if (spans1.doc() == spans2.doc()) {
         return NearSpansOrdered.docSpansOrdered(spans1, spans2);
@@ -78,10 +79,12 @@
       this.index = index;
     }
 
+    @Override
     public boolean next() throws IOException {
       return adjust(spans.next());
     }
 
+    @Override
     public boolean skipTo(int target) throws IOException {
       return adjust(spans.skipTo(target));
     }
@@ -103,19 +106,27 @@
       return condition;
     }
 
+    @Override
     public int doc() { return spans.doc(); }
+    
+    @Override
     public int start() { return spans.start(); }
+    
+    @Override
     public int end() { return spans.end(); }
                     // TODO: Remove warning after API has been finalized
+    @Override
     public Collection<byte[]> getPayload() throws IOException {
       return new ArrayList<byte[]>(spans.getPayload());
     }
 
     // TODO: Remove warning after API has been finalized
-   public boolean isPayloadAvailable() {
+    @Override
+    public boolean isPayloadAvailable() {
       return spans.isPayloadAvailable();
     }
 
+    @Override
     public String toString() { return spans.toString() + "#" + index; }
   }
 
@@ -138,6 +149,7 @@
   public Spans[] getSubSpans() {
 	  return subSpans;
   }
+  @Override
   public boolean next() throws IOException {
     if (firstTime) {
       initList(true);
@@ -189,6 +201,7 @@
     return false;                                 // no more matches
   }
 
+  @Override
   public boolean skipTo(int target) throws IOException {
     if (firstTime) {                              // initialize
       initList(false);
@@ -213,8 +226,11 @@
 
   private SpansCell min() { return queue.top(); }
 
+  @Override
   public int doc() { return min().doc(); }
+  @Override
   public int start() { return min().start(); }
+  @Override
   public int end() { return max.end(); }
 
   // TODO: Remove warning after API has been finalized
@@ -223,6 +239,7 @@
    * @return Collection of <code>byte[]</code> payloads
    * @throws IOException
    */
+  @Override
   public Collection<byte[]> getPayload() throws IOException {
     Set<byte[]> matchPayload = new HashSet<byte[]>();
     for (SpansCell cell = first; cell != null; cell = cell.next) {
@@ -234,6 +251,7 @@
   }
 
   // TODO: Remove warning after API has been finalized
+  @Override
   public boolean isPayloadAvailable() {
     SpansCell pointer = min();
     while (pointer != null) {
@@ -246,6 +264,7 @@
     return false;
   }
 
+  @Override
   public String toString() {
     return getClass().getName() + "("+query.toString()+")@"+
       (firstTime?"START":(more?(doc()+":"+start()+"-"+end()):"END"));

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/spans/SpanFirstQuery.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/spans/SpanFirstQuery.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/spans/SpanFirstQuery.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/spans/SpanFirstQuery.java Wed Oct 28 16:16:46 2009
@@ -46,8 +46,10 @@
   /** Return the maximum end position permitted in a match. */
   public int getEnd() { return end; }
 
+  @Override
   public String getField() { return match.getField(); }
 
+  @Override
   public String toString(String field) {
     StringBuilder buffer = new StringBuilder();
     buffer.append("spanFirst(");
@@ -59,20 +61,24 @@
     return buffer.toString();
   }
   
+  @Override
   public Object clone() {
     SpanFirstQuery spanFirstQuery = new SpanFirstQuery((SpanQuery) match.clone(), end);
     spanFirstQuery.setBoost(getBoost());
     return spanFirstQuery;
   }
   
+  @Override
   public void extractTerms(Set<Term> terms) {
 	    match.extractTerms(terms);
   }
 
+  @Override
   public Spans getSpans(final IndexReader reader) throws IOException {
     return new Spans() {
         private Spans spans = match.getSpans(reader);
 
+        @Override
         public boolean next() throws IOException {
           while (spans.next()) {                  // scan to next match
             if (end() <= end)
@@ -81,6 +87,7 @@
           return false;
         }
 
+        @Override
         public boolean skipTo(int target) throws IOException {
           if (!spans.skipTo(target))
             return false;
@@ -89,11 +96,15 @@
 
         }
 
+        @Override
         public int doc() { return spans.doc(); }
+        @Override
         public int start() { return spans.start(); }
+        @Override
         public int end() { return spans.end(); }
 
       // TODO: Remove warning after API has been finalized
+      @Override
       public Collection<byte[]> getPayload() throws IOException {
         ArrayList<byte[]> result = null;
         if (spans.isPayloadAvailable()) {
@@ -103,10 +114,12 @@
       }
 
       // TODO: Remove warning after API has been finalized
-     public boolean isPayloadAvailable() {
+      @Override
+      public boolean isPayloadAvailable() {
         return spans.isPayloadAvailable();
       }
 
+      @Override
       public String toString() {
           return "spans(" + SpanFirstQuery.this.toString() + ")";
         }
@@ -114,6 +127,7 @@
       };
   }
 
+  @Override
   public Query rewrite(IndexReader reader) throws IOException {
     SpanFirstQuery clone = null;
 
@@ -130,6 +144,7 @@
     }
   }
 
+  @Override
   public boolean equals(Object o) {
     if (this == o) return true;
     if (!(o instanceof SpanFirstQuery)) return false;
@@ -140,6 +155,7 @@
          && this.getBoost() == other.getBoost();
   }
 
+  @Override
   public int hashCode() {
     int h = match.hashCode();
     h ^= (h << 8) | (h >>> 25);  // reversible

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/spans/SpanNearQuery.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/spans/SpanNearQuery.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/spans/SpanNearQuery.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/spans/SpanNearQuery.java Wed Oct 28 16:16:46 2009
@@ -79,8 +79,10 @@
   /** Return true if matches are required to be in-order.*/
   public boolean isInOrder() { return inOrder; }
 
+  @Override
   public String getField() { return field; }
   
+  @Override
   public void extractTerms(Set<Term> terms) {
 	    for (final SpanQuery clause : clauses) {
 	      clause.extractTerms(terms);
@@ -88,6 +90,7 @@
   }  
   
 
+  @Override
   public String toString(String field) {
     StringBuilder buffer = new StringBuilder();
     buffer.append("spanNear([");
@@ -108,6 +111,7 @@
     return buffer.toString();
   }
 
+  @Override
   public Spans getSpans(final IndexReader reader) throws IOException {
     if (clauses.size() == 0)                      // optimize 0-clause case
       return new SpanOrQuery(getClauses()).getSpans(reader);
@@ -120,6 +124,7 @@
             : (Spans) new NearSpansUnordered(this, reader);
   }
 
+  @Override
   public Query rewrite(IndexReader reader) throws IOException {
     SpanNearQuery clone = null;
     for (int i = 0 ; i < clauses.size(); i++) {
@@ -138,6 +143,7 @@
     }
   }
   
+  @Override
   public Object clone() {
     int sz = clauses.size();
     SpanQuery[] newClauses = new SpanQuery[sz];
@@ -151,6 +157,7 @@
   }
 
   /** Returns true iff <code>o</code> is equal to this. */
+  @Override
   public boolean equals(Object o) {
     if (this == o) return true;
     if (!(o instanceof SpanNearQuery)) return false;
@@ -164,6 +171,7 @@
     return getBoost() == spanNearQuery.getBoost();
   }
 
+  @Override
   public int hashCode() {
     int result;
     result = clauses.hashCode();

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/spans/SpanNotQuery.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/spans/SpanNotQuery.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/spans/SpanNotQuery.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/spans/SpanNotQuery.java Wed Oct 28 16:16:46 2009
@@ -48,10 +48,13 @@
   /** Return the SpanQuery whose matches must not overlap those returned. */
   public SpanQuery getExclude() { return exclude; }
 
+  @Override
   public String getField() { return include.getField(); }
 
+  @Override
   public void extractTerms(Set<Term> terms) { include.extractTerms(terms); }
 
+  @Override
   public String toString(String field) {
     StringBuilder buffer = new StringBuilder();
     buffer.append("spanNot(");
@@ -63,12 +66,14 @@
     return buffer.toString();
   }
 
+  @Override
   public Object clone() {
     SpanNotQuery spanNotQuery = new SpanNotQuery((SpanQuery)include.clone(),(SpanQuery) exclude.clone());
     spanNotQuery.setBoost(getBoost());
     return  spanNotQuery;
   }
 
+  @Override
   public Spans getSpans(final IndexReader reader) throws IOException {
     return new Spans() {
         private Spans includeSpans = include.getSpans(reader);
@@ -77,6 +82,7 @@
         private Spans excludeSpans = exclude.getSpans(reader);
         private boolean moreExclude = excludeSpans.next();
 
+        @Override
         public boolean next() throws IOException {
           if (moreInclude)                        // move to next include
             moreInclude = includeSpans.next();
@@ -102,6 +108,7 @@
           return moreInclude;
         }
 
+        @Override
         public boolean skipTo(int target) throws IOException {
           if (moreInclude)                        // skip include
             moreInclude = includeSpans.skipTo(target);
@@ -127,11 +134,15 @@
           return next();                          // scan to next match
         }
 
+        @Override
         public int doc() { return includeSpans.doc(); }
+        @Override
         public int start() { return includeSpans.start(); }
+        @Override
         public int end() { return includeSpans.end(); }
 
       // TODO: Remove warning after API has been finalized
+      @Override
       public Collection<byte[]> getPayload() throws IOException {
         ArrayList<byte[]> result = null;
         if (includeSpans.isPayloadAvailable()) {
@@ -141,10 +152,12 @@
       }
 
       // TODO: Remove warning after API has been finalized
-     public boolean isPayloadAvailable() {
+      @Override
+      public boolean isPayloadAvailable() {
         return includeSpans.isPayloadAvailable();
       }
 
+      @Override
       public String toString() {
           return "spans(" + SpanNotQuery.this.toString() + ")";
         }
@@ -152,6 +165,7 @@
       };
   }
 
+  @Override
   public Query rewrite(IndexReader reader) throws IOException {
     SpanNotQuery clone = null;
 
@@ -174,6 +188,7 @@
   }
 
     /** Returns true iff <code>o</code> is equal to this. */
+  @Override
   public boolean equals(Object o) {
     if (this == o) return true;
     if (!(o instanceof SpanNotQuery)) return false;
@@ -184,6 +199,7 @@
             && this.getBoost() == other.getBoost();
   }
 
+  @Override
   public int hashCode() {
     int h = include.hashCode();
     h = (h<<1) | (h >>> 31);  // rotate left

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/spans/SpanOrQuery.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/spans/SpanOrQuery.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/spans/SpanOrQuery.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/spans/SpanOrQuery.java Wed Oct 28 16:16:46 2009
@@ -57,14 +57,17 @@
     return clauses.toArray(new SpanQuery[clauses.size()]);
   }
 
+  @Override
   public String getField() { return field; }
 
+  @Override
   public void extractTerms(Set<Term> terms) {
     for(final SpanQuery clause: clauses) {
       clause.extractTerms(terms);
     }
   }
   
+  @Override
   public Object clone() {
     int sz = clauses.size();
     SpanQuery[] newClauses = new SpanQuery[sz];
@@ -77,6 +80,7 @@
     return soq;
   }
 
+  @Override
   public Query rewrite(IndexReader reader) throws IOException {
     SpanOrQuery clone = null;
     for (int i = 0 ; i < clauses.size(); i++) {
@@ -95,6 +99,7 @@
     }
   }
 
+  @Override
   public String toString(String field) {
     StringBuilder buffer = new StringBuilder();
     buffer.append("spanOr([");
@@ -111,6 +116,7 @@
     return buffer.toString();
   }
 
+  @Override
   public boolean equals(Object o) {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
@@ -123,6 +129,7 @@
     return getBoost() == that.getBoost();
   }
 
+  @Override
   public int hashCode() {
     int h = clauses.hashCode();
     h ^= (h << 10) | (h >>> 23);
@@ -136,6 +143,7 @@
       initialize(size);
     }
 
+    @Override
     protected final boolean lessThan(Spans spans1, Spans spans2) {
       if (spans1.doc() == spans2.doc()) {
         if (spans1.start() == spans2.start()) {
@@ -149,6 +157,7 @@
     }
   }
 
+  @Override
   public Spans getSpans(final IndexReader reader) throws IOException {
     if (clauses.size() == 1)                      // optimize 1-clause case
       return (clauses.get(0)).getSpans(reader);
@@ -169,6 +178,7 @@
           return queue.size() != 0;
         }
 
+        @Override
         public boolean next() throws IOException {
           if (queue == null) {
             return initSpanQueue(-1);
@@ -189,6 +199,7 @@
 
         private Spans top() { return queue.top(); }
 
+        @Override
         public boolean skipTo(int target) throws IOException {
           if (queue == null) {
             return initSpanQueue(target);
@@ -210,10 +221,14 @@
           return next();
         }
 
+        @Override
         public int doc() { return top().doc(); }
+        @Override
         public int start() { return top().start(); }
+        @Override
         public int end() { return top().end(); }
 
+      @Override
       public Collection<byte[]> getPayload() throws IOException {
         ArrayList<byte[]> result = null;
         Spans theTop = top();
@@ -223,11 +238,13 @@
         return result;
       }
 
-     public boolean isPayloadAvailable() {
+      @Override
+      public boolean isPayloadAvailable() {
         Spans top = top();
         return top != null && top.isPayloadAvailable();
       }
 
+      @Override
       public String toString() {
           return "spans("+SpanOrQuery.this+")@"+
             ((queue == null)?"START"

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/spans/SpanQuery.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/spans/SpanQuery.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/spans/SpanQuery.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/spans/SpanQuery.java Wed Oct 28 16:16:46 2009
@@ -33,6 +33,7 @@
   /** Returns the name of the field matched by this query.*/
   public abstract String getField();
 
+  @Override
   public Weight createWeight(Searcher searcher) throws IOException {
     return new SpanWeight(this, searcher);
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/spans/SpanTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/spans/SpanTermQuery.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/spans/SpanTermQuery.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/spans/SpanTermQuery.java Wed Oct 28 16:16:46 2009
@@ -34,12 +34,15 @@
   /** Return the term whose spans are matched. */
   public Term getTerm() { return term; }
 
+  @Override
   public String getField() { return term.field(); }
   
+  @Override
   public void extractTerms(Set<Term> terms) {
 	  terms.add(term);
   }
 
+  @Override
   public String toString(String field) {
     StringBuilder buffer = new StringBuilder();
     if (term.field().equals(field))
@@ -50,6 +53,7 @@
     return buffer.toString();
   }
 
+  @Override
   public int hashCode() {
     final int prime = 31;
     int result = super.hashCode();
@@ -57,6 +61,7 @@
     return result;
   }
 
+  @Override
   public boolean equals(Object obj) {
     if (this == obj)
       return true;
@@ -73,6 +78,7 @@
     return true;
   }
 
+  @Override
   public Spans getSpans(final IndexReader reader) throws IOException {
     return new TermSpans(reader.termPositions(term), term);
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/spans/TermSpans.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/spans/TermSpans.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/spans/TermSpans.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/spans/TermSpans.java Wed Oct 28 16:16:46 2009
@@ -43,6 +43,7 @@
     doc = -1;
   }
 
+  @Override
   public boolean next() throws IOException {
     if (count == freq) {
       if (!positions.next()) {
@@ -58,6 +59,7 @@
     return true;
   }
 
+  @Override
   public boolean skipTo(int target) throws IOException {
     if (!positions.skipTo(target)) {
       doc = Integer.MAX_VALUE;
@@ -74,19 +76,23 @@
     return true;
   }
 
+  @Override
   public int doc() {
     return doc;
   }
 
+  @Override
   public int start() {
     return position;
   }
 
+  @Override
   public int end() {
     return position + 1;
   }
 
   // TODO: Remove warning after API has been finalized
+  @Override
   public Collection<byte[]> getPayload() throws IOException {
     byte [] bytes = new byte[positions.getPayloadLength()]; 
     bytes = positions.getPayload(bytes, 0);
@@ -94,10 +100,12 @@
   }
 
   // TODO: Remove warning after API has been finalized
- public boolean isPayloadAvailable() {
+  @Override
+  public boolean isPayloadAvailable() {
     return positions.isPayloadAvailable();
   }
 
+  @Override
   public String toString() {
     return "spans(" + term.toString() + ")@" +
             (doc == -1 ? "START" : (doc == Integer.MAX_VALUE) ? "END" : doc + "-" + position);

Modified: lucene/java/trunk/src/java/org/apache/lucene/store/BufferedIndexInput.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/store/BufferedIndexInput.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/store/BufferedIndexInput.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/store/BufferedIndexInput.java Wed Oct 28 16:16:46 2009
@@ -33,6 +33,7 @@
   private int bufferLength = 0;			  // end of valid bytes
   private int bufferPosition = 0;		  // next byte to read
 
+  @Override
   public byte readByte() throws IOException {
     if (bufferPosition >= bufferLength)
       refill();
@@ -88,10 +89,12 @@
       throw new IllegalArgumentException("bufferSize must be greater than 0 (got " + bufferSize + ")");
   }
 
+  @Override
   public void readBytes(byte[] b, int offset, int len) throws IOException {
     readBytes(b, offset, len, true);
   }
 
+  @Override
   public void readBytes(byte[] b, int offset, int len, boolean useBuffer) throws IOException {
 
     if(len <= (bufferLength-bufferPosition)){
@@ -169,8 +172,10 @@
   protected abstract void readInternal(byte[] b, int offset, int length)
           throws IOException;
 
+  @Override
   public long getFilePointer() { return bufferStart + bufferPosition; }
 
+  @Override
   public void seek(long pos) throws IOException {
     if (pos >= bufferStart && pos < (bufferStart + bufferLength))
       bufferPosition = (int)(pos - bufferStart);  // seek within buffer
@@ -188,6 +193,7 @@
    */
   protected abstract void seekInternal(long pos) throws IOException;
 
+  @Override
   public Object clone() {
     BufferedIndexInput clone = (BufferedIndexInput)super.clone();
 

Modified: lucene/java/trunk/src/java/org/apache/lucene/store/BufferedIndexOutput.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/store/BufferedIndexOutput.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/store/BufferedIndexOutput.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/store/BufferedIndexOutput.java Wed Oct 28 16:16:46 2009
@@ -30,6 +30,7 @@
   /** Writes a single byte.
    * @see IndexInput#readByte()
    */
+  @Override
   public void writeByte(byte b) throws IOException {
     if (bufferPosition >= BUFFER_SIZE)
       flush();
@@ -41,6 +42,7 @@
    * @param length the number of bytes to write
    * @see IndexInput#readBytes(byte[],int,int)
    */
+  @Override
   public void writeBytes(byte[] b, int offset, int length) throws IOException {
     int bytesLeft = BUFFER_SIZE - bufferPosition;
     // is there enough space in the buffer?
@@ -81,6 +83,7 @@
   }
 
   /** Forces any buffered output to be written. */
+  @Override
   public void flush() throws IOException {
     flushBuffer(buffer, bufferPosition);
     bufferStart += bufferPosition;
@@ -105,6 +108,7 @@
   protected abstract void flushBuffer(byte[] b, int offset, int len) throws IOException;
   
   /** Closes this stream to further operations. */
+  @Override
   public void close() throws IOException {
     flush();
   }
@@ -113,6 +117,7 @@
    * occur.
    * @see #seek(long)
    */
+  @Override
   public long getFilePointer() {
     return bufferStart + bufferPosition;
   }
@@ -120,12 +125,14 @@
   /** Sets current position in this file, where the next write will occur.
    * @see #getFilePointer()
    */
+  @Override
   public void seek(long pos) throws IOException {
     flush();
     bufferStart = pos;
   }
 
   /** The number of bytes in the file. */
+  @Override
   public abstract long length() throws IOException;
 
 

Modified: lucene/java/trunk/src/java/org/apache/lucene/store/ChecksumIndexInput.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/store/ChecksumIndexInput.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/store/ChecksumIndexInput.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/store/ChecksumIndexInput.java Wed Oct 28 16:16:46 2009
@@ -32,12 +32,14 @@
     digest = new CRC32();
   }
 
+  @Override
   public byte readByte() throws IOException {
     final byte b = main.readByte();
     digest.update(b);
     return b;
   }
 
+  @Override
   public void readBytes(byte[] b, int offset, int len)
     throws IOException {
     main.readBytes(b, offset, len);
@@ -49,18 +51,22 @@
     return digest.getValue();
   }
 
+  @Override
   public void close() throws IOException {
     main.close();
   }
 
+  @Override
   public long getFilePointer() {
     return main.getFilePointer();
   }
 
+  @Override
   public void seek(long pos) {
     throw new RuntimeException("not allowed");
   }
 
+  @Override
   public long length() {
     return main.length();
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/store/ChecksumIndexOutput.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/store/ChecksumIndexOutput.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/store/ChecksumIndexOutput.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/store/ChecksumIndexOutput.java Wed Oct 28 16:16:46 2009
@@ -32,11 +32,13 @@
     digest = new CRC32();
   }
 
+  @Override
   public void writeByte(byte b) throws IOException {
     digest.update(b);
     main.writeByte(b);
   }
 
+  @Override
   public void writeBytes(byte[] b, int offset, int length) throws IOException {
     digest.update(b, offset, length);
     main.writeBytes(b, offset, length);
@@ -46,18 +48,22 @@
     return digest.getValue();
   }
 
+  @Override
   public void flush() throws IOException {
     main.flush();
   }
 
+  @Override
   public void close() throws IOException {
     main.close();
   }
 
+  @Override
   public long getFilePointer() {
     return main.getFilePointer();
   }
 
+  @Override
   public void seek(long pos) {
     throw new RuntimeException("not allowed");    
   }
@@ -86,6 +92,7 @@
     main.writeLong(getChecksum());
   }
 
+  @Override
   public long length() throws IOException {
     return main.length();
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/store/FSDirectory.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/store/FSDirectory.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/store/FSDirectory.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/store/FSDirectory.java Wed Oct 28 16:16:46 2009
@@ -238,12 +238,14 @@
   /** Lists all files (not subdirectories) in the
    * directory.
    * @see #listAll(File) */
+  @Override
   public String[] listAll() throws IOException {
     ensureOpen();
     return listAll(directory);
   }
 
   /** Returns true iff a file with the given name exists. */
+  @Override
   public boolean fileExists(String name) {
     ensureOpen();
     File file = new File(directory, name);
@@ -251,6 +253,7 @@
   }
 
   /** Returns the time the named file was last modified. */
+  @Override
   public long fileModified(String name) {
     ensureOpen();
     File file = new File(directory, name);
@@ -264,6 +267,7 @@
   }
 
   /** Set the modified time of an existing file to now. */
+  @Override
   public void touchFile(String name) {
     ensureOpen();
     File file = new File(directory, name);
@@ -271,6 +275,7 @@
   }
 
   /** Returns the length in bytes of a file in the directory. */
+  @Override
   public long fileLength(String name) {
     ensureOpen();
     File file = new File(directory, name);
@@ -278,6 +283,7 @@
   }
 
   /** Removes an existing file in the directory. */
+  @Override
   public void deleteFile(String name) throws IOException {
     ensureOpen();
     File file = new File(directory, name);
@@ -285,6 +291,7 @@
       throw new IOException("Cannot delete " + file);
   }
 
+  @Override
   public void sync(String name) throws IOException {
     ensureOpen();
     File fullFile = new File(directory, name);
@@ -323,6 +330,7 @@
   }
 
   // Inherit javadoc
+  @Override
   public IndexInput openInput(String name) throws IOException {
     ensureOpen();
     return openInput(name, BufferedIndexInput.BUFFER_SIZE);
@@ -335,6 +343,7 @@
   {'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'};
 
   
+  @Override
   public String getLockID() {
     ensureOpen();
     String dirName;                               // name to be hashed
@@ -360,6 +369,7 @@
   }
 
   /** Closes the store to future operations. */
+  @Override
   public synchronized void close() {
     isOpen = false;
   }
@@ -370,6 +380,7 @@
   }
 
   /** For debug output. */
+  @Override
   public String toString() {
     return this.getClass().getName() + "@" + directory;
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/store/FileSwitchDirectory.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/store/FileSwitchDirectory.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/store/FileSwitchDirectory.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/store/FileSwitchDirectory.java Wed Oct 28 16:16:46 2009
@@ -59,6 +59,7 @@
     return secondaryDir;
   }
   
+  @Override
   public void close() throws IOException {
     if (doClose) {
       try {
@@ -70,6 +71,7 @@
     }
   }
   
+  @Override
   public String[] listAll() throws IOException {
     String[] primaryFiles = primaryDir.listAll();
     String[] secondaryFiles = secondaryDir.listAll();
@@ -97,34 +99,42 @@
     }
   }
 
+  @Override
   public boolean fileExists(String name) throws IOException {
     return getDirectory(name).fileExists(name);
   }
 
+  @Override
   public long fileModified(String name) throws IOException {
     return getDirectory(name).fileModified(name);
   }
 
+  @Override
   public void touchFile(String name) throws IOException {
     getDirectory(name).touchFile(name);
   }
 
+  @Override
   public void deleteFile(String name) throws IOException {
     getDirectory(name).deleteFile(name);
   }
 
+  @Override
   public long fileLength(String name) throws IOException {
     return getDirectory(name).fileLength(name);
   }
 
+  @Override
   public IndexOutput createOutput(String name) throws IOException {
     return getDirectory(name).createOutput(name);
   }
 
+  @Override
   public void sync(String name) throws IOException {
     getDirectory(name).sync(name);
   }
 
+  @Override
   public IndexInput openInput(String name) throws IOException {
     return getDirectory(name).openInput(name);
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/store/IndexInput.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/store/IndexInput.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/store/IndexInput.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/store/IndexInput.java Wed Oct 28 16:16:46 2009
@@ -217,6 +217,7 @@
    * different points in the input from each other and from the stream they
    * were cloned from.
    */
+  @Override
   public Object clone() {
     IndexInput clone = null;
     try {

Modified: lucene/java/trunk/src/java/org/apache/lucene/store/MMapDirectory.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/store/MMapDirectory.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/store/MMapDirectory.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/store/MMapDirectory.java Wed Oct 28 16:16:46 2009
@@ -202,6 +202,7 @@
         this.buffer = raf.getChannel().map(MapMode.READ_ONLY, 0, length);
     }
 
+    @Override
     public byte readByte() throws IOException {
       try {
         return buffer.get();
@@ -210,6 +211,7 @@
       }
     }
 
+    @Override
     public void readBytes(byte[] b, int offset, int len) throws IOException {
       try {
         buffer.get(b, offset, len);
@@ -218,18 +220,22 @@
       }
     }
 
+    @Override
     public long getFilePointer() {
       return buffer.position();
     }
 
+    @Override
     public void seek(long pos) throws IOException {
       buffer.position((int)pos);
     }
 
+    @Override
     public long length() {
       return length;
     }
 
+    @Override
     public Object clone() {
       MMapIndexInput clone = (MMapIndexInput)super.clone();
       clone.isClone = true;
@@ -237,6 +243,7 @@
       return clone;
     }
 
+    @Override
     public void close() throws IOException {
       if (isClone || buffer == null) return;
       // unmap the buffer (if enabled) and at least unset it for GC
@@ -299,6 +306,7 @@
       seek(0L);
     }
   
+    @Override
     public byte readByte() throws IOException {
       // Performance might be improved by reading ahead into an array of
       // e.g. 128 bytes and readByte() from there.
@@ -314,6 +322,7 @@
       return curBuf.get();
     }
   
+    @Override
     public void readBytes(byte[] b, int offset, int len) throws IOException {
       while (len > curAvail) {
         curBuf.get(b, offset, curAvail);
@@ -330,10 +339,12 @@
       curAvail -= len;
     }
   
+    @Override
     public long getFilePointer() {
       return ((long) curBufIndex * maxBufSize) + curBuf.position();
     }
   
+    @Override
     public void seek(long pos) throws IOException {
       curBufIndex = (int) (pos / maxBufSize);
       curBuf = buffers[curBufIndex];
@@ -342,10 +353,12 @@
       curAvail = bufSizes[curBufIndex] - bufOffset;
     }
   
+    @Override
     public long length() {
       return length;
     }
   
+    @Override
     public Object clone() {
       MultiMMapIndexInput clone = (MultiMMapIndexInput)super.clone();
       clone.isClone = true;
@@ -366,6 +379,7 @@
       return clone;
     }
   
+    @Override
     public void close() throws IOException {
       if (isClone || buffers == null) return;
       try {
@@ -384,6 +398,7 @@
   }
   
   /** Creates an IndexInput for the file with the given name. */
+  @Override
   public IndexInput openInput(String name, int bufferSize) throws IOException {
     ensureOpen();
     File f =  new File(getFile(), name);
@@ -398,6 +413,7 @@
   }
 
   /** Creates an IndexOutput for the file with the given name. */
+  @Override
   public IndexOutput createOutput(String name) throws IOException {
     initOutput(name);
     return new SimpleFSDirectory.SimpleFSIndexOutput(new File(directory, name));

Modified: lucene/java/trunk/src/java/org/apache/lucene/store/NIOFSDirectory.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/store/NIOFSDirectory.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/store/NIOFSDirectory.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/store/NIOFSDirectory.java Wed Oct 28 16:16:46 2009
@@ -61,12 +61,14 @@
   }
 
   /** Creates an IndexInput for the file with the given name. */
+  @Override
   public IndexInput openInput(String name, int bufferSize) throws IOException {
     ensureOpen();
     return new NIOFSIndexInput(new File(getFile(), name), bufferSize, getReadChunkSize());
   }
 
   /** Creates an IndexOutput for the file with the given name. */
+  @Override
   public IndexOutput createOutput(String name) throws IOException {
     initOutput(name);
     return new SimpleFSDirectory.SimpleFSIndexOutput(new File(directory, name));
@@ -86,11 +88,13 @@
       channel = file.getChannel();
     }
 
+    @Override
     protected void newBuffer(byte[] newBuffer) {
       super.newBuffer(newBuffer);
       byteBuf = ByteBuffer.wrap(newBuffer);
     }
 
+    @Override
     public void close() throws IOException {
       if (!isClone && file.isOpen) {
         // Close the channel & file
@@ -102,6 +106,7 @@
       }
     }
 
+    @Override
     protected void readInternal(byte[] b, int offset, int len) throws IOException {
 
       final ByteBuffer bb;

Modified: lucene/java/trunk/src/java/org/apache/lucene/store/NativeFSLockFactory.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/store/NativeFSLockFactory.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/store/NativeFSLockFactory.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/store/NativeFSLockFactory.java Wed Oct 28 16:16:46 2009
@@ -122,6 +122,7 @@
     setLockDir(lockDir);
   }
 
+  @Override
   public synchronized Lock makeLock(String lockName) {
     acquireTestLock();
     if (lockPrefix != null)
@@ -129,6 +130,7 @@
     return new NativeFSLock(lockDir, lockName);
   }
 
+  @Override
   public void clearLock(String lockName) throws IOException {
     // Note that this isn't strictly required anymore
     // because the existence of these files does not mean
@@ -175,6 +177,7 @@
     return lock != null;
   }
 
+  @Override
   public synchronized boolean obtain() throws IOException {
 
     if (lockExists()) {
@@ -274,6 +277,7 @@
     return lockExists();
   }
 
+  @Override
   public synchronized void release() throws IOException {
     if (lockExists()) {
       try {
@@ -299,6 +303,7 @@
     }
   }
 
+  @Override
   public synchronized boolean isLocked() {
     // The test for is isLocked is not directly possible with native file locks:
     
@@ -318,6 +323,7 @@
     }    
   }
 
+  @Override
   public String toString() {
     return "NativeFSLock@" + path;
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/store/NoLockFactory.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/store/NoLockFactory.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/store/NoLockFactory.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/store/NoLockFactory.java Wed Oct 28 16:16:46 2009
@@ -38,25 +38,31 @@
     return singleton;
   }
 
+  @Override
   public Lock makeLock(String lockName) {
     return singletonLock;
   }
 
+  @Override
   public void clearLock(String lockName) {};
 };
 
 class NoLock extends Lock {
+  @Override
   public boolean obtain() throws IOException {
     return true;
   }
 
+  @Override
   public void release() {
   }
 
+  @Override
   public boolean isLocked() {
     return false;
   }
 
+  @Override
   public String toString() {
     return "NoLock";
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/store/RAMDirectory.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/store/RAMDirectory.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/store/RAMDirectory.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/store/RAMDirectory.java Wed Oct 28 16:16:46 2009
@@ -69,6 +69,7 @@
     Directory.copy(dir, this, closeDir);
   }
 
+  @Override
   public synchronized final String[] listAll() {
     ensureOpen();
     Set<String> fileNames = fileMap.keySet();
@@ -80,6 +81,7 @@
   }
 
   /** Returns true iff the named file exists in this directory. */
+  @Override
   public final boolean fileExists(String name) {
     ensureOpen();
     RAMFile file;
@@ -92,6 +94,7 @@
   /** Returns the time the named file was last modified.
    * @throws IOException if the file does not exist
    */
+  @Override
   public final long fileModified(String name) throws IOException {
     ensureOpen();
     RAMFile file;
@@ -106,6 +109,7 @@
   /** Set the modified time of an existing file to now.
    * @throws IOException if the file does not exist
    */
+  @Override
   public void touchFile(String name) throws IOException {
     ensureOpen();
     RAMFile file;
@@ -134,6 +138,7 @@
   /** Returns the length in bytes of a file in the directory.
    * @throws IOException if the file does not exist
    */
+  @Override
   public final long fileLength(String name) throws IOException {
     ensureOpen();
     RAMFile file;
@@ -156,6 +161,7 @@
   /** Removes an existing file in the directory.
    * @throws IOException if the file does not exist
    */
+  @Override
   public synchronized void deleteFile(String name) throws IOException {
     ensureOpen();
     RAMFile file = fileMap.get(name);
@@ -168,6 +174,7 @@
   }
 
   /** Creates a new, empty file in the directory with the given name. Returns a stream writing this file. */
+  @Override
   public IndexOutput createOutput(String name) throws IOException {
     ensureOpen();
     RAMFile file = new RAMFile(this);
@@ -183,6 +190,7 @@
   }
 
   /** Returns a stream reading an existing file. */
+  @Override
   public IndexInput openInput(String name) throws IOException {
     ensureOpen();
     RAMFile file;
@@ -195,6 +203,7 @@
   }
 
   /** Closes the store to future operations, releasing associated memory. */
+  @Override
   public void close() {
     isOpen = false;
     fileMap = null;

Modified: lucene/java/trunk/src/java/org/apache/lucene/store/RAMInputStream.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/store/RAMInputStream.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/store/RAMInputStream.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/store/RAMInputStream.java Wed Oct 28 16:16:46 2009
@@ -49,14 +49,17 @@
     currentBuffer = null;
   }
 
+  @Override
   public void close() {
     // nothing to do here
   }
 
+  @Override
   public long length() {
     return length;
   }
 
+  @Override
   public byte readByte() throws IOException {
     if (bufferPosition >= bufferLength) {
       currentBufferIndex++;
@@ -65,6 +68,7 @@
     return currentBuffer[bufferPosition++];
   }
 
+  @Override
   public void readBytes(byte[] b, int offset, int len) throws IOException {
     while (len > 0) {
       if (bufferPosition >= bufferLength) {
@@ -100,10 +104,12 @@
     }
   }
 
+  @Override
   public long getFilePointer() {
     return currentBufferIndex < 0 ? 0 : bufferStart + bufferPosition;
   }
 
+  @Override
   public void seek(long pos) throws IOException {
     if (currentBuffer==null || pos < bufferStart || pos >= bufferStart + BUFFER_SIZE) {
       currentBufferIndex = (int) (pos / BUFFER_SIZE);

Modified: lucene/java/trunk/src/java/org/apache/lucene/store/RAMOutputStream.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/store/RAMOutputStream.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/store/RAMOutputStream.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/store/RAMOutputStream.java Wed Oct 28 16:16:46 2009
@@ -77,10 +77,12 @@
     file.setLength(0);
   }
 
+  @Override
   public void close() throws IOException {
     flush();
   }
 
+  @Override
   public void seek(long pos) throws IOException {
     // set the file length in case we seek back
     // and flush() has not been called yet
@@ -93,10 +95,12 @@
     bufferPosition = (int) (pos % BUFFER_SIZE);
   }
 
+  @Override
   public long length() {
     return file.length;
   }
 
+  @Override
   public void writeByte(byte b) throws IOException {
     if (bufferPosition == bufferLength) {
       currentBufferIndex++;
@@ -105,6 +109,7 @@
     currentBuffer[bufferPosition++] = b;
   }
 
+  @Override
   public void writeBytes(byte[] b, int offset, int len) throws IOException {
     assert b != null;
     while (len > 0) {
@@ -140,11 +145,13 @@
     }
   }
 
+  @Override
   public void flush() throws IOException {
     file.setLastModified(System.currentTimeMillis());
     setFileLength();
   }
 
+  @Override
   public long getFilePointer() {
     return currentBufferIndex < 0 ? 0 : bufferStart + bufferPosition;
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/store/SimpleFSDirectory.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/store/SimpleFSDirectory.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/store/SimpleFSDirectory.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/store/SimpleFSDirectory.java Wed Oct 28 16:16:46 2009
@@ -50,12 +50,14 @@
   }
 
   /** Creates an IndexOutput for the file with the given name. */
+  @Override
   public IndexOutput createOutput(String name) throws IOException {
     initOutput(name);
     return new SimpleFSIndexOutput(new File(directory, name));
   }
 
   /** Creates an IndexInput for the file with the given name. */
+  @Override
   public IndexInput openInput(String name, int bufferSize) throws IOException {
     ensureOpen();
     return new SimpleFSIndexInput(new File(directory, name), bufferSize, getReadChunkSize());
@@ -76,6 +78,7 @@
         length=length();
       }
   
+      @Override
       public void close() throws IOException {
         if (isOpen) {
           isOpen=false;
@@ -96,6 +99,7 @@
     }
   
     /** IndexInput methods */
+    @Override
     protected void readInternal(byte[] b, int offset, int len)
          throws IOException {
       synchronized (file) {
@@ -135,18 +139,22 @@
       }
     }
   
+    @Override
     public void close() throws IOException {
       // only close the file if this is not a clone
       if (!isClone) file.close();
     }
   
+    @Override
     protected void seekInternal(long position) {
     }
   
+    @Override
     public long length() {
       return file.length;
     }
   
+    @Override
     public Object clone() {
       SimpleFSIndexInput clone = (SimpleFSIndexInput)super.clone();
       clone.isClone = true;
@@ -174,9 +182,11 @@
     }
   
     /** output methods: */
+    @Override
     public void flushBuffer(byte[] b, int offset, int size) throws IOException {
       file.write(b, offset, size);
     }
+    @Override
     public void close() throws IOException {
       // only close the file if it has not been closed yet
       if (isOpen) {
@@ -199,13 +209,16 @@
     }
   
     /** Random-access methods */
+    @Override
     public void seek(long pos) throws IOException {
       super.seek(pos);
       file.seek(pos);
     }
+    @Override
     public long length() throws IOException {
       return file.length();
     }
+    @Override
     public void setLength(long length) throws IOException {
       file.setLength(length);
     }

Modified: lucene/java/trunk/src/java/org/apache/lucene/store/SimpleFSLockFactory.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/store/SimpleFSLockFactory.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/store/SimpleFSLockFactory.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/store/SimpleFSLockFactory.java Wed Oct 28 16:16:46 2009
@@ -80,6 +80,7 @@
     setLockDir(new File(lockDirName));
   }
 
+  @Override
   public Lock makeLock(String lockName) {
     if (lockPrefix != null) {
       lockName = lockPrefix + "-" + lockName;
@@ -87,6 +88,7 @@
     return new SimpleFSLock(lockDir, lockName);
   }
 
+  @Override
   public void clearLock(String lockName) throws IOException {
     if (lockDir.exists()) {
       if (lockPrefix != null) {
@@ -110,6 +112,7 @@
     lockFile = new File(lockDir, lockFileName);
   }
 
+  @Override
   public boolean obtain() throws IOException {
 
     // Ensure that lockDir exists and is a directory:
@@ -124,15 +127,18 @@
     return lockFile.createNewFile();
   }
 
+  @Override
   public void release() throws LockReleaseFailedException {
     if (lockFile.exists() && !lockFile.delete())
       throw new LockReleaseFailedException("failed to delete " + lockFile);
   }
 
+  @Override
   public boolean isLocked() {
     return lockFile.exists();
   }
 
+  @Override
   public String toString() {
     return "SimpleFSLock@" + lockFile;
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/store/SingleInstanceLockFactory.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/store/SingleInstanceLockFactory.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/store/SingleInstanceLockFactory.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/store/SingleInstanceLockFactory.java Wed Oct 28 16:16:46 2009
@@ -35,6 +35,7 @@
 
   private HashSet<String> locks = new HashSet<String>();
 
+  @Override
   public Lock makeLock(String lockName) {
     // We do not use the LockPrefix at all, because the private
     // HashSet instance effectively scopes the locking to this
@@ -42,6 +43,7 @@
     return new SingleInstanceLock(locks, lockName);
   }
 
+  @Override
   public void clearLock(String lockName) throws IOException {
     synchronized(locks) {
       if (locks.contains(lockName)) {
@@ -61,24 +63,28 @@
     this.lockName = lockName;
   }
 
+  @Override
   public boolean obtain() throws IOException {
     synchronized(locks) {
       return locks.add(lockName);
     }
   }
 
+  @Override
   public void release() {
     synchronized(locks) {
       locks.remove(lockName);
     }
   }
 
+  @Override
   public boolean isLocked() {
     synchronized(locks) {
       return locks.contains(lockName);
     }
   }
 
+  @Override
   public String toString() {
     return super.toString() + ": " + lockName;
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/store/VerifyingLockFactory.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/store/VerifyingLockFactory.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/store/VerifyingLockFactory.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/store/VerifyingLockFactory.java Wed Oct 28 16:16:46 2009
@@ -68,6 +68,7 @@
       }
     }
 
+    @Override
     public synchronized boolean obtain(long lockWaitTimeout)
       throws LockObtainFailedException, IOException {
       boolean obtained = lock.obtain(lockWaitTimeout);
@@ -76,15 +77,18 @@
       return obtained;
     }
 
+    @Override
     public synchronized boolean obtain()
       throws LockObtainFailedException, IOException {
       return lock.obtain();
     }
 
+    @Override
     public synchronized boolean isLocked() {
       return lock.isLocked();
     }
 
+    @Override
     public synchronized void release() throws IOException {
       if (isLocked()) {
         verify((byte) 0);
@@ -108,10 +112,12 @@
     this.port = port;
   }
 
+  @Override
   public synchronized Lock makeLock(String lockName) {
     return new CheckedLock(lf.makeLock(lockName));
   }
 
+  @Override
   public synchronized void clearLock(String lockName)
     throws IOException {
     lf.clearLock(lockName);

Modified: lucene/java/trunk/src/java/org/apache/lucene/util/AttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/util/AttributeImpl.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/util/AttributeImpl.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/util/AttributeImpl.java Wed Oct 28 16:16:46 2009
@@ -48,6 +48,7 @@
    * 
    * This method may be overridden by subclasses.
    */
+  @Override
   public String toString() {
     StringBuilder buffer = new StringBuilder();
     Class clazz = this.getClass();
@@ -89,6 +90,7 @@
    * 
    * see also {@link #equals(Object)}
    */
+  @Override
   public abstract int hashCode();
   
   /**
@@ -97,6 +99,7 @@
    * 
    * see also {@link Object#equals(Object)}
    */
+  @Override
   public abstract boolean equals(Object other);
   
   /**
@@ -110,6 +113,7 @@
    * Shallow clone. Subclasses must override this if they 
    * need to clone any members deeply,
    */
+  @Override
   public Object clone() {
     Object clone = null;
     try {

Modified: lucene/java/trunk/src/java/org/apache/lucene/util/AttributeSource.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/util/AttributeSource.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/util/AttributeSource.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/util/AttributeSource.java Wed Oct 28 16:16:46 2009
@@ -59,6 +59,7 @@
       
       private DefaultAttributeFactory() {}
     
+      @Override
       public AttributeImpl createAttributeInstance(Class<? extends Attribute> attClass) {
         try {
           return getClassForInterface(attClass).newInstance();
@@ -269,6 +270,7 @@
     private AttributeImpl attribute;
     private State next;
     
+    @Override
     public Object clone() {
       State clone = new State();
       clone.attribute = (AttributeImpl) attribute.clone();
@@ -352,6 +354,7 @@
     } while (state != null);
   }
 
+  @Override
   public int hashCode() {
     int code = 0;
     if (hasAttributes()) {
@@ -366,6 +369,7 @@
     return code;
   }
   
+  @Override
   public boolean equals(Object obj) {
     if (obj == this) {
       return true;
@@ -407,6 +411,7 @@
       return false;
   }
   
+  @Override
   public String toString() {
     StringBuilder sb = new StringBuilder().append('(');
     if (hasAttributes()) {

Modified: lucene/java/trunk/src/java/org/apache/lucene/util/AverageGuessMemoryModel.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/util/AverageGuessMemoryModel.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/util/AverageGuessMemoryModel.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/util/AverageGuessMemoryModel.java Wed Oct 28 16:16:46 2009
@@ -44,6 +44,7 @@
    * 
    * @see org.apache.lucene.util.MemoryModel#getArraySize()
    */
+  @Override
   public int getArraySize() {
     return 16;
   }
@@ -53,6 +54,7 @@
    * 
    * @see org.apache.lucene.util.MemoryModel#getClassSize()
    */
+  @Override
   public int getClassSize() {
     return 8;
   }
@@ -60,6 +62,7 @@
   /* (non-Javadoc)
    * @see org.apache.lucene.util.MemoryModel#getPrimitiveSize(java.lang.Class)
    */
+  @Override
   public int getPrimitiveSize(Class clazz) {
     return sizes.get(clazz).intValue();
   }
@@ -67,6 +70,7 @@
   /* (non-Javadoc)
    * @see org.apache.lucene.util.MemoryModel#getReferenceSize()
    */
+  @Override
   public int getReferenceSize() {
     return 4;
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/util/BitVector.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/util/BitVector.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/util/BitVector.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/util/BitVector.java Wed Oct 28 16:16:46 2009
@@ -49,6 +49,7 @@
     this.size = size;
   }
   
+  @Override
   public Object clone() {
     byte[] copyBits = new byte[bits.length];
     System.arraycopy(bits, 0, copyBits, 0, bits.length);

Modified: lucene/java/trunk/src/java/org/apache/lucene/util/DocIdBitSet.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/util/DocIdBitSet.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/util/DocIdBitSet.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/util/DocIdBitSet.java Wed Oct 28 16:16:46 2009
@@ -31,11 +31,13 @@
     this.bitSet = bitSet;
   }
 
+  @Override
   public DocIdSetIterator iterator() {
     return new DocIdBitSetIterator(bitSet);
   }
 
   /** This DocIdSet implementation is cacheable. */
+  @Override
   public boolean isCacheable() {
     return true;
   }
@@ -56,10 +58,12 @@
       this.docId = -1;
     }
     
+    @Override
     public int docID() {
       return docId;
     }
     
+    @Override
     public int nextDoc() {
       // (docId + 1) on next line requires -1 initial value for docNr:
       int d = bitSet.nextSetBit(docId + 1);
@@ -68,6 +72,7 @@
       return docId;
     }
   
+    @Override
     public int advance(int target) {
       int d = bitSet.nextSetBit(target);
       // -1 returned by BitSet.nextSetBit() when exhausted

Modified: lucene/java/trunk/src/java/org/apache/lucene/util/FieldCacheSanityChecker.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/util/FieldCacheSanityChecker.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/util/FieldCacheSanityChecker.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/util/FieldCacheSanityChecker.java Wed Oct 28 16:16:46 2009
@@ -297,9 +297,11 @@
       this.readerKey = readerKey;
       this.fieldName = fieldName;
     }
+    @Override
     public int hashCode() {
       return System.identityHashCode(readerKey) * fieldName.hashCode();
     }
+    @Override
     public boolean equals(Object that) {
       if (! (that instanceof ReaderField)) return false;
 
@@ -307,6 +309,7 @@
       return (this.readerKey == other.readerKey &&
               this.fieldName.equals(other.fieldName));
     }
+    @Override
     public String toString() {
       return readerKey.toString() + "+" + fieldName;
     }
@@ -352,6 +355,7 @@
      * the Type and Msg, followed by each CacheEntry.toString() on it's 
      * own line prefaced by a tab character
      */
+    @Override
     public String toString() {
       StringBuilder buf = new StringBuilder();
       buf.append(getType()).append(": ");
@@ -383,6 +387,7 @@
     private InsanityType(final String label) {
       this.label = label;
     }
+    @Override
     public String toString() { return label; }
 
     /** 

Modified: lucene/java/trunk/src/java/org/apache/lucene/util/OpenBitSet.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/util/OpenBitSet.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/util/OpenBitSet.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/util/OpenBitSet.java Wed Oct 28 16:16:46 2009
@@ -640,6 +640,7 @@
 
 
 
+  @Override
   public Object clone() {
     try {
       OpenBitSet obs = (OpenBitSet)super.clone();
@@ -775,6 +776,7 @@
 
 
   /** returns true if both sets have the same bits set */
+  @Override
   public boolean equals(Object o) {
     if (this == o) return true;
     if (!(o instanceof OpenBitSet)) return false;
@@ -800,6 +802,7 @@
   }
 
 
+  @Override
   public int hashCode() {
       long h = 0x98761234;  // something non-zero for length==0
       for (int i = bits.length; --i>=0;) {

Modified: lucene/java/trunk/src/java/org/apache/lucene/util/OpenBitSetIterator.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/util/OpenBitSetIterator.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/util/OpenBitSetIterator.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/util/OpenBitSetIterator.java Wed Oct 28 16:16:46 2009
@@ -128,6 +128,7 @@
   }
   ******/
 
+  @Override
   public int nextDoc() {
     if (indexArray == 0) {
       if (word != 0) {
@@ -155,6 +156,7 @@
     return curDocId = (i<<6) + bitIndex;
   }
   
+  @Override
   public int advance(int target) {
     indexArray = 0;
     i = target >> 6;
@@ -185,6 +187,7 @@
     return curDocId = (i<<6) + bitIndex;
   }
 
+  @Override
   public int docID() {
     return curDocId;
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/util/Parameter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/util/Parameter.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/util/Parameter.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/util/Parameter.java Wed Oct 28 16:16:46 2009
@@ -53,6 +53,7 @@
     return getClass() + " " + name;
   }
   
+  @Override
   public String toString() {
     return name;
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/util/SortedVIntList.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/util/SortedVIntList.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/util/SortedVIntList.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/util/SortedVIntList.java Wed Oct 28 16:16:46 2009
@@ -206,10 +206,12 @@
         }
       }
       
+      @Override
       public int docID() {
         return doc;
       }
       
+      @Override
       public int nextDoc() {
         if (bytePos >= lastBytePos) {
           doc = NO_MORE_DOCS;
@@ -220,6 +222,7 @@
         return doc;
       }
       
+      @Override
       public int advance(int target) {
         while (bytePos < lastBytePos) {
           advance();



Mime
View raw message