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 [2/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/index/DocInverterPerField.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/DocInverterPerField.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/DocInverterPerField.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/DocInverterPerField.java Wed Oct 28 16:16:46 2009
@@ -51,11 +51,13 @@
     this.endConsumer = perThread.endConsumer.addField(this, fieldInfo);
   }
 
+  @Override
   void abort() {
     consumer.abort();
     endConsumer.abort();
   }
 
+  @Override
   public void processFields(final Fieldable[] fields,
                             final int count) throws IOException {
 

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/DocInverterPerThread.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/DocInverterPerThread.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/DocInverterPerThread.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/DocInverterPerThread.java Wed Oct 28 16:16:46 2009
@@ -49,6 +49,7 @@
     }
     
     // this is a dummy, to not throw an UOE because this class does not implement any iteration method
+    @Override
     public boolean incrementToken() {
       throw new UnsupportedOperationException();
     }
@@ -68,11 +69,13 @@
     endConsumer = docInverter.endConsumer.addThread(this);
   }
 
+  @Override
   public void startDocument() throws IOException {
     consumer.startDocument();
     endConsumer.startDocument();
   }
 
+  @Override
   public DocumentsWriter.DocWriter finishDocument() throws IOException {
     // TODO: allow endConsumer.finishDocument to also return
     // a DocWriter
@@ -80,6 +83,7 @@
     return consumer.finishDocument();
   }
 
+  @Override
   void abort() {
     try {
       consumer.abort();
@@ -88,6 +92,7 @@
     }
   }
 
+  @Override
   public DocFieldConsumerPerField addField(FieldInfo fi) {
     return new DocInverterPerField(this, fi);
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/DocumentsWriter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/DocumentsWriter.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/DocumentsWriter.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/DocumentsWriter.java Wed Oct 28 16:16:46 2009
@@ -181,6 +181,7 @@
   
   static final IndexingChain DefaultIndexingChain = new IndexingChain() {
 
+    @Override
     DocConsumer getChain(DocumentsWriter documentsWriter) {
       /*
       This is the current indexing chain:
@@ -1115,10 +1116,13 @@
   }
 
   private static class SkipDocWriter extends DocWriter {
+    @Override
     void finish() {
     }
+    @Override
     void abort() {
     }
+    @Override
     long sizeInBytes() {
       return 0;
     }
@@ -1194,6 +1198,7 @@
     ArrayList<byte[]> freeByteBlocks = new ArrayList<byte[]>();
     
     /* Allocate another byte[] from the shared pool */
+    @Override
     byte[] getByteBlock(boolean trackAllocations) {
       synchronized(DocumentsWriter.this) {
         final int size = freeByteBlocks.size();
@@ -1217,6 +1222,7 @@
     }
 
     /* Return byte[]'s to the pool */
+    @Override
     void recycleByteBlocks(byte[][] blocks, int start, int end) {
       synchronized(DocumentsWriter.this) {
         for(int i=start;i<end;i++)

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/FieldInfo.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/FieldInfo.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/FieldInfo.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/FieldInfo.java Wed Oct 28 16:16:46 2009
@@ -55,6 +55,7 @@
     }
   }
 
+  @Override
   public Object clone() {
     return new FieldInfo(name, isIndexed, number, storeTermVector, storePositionWithTermVector,
                          storeOffsetWithTermVector, omitNorms, storePayloads, omitTermFreqAndPositions);

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/FieldInfos.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/FieldInfos.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/FieldInfos.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/FieldInfos.java Wed Oct 28 16:16:46 2009
@@ -98,6 +98,7 @@
   /**
    * Returns a deep clone of this FieldInfos instance.
    */
+  @Override
   synchronized public Object clone() {
     FieldInfos fis = new FieldInfos();
     final int numField = byNumber.size();

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/FieldSortedTermVectorMapper.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/FieldSortedTermVectorMapper.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/FieldSortedTermVectorMapper.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/FieldSortedTermVectorMapper.java Wed Oct 28 16:16:46 2009
@@ -43,11 +43,13 @@
     this.comparator = comparator;
   }
 
+  @Override
   public void map(String term, int frequency, TermVectorOffsetInfo[] offsets, int[] positions) {
     TermVectorEntry entry = new TermVectorEntry(currentField, term, frequency, offsets, positions);
     currentSet.add(entry);
   }
 
+  @Override
   public void setExpectations(String field, int numTerms, boolean storeOffsets, boolean storePositions) {
     currentSet = new TreeSet<TermVectorEntry>(comparator);
     currentField = field;

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/FieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/FieldsReader.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/FieldsReader.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/FieldsReader.java Wed Oct 28 16:16:46 2009
@@ -70,6 +70,7 @@
    *  job not to close the original FieldsReader until all
    *  clones are called (eg, currently SegmentReader manages
    *  this logic). */
+  @Override
   public Object clone() {
     ensureOpen();
     return new FieldsReader(fieldInfos, numTotalDocs, size, format, formatSize, docStoreOffset, cloneableFieldsStream, cloneableIndexStream);
@@ -516,6 +517,7 @@
       this.toRead = toRead;
     }
 
+    @Override
     public byte[] getBinaryValue(byte[] result) {
       ensureOpen();
 

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/FilterIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/FilterIndexReader.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/FilterIndexReader.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/FilterIndexReader.java Wed Oct 28 16:16:46 2009
@@ -85,9 +85,13 @@
 
     public FilterTermEnum(TermEnum in) { this.in = in; }
 
+    @Override
     public boolean next() throws IOException { return in.next(); }
+    @Override
     public Term term() { return in.term(); }
+    @Override
     public int docFreq() { return in.docFreq(); }
+    @Override
     public void close() throws IOException { in.close(); }
   }
 
@@ -105,16 +109,19 @@
     this.in = in;
   }
 
+  @Override
   public Directory directory() {
     return in.directory();
   }
   
+  @Override
   public TermFreqVector[] getTermFreqVectors(int docNumber)
           throws IOException {
     ensureOpen();
     return in.getTermFreqVectors(docNumber);
   }
 
+  @Override
   public TermFreqVector getTermFreqVector(int docNumber, String field)
           throws IOException {
     ensureOpen();
@@ -122,120 +129,146 @@
   }
 
 
+  @Override
   public void getTermFreqVector(int docNumber, String field, TermVectorMapper mapper) throws IOException {
     ensureOpen();
     in.getTermFreqVector(docNumber, field, mapper);
 
   }
 
+  @Override
   public void getTermFreqVector(int docNumber, TermVectorMapper mapper) throws IOException {
     ensureOpen();
     in.getTermFreqVector(docNumber, mapper);
   }
 
+  @Override
   public int numDocs() {
     // Don't call ensureOpen() here (it could affect performance)
     return in.numDocs();
   }
 
+  @Override
   public int maxDoc() {
     // Don't call ensureOpen() here (it could affect performance)
     return in.maxDoc();
   }
 
+  @Override
   public Document document(int n, FieldSelector fieldSelector) throws CorruptIndexException, IOException {
     ensureOpen();
     return in.document(n, fieldSelector);
   }
 
+  @Override
   public boolean isDeleted(int n) {
     // Don't call ensureOpen() here (it could affect performance)
     return in.isDeleted(n);
   }
 
+  @Override
   public boolean hasDeletions() {
     // Don't call ensureOpen() here (it could affect performance)
     return in.hasDeletions();
   }
 
+  @Override
   protected void doUndeleteAll() throws CorruptIndexException, IOException {in.undeleteAll();}
 
+  @Override
   public boolean hasNorms(String field) throws IOException {
     ensureOpen();
     return in.hasNorms(field);
   }
 
+  @Override
   public byte[] norms(String f) throws IOException {
     ensureOpen();
     return in.norms(f);
   }
 
+  @Override
   public void norms(String f, byte[] bytes, int offset) throws IOException {
     ensureOpen();
     in.norms(f, bytes, offset);
   }
 
+  @Override
   protected void doSetNorm(int d, String f, byte b) throws CorruptIndexException, IOException {
     in.setNorm(d, f, b);
   }
 
+  @Override
   public TermEnum terms() throws IOException {
     ensureOpen();
     return in.terms();
   }
 
+  @Override
   public TermEnum terms(Term t) throws IOException {
     ensureOpen();
     return in.terms(t);
   }
 
+  @Override
   public int docFreq(Term t) throws IOException {
     ensureOpen();
     return in.docFreq(t);
   }
 
+  @Override
   public TermDocs termDocs() throws IOException {
     ensureOpen();
     return in.termDocs();
   }
 
+  @Override
   public TermDocs termDocs(Term term) throws IOException {
     ensureOpen();
     return in.termDocs(term);
   }
 
+  @Override
   public TermPositions termPositions() throws IOException {
     ensureOpen();
     return in.termPositions();
   }
 
+  @Override
   protected void doDelete(int n) throws  CorruptIndexException, IOException { in.deleteDocument(n); }
   
+  @Override
   protected void doCommit(Map<String,String> commitUserData) throws IOException { in.commit(commitUserData); }
   
+  @Override
   protected void doClose() throws IOException { in.close(); }
 
 
+  @Override
   public Collection<String> getFieldNames(IndexReader.FieldOption fieldNames) {
     ensureOpen();
     return in.getFieldNames(fieldNames);
   }
 
+  @Override
   public long getVersion() {
     ensureOpen();
     return in.getVersion();
   }
 
+  @Override
   public boolean isCurrent() throws CorruptIndexException, IOException {
     ensureOpen();
     return in.isCurrent();
   }
   
+  @Override
   public boolean isOptimized() {
     ensureOpen();
     return in.isOptimized();
   }
   
+  @Override
   public IndexReader[] getSequentialSubReaders() {
     return in.getSequentialSubReaders();
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/FormatPostingsDocsWriter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/FormatPostingsDocsWriter.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/FormatPostingsDocsWriter.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/FormatPostingsDocsWriter.java Wed Oct 28 16:16:46 2009
@@ -67,6 +67,7 @@
 
   /** Adds a new doc in this term.  If this returns null
    *  then we just skip consuming positions/payloads. */
+  @Override
   FormatPostingsPositionsConsumer addDoc(int docID, int termDocFreq) throws IOException {
 
     final int delta = docID - lastDocID;
@@ -99,6 +100,7 @@
   final UnicodeUtil.UTF8Result utf8 = new UnicodeUtil.UTF8Result();
 
   /** Called when we are done adding docs to this term */
+  @Override
   void finish() throws IOException {
     long skipPointer = skipListWriter.writeSkip(out);
 

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/FormatPostingsFieldsWriter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/FormatPostingsFieldsWriter.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/FormatPostingsFieldsWriter.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/FormatPostingsFieldsWriter.java Wed Oct 28 16:16:46 2009
@@ -60,12 +60,14 @@
   }
 
   /** Add a new field */
+  @Override
   FormatPostingsTermsConsumer addField(FieldInfo field) {
     termsWriter.setField(field);
     return termsWriter;
   }
 
   /** Called when we are done adding everything. */
+  @Override
   void finish() throws IOException {
     termsOut.close();
     termsWriter.close();

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/FormatPostingsPositionsWriter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/FormatPostingsPositionsWriter.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/FormatPostingsPositionsWriter.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/FormatPostingsPositionsWriter.java Wed Oct 28 16:16:46 2009
@@ -49,6 +49,7 @@
   int lastPosition;
 
   /** Add a new position & payload */
+  @Override
   void addPosition(int position, byte[] payload, int payloadOffset, int payloadLength) throws IOException {
     assert !omitTermFreqAndPositions: "omitTermFreqAndPositions is true";
     assert out != null;
@@ -75,6 +76,7 @@
   }
 
   /** Called when we are done adding positions & payloads */
+  @Override
   void finish() {       
     lastPosition = 0;
     lastPayloadLength = -1;

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/FormatPostingsTermsWriter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/FormatPostingsTermsWriter.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/FormatPostingsTermsWriter.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/FormatPostingsTermsWriter.java Wed Oct 28 16:16:46 2009
@@ -45,6 +45,7 @@
   long proxStart;
 
   /** Adds a new term in this field */
+  @Override
   FormatPostingsDocsConsumer addTerm(char[] text, int start) {
     currentTerm = text;
     currentTermStart = start;
@@ -62,6 +63,7 @@
   }
 
   /** Called when we are done adding terms to this field */
+  @Override
   void finish() {
   }
 

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/FreqProxTermsWriter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/FreqProxTermsWriter.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/FreqProxTermsWriter.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/FreqProxTermsWriter.java Wed Oct 28 16:16:46 2009
@@ -31,10 +31,12 @@
 @SuppressWarnings("unchecked")
 final class FreqProxTermsWriter extends TermsHashConsumer {
 
+  @Override
   public TermsHashConsumerPerThread addThread(TermsHashPerThread perThread) {
     return new FreqProxTermsWriterPerThread(perThread);
   }
 
+  @Override
   void createPostings(RawPostingList[] postings, int start, int count) {
     final int end = start + count;
     for(int i=start;i<end;i++)
@@ -57,7 +59,9 @@
     }
   }
 
+  @Override
   void closeDocStore(SegmentWriteState state) {}
+  @Override
   void abort() {}
 
 
@@ -66,6 +70,7 @@
   // under the same FieldInfo together, up into TermsHash*.
   // Other writers would presumably share alot of this...
 
+  @Override
   public void flush(Map<TermsHashConsumerPerThread,Collection<TermsHashConsumerPerField>> threadsAndFields, final SegmentWriteState state) throws IOException {
 
     // Gather all FieldData's that have postings, across all
@@ -288,6 +293,7 @@
     int lastPosition;                               // Last position where this term occurred
   }
 
+  @Override
   int bytesPerPosting() {
     return RawPostingList.BYTES_SIZE + 4 * DocumentsWriter.INT_NUM_BYTE;
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java Wed Oct 28 16:16:46 2009
@@ -43,6 +43,7 @@
     omitTermFreqAndPositions = fieldInfo.omitTermFreqAndPositions;
   }
 
+  @Override
   int getStreamCount() {
     if (fieldInfo.omitTermFreqAndPositions)
       return 1;
@@ -50,10 +51,12 @@
       return 2;
   }
 
+  @Override
   void finish() {}
 
   boolean hasPayloads;
 
+  @Override
   void skippingLongTerm() throws IOException {}
 
   public int compareTo(FreqProxTermsWriterPerField other) {
@@ -67,6 +70,7 @@
     payloadAttribute = null;
   }
 
+  @Override
   boolean start(Fieldable[] fields, int count) {
     for(int i=0;i<count;i++)
       if (fields[i].isIndexed())
@@ -74,6 +78,7 @@
     return false;
   }     
   
+  @Override
   void start(Fieldable f) {
     if (fieldState.attributeSource.hasAttribute(PayloadAttribute.class)) {
       payloadAttribute = fieldState.attributeSource.getAttribute(PayloadAttribute.class);
@@ -100,6 +105,7 @@
     p.lastPosition = fieldState.position;
   }
 
+  @Override
   final void newTerm(RawPostingList p0) {
     // First time we're seeing this term since the last
     // flush
@@ -115,6 +121,7 @@
     }
   }
 
+  @Override
   final void addTerm(RawPostingList p0) {
 
     assert docState.testPoint("FreqProxTermsWriterPerField.addTerm start");

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/FreqProxTermsWriterPerThread.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/FreqProxTermsWriterPerThread.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/FreqProxTermsWriterPerThread.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/FreqProxTermsWriterPerThread.java Wed Oct 28 16:16:46 2009
@@ -26,16 +26,20 @@
     termsHashPerThread = perThread;
   }
   
+  @Override
   public TermsHashConsumerPerField addField(TermsHashPerField termsHashPerField, FieldInfo fieldInfo) {
     return new FreqProxTermsWriterPerField(termsHashPerField, this, fieldInfo);
   }
 
+  @Override
   void startDocument() {
   }
 
+  @Override
   DocumentsWriter.DocWriter finishDocument() {
     return null;
   }
 
+  @Override
   public void abort() {}
 }

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/IndexCommit.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/IndexCommit.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/IndexCommit.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/IndexCommit.java Wed Oct 28 16:16:46 2009
@@ -89,6 +89,7 @@
   /**
    * Two IndexCommits are equal if both their Directory and versions are equal.
    */
+  @Override
   public boolean equals(Object other) {
     if (other instanceof IndexCommit) {
       IndexCommit otherCommit = (IndexCommit) other;
@@ -97,6 +98,7 @@
       return false;
   }
 
+  @Override
   public int hashCode() {
     return getDirectory().hashCode() + getSegmentsFileName().hashCode();
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/IndexFileDeleter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/IndexFileDeleter.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/IndexFileDeleter.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/IndexFileDeleter.java Wed Oct 28 16:16:46 2009
@@ -585,30 +585,37 @@
       assert !segmentInfos.hasExternalSegments(directory);
     }
 
+    @Override
     public boolean isOptimized() {
       return isOptimized;
     }
 
+    @Override
     public String getSegmentsFileName() {
       return segmentsFileName;
     }
 
+    @Override
     public Collection<String> getFileNames() throws IOException {
       return files;
     }
 
+    @Override
     public Directory getDirectory() {
       return directory;
     }
 
+    @Override
     public long getVersion() {
       return version;
     }
 
+    @Override
     public long getGeneration() {
       return generation;
     }
 
+    @Override
     public Map<String,String> getUserData() {
       return userData;
     }
@@ -617,6 +624,7 @@
      * Called only be the deletion policy, to remove this
      * commit point from the index.
      */
+    @Override
     public void delete() {
       if (!deleted) {
         deleted = true;
@@ -624,6 +632,7 @@
       }
     }
 
+    @Override
     public boolean isDeleted() {
       return deleted;
     }

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/IndexReader.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/IndexReader.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/IndexReader.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/IndexReader.java Wed Oct 28 16:16:46 2009
@@ -88,6 +88,7 @@
     private FieldOption(String option) {
       this.option = option;
     }
+    @Override
     public String toString() {
       return this.option;
     }
@@ -395,6 +396,7 @@
    * @throws CorruptIndexException if the index is corrupt
    * @throws IOException if there is a low-level IO error
    */
+  @Override
   public synchronized Object clone() {
     throw new UnsupportedOperationException("This reader does not implement clone()");
   }
@@ -430,6 +432,7 @@
    */
   public static long lastModified(final Directory directory2) throws CorruptIndexException, IOException {
     return ((Long) new SegmentInfos.FindSegmentsFile(directory2) {
+        @Override
         public Object doBody(String segmentFileName) throws IOException {
           return Long.valueOf(directory2.fileModified(segmentFileName));
         }

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

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/LogByteSizeMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/LogByteSizeMergePolicy.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/LogByteSizeMergePolicy.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/LogByteSizeMergePolicy.java Wed Oct 28 16:16:46 2009
@@ -35,6 +35,7 @@
     minMergeSize = (long) (DEFAULT_MIN_MERGE_MB*1024*1024);
     maxMergeSize = (long) (DEFAULT_MAX_MERGE_MB*1024*1024);
   }
+  @Override
   protected long size(SegmentInfo info) throws IOException {
     return sizeBytes(info);
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/LogDocMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/LogDocMergePolicy.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/LogDocMergePolicy.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/LogDocMergePolicy.java Wed Oct 28 16:16:46 2009
@@ -36,6 +36,7 @@
     // it to Long.MAX_VALUE to disable it
     maxMergeSize = Long.MAX_VALUE;
   }
+  @Override
   protected long size(SegmentInfo info) throws IOException {
     return sizeDocs(info);
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/LogMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/LogMergePolicy.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/LogMergePolicy.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/LogMergePolicy.java Wed Oct 28 16:16:46 2009
@@ -102,6 +102,7 @@
   }
 
   // Javadoc inherited
+  @Override
   public boolean useCompoundFile(SegmentInfos infos, SegmentInfo info) {
     return useCompoundFile;
   }
@@ -120,6 +121,7 @@
   }
 
   // Javadoc inherited
+  @Override
   public boolean useCompoundDocStore(SegmentInfos infos) {
     return useCompoundDocStore;
   }
@@ -151,6 +153,7 @@
     return calibrateSizeByDeletes;
   }
 
+  @Override
   public void close() {}
 
   abstract protected long size(SegmentInfo info) throws IOException;
@@ -211,6 +214,7 @@
    *  setting is true.  This method returns multiple merges
    *  (mergeFactor at a time) so the {@link MergeScheduler}
    *  in use may make use of concurrency. */
+  @Override
   public MergeSpecification findMergesForOptimize(SegmentInfos infos,
       int maxNumSegments, Set<SegmentInfo> segmentsToOptimize) throws IOException {
     MergeSpecification spec;
@@ -295,6 +299,7 @@
    * index.  We simply merge adjacent segments that have
    * deletes, up to mergeFactor at a time.
    */ 
+  @Override
   public MergeSpecification findMergesToExpungeDeletes(SegmentInfos segmentInfos)
       throws CorruptIndexException, IOException {
     final int numSegments = segmentInfos.size();
@@ -347,6 +352,7 @@
    *  multiple levels have too many segments, this method
    *  will return multiple merges, allowing the {@link
    *  MergeScheduler} to use concurrency. */
+  @Override
   public MergeSpecification findMerges(SegmentInfos infos) throws IOException {
 
     final int numSegments = infos.size();

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/MultiLevelSkipListReader.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/MultiLevelSkipListReader.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/MultiLevelSkipListReader.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/MultiLevelSkipListReader.java Wed Oct 28 16:16:46 2009
@@ -244,27 +244,33 @@
       input.readBytes(data, 0, length);
     }
     
+    @Override
     public void close() throws IOException {
       data = null;
     }
 
+    @Override
     public long getFilePointer() {
       return pointer + pos;
     }
 
+    @Override
     public long length() {
       return data.length;
     }
 
+    @Override
     public byte readByte() throws IOException {
       return data[pos++];
     }
 
+    @Override
     public void readBytes(byte[] b, int offset, int len) throws IOException {
       System.arraycopy(data, pos, b, offset, len);
       pos += len;
     }
 
+    @Override
     public void seek(long pos) throws IOException {
       this.pos =  (int) (pos - pointer);
     }

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/MultiReader.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/MultiReader.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/MultiReader.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/MultiReader.java Wed Oct 28 16:16:46 2009
@@ -106,6 +106,7 @@
    * @throws CorruptIndexException if the index is corrupt
    * @throws IOException if there is a low-level IO error 
    */
+  @Override
   public synchronized IndexReader reopen() throws CorruptIndexException, IOException {
     return doReopen(false);
   }
@@ -119,6 +120,7 @@
    * readers is increased to ensure that the subreaders remain open
    * until the last referring reader is closed.
    */
+  @Override
   public synchronized Object clone() {
     try {
       return doReopen(true);
@@ -185,12 +187,14 @@
     }
   }
 
+  @Override
   public TermFreqVector[] getTermFreqVectors(int n) throws IOException {
     ensureOpen();
     int i = readerIndex(n);        // find segment num
     return subReaders[i].getTermFreqVectors(n - starts[i]); // dispatch to segment
   }
 
+  @Override
   public TermFreqVector getTermFreqVector(int n, String field)
       throws IOException {
     ensureOpen();
@@ -199,22 +203,26 @@
   }
 
 
+  @Override
   public void getTermFreqVector(int docNumber, String field, TermVectorMapper mapper) throws IOException {
     ensureOpen();
     int i = readerIndex(docNumber);        // find segment num
     subReaders[i].getTermFreqVector(docNumber - starts[i], field, mapper);
   }
 
+  @Override
   public void getTermFreqVector(int docNumber, TermVectorMapper mapper) throws IOException {
     ensureOpen();
     int i = readerIndex(docNumber);        // find segment num
     subReaders[i].getTermFreqVector(docNumber - starts[i], mapper);
   }
 
+  @Override
   public boolean isOptimized() {
     return false;
   }
   
+  @Override
   public synchronized int numDocs() {
     // Don't call ensureOpen() here (it could affect performance)
     if (numDocs == -1) {        // check cache
@@ -226,29 +234,34 @@
     return numDocs;
   }
 
+  @Override
   public int maxDoc() {
     // Don't call ensureOpen() here (it could affect performance)
     return maxDoc;
   }
 
   // inherit javadoc
+  @Override
   public Document document(int n, FieldSelector fieldSelector) throws CorruptIndexException, IOException {
     ensureOpen();
     int i = readerIndex(n);                          // find segment num
     return subReaders[i].document(n - starts[i], fieldSelector);    // dispatch to segment reader
   }
 
+  @Override
   public boolean isDeleted(int n) {
     // Don't call ensureOpen() here (it could affect performance)
     int i = readerIndex(n);                           // find segment num
     return subReaders[i].isDeleted(n - starts[i]);    // dispatch to segment reader
   }
 
+  @Override
   public boolean hasDeletions() {
     // Don't call ensureOpen() here (it could affect performance)
     return hasDeletions;
   }
 
+  @Override
   protected void doDelete(int n) throws CorruptIndexException, IOException {
     numDocs = -1;                             // invalidate cache
     int i = readerIndex(n);                   // find segment num
@@ -256,6 +269,7 @@
     hasDeletions = true;
   }
 
+  @Override
   protected void doUndeleteAll() throws CorruptIndexException, IOException {
     for (int i = 0; i < subReaders.length; i++)
       subReaders[i].undeleteAll();
@@ -268,6 +282,7 @@
     return DirectoryReader.readerIndex(n, this.starts, this.subReaders.length);
   }
   
+  @Override
   public boolean hasNorms(String field) throws IOException {
     ensureOpen();
     for (int i = 0; i < subReaders.length; i++) {
@@ -282,6 +297,7 @@
     return ones;
   }
   
+  @Override
   public synchronized byte[] norms(String field) throws IOException {
     ensureOpen();
     byte[] bytes = normsCache.get(field);
@@ -297,6 +313,7 @@
     return bytes;
   }
 
+  @Override
   public synchronized void norms(String field, byte[] result, int offset)
     throws IOException {
     ensureOpen();
@@ -315,6 +332,7 @@
     }
   }
 
+  @Override
   protected void doSetNorm(int n, String field, byte value)
     throws CorruptIndexException, IOException {
     synchronized (normsCache) {
@@ -324,16 +342,19 @@
     subReaders[i].setNorm(n-starts[i], field, value); // dispatch
   }
 
+  @Override
   public TermEnum terms() throws IOException {
     ensureOpen();
     return new MultiTermEnum(this, subReaders, starts, null);
   }
 
+  @Override
   public TermEnum terms(Term term) throws IOException {
     ensureOpen();
     return new MultiTermEnum(this, subReaders, starts, term);
   }
 
+  @Override
   public int docFreq(Term t) throws IOException {
     ensureOpen();
     int total = 0;          // sum freqs in segments
@@ -342,21 +363,25 @@
     return total;
   }
 
+  @Override
   public TermDocs termDocs() throws IOException {
     ensureOpen();
     return new MultiTermDocs(this, subReaders, starts);
   }
 
+  @Override
   public TermPositions termPositions() throws IOException {
     ensureOpen();
     return new MultiTermPositions(this, subReaders, starts);
   }
 
+  @Override
   protected void doCommit(Map<String,String> commitUserData) throws IOException {
     for (int i = 0; i < subReaders.length; i++)
       subReaders[i].commit(commitUserData);
   }
 
+  @Override
   protected synchronized void doClose() throws IOException {
     for (int i = 0; i < subReaders.length; i++) {
       if (decrefOnClose[i]) {
@@ -367,6 +392,7 @@
     }
   }
   
+  @Override
   public Collection<String> getFieldNames (IndexReader.FieldOption fieldNames) {
     ensureOpen();
     return DirectoryReader.getFieldNames(fieldNames, this.subReaders);
@@ -375,6 +401,7 @@
   /**
    * Checks recursively if all subreaders are up to date. 
    */
+  @Override
   public boolean isCurrent() throws CorruptIndexException, IOException {
     for (int i = 0; i < subReaders.length; i++) {
       if (!subReaders[i].isCurrent()) {
@@ -389,10 +416,12 @@
   /** Not implemented.
    * @throws UnsupportedOperationException
    */
+  @Override
   public long getVersion() {
     throw new UnsupportedOperationException("MultiReader does not support this method.");
   }
   
+  @Override
   public IndexReader[] getSequentialSubReaders() {
     return subReaders;
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/MultipleTermPositions.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/MultipleTermPositions.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/MultipleTermPositions.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/MultipleTermPositions.java Wed Oct 28 16:16:46 2009
@@ -46,6 +46,7 @@
       return top();
     }
 
+    @Override
     public final boolean lessThan(TermPositions a, TermPositions b) {
       return a.doc() < b.doc();
     }

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/NormsWriter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/NormsWriter.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/NormsWriter.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/NormsWriter.java Wed Oct 28 16:16:46 2009
@@ -41,21 +41,25 @@
 
   private static final byte defaultNorm = Similarity.encodeNorm(1.0f);
   private FieldInfos fieldInfos;
+  @Override
   public InvertedDocEndConsumerPerThread addThread(DocInverterPerThread docInverterPerThread) {
     return new NormsWriterPerThread(docInverterPerThread, this);
   }
 
+  @Override
   public void abort() {}
 
   // We only write the _X.nrm file at flush
   void files(Collection<String> files) {}
 
+  @Override
   void setFieldInfos(FieldInfos fieldInfos) {
     this.fieldInfos = fieldInfos;
   }
 
   /** Produce _X.nrm if any document had a field with norms
    *  not disabled */
+  @Override
   public void flush(Map<InvertedDocEndConsumerPerThread,Collection<InvertedDocEndConsumerPerField>> threadsAndFields, SegmentWriteState state) throws IOException {
 
     final Map byField = new HashMap();
@@ -173,5 +177,6 @@
     }
   }
 
+  @Override
   void closeDocStore(SegmentWriteState state) {}
 }

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/NormsWriterPerField.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/NormsWriterPerField.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/NormsWriterPerField.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/NormsWriterPerField.java Wed Oct 28 16:16:46 2009
@@ -52,6 +52,7 @@
     fieldState = docInverterPerField.fieldState;
   }
 
+  @Override
   void abort() {
     upto = 0;
   }
@@ -60,6 +61,7 @@
     return fieldInfo.name.compareTo(other.fieldInfo.name);
   }
   
+  @Override
   void finish() {
     assert docIDs.length == norms.length;
     if (fieldInfo.isIndexed && !fieldInfo.omitNorms) {

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/NormsWriterPerThread.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/NormsWriterPerThread.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/NormsWriterPerThread.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/NormsWriterPerThread.java Wed Oct 28 16:16:46 2009
@@ -26,13 +26,17 @@
     docState = docInverterPerThread.docState;
   }
 
+  @Override
   InvertedDocEndConsumerPerField addField(DocInverterPerField docInverterPerField, final FieldInfo fieldInfo) {
     return new NormsWriterPerField(docInverterPerField, this, fieldInfo);
   }
 
+  @Override
   void abort() {}
 
+  @Override
   void startDocument() {}
+  @Override
   void finishDocument() {}
 
   boolean freeRAM() {

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/ParallelReader.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/ParallelReader.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/ParallelReader.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/ParallelReader.java Wed Oct 28 16:16:46 2009
@@ -121,6 +121,7 @@
     decrefOnClose.add(Boolean.valueOf(incRefReaders));
   }
   
+  @Override
   public synchronized Object clone() {
     try {
       return doReopen(true);
@@ -148,6 +149,7 @@
    * @throws CorruptIndexException if the index is corrupt
    * @throws IOException if there is a low-level IO error 
    */
+  @Override
   public synchronized IndexReader reopen() throws CorruptIndexException, IOException {
     return doReopen(false);
   }
@@ -217,22 +219,26 @@
   }
 
 
+  @Override
   public int numDocs() {
     // Don't call ensureOpen() here (it could affect performance)
     return numDocs;
   }
 
+  @Override
   public int maxDoc() {
     // Don't call ensureOpen() here (it could affect performance)
     return maxDoc;
   }
 
+  @Override
   public boolean hasDeletions() {
     // Don't call ensureOpen() here (it could affect performance)
     return hasDeletions;
   }
 
   // check first reader
+  @Override
   public boolean isDeleted(int n) {
     // Don't call ensureOpen() here (it could affect performance)
     if (readers.size() > 0)
@@ -241,6 +247,7 @@
   }
 
   // delete in all readers
+  @Override
   protected void doDelete(int n) throws CorruptIndexException, IOException {
     for (final IndexReader reader : readers) {
       reader.deleteDocument(n);
@@ -249,6 +256,7 @@
   }
 
   // undeleteAll in all readers
+  @Override
   protected void doUndeleteAll() throws CorruptIndexException, IOException {
     for (final IndexReader reader : readers) {
       reader.undeleteAll();
@@ -257,6 +265,7 @@
   }
 
   // append fields from storedFieldReaders
+  @Override
   public Document document(int n, FieldSelector fieldSelector) throws CorruptIndexException, IOException {
     ensureOpen();
     Document result = new Document();
@@ -282,6 +291,7 @@
   }
 
   // get all vectors
+  @Override
   public TermFreqVector[] getTermFreqVectors(int n) throws IOException {
     ensureOpen();
     ArrayList<TermFreqVector> results = new ArrayList<TermFreqVector>();
@@ -296,6 +306,7 @@
     return results.toArray(new TermFreqVector[results.size()]);
   }
 
+  @Override
   public TermFreqVector getTermFreqVector(int n, String field)
     throws IOException {
     ensureOpen();
@@ -304,6 +315,7 @@
   }
 
 
+  @Override
   public void getTermFreqVector(int docNumber, String field, TermVectorMapper mapper) throws IOException {
     ensureOpen();
     IndexReader reader = fieldToReader.get(field);
@@ -312,6 +324,7 @@
     }
   }
 
+  @Override
   public void getTermFreqVector(int docNumber, TermVectorMapper mapper) throws IOException {
     ensureOpen();
 
@@ -324,18 +337,21 @@
 
   }
 
+  @Override
   public boolean hasNorms(String field) throws IOException {
     ensureOpen();
     IndexReader reader = fieldToReader.get(field);
     return reader==null ? false : reader.hasNorms(field);
   }
 
+  @Override
   public byte[] norms(String field) throws IOException {
     ensureOpen();
     IndexReader reader = fieldToReader.get(field);
     return reader==null ? null : reader.norms(field);
   }
 
+  @Override
   public void norms(String field, byte[] result, int offset)
     throws IOException {
     ensureOpen();
@@ -344,6 +360,7 @@
       reader.norms(field, result, offset);
   }
 
+  @Override
   protected void doSetNorm(int n, String field, byte value)
     throws CorruptIndexException, IOException {
     IndexReader reader = fieldToReader.get(field);
@@ -351,37 +368,44 @@
       reader.doSetNorm(n, field, value);
   }
 
+  @Override
   public TermEnum terms() throws IOException {
     ensureOpen();
     return new ParallelTermEnum();
   }
 
+  @Override
   public TermEnum terms(Term term) throws IOException {
     ensureOpen();
     return new ParallelTermEnum(term);
   }
 
+  @Override
   public int docFreq(Term term) throws IOException {
     ensureOpen();
     IndexReader reader = fieldToReader.get(term.field());
     return reader==null ? 0 : reader.docFreq(term);
   }
 
+  @Override
   public TermDocs termDocs(Term term) throws IOException {
     ensureOpen();
     return new ParallelTermDocs(term);
   }
 
+  @Override
   public TermDocs termDocs() throws IOException {
     ensureOpen();
     return new ParallelTermDocs();
   }
 
+  @Override
   public TermPositions termPositions(Term term) throws IOException {
     ensureOpen();
     return new ParallelTermPositions(term);
   }
 
+  @Override
   public TermPositions termPositions() throws IOException {
     ensureOpen();
     return new ParallelTermPositions();
@@ -390,6 +414,7 @@
   /**
    * Checks recursively if all subreaders are up to date. 
    */
+  @Override
   public boolean isCurrent() throws CorruptIndexException, IOException {
     for (final IndexReader reader : readers) {
       if (!reader.isCurrent()) {
@@ -404,6 +429,7 @@
   /**
    * Checks recursively if all subindexes are optimized 
    */
+  @Override
   public boolean isOptimized() {
     for (final IndexReader reader : readers) {
       if (!reader.isOptimized()) {
@@ -419,6 +445,7 @@
   /** Not implemented.
    * @throws UnsupportedOperationException
    */
+  @Override
   public long getVersion() {
     throw new UnsupportedOperationException("ParallelReader does not support this method.");
   }
@@ -428,11 +455,13 @@
     return readers.toArray(new IndexReader[readers.size()]);
   }
 
+  @Override
   protected void doCommit(Map<String,String> commitUserData) throws IOException {
     for (final IndexReader reader : readers)
       reader.commit(commitUserData);
   }
 
+  @Override
   protected synchronized void doClose() throws IOException {
     for (int i = 0; i < readers.size(); i++) {
       if (decrefOnClose.get(i).booleanValue()) {
@@ -443,6 +472,7 @@
     }
   }
 
+  @Override
   public Collection<String> getFieldNames (IndexReader.FieldOption fieldNames) {
     ensureOpen();
     Set<String> fieldSet = new HashSet<String>();
@@ -476,6 +506,7 @@
         termEnum = reader.terms(term);
     }
 
+    @Override
     public boolean next() throws IOException {
       if (termEnum==null)
         return false;
@@ -504,6 +535,7 @@
       return false;                               // no more fields
     }
 
+    @Override
     public Term term() {
       if (termEnum==null)
         return null;
@@ -511,6 +543,7 @@
       return termEnum.term();
     }
 
+    @Override
     public int docFreq() {
       if (termEnum==null)
         return 0;
@@ -518,6 +551,7 @@
       return termEnum.docFreq();
     }
 
+    @Override
     public void close() throws IOException {
       if (termEnum!=null)
         termEnum.close();
@@ -583,6 +617,7 @@
     public ParallelTermPositions() {}
     public ParallelTermPositions(Term term) throws IOException { seek(term); }
 
+    @Override
     public void seek(Term term) throws IOException {
       IndexReader reader = fieldToReader.get(term.field());
       termDocs = reader!=null ? reader.termPositions(term) : null;

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/Payload.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/Payload.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/Payload.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/Payload.java Wed Oct 28 16:16:46 2009
@@ -156,6 +156,7 @@
    * Clones this payload by creating a copy of the underlying
    * byte array.
    */
+  @Override
   public Object clone() {
     try {
       // Start with a shallow copy of data
@@ -176,6 +177,7 @@
     }
   }
 
+  @Override
   public boolean equals(Object obj) {
     if (obj == this)
       return true;
@@ -192,6 +194,7 @@
       return false;
   }
 
+  @Override
   public int hashCode() {
     return ArrayUtil.hashCode(data, offset, offset+length);
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/PositionBasedTermVectorMapper.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/PositionBasedTermVectorMapper.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/PositionBasedTermVectorMapper.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/PositionBasedTermVectorMapper.java Wed Oct 28 16:16:46 2009
@@ -56,6 +56,7 @@
    * Never ignores positions.  This mapper doesn't make much sense unless there are positions
    * @return false
    */
+  @Override
   public boolean isIgnoringPositions() {
     return false;
   }
@@ -67,6 +68,7 @@
    * @param offsets
    * @param positions
    */
+  @Override
   public void map(String term, int frequency, TermVectorOffsetInfo[] offsets, int[] positions) {
     for (int i = 0; i < positions.length; i++) {
       Integer posVal = Integer.valueOf(positions[i]);
@@ -86,6 +88,7 @@
    * @param storeOffsets Whether offsets are available
    * @param storePositions Whether positions are available
    */
+  @Override
   public void setExpectations(String field, int numTerms, boolean storeOffsets, boolean storePositions) {
     if (storePositions == false)
     {

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/ReadOnlyDirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/ReadOnlyDirectoryReader.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/ReadOnlyDirectoryReader.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/ReadOnlyDirectoryReader.java Wed Oct 28 16:16:46 2009
@@ -36,6 +36,7 @@
     super(writer, infos, termInfosIndexDivisor);
   }
   
+  @Override
   protected void acquireWriteLock() {
     ReadOnlySegmentReader.noWrite();
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/ReadOnlySegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/ReadOnlySegmentReader.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/ReadOnlySegmentReader.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/ReadOnlySegmentReader.java Wed Oct 28 16:16:46 2009
@@ -23,11 +23,13 @@
     throw new UnsupportedOperationException("This IndexReader cannot make any changes to the index (it was opened with readOnly = true)");
   }
   
+  @Override
   protected void acquireWriteLock() {
     noWrite();
   }
 
   // Not synchronized
+  @Override
   public boolean isDeleted(int n) {
     return deletedDocs != null && deletedDocs.get(n);
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/ReusableStringReader.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/ReusableStringReader.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/ReusableStringReader.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/ReusableStringReader.java Wed Oct 28 16:16:46 2009
@@ -31,9 +31,11 @@
     left = s.length();
     this.upto = 0;
   }
+  @Override
   public int read(char[] c) {
     return read(c, 0, c.length);
   }
+  @Override
   public int read(char[] c, int off, int len) {
     if (left > len) {
       s.getChars(upto, upto+len, c, off);
@@ -50,6 +52,7 @@
       return r;
     }
   }
+  @Override
   public void close() {};
 }
 

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/SegmentInfo.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/SegmentInfo.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/SegmentInfo.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/SegmentInfo.java Wed Oct 28 16:16:46 2009
@@ -91,6 +91,7 @@
 
   private Map<String,String> diagnostics;
 
+  @Override
   public String toString() {
     return "si: "+dir.toString()+" "+name+" docCount: "+docCount+" delCount: "+delCount+" delFileName: "+getDelFileName();
   }
@@ -314,6 +315,7 @@
     clearFiles();
   }
 
+  @Override
   public Object clone () {
     SegmentInfo si = new SegmentInfo(name, docCount, dir);
     si.isCompoundFile = isCompoundFile;
@@ -710,6 +712,7 @@
 
   /** We consider another SegmentInfo instance equal if it
    *  has the same dir and same name. */
+  @Override
   public boolean equals(Object obj) {
     SegmentInfo other;
     try {
@@ -720,6 +723,7 @@
     return other.dir == dir && other.name.equals(name);
   }
 
+  @Override
   public int hashCode() {
     return dir.hashCode() + name.hashCode();
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/SegmentInfos.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/SegmentInfos.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/SegmentInfos.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/SegmentInfos.java Wed Oct 28 16:16:46 2009
@@ -305,6 +305,7 @@
 
     new FindSegmentsFile(directory) {
 
+      @Override
       protected Object doBody(String segmentFileName) throws CorruptIndexException, IOException {
         read(directory, segmentFileName);
         return null;
@@ -369,6 +370,7 @@
    * SegmentInfo.
    */
   
+  @Override
   public Object clone() {
     SegmentInfos sis = (SegmentInfos) super.clone();
     for(int i=0;i<sis.size();i++) {
@@ -400,6 +402,7 @@
     throws CorruptIndexException, IOException {
 
     return ((Long) new FindSegmentsFile(directory) {
+        @Override
         protected Object doBody(String segmentFileName) throws CorruptIndexException, IOException {
 
           IndexInput input = directory.openInput(segmentFileName);

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/SegmentMergeQueue.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/SegmentMergeQueue.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/SegmentMergeQueue.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/SegmentMergeQueue.java Wed Oct 28 16:16:46 2009
@@ -25,6 +25,7 @@
     initialize(size);
   }
 
+  @Override
   protected final boolean lessThan(SegmentMergeInfo stiA, SegmentMergeInfo stiB) {
     int comparison = stiA.term.compareTo(stiB.term);
     if (comparison == 0)

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/SegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/SegmentMerger.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/SegmentMerger.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/SegmentMerger.java Wed Oct 28 16:16:46 2009
@@ -76,6 +76,7 @@
     directory = dir;
     segment = name;
     checkAbort = new CheckAbort(null, null) {
+      @Override
       public void work(double units) throws MergeAbortedException {
         // do nothing
       }
@@ -89,6 +90,7 @@
       checkAbort = new CheckAbort(merge, directory);
     } else {
       checkAbort = new CheckAbort(null, null) {
+        @Override
         public void work(double units) throws MergeAbortedException {
           // do nothing
         }

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/SegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/SegmentReader.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/SegmentReader.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/SegmentReader.java Wed Oct 28 16:16:46 2009
@@ -293,6 +293,7 @@
    * Sets the initial value 
    */
   private class FieldsReaderLocal extends CloseableThreadLocal<FieldsReader> {
+    @Override
     protected FieldsReader initialValue() {
       return (FieldsReader) core.getFieldsReaderOrig().clone();
     }
@@ -301,6 +302,7 @@
   static class Ref {
     private int refCount = 1;
     
+    @Override
     public String toString() {
       return "refcount: "+refCount;
     }
@@ -491,6 +493,7 @@
     
     // Returns a copy of this Norm instance that shares
     // IndexInput & bytes with the original one
+    @Override
     public synchronized Object clone() {
       assert refCount > 0 && (origNorm == null || origNorm.refCount > 0);
         
@@ -633,6 +636,7 @@
     return (BitVector)bv.clone();
   }
 
+  @Override
   public final synchronized Object clone() {
     try {
       return clone(readOnly); // Preserve current readOnly
@@ -641,6 +645,7 @@
     }
   }
 
+  @Override
   public final synchronized IndexReader clone(boolean openReadOnly) throws CorruptIndexException, IOException {
     return reopenSegment(si, true, openReadOnly);
   }
@@ -737,6 +742,7 @@
     return clone;
   }
 
+  @Override
   protected void doCommit(Map<String,String> commitUserData) throws IOException {
     if (hasChanges) {
       if (deletedDocsDirty) {               // re-write deleted
@@ -772,6 +778,7 @@
     return fieldsReaderLocal.get();
   }
 
+  @Override
   protected void doClose() throws IOException {
     termVectorsLocal.close();
     fieldsReaderLocal.close();
@@ -795,6 +802,7 @@
     return si.hasDeletions();
   }
 
+  @Override
   public boolean hasDeletions() {
     // Don't call ensureOpen() here (it could affect performance)
     return deletedDocs != null;
@@ -808,6 +816,7 @@
     return si.hasSeparateNorms();
   }
 
+  @Override
   protected void doDelete(int docNum) {
     if (deletedDocs == null) {
       deletedDocs = new BitVector(maxDoc());
@@ -827,6 +836,7 @@
       pendingDeleteCount++;
   }
 
+  @Override
   protected void doUndeleteAll() {
     deletedDocsDirty = false;
     if (deletedDocs != null) {
@@ -847,11 +857,13 @@
     return new ArrayList<String>(si.files());
   }
 
+  @Override
   public TermEnum terms() {
     ensureOpen();
     return core.getTermsReader().terms();
   }
 
+  @Override
   public TermEnum terms(Term t) throws IOException {
     ensureOpen();
     return core.getTermsReader().terms(t);
@@ -861,15 +873,18 @@
     return core.fieldInfos;
   }
 
+  @Override
   public Document document(int n, FieldSelector fieldSelector) throws CorruptIndexException, IOException {
     ensureOpen();
     return getFieldsReader().doc(n, fieldSelector);
   }
 
+  @Override
   public synchronized boolean isDeleted(int n) {
     return (deletedDocs != null && deletedDocs.get(n));
   }
 
+  @Override
   public TermDocs termDocs(Term term) throws IOException {
     if (term == null) {
       return new AllTermDocs(this);
@@ -878,16 +893,19 @@
     }
   }
 
+  @Override
   public TermDocs termDocs() throws IOException {
     ensureOpen();
     return new SegmentTermDocs(this);
   }
 
+  @Override
   public TermPositions termPositions() throws IOException {
     ensureOpen();
     return new SegmentTermPositions(this);
   }
 
+  @Override
   public int docFreq(Term t) throws IOException {
     ensureOpen();
     TermInfo ti = core.getTermsReader().get(t);
@@ -897,6 +915,7 @@
       return 0;
   }
 
+  @Override
   public int numDocs() {
     // Don't call ensureOpen() here (it could affect performance)
     int n = maxDoc();
@@ -905,6 +924,7 @@
     return n;
   }
 
+  @Override
   public int maxDoc() {
     // Don't call ensureOpen() here (it could affect performance)
     return si.docCount;
@@ -913,6 +933,7 @@
   /**
    * @see IndexReader#getFieldNames(IndexReader.FieldOption fldOption)
    */
+  @Override
   public Collection<String> getFieldNames(IndexReader.FieldOption fieldOption) {
     ensureOpen();
 
@@ -961,6 +982,7 @@
   }
 
 
+  @Override
   public synchronized boolean hasNorms(String field) {
     ensureOpen();
     return norms.containsKey(field);
@@ -982,12 +1004,14 @@
   }
 
   // returns fake norms if norms aren't available
+  @Override
   public synchronized byte[] norms(String field) throws IOException {
     ensureOpen();
     byte[] bytes = getNorms(field);
     return bytes;
   }
 
+  @Override
   protected void doSetNorm(int doc, String field, byte value)
           throws IOException {
     Norm norm = norms.get(field);
@@ -999,6 +1023,7 @@
   }
 
   /** Read norms into a pre-allocated array. */
+  @Override
   public synchronized void norms(String field, byte[] bytes, int offset)
     throws IOException {
 
@@ -1121,6 +1146,7 @@
    *  flag set.  If the flag was not set, the method returns null.
    * @throws IOException
    */
+  @Override
   public TermFreqVector getTermFreqVector(int docNumber, String field) throws IOException {
     // Check if this field is invalid or has no stored term vector
     ensureOpen();
@@ -1136,6 +1162,7 @@
   }
 
 
+  @Override
   public void getTermFreqVector(int docNumber, String field, TermVectorMapper mapper) throws IOException {
     ensureOpen();
     FieldInfo fi = core.fieldInfos.fieldInfo(field);
@@ -1152,6 +1179,7 @@
   }
 
 
+  @Override
   public void getTermFreqVector(int docNumber, TermVectorMapper mapper) throws IOException {
     ensureOpen();
 
@@ -1169,6 +1197,7 @@
    *  If no such fields existed, the method returns null.
    * @throws IOException
    */
+  @Override
   public TermFreqVector[] getTermFreqVectors(int docNumber) throws IOException {
     ensureOpen();
     
@@ -1218,6 +1247,7 @@
   }
 
   /** Returns the directory this index resides in. */
+  @Override
   public Directory directory() {
     // Don't ensureOpen here -- in certain cases, when a
     // cloned/reopened reader needs to commit, it may call
@@ -1228,10 +1258,12 @@
   // This is necessary so that cloned SegmentReaders (which
   // share the underlying postings data) will map to the
   // same entry in the FieldCache.  See LUCENE-1579.
+  @Override
   public final Object getFieldCacheKey() {
     return core.freqStream;
   }
 
+  @Override
   public long getUniqueTermCount() {
     return core.getTermsReader().size();
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/SegmentTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/SegmentTermEnum.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/SegmentTermEnum.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/SegmentTermEnum.java Wed Oct 28 16:16:46 2009
@@ -92,6 +92,7 @@
     }
   }
 
+  @Override
   protected Object clone() {
     SegmentTermEnum clone = null;
     try {
@@ -118,6 +119,7 @@
   }
 
   /** Increments the enumeration to the next element.  True if one exists.*/
+  @Override
   public final boolean next() throws IOException {
     if (position++ >= size - 1) {
       prevBuffer.set(termBuffer);
@@ -165,6 +167,7 @@
 
   /** Returns the current Term in the enumeration.
    Initially invalid, valid after next() called for the first time.*/
+  @Override
   public final Term term() {
     return termBuffer.toTerm();
   }
@@ -188,6 +191,7 @@
 
   /** Returns the docFreq from the current TermInfo in the enumeration.
    Initially invalid, valid after next() called for the first time.*/
+  @Override
   public final int docFreq() {
     return termInfo.docFreq;
   }
@@ -205,6 +209,7 @@
   }
 
   /** Closes the enumeration to further activity, freeing resources. */
+  @Override
   public final void close() throws IOException {
     input.close();
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/SegmentTermPositions.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/SegmentTermPositions.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/SegmentTermPositions.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/SegmentTermPositions.java Wed Oct 28 16:16:46 2009
@@ -43,6 +43,7 @@
     this.proxStream = null;  // the proxStream will be cloned lazily when nextPosition() is called for the first time
   }
 
+  @Override
   final void seek(TermInfo ti, Term term) throws IOException {
     super.seek(ti, term);
     if (ti != null)
@@ -54,6 +55,7 @@
     needToLoadPayload = false;
   }
 
+  @Override
   public final void close() throws IOException {
     super.close();
     if (proxStream != null) proxStream.close();
@@ -85,11 +87,13 @@
     return delta;
   }
   
+  @Override
   protected final void skippingDoc() throws IOException {
     // we remember to skip a document lazily
     lazySkipProxCount += freq;
   }
 
+  @Override
   public final boolean next() throws IOException {
     // we remember to skip the remaining positions of the current
     // document lazily
@@ -103,12 +107,14 @@
     return false;
   }
 
+  @Override
   public final int read(final int[] docs, final int[] freqs) {
     throw new UnsupportedOperationException("TermPositions does not support processing multiple documents in one call. Use TermDocs instead.");
   }
 
 
   /** Called by super.skipTo(). */
+  @Override
   protected void skipProx(long proxPointer, int payloadLength) throws IOException {
     // we save the pointer, we might have to skip there lazily
     lazySkipPointer = proxPointer;

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

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/SerialMergeScheduler.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/SerialMergeScheduler.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/SerialMergeScheduler.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/SerialMergeScheduler.java Wed Oct 28 16:16:46 2009
@@ -26,6 +26,7 @@
   /** Just do the merges in sequence. We do this
    * "synchronized" so that even if the application is using
    * multiple threads, only one merge may run at a time. */
+  @Override
   synchronized public void merge(IndexWriter writer)
     throws CorruptIndexException, IOException {
 
@@ -37,5 +38,6 @@
     }
   }
 
+  @Override
   public void close() {}
 }

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/SnapshotDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/SnapshotDeletionPolicy.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/SnapshotDeletionPolicy.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/SnapshotDeletionPolicy.java Wed Oct 28 16:16:46 2009
@@ -92,15 +92,19 @@
     MyCommitPoint(IndexCommit cp) {
       this.cp = cp;
     }
+    @Override
     public String getSegmentsFileName() {
       return cp.getSegmentsFileName();
     }
+    @Override
     public Collection<String> getFileNames() throws IOException {
       return cp.getFileNames();
     }
+    @Override
     public Directory getDirectory() {
       return cp.getDirectory();
     }
+    @Override
     public void delete() {
       synchronized(SnapshotDeletionPolicy.this) {
         // Suppress the delete request if this commit point is
@@ -109,15 +113,19 @@
           cp.delete();
       }
     }
+    @Override
     public boolean isDeleted() {
       return cp.isDeleted();
     }
+    @Override
     public long getVersion() {
       return cp.getVersion();
     }
+    @Override
     public long getGeneration() {
       return cp.getGeneration();
     }
+    @Override
     public Map<String,String> getUserData() throws IOException {
       return cp.getUserData();
     }

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/SortedTermVectorMapper.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/SortedTermVectorMapper.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/SortedTermVectorMapper.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/SortedTermVectorMapper.java Wed Oct 28 16:16:46 2009
@@ -60,6 +60,7 @@
    * @param positions Position information, may be null
    */
   //We need to combine any previous mentions of the term
+  @Override
   public void map(String term, int frequency, TermVectorOffsetInfo[] offsets, int[] positions) {
     TermVectorEntry entry =  termToTVE.get(term);
     if (entry == null) {
@@ -108,6 +109,7 @@
 
   }
 
+  @Override
   public void setExpectations(String field, int numTerms, boolean storeOffsets, boolean storePositions) {
 
     this.storeOffsets = storeOffsets;

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/StoredFieldsWriter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/StoredFieldsWriter.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/StoredFieldsWriter.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/StoredFieldsWriter.java Wed Oct 28 16:16:46 2009
@@ -177,15 +177,18 @@
       numStoredFields = 0;
     }
 
+    @Override
     void abort() {
       reset();
       free(this);
     }
 
+    @Override
     public long sizeInBytes() {
       return fdt.sizeInBytes();
     }
 
+    @Override
     public void finish() throws IOException {
       finishDocument(this);
     }

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/TermBuffer.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/TermBuffer.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/TermBuffer.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/TermBuffer.java Wed Oct 28 16:16:46 2009
@@ -124,6 +124,7 @@
     return term;
   }
 
+  @Override
   protected Object clone() {
     TermBuffer clone = null;
     try {

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorEntry.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorEntry.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorEntry.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorEntry.java Wed Oct 28 16:16:46 2009
@@ -73,6 +73,7 @@
   }
 
 
+  @Override
   public boolean equals(Object o) {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
@@ -84,10 +85,12 @@
     return true;
   }
 
+  @Override
   public int hashCode() {
     return (term != null ? term.hashCode() : 0);
   }
 
+  @Override
   public String toString() {
     return "TermVectorEntry{" +
             "field='" + field + '\'' +

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorOffsetInfo.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorOffsetInfo.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorOffsetInfo.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorOffsetInfo.java Wed Oct 28 16:16:46 2009
@@ -70,6 +70,7 @@
    * @param o The comparison Object
    * @return true if both {@link #getStartOffset()} and {@link #getEndOffset()} are the same for both objects.
    */
+  @Override
   public boolean equals(Object o) {
     if (this == o) return true;
     if (!(o instanceof TermVectorOffsetInfo)) return false;
@@ -82,6 +83,7 @@
     return true;
   }
 
+  @Override
   public int hashCode() {
     int result;
     result = startOffset;

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorsReader.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorsReader.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorsReader.java Wed Oct 28 16:16:46 2009
@@ -520,6 +520,7 @@
     }
   }
 
+  @Override
   protected Object clone() throws CloneNotSupportedException {
     
     final TermVectorsReader clone = (TermVectorsReader) super.clone();
@@ -552,6 +553,7 @@
   private boolean storingPositions;
   private String field;
 
+  @Override
   public void setExpectations(String field, int numTerms, boolean storeOffsets, boolean storePositions) {
     this.field = field;
     terms = new String[numTerms];
@@ -564,6 +566,7 @@
       this.offsets = new TermVectorOffsetInfo[numTerms][];
   }
 
+  @Override
   public void map(String term, int frequency, TermVectorOffsetInfo[] offsets, int[] positions) {
     terms[currentPosition] = term;
     termFreqs[currentPosition] = frequency;

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorsTermsWriter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorsTermsWriter.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorsTermsWriter.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorsTermsWriter.java Wed Oct 28 16:16:46 2009
@@ -41,16 +41,19 @@
     this.docWriter = docWriter;
   }
 
+  @Override
   public TermsHashConsumerPerThread addThread(TermsHashPerThread termsHashPerThread) {
     return new TermVectorsTermsWriterPerThread(termsHashPerThread, this);
   }
 
+  @Override
   void createPostings(RawPostingList[] postings, int start, int count) {
     final int end = start + count;
     for(int i=start;i<end;i++)
       postings[i] = new PostingList();
   }
 
+  @Override
   synchronized void flush(Map<TermsHashConsumerPerThread,Collection<TermsHashConsumerPerField>> threadsAndFields, final SegmentWriteState state) throws IOException {
 
     if (tvx != null) {
@@ -77,6 +80,7 @@
     }
   }
 
+  @Override
   synchronized void closeDocStore(final SegmentWriteState state) throws IOException {
     if (tvx != null) {
       // At least one doc in this run had term vectors
@@ -207,6 +211,7 @@
     return false;
   }
 
+  @Override
   public void abort() {
     if (tvx != null) {
       try {
@@ -252,6 +257,7 @@
       numVectorFields = 0;
     }
 
+    @Override
     void abort() {
       reset();
       free(this);
@@ -267,10 +273,12 @@
       numVectorFields++;
     }
 
+    @Override
     public long sizeInBytes() {
       return tvf.sizeInBytes();
     }
 
+    @Override
     public void finish() throws IOException {
       finishDocument(this);
     }
@@ -282,6 +290,7 @@
     int lastPosition;                               // Last position where this term occurred
   }
 
+  @Override
   int bytesPerPosting() {
     return RawPostingList.BYTES_SIZE + 3 * DocumentsWriter.INT_NUM_BYTE;
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorsTermsWriterPerField.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorsTermsWriterPerField.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorsTermsWriterPerField.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorsTermsWriterPerField.java Wed Oct 28 16:16:46 2009
@@ -49,10 +49,12 @@
     fieldState = termsHashPerField.fieldState;
   }
 
+  @Override
   int getStreamCount() {
     return 2;
   }
 
+  @Override
   boolean start(Fieldable[] fields, int count) {
     doVectors = false;
     doVectorPositions = false;
@@ -97,6 +99,7 @@
    *  are enabled, to write the vectors to
    *  RAMOutputStream, which is then quickly flushed to
    *  * the real term vectors files in the Directory. */
+  @Override
   void finish() throws IOException {
 
     assert docState.testPoint("TermVectorsTermsWriterPerField.finish start");
@@ -194,6 +197,7 @@
     maxNumPostings = 0;
   }
   
+  @Override
   void start(Fieldable f) {
     if (doVectorOffsets) {
       offsetAttribute = fieldState.attributeSource.addAttribute(OffsetAttribute.class);
@@ -202,6 +206,7 @@
     }
   }
 
+  @Override
   void newTerm(RawPostingList p0) {
 
     assert docState.testPoint("TermVectorsTermsWriterPerField.newTerm start");
@@ -225,6 +230,7 @@
     }
   }
 
+  @Override
   void addTerm(RawPostingList p0) {
 
     assert docState.testPoint("TermVectorsTermsWriterPerField.addTerm start");
@@ -247,5 +253,6 @@
     }
   }
 
+  @Override
   void skippingLongTerm() {}
 }

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorsTermsWriterPerThread.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorsTermsWriterPerThread.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorsTermsWriterPerThread.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorsTermsWriterPerThread.java Wed Oct 28 16:16:46 2009
@@ -39,6 +39,7 @@
   final UnicodeUtil.UTF8Result utf8Results[] = {new UnicodeUtil.UTF8Result(),
                                                 new UnicodeUtil.UTF8Result()};
 
+  @Override
   public void startDocument() {
     assert clearLastVectorFieldName();
     if (doc != null) {
@@ -47,6 +48,7 @@
     }
   }
 
+  @Override
   public DocumentsWriter.DocWriter finishDocument() {
     try {
       return doc;
@@ -55,10 +57,12 @@
     }
   }
 
+  @Override
   public TermsHashConsumerPerField addField(TermsHashPerField termsHashPerField, FieldInfo fieldInfo) {
     return new TermVectorsTermsWriterPerField(termsHashPerField, this, fieldInfo);
   }
 
+  @Override
   public void abort() {
     if (doc != null) {
       doc.abort();

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/TermsHash.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/TermsHash.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/TermsHash.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/TermsHash.java Wed Oct 28 16:16:46 2009
@@ -68,6 +68,7 @@
     postingsFreeChunk = (int) (DocumentsWriter.BYTE_BLOCK_SIZE / bytesPerPosting);
   }
 
+  @Override
   InvertedDocConsumerPerThread addThread(DocInverterPerThread docInverterPerThread) {
     return new TermsHashPerThread(docInverterPerThread, this, nextTermsHash, null);
   }
@@ -76,11 +77,13 @@
     return new TermsHashPerThread(docInverterPerThread, this, nextTermsHash, primaryPerThread);
   }
 
+  @Override
   void setFieldInfos(FieldInfos fieldInfos) {
     this.fieldInfos = fieldInfos;
     consumer.setFieldInfos(fieldInfos);
   }
 
+  @Override
   synchronized public void abort() {
     consumer.abort();
     if (nextTermsHash != null)
@@ -99,12 +102,14 @@
     }
   }
 
+  @Override
   synchronized void closeDocStore(SegmentWriteState state) throws IOException {
     consumer.closeDocStore(state);
     if (nextTermsHash != null)
       nextTermsHash.closeDocStore(state);
   }
 
+  @Override
   synchronized void flush(Map<InvertedDocConsumerPerThread,Collection<InvertedDocConsumerPerField>> threadsAndFields, final SegmentWriteState state) throws IOException {
     Map childThreadsAndFields = new HashMap();
     Map nextThreadsAndFields;
@@ -152,6 +157,7 @@
       nextTermsHash.flush(nextThreadsAndFields, state);
   }
 
+  @Override
   synchronized public boolean freeRAM() {
 
     if (!trackAllocations)

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/TermsHashPerField.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/TermsHashPerField.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/TermsHashPerField.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/TermsHashPerField.java Wed Oct 28 16:16:46 2009
@@ -100,6 +100,7 @@
       nextPerField.reset();
   }
 
+  @Override
   synchronized public void abort() {
     reset();
     if (nextPerField != null)
@@ -248,6 +249,7 @@
   private boolean doCall;
   private boolean doNextCall;
 
+  @Override
   void start(Fieldable f) {
     termAtt = fieldState.attributeSource.addAttribute(TermAttribute.class);
     consumer.start(f);
@@ -256,6 +258,7 @@
     }
   }
   
+  @Override
   boolean start(Fieldable[] fields, int count) throws IOException {
     doCall = consumer.start(fields, count);
     if (nextPerField != null)
@@ -339,6 +342,7 @@
   }
 
   // Primary entry point (for first TermsHash)
+  @Override
   void add() throws IOException {
 
     assert !postingsCompacted;
@@ -505,6 +509,7 @@
     writeByte(stream, (byte) i);
   }
 
+  @Override
   void finish() throws IOException {
     consumer.finish();
     if (nextPerField != null)

Modified: lucene/java/trunk/src/java/org/apache/lucene/index/TermsHashPerThread.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/TermsHashPerThread.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/TermsHashPerThread.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/TermsHashPerThread.java Wed Oct 28 16:16:46 2009
@@ -58,10 +58,12 @@
       nextPerThread = null;
   }
 
+  @Override
   InvertedDocConsumerPerField addField(DocInverterPerField docInverterPerField, final FieldInfo fieldInfo) {
     return new TermsHashPerField(docInverterPerField, this, nextPerThread, fieldInfo);
   }
 
+  @Override
   synchronized public void abort() {
     reset(true);
     consumer.abort();
@@ -83,12 +85,14 @@
     return true;
   }
 
+  @Override
   public void startDocument() throws IOException {
     consumer.startDocument();
     if (nextPerThread != null)
       nextPerThread.consumer.startDocument();
   }
 
+  @Override
   public DocumentsWriter.DocWriter finishDocument() throws IOException {
     final DocumentsWriter.DocWriter doc = consumer.finishDocument();
 

Modified: lucene/java/trunk/src/java/org/apache/lucene/messages/MessageImpl.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/messages/MessageImpl.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/messages/MessageImpl.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/messages/MessageImpl.java Wed Oct 28 16:16:46 2009
@@ -57,6 +57,7 @@
     return NLS.getLocalizedMessage(getKey(), locale, getArguments());
   }
 
+  @Override
   public String toString() {
     Object[] args = getArguments();
     String argsString = "";

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/BooleanClause.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/BooleanClause.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/BooleanClause.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/BooleanClause.java Wed Oct 28 16:16:46 2009
@@ -24,7 +24,7 @@
   public static enum Occur {
 
     /** Use this operator for clauses that <i>must</i> appear in the matching documents. */
-    MUST     { public String toString() { return "+"; } },
+    MUST     { @Override public String toString() { return "+"; } },
 
     /** Use this operator for clauses that <i>should</i> appear in the 
      * matching documents. For a BooleanQuery with no <code>MUST</code> 
@@ -32,12 +32,12 @@
      * for the BooleanQuery to match.
      * @see BooleanQuery#setMinimumNumberShouldMatch
      */
-    SHOULD   { public String toString() { return "";  } },
+    SHOULD   { @Override public String toString() { return "";  } },
 
     /** Use this operator for clauses that <i>must not</i> appear in the matching documents.
      * Note that it is not possible to search for queries that only consist
      * of a <code>MUST_NOT</code> clause. */
-    MUST_NOT { public String toString() { return "-"; } };
+    MUST_NOT { @Override public String toString() { return "-"; } };
 
   }
 
@@ -84,6 +84,7 @@
 
 
   /** Returns true if <code>o</code> is equal to this. */
+  @Override
   public boolean equals(Object o) {
     if (o == null || !(o instanceof BooleanClause))
       return false;
@@ -93,11 +94,13 @@
   }
 
   /** Returns a hash code value for this object.*/
+  @Override
   public int hashCode() {
     return query.hashCode() ^ (Occur.MUST == occur?1:0) ^ (Occur.MUST_NOT == occur?2:0);
   }
 
 
+  @Override
   public String toString() {
     return occur.toString() + query.toString();
   }

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/BooleanQuery.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/BooleanQuery.java?rev=830661&r1=830660&r2=830661&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/BooleanQuery.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/BooleanQuery.java Wed Oct 28 16:16:46 2009
@@ -40,6 +40,7 @@
    */
   public static class TooManyClauses extends RuntimeException {
     public TooManyClauses() {}
+    @Override
     public String getMessage() {
       return "maxClauseCount is set to " + maxClauseCount;
     }
@@ -89,10 +90,12 @@
 
   // Implement coord disabling.
   // Inherit javadoc.
+  @Override
   public Similarity getSimilarity(Searcher searcher) {
     Similarity result = super.getSimilarity(searcher);
     if (disableCoord) {                           // disable coord as requested
       result = new SimilarityDelegator(result) {
+          @Override
           public float coord(int overlap, int maxOverlap) {
             return 1.0f;
           }



Mime
View raw message