lucene-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From markrmil...@apache.org
Subject svn commit: r831556 [1/2] - in /lucene/java/branches/flex_1458/src/java/org/apache/lucene: index/ index/codecs/ index/codecs/intblock/ index/codecs/preflex/ index/codecs/pulsing/ index/codecs/sep/ index/codecs/standard/ queryParser/ search/ search/payl...
Date Sat, 31 Oct 2009 15:39:28 GMT
Author: markrmiller
Date: Sat Oct 31 15:39:26 2009
New Revision: 831556

URL: http://svn.apache.org/viewvc?rev=831556&view=rev
Log:
add @overrides

Modified:
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/AllDocsEnum.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/DirectoryReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/IndexReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/LegacyFields.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/LegacyFieldsEnum.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/LegacySegmentMergeQueue.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/LegacyTerms.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/MultiReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/ParallelReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentFieldMergeQueue.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/Term.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/TermRef.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/Codecs.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/MultiLevelSkipListReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/FixedIntBlockIndexInput.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/FixedIntBlockIndexOutput.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/IntBlockCodec.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/SimpleIntBlockFactory.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/SimpleIntBlockIndexInput.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/SimpleIntBlockIndexOutput.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/PreFlexCodec.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/PreFlexFields.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/SegmentTermEnum.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/SegmentTermPositions.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/TermBuffer.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/pulsing/PulsingCodec.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/pulsing/PulsingDocsReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/pulsing/PulsingDocsWriter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepCodec.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepDocsReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepDocsWriter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepPositionsReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepPositionsWriter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepSkipListReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepSkipListWriter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SingleIntFactory.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SingleIntIndexInput.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SingleIntIndexOutput.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/DefaultSkipListReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/DefaultSkipListWriter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/SimpleStandardTermsIndexReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/SimpleStandardTermsIndexWriter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardCodec.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardDocsReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardDocsWriter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardPositionsReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardPositionsWriter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardTermsDictReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardTermsDictWriter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/queryParser/MultiFieldQueryParser.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/DisjunctionSumScorer.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/DocIdSet.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FieldCacheRangeFilter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FieldCacheTermsFilter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FilteredDocIdSet.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FilteredTermsEnum.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FuzzyTermsEnum.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/MultiPhraseQuery.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/NumericRangeQuery.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/PrefixTermsEnum.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/QueryWrapperFilter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/TermRangeQuery.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/TermRangeTermsEnum.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/WildcardQuery.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/WildcardTermsEnum.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/OpenBitSet.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/SimpleStringInterner.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/SortedVIntList.java

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/AllDocsEnum.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/AllDocsEnum.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/AllDocsEnum.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/AllDocsEnum.java Sat Oct 31 15:39:26 2009
@@ -32,14 +32,17 @@
     this.reader = reader;
   }
 
+  @Override
   public int freq() {
     return 1;
   }
 
+  @Override
   public int next() throws IOException {
     return advance(doc+1);
   }
 
+  @Override
   public int read(int[] docs, int[] freqs) throws IOException {
     final int length = docs.length;
     int i = 0;
@@ -54,6 +57,7 @@
     return i;
   }
 
+  @Override
   public int advance(int target) throws IOException {
     doc = target;
     while (doc < maxDoc) {
@@ -66,6 +70,7 @@
     return doc;
   }
 
+  @Override
   public PositionsEnum positions() {
     throw new UnsupportedOperationException();
   }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/DirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/DirectoryReader.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/DirectoryReader.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/DirectoryReader.java Sat Oct 31 15:39:26 2009
@@ -85,6 +85,7 @@
       codecs2 = codecs;
     }
     return (IndexReader) new SegmentInfos.FindSegmentsFile(directory) {
+      @Override
       protected Object doBody(String segmentFileName) throws CorruptIndexException, IOException {
         SegmentInfos infos = new SegmentInfos();
         infos.read(directory, segmentFileName, codecs2);
@@ -409,10 +410,12 @@
     }
   }
 
+  @Override
   public Bits getDeletedDocs() {
     return deletedDocs;
   }
 
+  @Override
   public final synchronized Object clone() {
     try {
       return clone(readOnly); // Preserve current readOnly
@@ -421,6 +424,7 @@
     }
   }
 
+  @Override
   public final synchronized IndexReader clone(boolean openReadOnly) throws CorruptIndexException, IOException {
     DirectoryReader newReader = doReopen((SegmentInfos) segmentInfos.clone(), true, openReadOnly);
 
@@ -443,15 +447,18 @@
     return newReader;
   }
 
+  @Override
   public final synchronized IndexReader reopen() throws CorruptIndexException, IOException {
     // Preserve current readOnly
     return doReopen(readOnly, null);
   }
 
+  @Override
   public final synchronized IndexReader reopen(boolean openReadOnly) throws CorruptIndexException, IOException {
     return doReopen(openReadOnly, null);
   }
 
+  @Override
   public final synchronized IndexReader reopen(final IndexCommit commit) throws CorruptIndexException, IOException {
     return doReopen(true, commit);
   }
@@ -522,6 +529,7 @@
     }
 
     return (IndexReader) new SegmentInfos.FindSegmentsFile(directory) {
+      @Override
       protected Object doBody(String segmentFileName) throws CorruptIndexException, IOException {
         SegmentInfos infos = new SegmentInfos();
         infos.read(directory, segmentFileName, codecs);
@@ -541,17 +549,20 @@
   }
 
   /** Version number when this IndexReader was opened. */
+  @Override
   public long getVersion() {
     ensureOpen();
     return segmentInfos.getVersion();
   }
 
+  @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();
@@ -560,12 +571,14 @@
   }
 
 
+  @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
@@ -576,11 +589,13 @@
    * Checks is the index is optimized (if it has a single segment and no deletions)
    * @return <code>true</code> if the index is optimized; <code>false</code> otherwise
    */
+  @Override
   public boolean isOptimized() {
     ensureOpen();
     return segmentInfos.size() == 1 && !hasDeletions();
   }
   
+  @Override
   public synchronized int numDocs() {
     // Don't call ensureOpen() here (it could affect performance)
     if (numDocs == -1) {        // check cache
@@ -592,29 +607,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)
     final 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
@@ -622,6 +642,7 @@
     hasDeletions = true;
   }
 
+  @Override
   protected void doUndeleteAll() throws CorruptIndexException, IOException {
     for (int i = 0; i < subReaders.length; i++)
       subReaders[i].undeleteAll();
@@ -655,6 +676,7 @@
     return hi;
   }
 
+  @Override
   public boolean hasNorms(String field) throws IOException {
     ensureOpen();
     for (int i = 0; i < subReaders.length; i++) {
@@ -663,6 +685,7 @@
     return false;
   }
 
+  @Override
   public synchronized byte[] norms(String field) throws IOException {
     ensureOpen();
     byte[] bytes = normsCache.get(field);
@@ -678,6 +701,7 @@
     return bytes;
   }
 
+  @Override
   public synchronized void norms(String field, byte[] result, int offset)
     throws IOException {
     ensureOpen();
@@ -693,6 +717,7 @@
     }
   }
 
+  @Override
   protected void doSetNorm(int n, String field, byte value)
     throws CorruptIndexException, IOException {
     synchronized (normsCache) {
@@ -702,16 +727,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
@@ -720,6 +748,7 @@
     return total;
   }
 
+  @Override
   public int docFreq(String field, TermRef term) throws IOException {
     ensureOpen();
     int total = 0;          // sum freqs in segments
@@ -729,15 +758,18 @@
     return total;
   }
 
+  @Override
   public TermDocs termDocs() throws IOException {
     ensureOpen();
     return new MultiTermDocs(this, subReaders, starts);
   }
   
+  @Override
   public Fields fields() throws IOException {
     return fields;
   }
 
+  @Override
   public TermPositions termPositions() throws IOException {
     ensureOpen();
     return new MultiTermPositions(this, subReaders, starts);
@@ -754,6 +786,7 @@
    *                               obtained)
    * @throws IOException           if there is a low-level IO error
    */
+  @Override
   protected void acquireWriteLock() throws StaleReaderException, CorruptIndexException, LockObtainFailedException, IOException {
 
     if (readOnly) {
@@ -794,6 +827,7 @@
    *
    * @throws IOException if there is a low-level IO error
    */
+  @Override
   protected void doCommit(Map<String,String> commitUserData) throws IOException {
     if (hasChanges) {
       segmentInfos.setUserData(commitUserData);
@@ -878,6 +912,7 @@
     }
   }
 
+  @Override
   public Map<String,String> getCommitUserData() {
     ensureOpen();
     return segmentInfos.getUserData();
@@ -893,11 +928,13 @@
    * @throws CorruptIndexException if the index is corrupt
    * @throws IOException           if there is a low-level IO error
    */
+  @Override
   public boolean isCurrent() throws CorruptIndexException, IOException {
     ensureOpen();
     return SegmentInfos.readCurrentVersion(directory, codecs) == segmentInfos.getVersion();
   }
 
+  @Override
   protected synchronized void doClose() throws IOException {
     IOException ioe = null;
     normsCache = null;
@@ -913,6 +950,7 @@
     if (ioe != null) throw ioe;
   }
 
+  @Override
   public Collection<String> getFieldNames (IndexReader.FieldOption fieldNames) {
     ensureOpen();
     return getFieldNames(fieldNames, this.subReaders);
@@ -928,11 +966,13 @@
     return fieldSet;
   } 
   
+  @Override
   public IndexReader[] getSequentialSubReaders() {
     return subReaders;
   }
 
   /** 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
@@ -949,6 +989,7 @@
    * <p/>
    * <p><b>WARNING</b>: this API is new and experimental and may suddenly change.</p>
    */
+  @Override
   public IndexCommit getIndexCommit() throws IOException {
     return new ReaderCommit(segmentInfos, directory);
   }
@@ -1021,34 +1062,42 @@
       isOptimized = infos.size() == 1 && !infos.info(0).hasDeletions();
     }
 
+    @Override
     public boolean isOptimized() {
       return isOptimized;
     }
 
+    @Override
     public String getSegmentsFileName() {
       return segmentsFileName;
     }
 
+    @Override
     public Collection<String> getFileNames() {
       return files;
     }
 
+    @Override
     public Directory getDirectory() {
       return dir;
     }
 
+    @Override
     public long getVersion() {
       return version;
     }
 
+    @Override
     public long getGeneration() {
       return generation;
     }
 
+    @Override
     public boolean isDeleted() {
       return false;
     }
 
+    @Override
     public Map<String,String> getUserData() {
       return userData;
     }
@@ -1117,6 +1166,7 @@
       initialize(size);
     }
 
+    @Override
     protected final boolean lessThan(Object a, Object b) {
       FieldsEnumWithBase fieldsA = (FieldsEnumWithBase) a;
       FieldsEnumWithBase fieldsB = (FieldsEnumWithBase) b;
@@ -1129,6 +1179,7 @@
       initialize(size);
     }
 
+    @Override
     protected final boolean lessThan(Object a, Object b) {
       TermsEnumWithBase termsA = (TermsEnumWithBase) a;
       TermsEnumWithBase termsB = (TermsEnumWithBase) b;
@@ -1151,6 +1202,7 @@
       this.starts = starts;
     }
 
+    @Override
     public FieldsEnum iterator() throws IOException {
       FieldsEnumWithBase[] subs = new FieldsEnumWithBase[readers.length];
       for(int i=0;i<subs.length;i++) {
@@ -1159,6 +1211,7 @@
       return new MultiFieldsEnum(subs);
     }
 
+    @Override
     public Terms terms(String field) throws IOException {
       MultiTerms result = terms.get(field);
       if (result == null) {
@@ -1189,6 +1242,7 @@
       this.subs = subs;
     }
 
+    @Override
     public TermsEnum iterator() throws IOException {
       return new MultiTermsEnum(subs.length).reset(subs);
     }
@@ -1221,6 +1275,7 @@
       return currentField;
     }
 
+    @Override
     public String next() throws IOException {
 
       // restore queue
@@ -1251,6 +1306,7 @@
       return currentField;
     }
 
+    @Override
     public TermsEnum terms() throws IOException {
       return terms.reset(top, numTop);
     }
@@ -1273,6 +1329,7 @@
       docs = new MultiDocsEnum(size);
     }
 
+    @Override
     public TermRef term() {
       return current;
     }
@@ -1319,6 +1376,7 @@
       return this;
     }
 
+    @Override
     public SeekStatus seek(TermRef term) throws IOException {
       queue.clear();
       numTop = 0;
@@ -1345,10 +1403,12 @@
       }
     }
 
+    @Override
     public SeekStatus seek(long ord) throws IOException {
       throw new UnsupportedOperationException();
     }
 
+    @Override
     public long ord() throws IOException {
       throw new UnsupportedOperationException();
     }
@@ -1377,6 +1437,7 @@
       numTop = 0;
     }
 
+    @Override
     public TermRef next() throws IOException {
       // restore queue
       pushTop();
@@ -1391,6 +1452,7 @@
       return current;
     }
 
+    @Override
     public int docFreq() {
       int sum = 0;
       for(int i=0;i<numTop;i++) {
@@ -1399,6 +1461,7 @@
       return sum;
     }
 
+    @Override
     public DocsEnum docs(Bits skipDocs) throws IOException {
       return docs.reset(top, numTop, skipDocs);
     }
@@ -1456,10 +1519,12 @@
       return this;
     }
 
+    @Override
     public int freq() {
       return currentDocs.freq();
     }
 
+    @Override
     public int read(final int docs[], final int freqs[]) throws IOException {
       while (true) {
         while (currentDocs == null) {
@@ -1483,6 +1548,7 @@
       }
     }
 
+    @Override
     public int advance(int target) throws IOException {
       while(true) {
         if (currentDocs != null) {
@@ -1502,6 +1568,7 @@
       }
     }
 
+    @Override
     public int next() throws IOException {
       while(true) {
         if (currentDocs == null) {
@@ -1523,6 +1590,7 @@
       }
     }
 
+    @Override
     public PositionsEnum positions() throws IOException {
       return currentDocs.positions();
     }
@@ -1774,6 +1842,7 @@
       super(topReader,r,s);
     }
   
+    @Override
     protected TermDocs termDocs(IndexReader reader) throws IOException {
       return reader.termPositions();
     }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/IndexReader.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/IndexReader.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/IndexReader.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/IndexReader.java Sat Oct 31 15:39:26 2009
@@ -874,18 +874,23 @@
   }
 
   private static class NullDocsEnum extends DocsEnum {
+    @Override
     public int advance(int target) {
       return NO_MORE_DOCS;
     }
+    @Override
     public int next() {
       return NO_MORE_DOCS;
     }
+    @Override
     public int freq() {
       return 1;
     }
+    @Override
     public int read(int[] docs, int[] freqs) {
       return 0;
     }
+    @Override
     public PositionsEnum positions() {
       return null;
     }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/LegacyFields.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/LegacyFields.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/LegacyFields.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/LegacyFields.java Sat Oct 31 15:39:26 2009
@@ -30,10 +30,12 @@
     this.r = r;
   }
 
+  @Override
   public FieldsEnum iterator() throws IOException {
     return new LegacyFieldsEnum(r);
   }
 
+  @Override
   public Terms terms(String field) throws IOException {
     // nocommit
     return new LegacyTerms(r, field);

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/LegacyFieldsEnum.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/LegacyFieldsEnum.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/LegacyFieldsEnum.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/LegacyFieldsEnum.java Sat Oct 31 15:39:26 2009
@@ -46,6 +46,7 @@
   }
   */
 
+  @Override
   public String next() throws IOException {
 
     if (field != null) {
@@ -62,6 +63,7 @@
     }
   }
 
+  @Override
   public TermsEnum terms() throws IOException {
     return new LegacyTermsEnum(r, field);
   }
@@ -83,6 +85,7 @@
       this.terms = r.terms(new Term(field, ""));
     }
 
+    @Override
     public SeekStatus seek(TermRef text) throws IOException {
 
       // nocommit: too slow?
@@ -105,14 +108,17 @@
       }
     }
 
+    @Override
     public SeekStatus seek(long ord) throws IOException {
       throw new UnsupportedOperationException();
     }
 
+    @Override
     public long ord() throws IOException {
       throw new UnsupportedOperationException();
     }
 
+    @Override
     public TermRef next() throws IOException {
       if (terms.next()) {
         // nocommit -- reuse TermRef instance
@@ -124,6 +130,7 @@
       }
     }
 
+    @Override
     public TermRef term() {
       return current;
     }
@@ -134,10 +141,12 @@
     }
     */
 
+    @Override
     public int docFreq() {
       return terms.docFreq();
     }
 
+    @Override
     public DocsEnum docs(Bits skipDocs) throws IOException {
       return new LegacyDocsEnum(r, field, terms.term(), skipDocs);
     }
@@ -168,6 +177,7 @@
     // nocommit -- must enforce skipDocs... but old API will
     // always secretly skip deleted docs, and we can't work
     // around that for external readers?
+    @Override
     public int next() throws IOException {
       if (td.next()) {
         return td.doc();
@@ -176,6 +186,7 @@
       }
     }
 
+    @Override
     public int advance(int target) throws IOException {
       if (td.skipTo(target)) {
         return td.doc();
@@ -184,10 +195,12 @@
       }
     }
 
+    @Override
     public int freq() {
       return td.freq();
     }
 
+    @Override
     public int read(int[] docs, int[] freqs) throws IOException {
       return td.read(docs, freqs);
     }
@@ -198,6 +211,7 @@
 
     LegacyPositionsEnum lpe;
 
+    @Override
     public PositionsEnum positions() throws IOException {
       if (tp == null) {
         tp = r.termPositions(term);
@@ -218,18 +232,22 @@
       this.tp = tp;
     }
 
+    @Override
     public int next() throws IOException {
       return tp.nextPosition();
     }
 
+    @Override
     public int getPayloadLength() {
       return tp.getPayloadLength();
     }
 
+    @Override
     public byte[] getPayload(byte[] data, int offset) throws IOException {
       return tp.getPayload(data, offset);
     }
 
+    @Override
     public boolean hasPayload() {
       return tp.isPayloadAvailable();
     }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/LegacySegmentMergeQueue.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/LegacySegmentMergeQueue.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/LegacySegmentMergeQueue.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/LegacySegmentMergeQueue.java Sat Oct 31 15:39:26 2009
@@ -25,6 +25,7 @@
     initialize(size);
   }
 
+  @Override
   protected final boolean lessThan(LegacySegmentMergeInfo a, LegacySegmentMergeInfo b) {
     int comparison = a.term.compareTo(b.term);
     if (comparison == 0)

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/LegacyTerms.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/LegacyTerms.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/LegacyTerms.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/LegacyTerms.java Sat Oct 31 15:39:26 2009
@@ -33,6 +33,7 @@
     this.field = field;
   }
 
+  @Override
   public TermsEnum iterator() throws IOException {
     return new LegacyFieldsEnum.LegacyTermsEnum(r, field);
   }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/MultiReader.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/MultiReader.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/MultiReader.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/MultiReader.java Sat Oct 31 15:39:26 2009
@@ -102,6 +102,7 @@
     fields = new MultiFields(subReaders, starts);
   }
 
+  @Override
   public Fields fields() throws IOException {
     return fields;
   }
@@ -148,6 +149,7 @@
     }
   }
   
+  @Override
   public Bits getDeletedDocs() {
     return deletedDocs;
   }
@@ -413,6 +415,7 @@
     doCommit(null);
   }
   
+  @Override
   protected void doCommit(Map<String,String> commitUserData) throws IOException {
     for (int i = 0; i < subReaders.length; i++)
       subReaders[i].commit(commitUserData);

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/ParallelReader.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/ParallelReader.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/ParallelReader.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/ParallelReader.java Sat Oct 31 15:39:26 2009
@@ -136,6 +136,7 @@
       keys = fieldToReader.keySet().iterator();
     }
 
+    @Override
     public String next() throws IOException {
       if (keys.hasNext()) {
         currentField = (String) keys.next();
@@ -147,6 +148,7 @@
       return currentField;
     }
 
+    @Override
     public TermsEnum terms() throws IOException {
       assert currentReader != null;
       return currentReader.fields().terms(currentField).iterator();
@@ -161,18 +163,22 @@
       fields.put(field, r.fields().terms(field));
     }
 
+    @Override
     public FieldsEnum iterator() throws IOException {
       return new ParallelFieldsEnum();
     }
+    @Override
     public Terms terms(String field) throws IOException {
       return fields.get(field);
     }
   }
 
+  @Override
   public Bits getDeletedDocs() throws IOException {
     return ((IndexReader) readers.get(0)).getDeletedDocs();
   }
 
+  @Override
   public Fields fields() {
     return fields;
   }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentFieldMergeQueue.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentFieldMergeQueue.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentFieldMergeQueue.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentFieldMergeQueue.java Sat Oct 31 15:39:26 2009
@@ -25,6 +25,7 @@
     initialize(size);
   }
 
+  @Override
   protected final boolean lessThan(SegmentMergeInfo a, SegmentMergeInfo b) {
     SegmentMergeInfo stiA = a;
     SegmentMergeInfo stiB = b;

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentReader.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentReader.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentReader.java Sat Oct 31 15:39:26 2009
@@ -565,6 +565,7 @@
     core.openDocStores(si);
   }
 
+  @Override
   public synchronized Bits getDeletedDocs() {
     return deletedDocs;
   }
@@ -884,6 +885,7 @@
     }
   }
   
+  @Override
   public Fields fields() throws IOException {
     return core.fields;
   }
@@ -946,6 +948,7 @@
   }
 
   
+  @Override
   public int docFreq(Term t) throws IOException {
     ensureOpen();
     Terms terms = core.fields.terms(t.field);
@@ -956,6 +959,7 @@
     }
   }
 
+  @Override
   public int docFreq(String field, TermRef term) throws IOException {
     ensureOpen();
 
@@ -1398,6 +1402,7 @@
       }
     }
 
+    @Override
     public boolean next() throws IOException {
 
       if (Codec.DEBUG) {
@@ -1431,6 +1436,7 @@
       }
     }
 
+    @Override
     public Term term() {
       if (terms != null && !done) {
         if (currentTerm != null) {
@@ -1440,10 +1446,12 @@
       return null;
     }
 
+    @Override
     public int docFreq() {
       return terms == null ? 0 : terms.docFreq();
     }
 
+    @Override
     public void close() {}
   }
 
@@ -1550,27 +1558,32 @@
       super();
     }
 
+    @Override
     public void seek(TermEnum termEnum) throws IOException {
       super.seek(termEnum);
       if (docs != null)
         positions = docs.positions();
     }
 
+    @Override
     public boolean skipTo(int target) throws IOException {
       boolean result = super.skipTo(target);
       positions = null;
       return result;
     }
 
+    @Override
     public int read(int[] docs, int[] freqs) throws IOException {
       throw new UnsupportedOperationException("TermPositions does not support processing multiple documents in one call. Use TermDocs instead.");
     }
 
+    @Override
     public void seek(Term term) throws IOException {
       super.seek(term);
       positions = null;
     }
 
+    @Override
     public boolean next() throws IOException {
       boolean result = super.next();
       positions = null;

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/Term.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/Term.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/Term.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/Term.java Sat Oct 31 15:39:26 2009
@@ -76,6 +76,7 @@
   }
 
   //@Override
+  @Override
   public boolean equals(Object obj) {
     if (this == obj)
       return true;
@@ -98,6 +99,7 @@
   }
 
   //@Override
+  @Override
   public int hashCode() {
     final int prime = 31;
     int result = 1;
@@ -128,6 +130,7 @@
     text = txt;
   }
 
+  @Override
   public final String toString() { return field + ":" + text; }
 
   private void readObject(java.io.ObjectInputStream in)

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/TermRef.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/TermRef.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/TermRef.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/TermRef.java Sat Oct 31 15:39:26 2009
@@ -85,6 +85,7 @@
     }
   }
 
+  @Override
   public Object clone() {
     TermRef other = new TermRef();
     other.bytes = new byte[length];
@@ -131,6 +132,7 @@
     return this.termEquals((TermRef) other);
   }
 
+  @Override
   public String toString() {
     try {
       return new String(bytes, offset, length, "UTF-8");

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/Codecs.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/Codecs.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/Codecs.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/Codecs.java Sat Oct 31 15:39:26 2009
@@ -82,6 +82,7 @@
     register(new SepCodec());
   }
 
+  @Override
   public Codec getWriter(SegmentWriteState state) {
     return lookup("Standard");
     //return lookup("Pulsing");

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/MultiLevelSkipListReader.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/MultiLevelSkipListReader.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/MultiLevelSkipListReader.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/MultiLevelSkipListReader.java Sat Oct 31 15:39:26 2009
@@ -250,27 +250,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/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/FixedIntBlockIndexInput.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/FixedIntBlockIndexInput.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/FixedIntBlockIndexInput.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/FixedIntBlockIndexInput.java Sat Oct 31 15:39:26 2009
@@ -41,6 +41,7 @@
     blockSize = in.readVInt();
   }
 
+  @Override
   public Reader reader() throws IOException {
     int[] buffer = new int[blockSize];
     IndexInput clone = (IndexInput) in.clone();
@@ -48,10 +49,12 @@
     return new Reader(clone, buffer, getBlockReader(clone, buffer));
   }
 
+  @Override
   public void close() throws IOException {
     in.close();
   }
 
+  @Override
   public Index index() {
     return new Index();
   }
@@ -104,6 +107,7 @@
       }
     }
 
+    @Override
     public int next() throws IOException {
       maybeSeek();
       if (upto == blockSize) {
@@ -115,6 +119,7 @@
       return pending[upto++];
     }
 
+    @Override
     public BulkReadResult read(int[] buffer, int count) throws IOException {
       maybeSeek();
       if (upto == blockSize) {
@@ -133,6 +138,7 @@
       return result;
     }
 
+    @Override
     public String descFilePointer() {
       return in.getFilePointer() + ":" + upto;
     }
@@ -142,6 +148,7 @@
     private long fp;
     private int upto;
 
+    @Override
     public void read(IndexInput indexIn, boolean absolute) throws IOException {
       if (absolute) {
         fp = indexIn.readVLong();
@@ -160,10 +167,12 @@
       assert upto < blockSize;
     }
 
+    @Override
     public void seek(IntIndexInput.Reader other) throws IOException {
       ((Reader) other).seek(fp, upto);
     }
 
+    @Override
     public void set(IntIndexInput.Index other) {
       Index idx = (Index) other;
       fp = idx.fp;

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/FixedIntBlockIndexOutput.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/FixedIntBlockIndexOutput.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/FixedIntBlockIndexOutput.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/FixedIntBlockIndexOutput.java Sat Oct 31 15:39:26 2009
@@ -44,10 +44,12 @@
 
   protected abstract void flushBlock(int[] buffer, IndexOutput out) throws IOException;
 
+  @Override
   public Index index() throws IOException {
     return new Index();
   }
 
+  @Override
   public String descFilePointer() {
     return out.getFilePointer() + ":" + upto;
   }
@@ -58,17 +60,20 @@
     long lastFP;
     int lastUpto;
 
+    @Override
     public void mark() throws IOException {
       fp = out.getFilePointer();
       upto = FixedIntBlockIndexOutput.this.upto;
     }
 
+    @Override
     public void set(IntIndexOutput.Index other) throws IOException {
       Index idx = (Index) other;
       lastFP = fp = idx.fp;
       lastUpto = upto = idx.upto;
     }
 
+    @Override
     public void write(IndexOutput indexOut, boolean absolute) throws IOException {
       if (absolute) {
         indexOut.writeVLong(fp);
@@ -88,6 +93,7 @@
     }
   }
 
+  @Override
   public void write(int v) throws IOException {
     pending[upto++] = v;
     if (upto == blockSize) {
@@ -96,6 +102,7 @@
     }
   }
 
+  @Override
   public void close() throws IOException {
     // NOTE: entries in the block after current upto are
     // invalid

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/IntBlockCodec.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/IntBlockCodec.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/IntBlockCodec.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/IntBlockCodec.java Sat Oct 31 15:39:26 2009
@@ -46,6 +46,7 @@
     name = "IntBlock";
   }
 
+  @Override
   public FieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
     StandardDocsConsumer docsWriter = new SepDocsWriter(state, new SimpleIntBlockFactory(1024));
 
@@ -84,6 +85,7 @@
   final static String PAYLOAD_EXTENSION = "pyl";
   */
 
+  @Override
   public FieldsProducer fieldsProducer(Directory dir, FieldInfos fieldInfos, SegmentInfo si, int readBufferSize, int indexDivisor) throws IOException {
     StandardDocsProducer docsReader = new SepDocsReader(dir, si, readBufferSize, new SimpleIntBlockFactory(1024));
 
@@ -120,12 +122,14 @@
     }
   }
 
+  @Override
   public void files(Directory dir, SegmentInfo segmentInfo, Collection files) {
     SepDocsReader.files(segmentInfo, files);
     StandardTermsDictReader.files(segmentInfo, files);
     SimpleStandardTermsIndexReader.files(segmentInfo, files);
   }
 
+  @Override
   public void getExtensions(Collection extensions) {
     SepCodec.getSepExtensions(extensions);
   }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/SimpleIntBlockFactory.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/SimpleIntBlockFactory.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/SimpleIntBlockFactory.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/SimpleIntBlockFactory.java Sat Oct 31 15:39:26 2009
@@ -29,9 +29,11 @@
   public SimpleIntBlockFactory(int blockSize) {
     this.blockSize = blockSize;
   }
+  @Override
   public IntIndexInput openInput(Directory dir, String fileName, int readBufferSize) throws IOException {
     return new SimpleIntBlockIndexInput(dir, fileName, readBufferSize);
   }
+  @Override
   public IntIndexOutput createOutput(Directory dir, String fileName) throws IOException {
     return new SimpleIntBlockIndexOutput(dir, fileName, blockSize);
   }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/SimpleIntBlockIndexInput.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/SimpleIntBlockIndexInput.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/SimpleIntBlockIndexInput.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/SimpleIntBlockIndexInput.java Sat Oct 31 15:39:26 2009
@@ -55,6 +55,7 @@
     }
   }
 
+  @Override
   protected BlockReader getBlockReader(IndexInput in, int[] buffer) {
     return new BlockReader(in, buffer);
   }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/SimpleIntBlockIndexOutput.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/SimpleIntBlockIndexOutput.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/SimpleIntBlockIndexOutput.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/SimpleIntBlockIndexOutput.java Sat Oct 31 15:39:26 2009
@@ -41,6 +41,7 @@
     init(out, blockSize);
   }
 
+  @Override
   protected void flushBlock(int[] buffer, IndexOutput out) throws IOException {
     // silly impl
     for(int i=0;i<buffer.length;i++) {

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/PreFlexCodec.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/PreFlexCodec.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/PreFlexCodec.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/PreFlexCodec.java Sat Oct 31 15:39:26 2009
@@ -49,18 +49,22 @@
     name = "PreFlex";
   }
   
+  @Override
   public FieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
     throw new IllegalArgumentException("this codec can only be used for reading");
   }
 
+  @Override
   public FieldsProducer fieldsProducer(Directory dir, FieldInfos fieldInfos, SegmentInfo info, int readBufferSize, int indexDivisor) throws IOException {
     return new PreFlexFields(dir, fieldInfos, info, readBufferSize, indexDivisor);
   }
 
+  @Override
   public void files(Directory dir, SegmentInfo info, Collection files) throws IOException {
     PreFlexFields.files(dir, info, files);
   }
 
+  @Override
   public void getExtensions(Collection extensions) {
     extensions.add(FREQ_EXTENSION);
     extensions.add(PROX_EXTENSION);

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/PreFlexFields.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/PreFlexFields.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/PreFlexFields.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/PreFlexFields.java Sat Oct 31 15:39:26 2009
@@ -96,10 +96,12 @@
     }
   }
 
+  @Override
   public FieldsEnum iterator() {
     return new Fields();
   }
 
+  @Override
   public Terms terms(String field) {
     FieldInfo fi = fieldInfos.fieldInfo(field);
     if (fi != null) {
@@ -109,10 +111,12 @@
     }
   }
 
+  @Override
   public void loadTermsIndex() throws IOException {
     // nocommit -- todo
   }
 
+  @Override
   public void close() throws IOException {
     tis.close();
   }
@@ -126,6 +130,7 @@
       it = fields.values().iterator();
     }
 
+    @Override
     public String next() {
       if (it.hasNext()) {
         current = (FieldInfo) it.next();
@@ -135,6 +140,7 @@
       }
     }
     
+    @Override
     public TermsEnum terms() throws IOException {
       final PreTermsEnum terms;
       if (lastTermsEnum != null) {
@@ -153,6 +159,7 @@
     PreTerms(FieldInfo fieldInfo) {
       this.fieldInfo = fieldInfo;
     }
+    @Override
     public TermsEnum iterator() {
       //System.out.println("pff.init create no context");
       return new PreTermsEnum(fieldInfo);
@@ -180,14 +187,17 @@
       }
     }
 
+    @Override
     public SeekStatus seek(long ord) throws IOException {
       throw new UnsupportedOperationException();
     }
 
+    @Override
     public long ord() throws IOException {
       throw new UnsupportedOperationException();
     }
 
+    @Override
     public SeekStatus seek(TermRef term) throws IOException {
       if (Codec.DEBUG) {
         System.out.println("pff.seek term=" + term);
@@ -217,6 +227,7 @@
       }
     }
 
+    @Override
     public TermRef next() throws IOException {
       if (skipNext) {
         // nocommit -- is there a cleaner way?
@@ -251,14 +262,17 @@
       }
     }
 
+    @Override
     public TermRef term() {
       return current;
     }
 
+    @Override
     public int docFreq() {
       return terms.docFreq();
     }
 
+    @Override
     public DocsEnum docs(Bits skipDocs) throws IOException {
       return new PreDocsEnum(skipDocs, terms);
     }
@@ -286,6 +300,7 @@
       pos.seek(te);
     }
 
+    @Override
     public int next() throws IOException {
       if (Codec.DEBUG) {
         System.out.println("pff.docs.next");
@@ -297,6 +312,7 @@
       }
     }
 
+    @Override
     public int advance(int target) throws IOException {
       if (current.skipTo(target)) {
         return current.doc();
@@ -305,10 +321,12 @@
       }
     }
 
+    @Override
     public int freq() {
       return current.freq();
     }
 
+    @Override
     public int read(int[] docIDs, int[] freqs) throws IOException {
       if (current != docs) {
         docs.skipTo(current.doc());
@@ -317,6 +335,7 @@
       return current.read(docIDs, freqs);
     }
 
+    @Override
     public PositionsEnum positions() throws IOException {
       if (current != pos) {
         pos.skipTo(docs.doc());
@@ -332,18 +351,22 @@
       this.pos = pos;
     }
 
+    @Override
     public int next() throws IOException {
       return pos.nextPosition();
     }
 
+    @Override
     public int getPayloadLength() {
       return pos.getPayloadLength();
     }
 
+    @Override
     public boolean hasPayload() {
       return pos.isPayloadAvailable();
     }
 
+    @Override
     public byte[] getPayload(byte[] data, int offset) throws IOException {
       return pos.getPayload(data, offset);
     }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/SegmentTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/SegmentTermEnum.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/SegmentTermEnum.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/SegmentTermEnum.java Sat Oct 31 15:39:26 2009
@@ -110,6 +110,7 @@
     }
   }
 
+  @Override
   protected Object clone() {
     SegmentTermEnum clone = null;
     try {
@@ -136,6 +137,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);
@@ -183,6 +185,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();
   }
@@ -206,6 +209,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;
   }
@@ -223,6 +227,7 @@
   }
 
   /** Closes the enumeration to further activity, freeing resources. */
+  @Override
   public final void close() throws IOException {
     input.close();
   }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/SegmentTermPositions.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/SegmentTermPositions.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/SegmentTermPositions.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/SegmentTermPositions.java Sat Oct 31 15:39:26 2009
@@ -56,6 +56,7 @@
     this.proxStreamOrig = proxStream;  // 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)
@@ -67,6 +68,7 @@
     needToLoadPayload = false;
   }
 
+  @Override
   public final void close() throws IOException {
     super.close();
     if (proxStream != null) proxStream.close();
@@ -98,11 +100,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
@@ -116,12 +120,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/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/TermBuffer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/TermBuffer.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/TermBuffer.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/TermBuffer.java Sat Oct 31 15:39:26 2009
@@ -126,6 +126,7 @@
     return term;
   }
 
+  @Override
   protected Object clone() {
     TermBuffer clone = null;
     try {

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/pulsing/PulsingCodec.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/pulsing/PulsingCodec.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/pulsing/PulsingCodec.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/pulsing/PulsingCodec.java Sat Oct 31 15:39:26 2009
@@ -54,6 +54,7 @@
     name = "Pulsing";
   }
 
+  @Override
   public FieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
     // We wrap StandardDocsWriter, but any DocsConsumer
     // will work:
@@ -93,6 +94,7 @@
     }
   }
 
+  @Override
   public FieldsProducer fieldsProducer(Directory dir, FieldInfos fieldInfos, SegmentInfo si, int readBufferSize, int indexDivisor) throws IOException {
 
     // We wrap StandardDocsReader, but any DocsProducer
@@ -136,12 +138,14 @@
     }
   }
 
+  @Override
   public void files(Directory dir, SegmentInfo segmentInfo, Collection files) {
     StandardDocsReader.files(segmentInfo, files);
     StandardTermsDictReader.files(segmentInfo, files);
     SimpleStandardTermsIndexReader.files(segmentInfo, files);
   }
 
+  @Override
   public void getExtensions(Collection extensions) {
     StandardCodec.getStandardExtensions(extensions);
   }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/pulsing/PulsingDocsReader.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/pulsing/PulsingDocsReader.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/pulsing/PulsingDocsReader.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/pulsing/PulsingDocsReader.java Sat Oct 31 15:39:26 2009
@@ -50,6 +50,7 @@
     this.wrappedDocsReader = wrappedDocsReader;
   }
 
+  @Override
   public void start(IndexInput termsIn) throws IOException {
     this.termsIn = termsIn;
     Codec.checkHeader(termsIn, PulsingDocsWriter.CODEC, PulsingDocsWriter.VERSION_START);
@@ -57,6 +58,7 @@
     wrappedDocsReader.start(termsIn);
   }
 
+  @Override
   public Reader reader(FieldInfo fieldInfo, IndexInput termsIn) throws IOException {
     return new PulsingReader(fieldInfo, termsIn, wrappedDocsReader.reader(fieldInfo, termsIn));
   }
@@ -87,6 +89,7 @@
       }
     }
 
+    @Override
     public void readTerm(int docFreq, boolean isIndexTerm) throws IOException {
 
       if (Codec.DEBUG) {
@@ -177,6 +180,7 @@
 
     final PulsingDocsEnum docsEnum = new PulsingDocsEnum();
 
+    @Override
     public DocsEnum docs(Bits skipDocs) throws IOException {
       if (docFreq <= maxPulsingDocFreq) {
         docsEnum.reset(skipDocs);
@@ -198,6 +202,7 @@
         nextRead = 0;
       }
 
+      @Override
       public int next() {
         while(true) {
           if (nextRead >= docFreq) {
@@ -211,6 +216,7 @@
         }
       }
 
+      @Override
       public int read(int[] retDocs, int[] retFreqs) {
         int i=0;
         // nocommit -- ob1?
@@ -233,6 +239,7 @@
         return nextRead-1;
       }
 
+      @Override
       public int freq() {
         return doc.numPositions;
       }
@@ -251,6 +258,7 @@
           payloadRetrieved = false;
         }
 
+        @Override
         public int next() {
           assert nextRead < doc.numPositions;
           pos = doc.positions[nextRead++];
@@ -258,15 +266,18 @@
           return pos.pos;
         }
 
+        @Override
         public int getPayloadLength() {
           return pos.payloadLength;
         }
 
+        @Override
         public boolean hasPayload() {
           // nocommit -- maybe don't do the payloadRetrieved check?
           return !payloadRetrieved && pos.payloadLength > 0;
         }
 
+        @Override
         public byte[] getPayload(byte[] data, int offset) {
           // nocommit -- inefficient
           if (!payloadRetrieved) {
@@ -281,11 +292,13 @@
       
       final PulsingPositionsEnum positions = new PulsingPositionsEnum();
 
+      @Override
       public PositionsEnum positions() throws IOException {
         positions.reset();
         return positions;
       }
 
+      @Override
       public int advance(int target) throws IOException {
         int doc;
         while((doc=next()) != NO_MORE_DOCS) {
@@ -324,6 +337,7 @@
     }
   }
 
+  @Override
   public void close() throws IOException {
     wrappedDocsReader.close();
   }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/pulsing/PulsingDocsWriter.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/pulsing/PulsingDocsWriter.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/pulsing/PulsingDocsWriter.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/pulsing/PulsingDocsWriter.java Sat Oct 31 15:39:26 2009
@@ -69,6 +69,7 @@
       positions[0] = new Position();
     }
     
+    @Override
     public Object clone() {
       Document doc = new Document();
       doc.docID = docID;
@@ -101,6 +102,7 @@
     int pos;
     int payloadLength;
     
+    @Override
     public Object clone() {
       Position position = new Position();
       position.pos = pos;
@@ -133,6 +135,7 @@
     this.wrappedDocsWriter = wrappedDocsWriter;
   }
 
+  @Override
   public void start(IndexOutput termsOut) throws IOException {
     this.termsOut = termsOut;
     Codec.writeHeader(termsOut, CODEC, VERSION_CURRENT);
@@ -140,6 +143,7 @@
     wrappedDocsWriter.start(termsOut);
   }
 
+  @Override
   public void startTerm() {
     assert pendingDocCount == 0;
     pulsed = false;
@@ -150,6 +154,7 @@
 
   // Currently, this instance is re-used across fields, so
   // our parent calls setField whenever the field changes
+  @Override
   public void setField(FieldInfo fieldInfo) {
     this.fieldInfo = fieldInfo;
     omitTF = fieldInfo.omitTermFreqAndPositions;
@@ -159,8 +164,11 @@
 
   /** Simply buffers up positions */
   class PositionsWriter extends StandardPositionsConsumer {
+    @Override
     public void start(IndexOutput termsOut) {}
+    @Override
     public void startTerm() {}
+    @Override
     public void addPosition(int position, byte[] payload, int payloadOffset, int payloadLength) {
       Position pos = currentDoc.positions[currentDoc.numPositions++];
       pos.pos = position;
@@ -173,15 +181,19 @@
       } else
         pos.payloadLength = 0;
     }
+    @Override
     public void finishDoc() {
       assert currentDoc.numPositions == currentDoc.termDocFreq;
     }
+    @Override
     public void finishTerm(boolean isIndexTerm) {}
+    @Override
     public void close() {}
   }
 
   final PositionsWriter posWriter = new PositionsWriter();
 
+  @Override
   public PositionsConsumer addDoc(int docID, int termDocFreq) throws IOException {
 
     assert docID >= 0: "got docID=" + docID;
@@ -251,6 +263,7 @@
   int nonPulsedCount;
 
   /** Called when we are done adding docs to this term */
+  @Override
   public void finishTerm(int docCount, boolean isIndexTerm) throws IOException {
 
     if (Codec.DEBUG)
@@ -312,6 +325,7 @@
     pendingDocCount = 0;
   }
 
+  @Override
   public void close() throws IOException {
     wrappedDocsWriter.close();
   }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepCodec.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepCodec.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepCodec.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepCodec.java Sat Oct 31 15:39:26 2009
@@ -43,6 +43,7 @@
     name = "Sep";
   }
 
+  @Override
   public FieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
 
     StandardDocsConsumer docsWriter = new SepDocsWriter(state, new SingleIntFactory());
@@ -80,6 +81,7 @@
   final static String POS_EXTENSION = "pos";
   final static String PAYLOAD_EXTENSION = "pyl";
 
+  @Override
   public FieldsProducer fieldsProducer(Directory dir, FieldInfos fieldInfos, SegmentInfo si, int readBufferSize, int indexDivisor) throws IOException {
 
     StandardDocsProducer docsReader = new SepDocsReader(dir, si, readBufferSize, new SingleIntFactory());
@@ -117,12 +119,14 @@
     }
   }
 
+  @Override
   public void files(Directory dir, SegmentInfo segmentInfo, Collection files) {
     SepDocsReader.files(segmentInfo, files);
     StandardTermsDictReader.files(segmentInfo, files);
     SimpleStandardTermsIndexReader.files(segmentInfo, files);
   }
 
+  @Override
   public void getExtensions(Collection extensions) {
     getSepExtensions(extensions);
   }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepDocsReader.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepDocsReader.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepDocsReader.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepDocsReader.java Sat Oct 31 15:39:26 2009
@@ -205,6 +205,7 @@
       }
     }
 
+    @Override
     public DocsEnum docs(Bits skipDocs) throws IOException {
 
       if (docs == null) {
@@ -329,6 +330,7 @@
         return doc;
       }
 
+      @Override
       public int read(int[] docs, int[] freqs) throws IOException {
         // nocommit -- switch to bulk read api in IntIndexInput
         int i = 0;
@@ -356,6 +358,7 @@
         return i;
       }
 
+      @Override
       public int freq() {
         return freq;
       }
@@ -373,6 +376,7 @@
 
       PositionsEnum fakePositions;
 
+      @Override
       public PositionsEnum positions() throws IOException {
         
         if (Codec.DEBUG) {

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepDocsWriter.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepDocsWriter.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepDocsWriter.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepDocsWriter.java Sat Oct 31 15:39:26 2009
@@ -99,6 +99,7 @@
     posWriter = new SepPositionsWriter(state, this, factory);
   }
 
+  @Override
   public void start(IndexOutput termsOut) throws IOException {
     this.termsOut = termsOut;
     Codec.writeHeader(termsOut, CODEC, VERSION_CURRENT);
@@ -108,6 +109,7 @@
     posWriter.start(termsOut);
   }
 
+  @Override
   public void startTerm() throws IOException {
     docIndex.mark();
     if (!omitTF) {
@@ -122,6 +124,7 @@
 
   // Currently, this instance is re-used across fields, so
   // our parent calls setField whenever the field changes
+  @Override
   public void setField(FieldInfo fieldInfo) {
     this.fieldInfo = fieldInfo;
     omitTF = fieldInfo.omitTermFreqAndPositions;
@@ -137,6 +140,7 @@
 
   /** Adds a new doc in this term.  If this returns null
    *  then we just skip consuming positions/payloads. */
+  @Override
   public PositionsConsumer addDoc(int docID, int termDocFreq) throws IOException {
 
     final int delta = docID - lastDocID;
@@ -186,6 +190,7 @@
   }
 
   /** Called when we are done adding docs to this term */
+  @Override
   public void finishTerm(int docCount, boolean isIndexTerm) throws IOException {
 
     long skipPos = skipOut.getFilePointer();
@@ -228,6 +233,7 @@
     count = 0;
   }
 
+  @Override
   public void close() throws IOException {
     if (Codec.DEBUG)
       System.out.println("dw.close skipFP=" + skipOut.getFilePointer());

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepPositionsReader.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepPositionsReader.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepPositionsReader.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepPositionsReader.java Sat Oct 31 15:39:26 2009
@@ -51,6 +51,7 @@
     }
   }
 
+  @Override
   public void start(IndexInput termsIn) throws IOException {
     this.termsIn = termsIn;
 
@@ -65,10 +66,12 @@
     }
   }
 
+  @Override
   public Reader reader(FieldInfo fieldInfo, IndexInput termsIn) throws IOException {
     return new TermsDictReader(termsIn, fieldInfo);
   }
 
+  @Override
   public void close() throws IOException {
     try {
       if (posIn != null)
@@ -99,6 +102,7 @@
       return SepPositionsReader.this.posIn;
     }
 
+    @Override
     public void readTerm(int docFreq, boolean isIndexTerm) throws IOException {
       if (Codec.DEBUG) {
         System.out.println("    pr.readterm termsInPointer=" + termsIn.getFilePointer() + " isIndex=" + isIndexTerm);
@@ -119,6 +123,7 @@
 
     SegmentPositionsEnum positions;
 
+    @Override
     public PositionsEnum positions() throws IOException {
 
       if (positions == null) {
@@ -213,6 +218,7 @@
         position = 0;
       }
 
+      @Override
       public int next() throws IOException {
 
         if (Codec.DEBUG) {
@@ -269,10 +275,12 @@
         }
       }
 
+      @Override
       public int getPayloadLength() {
         return payloadLength;
       }
 
+      @Override
       public byte[] getPayload(byte[] data, int offset) throws IOException {
 
         if (!payloadPending) {
@@ -300,6 +308,7 @@
         return retArray;
       }
       
+      @Override
       public boolean hasPayload() {
         return payloadPending && payloadLength > 0;
       }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepPositionsWriter.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepPositionsWriter.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepPositionsWriter.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepPositionsWriter.java Sat Oct 31 15:39:26 2009
@@ -111,6 +111,7 @@
   int lastPosition;
 
   /** Add a new position & payload */
+  @Override
   public void addPosition(int position, byte[] payload, int payloadOffset, int payloadLength) throws IOException {
     assert !omitTF: "omitTF is true";
     assert posOut != null;
@@ -159,6 +160,7 @@
   }
 
   /** Called when we are done adding positions & payloads */
+  @Override
   public void finishDoc() {       
     lastPosition = 0;
   }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepSkipListReader.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepSkipListReader.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepSkipListReader.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepSkipListReader.java Sat Oct 31 15:39:26 2009
@@ -146,6 +146,7 @@
     return lastPayloadLength;
   }
   
+  @Override
   protected void seekChild(int level) throws IOException {
     super.seekChild(level);
     //freqPointer[level] = lastFreqPointer;
@@ -155,6 +156,7 @@
     payloadLength[level] = lastPayloadLength;
   }
   
+  @Override
   protected void setLastSkipData(int level) {
     super.setLastSkipData(level);
 
@@ -195,6 +197,7 @@
     return lastDocIndex;
   }
 
+  @Override
   protected int readSkipData(int level, IndexInput skipStream) throws IOException {
     int delta;
     if (currentFieldStoresPayloads) {

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepSkipListWriter.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepSkipListWriter.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepSkipListWriter.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepSkipListWriter.java Sat Oct 31 15:39:26 2009
@@ -150,6 +150,7 @@
     }
   }
   
+  @Override
   protected void writeSkipData(int level, IndexOutput skipBuffer) throws IOException {
     // To efficiently store payloads in the posting lists we do not store the length of
     // every payload. Instead we omit the length for a payload if the previous payload had

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SingleIntFactory.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SingleIntFactory.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SingleIntFactory.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SingleIntFactory.java Sat Oct 31 15:39:26 2009
@@ -21,9 +21,11 @@
 import java.io.IOException;
 
 public class SingleIntFactory extends IntStreamFactory {
+  @Override
   public IntIndexInput openInput(Directory dir, String fileName, int readBufferSize) throws IOException {
     return new SingleIntIndexInput(dir, fileName, readBufferSize);
   }
+  @Override
   public IntIndexOutput createOutput(Directory dir, String fileName) throws IOException {
     return new SingleIntIndexOutput(dir, fileName);
   }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SingleIntIndexInput.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SingleIntIndexInput.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SingleIntIndexInput.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SingleIntIndexInput.java Sat Oct 31 15:39:26 2009
@@ -34,10 +34,12 @@
     Codec.checkHeader(in, SingleIntIndexOutput.CODEC, SingleIntIndexOutput.VERSION_START);
   }
 
+  @Override
   public Reader reader() throws IOException {
     return new Reader((IndexInput) in.clone());
   }
 
+  @Override
   public void close() throws IOException {
     in.close();
   }
@@ -54,11 +56,13 @@
     }
 
     /** Reads next single int */
+    @Override
     public int next() throws IOException {
       return in.readVInt();
     }
 
     /** Reads next chunk of ints */
+    @Override
     public BulkReadResult read(int[] buffer, int count) throws IOException {
       result.buffer = buffer;
       for(int i=0;i<count;i++) {
@@ -68,6 +72,7 @@
       return result;
     }
 
+    @Override
     public String descFilePointer() {
       return Long.toString(in.getFilePointer());
     }
@@ -82,6 +87,7 @@
     private long fp;
     boolean first = true;
 
+    @Override
     public void read(IndexInput indexIn, boolean absolute)
       throws IOException {
       long cur = fp;
@@ -97,15 +103,18 @@
       }
     }
 
+    @Override
     public void set(IntIndexInput.Index other) {
       fp = ((Index) other).fp;
       first = false;
     }
 
+    @Override
     public void seek(IntIndexInput.Reader other) throws IOException {
       ((Reader) other).in.seek(fp);
     }
 
+    @Override
     public String toString() {
       return Long.toString(fp);
     }
@@ -130,6 +139,7 @@
     
   }
 
+  @Override
   public Index index() {
     return new Index();
   }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SingleIntIndexOutput.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SingleIntIndexOutput.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SingleIntIndexOutput.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SingleIntIndexOutput.java Sat Oct 31 15:39:26 2009
@@ -40,18 +40,22 @@
   }
 
   /** Write an int to the primary file */
+  @Override
   public void write(int v) throws IOException {
     out.writeVInt(v);
   }
 
+  @Override
   public Index index() {
     return new Index();
   }
 
+  @Override
   public void close() throws IOException {
     out.close();
   }
 
+  @Override
   public String descFilePointer() {
     return Long.toString(out.getFilePointer());
   }
@@ -59,15 +63,18 @@
   private class Index extends IntIndexOutput.Index {
     long fp;
     long lastFP;
+    @Override
     public void mark() {
       fp = out.getFilePointer();
       if (Codec.DEBUG) {
         System.out.println("siio.idx.mark id=" + desc + " fp=" + fp);
       }
     }
+    @Override
     public void set(IntIndexOutput.Index other) {
       lastFP = fp = ((Index) other).fp;
     }
+    @Override
     public void write(IndexOutput indexOut, boolean absolute)
       throws IOException {
       if (Codec.DEBUG) {
@@ -80,6 +87,7 @@
       }
       lastFP = fp;
     }
+    @Override
     public String toString() {
       return Long.toString(fp);
     }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/DefaultSkipListReader.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/DefaultSkipListReader.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/DefaultSkipListReader.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/DefaultSkipListReader.java Sat Oct 31 15:39:26 2009
@@ -82,6 +82,7 @@
     return lastPayloadLength;
   }
   
+  @Override
   protected void seekChild(int level) throws IOException {
     super.seekChild(level);
     freqPointer[level] = lastFreqPointer;
@@ -89,6 +90,7 @@
     payloadLength[level] = lastPayloadLength;
   }
   
+  @Override
   protected void setLastSkipData(int level) {
     super.setLastSkipData(level);
     lastFreqPointer = freqPointer[level];
@@ -97,6 +99,7 @@
   }
 
 
+  @Override
   protected int readSkipData(int level, IndexInput skipStream) throws IOException {
     int delta;
     if (currentFieldStoresPayloads) {

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/DefaultSkipListWriter.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/DefaultSkipListWriter.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/DefaultSkipListWriter.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/DefaultSkipListWriter.java Sat Oct 31 15:39:26 2009
@@ -83,6 +83,7 @@
   }
 
   // nocommit -- made public
+  @Override
   public void resetSkip() {
     super.resetSkip();
     Arrays.fill(lastSkipDoc, 0);
@@ -98,6 +99,7 @@
     }
   }
   
+  @Override
   protected void writeSkipData(int level, IndexOutput skipBuffer) throws IOException {
     // To efficiently store payloads in the posting lists we do not store the length of
     // every payload. Instead we omit the length for a payload if the previous payload had

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/SimpleStandardTermsIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/SimpleStandardTermsIndexReader.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/SimpleStandardTermsIndexReader.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/SimpleStandardTermsIndexReader.java Sat Oct 31 15:39:26 2009
@@ -210,10 +210,12 @@
       }
     }
 
+    @Override
     public boolean isIndexTerm(int position, int docFreq) {
       return position % totalIndexInterval == 0;
     }
 
+    @Override
     public final void getIndexOffset(TermRef term, TermsIndexResult result) throws IOException {
       // You must call loadTermsIndex if you had specified -1 for indexDivisor
       if (coreIndex == null) {
@@ -222,6 +224,7 @@
       coreIndex.getIndexOffset(term, result);
     }
 
+    @Override
     public final void getIndexOffset(long ord, TermsIndexResult result) throws IOException {
       // You must call loadTermsIndex if you had specified -1 for indexDivisor
       if (coreIndex == null) {
@@ -448,6 +451,7 @@
     }
   }
 
+  @Override
   public void loadTermsIndex() throws IOException {
 
     if (!indexLoaded) {
@@ -466,6 +470,7 @@
     }
   }
 
+  @Override
   public FieldReader getField(FieldInfo fieldInfo) {
     return fields.get(fieldInfo);
   }
@@ -478,10 +483,12 @@
     extensions.add(StandardCodec.TERMS_INDEX_EXTENSION);
   }
 
+  @Override
   public void getExtensions(Collection extensions) {
     getIndexExtensions(extensions);
   }
 
+  @Override
   public void close() throws IOException {
     if (in != null) {
       in.close();

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/SimpleStandardTermsIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/SimpleStandardTermsIndexWriter.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/SimpleStandardTermsIndexWriter.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/SimpleStandardTermsIndexWriter.java Sat Oct 31 15:39:26 2009
@@ -67,6 +67,7 @@
   final private DeltaBytesWriter termWriter;
   private FieldInfo currentField;
 
+  @Override
   public FieldWriter addField(FieldInfo field) {
     currentField = field;
     SimpleFieldWriter writer = new SimpleFieldWriter(field);
@@ -87,6 +88,7 @@
       termWriter.reset();
     }
 
+    @Override
     public boolean checkIndexTerm(byte[] term, int termLength, int docFreq) throws IOException {
       // First term is first indexed term:
       if (0 == (numTerms++ % termIndexInterval)) {
@@ -107,6 +109,7 @@
     }
   }
 
+  @Override
   public void close() throws IOException {
     final long dirStart = out.getFilePointer();
     if (Codec.DEBUG) {

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardCodec.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardCodec.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardCodec.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardCodec.java Sat Oct 31 15:39:26 2009
@@ -36,6 +36,7 @@
     name = "Standard";
   }
 
+  @Override
   public FieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
     StandardDocsConsumer docs = new StandardDocsWriter(state);
 
@@ -66,6 +67,7 @@
     }
   }
 
+  @Override
   public FieldsProducer fieldsProducer(Directory dir, FieldInfos fieldInfos, SegmentInfo si, int readBufferSize, int indexDivisor) throws IOException {
     StandardDocsReader docs = new StandardDocsReader(dir, si, readBufferSize);
     StandardTermsIndexReader indexReader;
@@ -116,12 +118,14 @@
   /** Extension of terms index file */
   static final String TERMS_INDEX_EXTENSION = "tii";
 
+  @Override
   public void files(Directory dir, SegmentInfo segmentInfo, Collection files) {
     StandardDocsReader.files(segmentInfo, files);
     StandardTermsDictReader.files(segmentInfo, files);
     SimpleStandardTermsIndexReader.files(segmentInfo, files);
   }
 
+  @Override
   public void getExtensions(Collection extensions) {
     getStandardExtensions(extensions);
   }

Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardDocsReader.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardDocsReader.java?rev=831556&r1=831555&r2=831556&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardDocsReader.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardDocsReader.java Sat Oct 31 15:39:26 2009
@@ -285,6 +285,7 @@
         //new Throwable().printStackTrace(System.out);
       }
 
+      @Override
       public int next() throws IOException {
         if (Codec.DEBUG) {
           System.out.println("sdr.next [" + desc + "] count=" + count + " vs df=" + docFreq + " freq pointer=" + freqIn.getFilePointer() + " (in=" + freqIn + "; this=" + this + ") + has skip docs=" + (skipDocs != null));
@@ -335,6 +336,7 @@
         return doc;
       }
 
+      @Override
       public int read(int[] docs, int[] freqs) throws IOException {
         if (Codec.DEBUG) {
           System.out.println("sdr.read: count=" + count + " df=" + docFreq);
@@ -378,6 +380,7 @@
         return doc;
       }
 
+      @Override
       public int freq() {
         return freq;
       }
@@ -387,6 +390,7 @@
       int proxSkipFreq;
       PositionsEnum fakePositions;
 
+      @Override
       public PositionsEnum positions() throws IOException {
         if (Codec.DEBUG) {
           System.out.println("str.positions: create");
@@ -420,6 +424,7 @@
         return positions;
       }
 
+      @Override
       public int advance(int target) throws IOException {
 
         // TODO: jump right to next() if target is < X away



Mime
View raw message