lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rm...@apache.org
Subject svn commit: r1389149 [2/5] - in /lucene/dev/branches/lucene_solr_4_0: ./ dev-tools/ dev-tools/eclipse/dot.settings/ lucene/ lucene/analysis/ lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/ lucene/analysis/common/src/java/org/apac...
Date Sun, 23 Sep 2012 21:39:27 GMT
Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xStoredFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xStoredFieldsReader.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xStoredFieldsReader.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xStoredFieldsReader.java Sun Sep 23 21:39:18 2012
@@ -42,7 +42,7 @@ import java.io.Closeable;
  * <p/>
  * It uses &lt;segment&gt;.fdt and &lt;segment&gt;.fdx; files.
  * 
- * @deprecated
+ * @deprecated Only for reading existing 3.x indexes
  */
 @Deprecated
 final class Lucene3xStoredFieldsReader extends StoredFieldsReader implements Cloneable, Closeable {
@@ -206,7 +206,7 @@ final class Lucene3xStoredFieldsReader e
    * Closes the underlying {@link org.apache.lucene.store.IndexInput} streams.
    * This means that the Fields values will not be accessible.
    *
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public final void close() throws IOException {
     if (!closed) {

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsReader.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsReader.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsReader.java Sun Sep 23 21:39:18 2012
@@ -46,7 +46,7 @@ import org.apache.lucene.util.Bits;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.IOUtils;
 
-/** @deprecated */
+/** @deprecated Only for reading existing 3.x indexes */
 @Deprecated
 class Lucene3xTermVectorsReader extends TermVectorsReader {
 

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReaderIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReaderIndex.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReaderIndex.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReaderIndex.java Sun Sep 23 21:39:18 2012
@@ -37,7 +37,7 @@ import org.apache.lucene.util.packed.Pac
  * index segment. Pairs are accessed either by Term or by ordinal position the
  * set. The Terms and TermInfo are actually serialized and stored into a byte
  * array and pointers to the position of each are stored in a int array.
- * @deprecated
+ * @deprecated Only for reading existing 3.x indexes
  */
 @Deprecated
 class TermInfosReaderIndex {
@@ -150,7 +150,7 @@ class TermInfosReaderIndex {
    * 
    * @param term
    *          the term to locate.
-   * @throws IOException 
+   * @throws IOException If there is a low-level I/O error.
    */
   int getIndexOffset(Term term) throws IOException {
     int lo = 0;
@@ -176,7 +176,7 @@ class TermInfosReaderIndex {
    * @param termIndex
    *          the position to read the term from the index.
    * @return the term.
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   Term getTerm(int termIndex) throws IOException {
     PagedBytesDataInput input = dataInput.clone();
@@ -206,7 +206,7 @@ class TermInfosReaderIndex {
    * @param termIndex
    *          the index of the of term to compare.
    * @return int.
-   * @throws IOException 
+   * @throws IOException If there is a low-level I/O error.
    */
   int compareTo(Term term, int termIndex) throws IOException {
     return compareTo(term, termIndex, dataInput.clone(), new BytesRef());
@@ -223,7 +223,7 @@ class TermInfosReaderIndex {
    * @param input
    *          the input buffer.
    * @return int.
-   * @throws IOException 
+   * @throws IOException If there is a low-level I/O error.
    */
   private int compareTo(Term term, int termIndex, PagedBytesDataInput input, BytesRef reuse) throws IOException {
     // if term field does not equal mid's field index, then compare fields
@@ -248,7 +248,7 @@ class TermInfosReaderIndex {
    * @param input
    *          the data block.
    * @return int.
-   * @throws IOException 
+   * @throws IOException If there is a low-level I/O error.
    */
   private int compareField(Term term, int termIndex, PagedBytesDataInput input) throws IOException {
     input.setPosition(indexToDataOffset.get(termIndex));

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsReader.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsReader.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsReader.java Sun Sep 23 21:39:18 2012
@@ -120,7 +120,7 @@ public final class Lucene40StoredFieldsR
    * Closes the underlying {@link org.apache.lucene.store.IndexInput} streams.
    * This means that the Fields values will not be accessible.
    *
-   * @throws IOException
+   * @throws IOException If an I/O error occurs
    */
   public final void close() throws IOException {
     if (!closed) {

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/DirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/DirectoryReader.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/DirectoryReader.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/DirectoryReader.java Sun Sep 23 21:39:18 2012
@@ -99,7 +99,7 @@ public abstract class DirectoryReader ex
    * can tolerate deleted documents being returned you might
    * gain some performance by passing false.
    * @return The new IndexReader
-   * @throws CorruptIndexException
+   * @throws CorruptIndexException if the index is corrupt
    * @throws IOException if there is a low-level IO error
    *
    * @see #openIfChanged(DirectoryReader,IndexWriter,boolean)
@@ -241,7 +241,7 @@ public abstract class DirectoryReader ex
    * can tolerate deleted documents being returned you might
    * gain some performance by passing false.
    *
-   * @throws IOException
+   * @throws IOException if there is a low-level IO error
    *
    * @lucene.experimental
    */

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java Sun Sep 23 21:39:18 2012
@@ -146,10 +146,13 @@ public class FieldInfos implements Itera
 
   /**
    * Return the fieldinfo object referenced by the fieldNumber.
-   * @param fieldNumber
+   * @param fieldNumber field's number. if this is negative, this method
+   *        always returns null.
    * @return the FieldInfo object or null when the given fieldNumber
    * doesn't exist.
    */  
+  // TODO: fix this negative behavior, this was something related to Lucene3x?
+  // if the field name is empty, i think it writes the fieldNumber as -1
   public FieldInfo fieldInfo(int fieldNumber) {
     return (fieldNumber >= 0) ? byNumber.get(fieldNumber) : null;
   }

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/FilteredTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/FilteredTermsEnum.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/FilteredTermsEnum.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/FilteredTermsEnum.java Sun Sep 23 21:39:18 2012
@@ -150,7 +150,8 @@ public abstract class FilteredTermsEnum 
   }
 
   /** This enum does not support seeking!
-   * @throws UnsupportedOperationException
+   * @throws UnsupportedOperationException In general, subclasses do not
+   *         support seeking.
    */
   @Override
   public boolean seekExact(BytesRef term, boolean useCache) throws IOException {
@@ -158,7 +159,8 @@ public abstract class FilteredTermsEnum 
   }
 
   /** This enum does not support seeking!
-   * @throws UnsupportedOperationException
+   * @throws UnsupportedOperationException In general, subclasses do not
+   *         support seeking.
    */
   @Override
   public SeekStatus seekCeil(BytesRef term, boolean useCache) throws IOException {
@@ -166,7 +168,8 @@ public abstract class FilteredTermsEnum 
   }
 
   /** This enum does not support seeking!
-   * @throws UnsupportedOperationException
+   * @throws UnsupportedOperationException In general, subclasses do not
+   *         support seeking.
    */
   @Override
   public void seekExact(long ord) throws IOException {
@@ -189,7 +192,8 @@ public abstract class FilteredTermsEnum 
   }
   
   /** This enum does not support seeking!
-   * @throws UnsupportedOperationException
+   * @throws UnsupportedOperationException In general, subclasses do not
+   *         support seeking.
    */
   @Override
   public void seekExact(BytesRef term, TermState state) throws IOException {

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java Sun Sep 23 21:39:18 2012
@@ -322,7 +322,7 @@ public class IndexWriter implements Clos
    * @return IndexReader that covers entire index plus all
    * changes made so far by this IndexWriter instance
    *
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error
    */
   DirectoryReader getReader(boolean applyAllDeletes) throws IOException {
     ensureOpen();
@@ -475,7 +475,7 @@ public class IndexWriter implements Clos
      * Commit live docs changes for the segment readers for
      * the provided infos.
      *
-     * @throws IOException
+     * @throws IOException If there is a low-level I/O error
      */
     public synchronized void commit(SegmentInfos infos) throws IOException {
       for (SegmentInfoPerCommit info : infos) {

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/ReaderManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/ReaderManager.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/ReaderManager.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/ReaderManager.java Sun Sep 23 21:39:18 2012
@@ -51,7 +51,7 @@ public final class ReaderManager extends
    *          performance by passing <code>false</code>. See
    *          {@link DirectoryReader#openIfChanged(DirectoryReader, IndexWriter, boolean)}.
    * 
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error
    */
   public ReaderManager(IndexWriter writer, boolean applyAllDeletes) throws IOException {
     current = DirectoryReader.open(writer, applyAllDeletes);
@@ -61,7 +61,7 @@ public final class ReaderManager extends
    * Creates and returns a new ReaderManager from the given {@link Directory}. 
    * @param dir the directory to open the DirectoryReader on.
    *        
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error
    */
   public ReaderManager(Directory dir) throws IOException {
     current = DirectoryReader.open(dir);

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java Sun Sep 23 21:39:18 2012
@@ -70,7 +70,6 @@ final class SegmentMerger {
 
   /**
    * Add an IndexReader to the collection of readers that are to be merged
-   * @param reader
    */
   final void add(IndexReader reader) {
     for (final AtomicReaderContext ctx : reader.leaves()) {
@@ -253,7 +252,7 @@ final class SegmentMerger {
 
   /**
    * Merge the TermVectors from each of the segments into the new one.
-   * @throws IOException
+   * @throws IOException if there is a low-level IO error
    */
   private final int mergeVectors() throws IOException {
     final TermVectorsWriter termVectorsWriter = codec.termVectorsFormat().vectorsWriter(directory, mergeState.segmentInfo, context);

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java Sun Sep 23 21:39:18 2012
@@ -168,12 +168,6 @@ public final class SegmentReader extends
     return core.termVectorsLocal.get();
   }
 
-  /** Return a term frequency vector for the specified document and field. The
-   *  vector returned contains term numbers and frequencies for all terms in
-   *  the specified field of this document, if the field had storeTermVector
-   *  flag set.  If the flag was not set, the method returns null.
-   * @throws IOException
-   */
   @Override
   public Fields getTermVectors(int docID) throws IOException {
     TermVectorsReader termVectorsReader = getTermVectorsReader();

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/Term.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/Term.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/Term.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/index/Term.java Sun Sep 23 21:39:18 2012
@@ -56,7 +56,7 @@ public final class Term implements Compa
    * This serves two purposes: 1) reuse of a Term with the same field.
    * 2) pattern for a query.
    * 
-   * @param fld
+   * @param fld field's name
    */
   public Term(String fld) {
     this(fld, new BytesRef());

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/FieldComparator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/FieldComparator.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/FieldComparator.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/FieldComparator.java Sun Sep 23 21:39:18 2012
@@ -148,7 +148,7 @@ public abstract class FieldComparator<T>
    * @return the comparator to use for this segment; most
    *   comparators can just return "this" to reuse the same
    *   comparator across segments
-   * @throws IOException
+   * @throws IOException if there is a low-level IO error
    */
   public abstract FieldComparator<T> setNextReader(AtomicReaderContext context) throws IOException;
 

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/FieldValueHitQueue.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/FieldValueHitQueue.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/FieldValueHitQueue.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/FieldValueHitQueue.java Sun Sep 23 21:39:18 2012
@@ -159,7 +159,7 @@ public abstract class FieldValueHitQueue
    *          priority first); cannot be <code>null</code> or empty
    * @param size
    *          The number of hits to retain. Must be greater than zero.
-   * @throws IOException
+   * @throws IOException if there is a low-level IO error
    */
   public static <T extends FieldValueHitQueue.Entry> FieldValueHitQueue<T> create(SortField[] fields, int size) throws IOException {
 

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/FuzzyTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/FuzzyTermsEnum.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/FuzzyTermsEnum.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/FuzzyTermsEnum.java Sun Sep 23 21:39:18 2012
@@ -96,7 +96,7 @@ public class FuzzyTermsEnum extends Term
    * @param minSimilarity Minimum required similarity for terms from the reader. Pass an integer value
    *        representing edit distance. Passing a fraction is deprecated.
    * @param prefixLength Length of required common prefix. Default value is 0.
-   * @throws IOException
+   * @throws IOException if there is a low-level IO error
    */
   public FuzzyTermsEnum(Terms terms, AttributeSource atts, Term term, 
       final float minSimilarity, final int prefixLength, boolean transpositions) throws IOException {

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java Sun Sep 23 21:39:18 2012
@@ -219,7 +219,8 @@ public class IndexSearcher {
    * this method can be used for efficient 'deep-paging' across potentially
    * large result sets.
    *
-   * @throws BooleanQuery.TooManyClauses
+   * @throws BooleanQuery.TooManyClauses If a query would exceed 
+   *         {@link BooleanQuery#getMaxClauseCount()} clauses.
    */
   public TopDocs searchAfter(ScoreDoc after, Query query, int n) throws IOException {
     return search(createNormalizedWeight(query), after, n);
@@ -233,7 +234,8 @@ public class IndexSearcher {
    * this method can be used for efficient 'deep-paging' across potentially
    * large result sets.
    *
-   * @throws BooleanQuery.TooManyClauses
+   * @throws BooleanQuery.TooManyClauses If a query would exceed 
+   *         {@link BooleanQuery#getMaxClauseCount()} clauses.
    */
   public TopDocs searchAfter(ScoreDoc after, Query query, Filter filter, int n) throws IOException {
     return search(createNormalizedWeight(wrapFilter(query, filter)), after, n);
@@ -242,7 +244,8 @@ public class IndexSearcher {
   /** Finds the top <code>n</code>
    * hits for <code>query</code>.
    *
-   * @throws BooleanQuery.TooManyClauses
+   * @throws BooleanQuery.TooManyClauses If a query would exceed 
+   *         {@link BooleanQuery#getMaxClauseCount()} clauses.
    */
   public TopDocs search(Query query, int n)
     throws IOException {
@@ -253,7 +256,8 @@ public class IndexSearcher {
   /** Finds the top <code>n</code>
    * hits for <code>query</code>, applying <code>filter</code> if non-null.
    *
-   * @throws BooleanQuery.TooManyClauses
+   * @throws BooleanQuery.TooManyClauses If a query would exceed 
+   *         {@link BooleanQuery#getMaxClauseCount()} clauses.
    */
   public TopDocs search(Query query, Filter filter, int n)
     throws IOException {
@@ -268,7 +272,8 @@ public class IndexSearcher {
    * @param query to match documents
    * @param filter if non-null, used to permit documents to be collected.
    * @param results to receive hits
-   * @throws BooleanQuery.TooManyClauses
+   * @throws BooleanQuery.TooManyClauses If a query would exceed 
+   *         {@link BooleanQuery#getMaxClauseCount()} clauses.
    */
   public void search(Query query, Filter filter, Collector results)
     throws IOException {
@@ -276,11 +281,12 @@ public class IndexSearcher {
   }
 
   /** Lower-level search API.
-  *
-  * <p>{@link Collector#collect(int)} is called for every matching document.
-  *
-  * @throws BooleanQuery.TooManyClauses
-  */
+   *
+   * <p>{@link Collector#collect(int)} is called for every matching document.
+   *
+   * @throws BooleanQuery.TooManyClauses If a query would exceed 
+   *         {@link BooleanQuery#getMaxClauseCount()} clauses.
+   */
   public void search(Query query, Collector results)
     throws IOException {
     search(leafContexts, createNormalizedWeight(query), results);
@@ -295,7 +301,8 @@ public class IndexSearcher {
    * {@link IndexSearcher#search(Query,Filter,int,Sort,boolean,boolean)} to
    * control scoring.
    *
-   * @throws BooleanQuery.TooManyClauses
+   * @throws BooleanQuery.TooManyClauses If a query would exceed 
+   *         {@link BooleanQuery#getMaxClauseCount()} clauses.
    */
   public TopFieldDocs search(Query query, Filter filter, int n,
                              Sort sort) throws IOException {
@@ -313,7 +320,8 @@ public class IndexSearcher {
    * <code>true</code> then the maximum score over all
    * collected hits will be computed.
    * 
-   * @throws BooleanQuery.TooManyClauses
+   * @throws BooleanQuery.TooManyClauses If a query would exceed 
+   *         {@link BooleanQuery#getMaxClauseCount()} clauses.
    */
   public TopFieldDocs search(Query query, Filter filter, int n,
                              Sort sort, boolean doDocScores, boolean doMaxScore) throws IOException {
@@ -328,7 +336,8 @@ public class IndexSearcher {
    * this method can be used for efficient 'deep-paging' across potentially
    * large result sets.
    *
-   * @throws BooleanQuery.TooManyClauses
+   * @throws BooleanQuery.TooManyClauses If a query would exceed 
+   *         {@link BooleanQuery#getMaxClauseCount()} clauses.
    */
   public TopDocs searchAfter(ScoreDoc after, Query query, Filter filter, int n, Sort sort) throws IOException {
     if (after != null && !(after instanceof FieldDoc)) {
@@ -345,7 +354,7 @@ public class IndexSearcher {
    * @param n Return only the top n results
    * @param sort The {@link org.apache.lucene.search.Sort} object
    * @return The top docs, sorted according to the supplied {@link org.apache.lucene.search.Sort} instance
-   * @throws IOException
+   * @throws IOException if there is a low-level I/O error
    */
   public TopFieldDocs search(Query query, int n,
                              Sort sort) throws IOException {
@@ -360,7 +369,8 @@ public class IndexSearcher {
    * this method can be used for efficient 'deep-paging' across potentially
    * large result sets.
    *
-   * @throws BooleanQuery.TooManyClauses
+   * @throws BooleanQuery.TooManyClauses If a query would exceed 
+   *         {@link BooleanQuery#getMaxClauseCount()} clauses.
    */
   public TopDocs searchAfter(ScoreDoc after, Query query, int n, Sort sort) throws IOException {
     if (after != null && !(after instanceof FieldDoc)) {
@@ -384,7 +394,8 @@ public class IndexSearcher {
    * <code>true</code> then the maximum score over all
    * collected hits will be computed.
    *
-   * @throws BooleanQuery.TooManyClauses
+   * @throws BooleanQuery.TooManyClauses If a query would exceed 
+   *         {@link BooleanQuery#getMaxClauseCount()} clauses.
    */
   public TopDocs searchAfter(ScoreDoc after, Query query, Filter filter, int n, Sort sort,
                              boolean doDocScores, boolean doMaxScore) throws IOException {
@@ -402,7 +413,8 @@ public class IndexSearcher {
    *
    * <p>Applications should usually call {@link IndexSearcher#search(Query,int)} or
    * {@link IndexSearcher#search(Query,Filter,int)} instead.
-   * @throws BooleanQuery.TooManyClauses
+   * @throws BooleanQuery.TooManyClauses If a query would exceed 
+   *         {@link BooleanQuery#getMaxClauseCount()} clauses.
    */
   protected TopDocs search(Weight weight, ScoreDoc after, int nDocs) throws IOException {
     if (executor == null) {
@@ -439,7 +451,8 @@ public class IndexSearcher {
    *
    * <p>Applications should usually call {@link IndexSearcher#search(Query,int)} or
    * {@link IndexSearcher#search(Query,Filter,int)} instead.
-   * @throws BooleanQuery.TooManyClauses
+   * @throws BooleanQuery.TooManyClauses If a query would exceed 
+   *         {@link BooleanQuery#getMaxClauseCount()} clauses.
    */
   protected TopDocs search(List<AtomicReaderContext> leaves, Weight weight, ScoreDoc after, int nDocs) throws IOException {
     // single thread
@@ -462,7 +475,8 @@ public class IndexSearcher {
    * <p>Applications should usually call {@link
    * IndexSearcher#search(Query,Filter,int,Sort)} instead.
    * 
-   * @throws BooleanQuery.TooManyClauses
+   * @throws BooleanQuery.TooManyClauses If a query would exceed 
+   *         {@link BooleanQuery#getMaxClauseCount()} clauses.
    */
   protected TopFieldDocs search(Weight weight,
                                 final int nDocs, Sort sort,
@@ -558,7 +572,8 @@ public class IndexSearcher {
    *          to match documents
    * @param collector
    *          to receive hits
-   * @throws BooleanQuery.TooManyClauses
+   * @throws BooleanQuery.TooManyClauses If a query would exceed 
+   *         {@link BooleanQuery#getMaxClauseCount()} clauses.
    */
   protected void search(List<AtomicReaderContext> leaves, Weight weight, Collector collector)
       throws IOException {
@@ -576,7 +591,8 @@ public class IndexSearcher {
   }
 
   /** Expert: called to re-write queries into primitive queries.
-   * @throws BooleanQuery.TooManyClauses
+   * @throws BooleanQuery.TooManyClauses If a query would exceed 
+   *         {@link BooleanQuery#getMaxClauseCount()} clauses.
    */
   public Query rewrite(Query original) throws IOException {
     Query query = original;
@@ -608,7 +624,8 @@ public class IndexSearcher {
    * Computing an explanation is as expensive as executing the query over the
    * entire index.
    * <p>Applications should call {@link IndexSearcher#explain(Query, int)}.
-   * @throws BooleanQuery.TooManyClauses
+   * @throws BooleanQuery.TooManyClauses If a query would exceed 
+   *         {@link BooleanQuery#getMaxClauseCount()} clauses.
    */
   protected Explanation explain(Weight weight, int doc) throws IOException {
     int n = ReaderUtil.subIndex(doc, leafContexts);

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java Sun Sep 23 21:39:18 2012
@@ -86,8 +86,6 @@ public class MultiPhraseQuery extends Qu
    * Allows to specify the relative position of terms within the phrase.
    * 
    * @see PhraseQuery#add(Term, int)
-   * @param terms
-   * @param position
    */
   public void add(Term[] terms, int position) {
     if (termArrays.size() == 0)

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/NGramPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/NGramPhraseQuery.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/NGramPhraseQuery.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/NGramPhraseQuery.java Sun Sep 23 21:39:18 2012
@@ -35,7 +35,7 @@ public class NGramPhraseQuery extends Ph
   
   /**
    * Constructor that takes gram size.
-   * @param n
+   * @param n n-gram size
    */
   public NGramPhraseQuery(int n){
     super();

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java Sun Sep 23 21:39:18 2012
@@ -90,8 +90,6 @@ public class PhraseQuery extends Query {
    * This allows e.g. phrases with more than one term at the same position
    * or phrases with gaps (e.g. in connection with stopwords).
    * 
-   * @param term
-   * @param position
    */
   public void add(Term term, int position) {
     if (terms.size() == 0) {

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/SearcherManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/SearcherManager.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/SearcherManager.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/SearcherManager.java Sun Sep 23 21:39:18 2012
@@ -79,7 +79,7 @@ public final class SearcherManager exten
    *          don't require the searcher to be warmed before going live or other
    *          custom behavior.
    * 
-   * @throws IOException
+   * @throws IOException if there is a low-level I/O error
    */
   public SearcherManager(IndexWriter writer, boolean applyAllDeletes, SearcherFactory searcherFactory) throws IOException {
     if (searcherFactory == null) {
@@ -96,7 +96,7 @@ public final class SearcherManager exten
    *        <code>null</code> if you don't require the searcher to be warmed
    *        before going live or other custom behavior.
    *        
-   * @throws IOException
+   * @throws IOException if there is a low-level I/O error
    */
   public SearcherManager(Directory dir, SearcherFactory searcherFactory) throws IOException {
     if (searcherFactory == null) {

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/TimeLimitingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/TimeLimitingCollector.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/TimeLimitingCollector.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/TimeLimitingCollector.java Sun Sep 23 21:39:18 2012
@@ -96,7 +96,6 @@ public class TimeLimitingCollector exten
    * </pre>
    * </p>
    * @see #setBaseline() 
-   * @param clockTime
    */
   public void setBaseline(long clockTime) {
     t0 = clockTime;

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/TopFieldCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/TopFieldCollector.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/TopFieldCollector.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/TopFieldCollector.java Sun Sep 23 21:39:18 2012
@@ -1060,7 +1060,7 @@ public abstract class TopFieldCollector 
    *          the given {@link Scorer} in {@link #setScorer(Scorer)}.
    * @return a {@link TopFieldCollector} instance which will sort the results by
    *         the sort criteria.
-   * @throws IOException
+   * @throws IOException if there is a low-level I/O error
    */
   public static TopFieldCollector create(Sort sort, int numHits,
       boolean fillFields, boolean trackDocScores, boolean trackMaxScore,
@@ -1105,7 +1105,7 @@ public abstract class TopFieldCollector 
    *          the given {@link Scorer} in {@link #setScorer(Scorer)}.
    * @return a {@link TopFieldCollector} instance which will sort the results by
    *         the sort criteria.
-   * @throws IOException
+   * @throws IOException if there is a low-level I/O error
    */
   public static TopFieldCollector create(Sort sort, int numHits, FieldDoc after,
       boolean fillFields, boolean trackDocScores, boolean trackMaxScore,

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/Weight.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/Weight.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/Weight.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/Weight.java Sun Sep 23 21:39:18 2012
@@ -108,7 +108,7 @@ public abstract class Weight {
    *          but possibly filtering other documents)
    *          
    * @return a {@link Scorer} which scores documents in/out-of order.
-   * @throws IOException
+   * @throws IOException if there is a low-level I/O error
    */
   public abstract Scorer scorer(AtomicReaderContext context, boolean scoreDocsInOrder,
       boolean topScorer, Bits acceptDocs) throws IOException;

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadSpanUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadSpanUtil.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadSpanUtil.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadSpanUtil.java Sun Sep 23 21:39:18 2012
@@ -69,9 +69,9 @@ public class PayloadSpanUtil {
   /**
    * Query should be rewritten for wild/fuzzy support.
    * 
-   * @param query
+   * @param query rewritten query
    * @return payloads Collection
-   * @throws IOException
+   * @throws IOException if there is a low-level I/O error
    */
   public Collection<byte[]> getPayloadsForQuery(Query query) throws IOException {
     Collection<byte[]> payloads = new ArrayList<byte[]>();

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java Sun Sep 23 21:39:18 2012
@@ -139,7 +139,7 @@ public class PayloadTermQuery extends Sp
       /**
        * 
        * @return {@link #getSpanScore()} * {@link #getPayloadScore()}
-       * @throws IOException
+       * @throws IOException if there is a low-level I/O error
        */
       @Override
       public float score() throws IOException {
@@ -154,7 +154,7 @@ public class PayloadTermQuery extends Sp
        * Should not be overridden without good cause!
        * 
        * @return the score for just the Span part w/o the payload
-       * @throws IOException
+       * @throws IOException if there is a low-level I/O error
        * 
        * @see #score()
        */

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/similarities/Similarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/similarities/Similarity.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/similarities/Similarity.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/similarities/Similarity.java Sun Sep 23 21:39:18 2012
@@ -179,7 +179,7 @@ public abstract class Similarity {
    * @param weight collection information from {@link #computeWeight(float, CollectionStatistics, TermStatistics...)}
    * @param context segment of the inverted index to be scored.
    * @return ExactSimScorer for scoring documents across <code>context</code>
-   * @throws IOException
+   * @throws IOException if there is a low-level I/O error
    */
   public abstract ExactSimScorer exactSimScorer(SimWeight weight, AtomicReaderContext context) throws IOException;
   
@@ -188,7 +188,7 @@ public abstract class Similarity {
    * @param weight collection information from {@link #computeWeight(float, CollectionStatistics, TermStatistics...)}
    * @param context segment of the inverted index to be scored.
    * @return SloppySimScorer for scoring documents across <code>context</code>
-   * @throws IOException
+   * @throws IOException if there is a low-level I/O error
    */
   public abstract SloppySimScorer sloppySimScorer(SimWeight weight, AtomicReaderContext context) throws IOException;
   

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java Sun Sep 23 21:39:18 2012
@@ -219,8 +219,6 @@ public class NearSpansOrdered extends Sp
   }
   
   /** Check whether two Spans in the same document are ordered.
-   * @param spans1 
-   * @param spans2 
    * @return true iff spans1 starts before spans2
    *              or the spans start at the same position,
    *              and spans1 ends before spans2.

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java Sun Sep 23 21:39:18 2012
@@ -241,7 +241,7 @@ public class NearSpansUnordered extends 
   /**
    * WARNING: The List is not necessarily in order of the the positions
    * @return Collection of <code>byte[]</code> payloads
-   * @throws IOException
+   * @throws IOException if there is a low-level I/O error
    */
   @Override
   public Collection<byte[]> getPayload() throws IOException {

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/spans/Spans.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/spans/Spans.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/spans/Spans.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/search/spans/Spans.java Sun Sep 23 21:39:18 2012
@@ -69,7 +69,7 @@ public abstract class Spans {
    * @lucene.experimental
    *
    * @return a List of byte arrays containing the data of this payload, otherwise null if isPayloadAvailable is false
-   * @throws java.io.IOException
+   * @throws IOException if there is a low-level I/O error
     */
   // TODO: Remove warning after API has been finalized
   public abstract Collection<byte[]> getPayload() throws IOException;

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/store/CompoundFileDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/store/CompoundFileDirectory.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/store/CompoundFileDirectory.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/store/CompoundFileDirectory.java Sun Sep 23 21:39:18 2012
@@ -300,14 +300,14 @@ public final class CompoundFileDirectory
   }
   
   /** Not implemented
-   * @throws UnsupportedOperationException */
+   * @throws UnsupportedOperationException always: not supported by CFS */
   @Override
   public void deleteFile(String name) {
     throw new UnsupportedOperationException();
   }
   
   /** Not implemented
-   * @throws UnsupportedOperationException */
+   * @throws UnsupportedOperationException always: not supported by CFS */
   public void renameFile(String from, String to) {
     throw new UnsupportedOperationException();
   }
@@ -338,7 +338,7 @@ public final class CompoundFileDirectory
   }
   
   /** Not implemented
-   * @throws UnsupportedOperationException */
+   * @throws UnsupportedOperationException always: not supported by CFS */
   @Override
   public Lock makeLock(String name) {
     throw new UnsupportedOperationException();

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/store/Directory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/store/Directory.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/store/Directory.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/store/Directory.java Sun Sep 23 21:39:18 2012
@@ -260,7 +260,7 @@ public abstract class Directory implemen
     /**
      * Returns an {@link IndexInput} slice starting at offset <i>0</i> with a
      * length equal to the length of the underlying file
-     * @deprecated
+     * @deprecated Only for reading CFS files from 3.x indexes.
      */
     @Deprecated
     // can we remove this somehow?

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/store/FSDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/store/FSDirectory.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/store/FSDirectory.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/store/FSDirectory.java Sun Sep 23 21:39:18 2012
@@ -135,7 +135,7 @@ public abstract class FSDirectory extend
    * @param path the path of the directory
    * @param lockFactory the lock factory to use, or null for the default
    * ({@link NativeFSLockFactory});
-   * @throws IOException
+   * @throws IOException if there is a low-level I/O error
    */
   protected FSDirectory(File path, LockFactory lockFactory) throws IOException {
     // new ctors use always NativeFSLockFactory as default:

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/store/MMapDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/store/MMapDirectory.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/store/MMapDirectory.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/store/MMapDirectory.java Sun Sep 23 21:39:18 2012
@@ -90,7 +90,7 @@ public class MMapDirectory extends FSDir
    * @param path the path of the directory
    * @param lockFactory the lock factory to use, or null for the default
    * ({@link NativeFSLockFactory});
-   * @throws IOException
+   * @throws IOException if there is a low-level I/O error
    */
   public MMapDirectory(File path, LockFactory lockFactory) throws IOException {
     this(path, lockFactory, DEFAULT_MAX_BUFF);
@@ -99,7 +99,7 @@ public class MMapDirectory extends FSDir
   /** Create a new MMapDirectory for the named location and {@link NativeFSLockFactory}.
    *
    * @param path the path of the directory
-   * @throws IOException
+   * @throws IOException if there is a low-level I/O error
    */
   public MMapDirectory(File path) throws IOException {
     this(path, null);
@@ -123,7 +123,7 @@ public class MMapDirectory extends FSDir
    * be {@code 1 << 30}, as the address space is big enough.
    * <p>
    * <b>Please note:</b> The chunk size is always rounded down to a power of 2.
-   * @throws IOException
+   * @throws IOException if there is a low-level I/O error
    */
   public MMapDirectory(File path, LockFactory lockFactory, int maxChunkSize) throws IOException {
     super(path, lockFactory);

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/store/NIOFSDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/store/NIOFSDirectory.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/store/NIOFSDirectory.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/store/NIOFSDirectory.java Sun Sep 23 21:39:18 2012
@@ -58,7 +58,7 @@ public class NIOFSDirectory extends FSDi
    * @param path the path of the directory
    * @param lockFactory the lock factory to use, or null for the default
    * ({@link NativeFSLockFactory});
-   * @throws IOException
+   * @throws IOException if there is a low-level I/O error
    */
   public NIOFSDirectory(File path, LockFactory lockFactory) throws IOException {
     super(path, lockFactory);
@@ -67,7 +67,7 @@ public class NIOFSDirectory extends FSDi
   /** Create a new NIOFSDirectory for the named location and {@link NativeFSLockFactory}.
    *
    * @param path the path of the directory
-   * @throws IOException
+   * @throws IOException if there is a low-level I/O error
    */
   public NIOFSDirectory(File path) throws IOException {
     super(path, null);

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/store/SimpleFSDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/store/SimpleFSDirectory.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/store/SimpleFSDirectory.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/store/SimpleFSDirectory.java Sun Sep 23 21:39:18 2012
@@ -35,7 +35,7 @@ public class SimpleFSDirectory extends F
    * @param path the path of the directory
    * @param lockFactory the lock factory to use, or null for the default
    * ({@link NativeFSLockFactory});
-   * @throws IOException
+   * @throws IOException if there is a low-level I/O error
    */
   public SimpleFSDirectory(File path, LockFactory lockFactory) throws IOException {
     super(path, lockFactory);
@@ -44,7 +44,7 @@ public class SimpleFSDirectory extends F
   /** Create a new SimpleFSDirectory for the named location and {@link NativeFSLockFactory}.
    *
    * @param path the path of the directory
-   * @throws IOException
+   * @throws IOException if there is a low-level I/O error
    */
   public SimpleFSDirectory(File path) throws IOException {
     super(path, null);

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/util/BytesRef.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/util/BytesRef.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/util/BytesRef.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/util/BytesRef.java Sun Sep 23 21:39:18 2012
@@ -262,7 +262,7 @@ public final class BytesRef implements C
     }    
   }
 
-  /** @deprecated */
+  /** @deprecated This comparator is only a transition mechanism */
   @Deprecated
   private final static Comparator<BytesRef> utf8SortedAsUTF16SortOrder = new UTF8SortedAsUTF16Comparator();
 
@@ -272,7 +272,7 @@ public final class BytesRef implements C
     return utf8SortedAsUTF16SortOrder;
   }
 
-  /** @deprecated */
+  /** @deprecated This comparator is only a transition mechanism */
   @Deprecated
   private static class UTF8SortedAsUTF16Comparator implements Comparator<BytesRef> {
     // Only singleton

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/util/BytesRefIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/util/BytesRefIterator.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/util/BytesRefIterator.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/util/BytesRefIterator.java Sun Sep 23 21:39:18 2012
@@ -34,7 +34,7 @@ public interface BytesRefIterator {
    * 
    * @return the next {@link BytesRef} in the iterator or <code>null</code> if
    *         the end of the iterator is reached.
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public BytesRef next() throws IOException;
   

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/util/CharsRef.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/util/CharsRef.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/util/CharsRef.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/util/CharsRef.java Sun Sep 23 21:39:18 2012
@@ -217,7 +217,7 @@ public final class CharsRef implements C
     return new CharsRef(chars, offset + start, offset + end);
   }
   
-  /** @deprecated */
+  /** @deprecated This comparator is only a transition mechanism */
   @Deprecated
   private final static Comparator<CharsRef> utf16SortedAsUTF8SortOrder = new UTF16SortedAsUTF8Comparator();
   
@@ -227,7 +227,7 @@ public final class CharsRef implements C
     return utf16SortedAsUTF8SortOrder;
   }
   
-  /** @deprecated */
+  /** @deprecated This comparator is only a transition mechanism */
   @Deprecated
   private static class UTF16SortedAsUTF8Comparator implements Comparator<CharsRef> {
     // Only singleton

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/util/CommandLineUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/util/CommandLineUtil.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/util/CommandLineUtil.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/util/CommandLineUtil.java Sun Sep 23 21:39:18 2012
@@ -62,7 +62,7 @@ public final class CommandLineUtil {
    * Loads a specific Directory implementation 
    * @param clazzName The name of the Directory class to load
    * @return The Directory class loaded
-   * @throws ClassNotFoundException
+   * @throws ClassNotFoundException If the specified class cannot be found.
    */
   public static Class<? extends Directory> loadDirectoryClass(String clazzName) 
       throws ClassNotFoundException {
@@ -73,7 +73,7 @@ public final class CommandLineUtil {
    * Loads a specific FSDirectory implementation
    * @param clazzName The name of the FSDirectory class to load
    * @return The FSDirectory class loaded
-   * @throws ClassNotFoundException
+   * @throws ClassNotFoundException If the specified class cannot be found.
    */
   public static Class<? extends FSDirectory> loadFSDirectoryClass(String clazzName) 
       throws ClassNotFoundException {
@@ -97,10 +97,10 @@ public final class CommandLineUtil {
    * @param clazz The class of the object to be created
    * @param file The file to be used as parameter constructor
    * @return The new FSDirectory instance
-   * @throws NoSuchMethodException
-   * @throws InstantiationException
-   * @throws IllegalAccessException
-   * @throws InvocationTargetException
+   * @throws NoSuchMethodException If the Directory does not have a constructor that takes <code>File</code>.
+   * @throws InstantiationException If the class is abstract or an interface.
+   * @throws IllegalAccessException If the constructor does not have public visibility.
+   * @throws InvocationTargetException If the constructor throws an exception
    */
   public static FSDirectory newFSDirectory(Class<? extends FSDirectory> clazz, File file) 
       throws NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException {

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/util/OpenBitSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/util/OpenBitSet.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/util/OpenBitSet.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/util/OpenBitSet.java Sun Sep 23 21:39:18 2012
@@ -81,9 +81,7 @@ public class OpenBitSet extends DocIdSet
   // Used only for assert:
   private long numBits;
 
-  /** Constructs an OpenBitSet large enough to hold numBits.
-   *
-   * @param numBits
+  /** Constructs an OpenBitSet large enough to hold <code>numBits</code>.
    */
   public OpenBitSet(long numBits) {
     this.numBits = numBits;

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java Sun Sep 23 21:39:18 2012
@@ -712,7 +712,7 @@ public class PackedInts {
    * @param valueCount   how many values the stream holds
    * @param bitsPerValue the number of bits per value
    * @return             a Reader
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error
    * @see PackedInts#getWriterNoHeader(DataOutput, Format, int, int, int)
    * @lucene.internal
    */
@@ -754,7 +754,7 @@ public class PackedInts {
    *
    * @param in           the stream to read data from
    * @return             a Reader
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error
    * @lucene.internal
    */
   public static Reader getReader(DataInput in) throws IOException {
@@ -846,7 +846,7 @@ public class PackedInts {
    *
    * @param in           the stream to read data from
    * @return a direct Reader
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error
    * @lucene.internal
    */
   public static Reader getDirectReader(IndexInput in) throws IOException {
@@ -990,7 +990,7 @@ public class PackedInts {
    * @param bitsPerValue the number of bits per value
    * @param acceptableOverheadRatio an acceptable overhead ratio per value
    * @return             a Writer
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error
    * @lucene.internal
    */
   public static Writer getWriter(DataOutput out,

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestBitVector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestBitVector.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestBitVector.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestBitVector.java Sun Sep 23 21:39:18 2012
@@ -33,7 +33,6 @@ public class TestBitVector extends Lucen
 
     /**
      * Test the default constructor on BitVectors of various sizes.
-     * @throws Exception
      */
     public void testConstructSize() throws Exception {
         doTestConstructOfSize(8);
@@ -49,7 +48,6 @@ public class TestBitVector extends Lucen
 
     /**
      * Test the get() and set() methods on BitVectors of various sizes.
-     * @throws Exception
      */
     public void testGetSet() throws Exception {
         doTestGetSetVectorOfSize(8);
@@ -70,7 +68,6 @@ public class TestBitVector extends Lucen
 
     /**
      * Test the clear() method on BitVectors of various sizes.
-     * @throws Exception
      */
     public void testClear() throws Exception {
         doTestClearVectorOfSize(8);
@@ -93,7 +90,6 @@ public class TestBitVector extends Lucen
 
     /**
      * Test the count() method on BitVectors of various sizes.
-     * @throws Exception
      */
     public void testCount() throws Exception {
         doTestCountVectorOfSize(8);
@@ -129,7 +125,6 @@ public class TestBitVector extends Lucen
 
     /**
      * Test writing and construction to/from Directory.
-     * @throws Exception
      */
     public void testWriteRead() throws Exception {
         doTestWriteRead(8);

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java Sun Sep 23 21:39:18 2012
@@ -41,8 +41,6 @@ public class TestCrashCausesCorruptIndex
     
   /**
    * LUCENE-3627: This test fails.
-   * 
-   * @throws Exception
    */
   public void testCrashCorruptsIndexing() throws Exception {
     path = _TestUtil.getTempDir("testCrashCorruptsIndexing");
@@ -60,8 +58,6 @@ public class TestCrashCausesCorruptIndex
    * index 1 document and commit.
    * prepare for crashing.
    * index 1 more document, and upon commit, creation of segments_2 will crash.
-   * 
-   * @throws IOException
    */
   private void indexAndCrashOnCreateOutputSegments2() throws IOException {
     Directory realDirectory = FSDirectory.open(path);
@@ -93,8 +89,6 @@ public class TestCrashCausesCorruptIndex
     
   /**
    * Attempts to index another 1 document.
-   * 
-   * @throws IOException
    */
   private void indexAfterRestart() throws IOException {
     Directory realDirectory = newFSDirectory(path);
@@ -115,8 +109,6 @@ public class TestCrashCausesCorruptIndex
     
   /**
    * Run an example search.
-   * 
-   * @throws IOException
    */
   private void searchForFleas(final int expectedTotalHits) throws IOException {
     Directory realDirectory = newFSDirectory(path);

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java Sun Sep 23 21:39:18 2012
@@ -644,8 +644,6 @@ public class TestIndexWriter extends Luc
    * Test that no NullPointerException will be raised,
    * when adding one document with a single, empty field
    * and term vectors enabled.
-   * @throws IOException
-   *
    */
   public void testBadSegment() throws IOException {
     Directory dir = newDirectory();

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java Sun Sep 23 21:39:18 2012
@@ -224,8 +224,6 @@ public class TestIndexWriterReader exten
   
   /**
    * Test using IW.addIndexes
-   * 
-   * @throws Exception
    */
   public void testAddIndexes() throws Exception {
     boolean doFullMerge = false;
@@ -311,8 +309,6 @@ public class TestIndexWriterReader exten
 
   /**
    * Deletes using IW.deleteDocuments
-   * 
-   * @throws Exception
    */
   public void testDeleteFromIndexWriter() throws Exception {
     boolean doFullMerge = true;

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/TestIsCurrent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/TestIsCurrent.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/TestIsCurrent.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/TestIsCurrent.java Sun Sep 23 21:39:18 2012
@@ -56,8 +56,6 @@ public class TestIsCurrent extends Lucen
 
   /**
    * Failing testcase showing the trouble
-   * 
-   * @throws IOException
    */
   @Test
   public void testDeleteByTermIsCurrent() throws IOException {
@@ -83,8 +81,6 @@ public class TestIsCurrent extends Lucen
 
   /**
    * Testcase for example to show that writer.deleteAll() is working as expected
-   * 
-   * @throws IOException
    */
   @Test
   public void testDeleteAllIsCurrent() throws IOException {

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java Sun Sep 23 21:39:18 2012
@@ -36,8 +36,6 @@ public class TestParallelReaderEmptyInde
   /**
    * Creates two empty indexes and wraps a ParallelReader around. Adding this
    * reader to a new index should not throw any exception.
-   * 
-   * @throws IOException
    */
   public void testEmptyIndex() throws IOException {
     Directory rd1 = newDirectory();

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java Sun Sep 23 21:39:18 2012
@@ -59,8 +59,6 @@ public class TestBooleanOr extends Lucen
   /**
    * <code>T:files T:deleting C:production C:optimize </code>
    * it works.
-   *
-   * @throws IOException
    */
   public void testFlat() throws IOException {
     BooleanQuery q = new BooleanQuery();
@@ -74,8 +72,6 @@ public class TestBooleanOr extends Lucen
   /**
    * <code>(T:files T:deleting) (+C:production +C:optimize)</code>
    * it works.
-   *
-   * @throws IOException
    */
   public void testParenthesisMust() throws IOException {
     BooleanQuery q3 = new BooleanQuery();
@@ -93,8 +89,6 @@ public class TestBooleanOr extends Lucen
   /**
    * <code>(T:files T:deleting) +(C:production C:optimize)</code>
    * not working. results NO HIT.
-   *
-   * @throws IOException
    */
   public void testParenthesisMust2() throws IOException {
     BooleanQuery q3 = new BooleanQuery();
@@ -112,8 +106,6 @@ public class TestBooleanOr extends Lucen
   /**
    * <code>(T:files T:deleting) (C:production C:optimize)</code>
    * not working. results NO HIT.
-   *
-   * @throws IOException
    */
   public void testParenthesisShould() throws IOException {
     BooleanQuery q3 = new BooleanQuery();

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java Sun Sep 23 21:39:18 2012
@@ -152,8 +152,6 @@ public class TestCustomSearcherSort exte
   
   /**
    * Check the hits for duplicates.
-   * 
-   * @param hits
    */
   private void checkHits(ScoreDoc[] hits, String prefix) {
     if (hits != null) {
@@ -186,9 +184,6 @@ public class TestCustomSearcherSort exte
   public class CustomSearcher extends IndexSearcher {
     private int switcher;
     
-    /**
-     * @param r
-     */
     public CustomSearcher(IndexReader r, int switcher) {
       super(r);
       this.switcher = switcher;

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java Sun Sep 23 21:39:18 2012
@@ -269,7 +269,6 @@ public class TestWildcard
    * This test looks at both parsing and execution of wildcard queries.
    * Although placed here, it also tests prefix queries, verifying that
    * prefix queries are not parsed into wild card queries, and viceversa.
-   * @throws Exception
    */
   public void testParsingAndSearching() throws Exception {
     String field = "content";

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/search/payloads/PayloadHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/search/payloads/PayloadHelper.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/search/payloads/PayloadHelper.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/search/payloads/PayloadHelper.java Sun Sep 23 21:39:18 2012
@@ -113,7 +113,6 @@ public class PayloadHelper {
    * @param similarity The Similarity class to use in the Searcher
    * @param numDocs The num docs to add
    * @return An IndexSearcher
-   * @throws IOException
    */
   // TODO: randomize
   public IndexSearcher setUp(Random random, Similarity similarity, int numDocs) throws IOException {

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java Sun Sep 23 21:39:18 2012
@@ -85,7 +85,6 @@ public class TestSpansAdvanced extends L
    * @param writer the Lucene index writer
    * @param id the unique id of the document
    * @param text the text of the document
-   * @throws IOException
    */
   protected void addDocument(final RandomIndexWriter writer, final String id,
       final String text) throws IOException {
@@ -98,8 +97,6 @@ public class TestSpansAdvanced extends L
   
   /**
    * Tests two span queries.
-   * 
-   * @throws IOException
    */
   public void testBooleanQueryWithSpanQueries() throws IOException {
     
@@ -108,8 +105,6 @@ public class TestSpansAdvanced extends L
   
   /**
    * Tests two span queries.
-   * 
-   * @throws IOException
    */
   protected void doTestBooleanQueryWithSpanQueries(IndexSearcher s,
       final float expectedScore) throws IOException {
@@ -131,8 +126,6 @@ public class TestSpansAdvanced extends L
    * @param description the description of the search
    * @param expectedIds the expected document ids of the hits
    * @param expectedScores the expected scores of the hits
-   * 
-   * @throws IOException
    */
   protected static void assertHits(IndexSearcher s, Query query,
       final String description, final String[] expectedIds,

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced2.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced2.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced2.java Sun Sep 23 21:39:18 2012
@@ -72,8 +72,6 @@ public class TestSpansAdvanced2 extends 
   
   /**
    * Verifies that the index has the correct number of documents.
-   * 
-   * @throws Exception
    */
   public void testVerifyIndex() throws Exception {
     final IndexReader reader = DirectoryReader.open(mDirectory);
@@ -83,8 +81,6 @@ public class TestSpansAdvanced2 extends 
   
   /**
    * Tests a single span query that matches multiple documents.
-   * 
-   * @throws IOException
    */
   public void testSingleSpanQuery() throws IOException {
     
@@ -99,8 +95,6 @@ public class TestSpansAdvanced2 extends 
   
   /**
    * Tests a single span query that matches multiple documents.
-   * 
-   * @throws IOException
    */
   public void testMultipleDifferentSpanQueries() throws IOException {
     
@@ -119,8 +113,6 @@ public class TestSpansAdvanced2 extends 
   
   /**
    * Tests two span queries.
-   * 
-   * @throws IOException
    */
   @Override
   public void testBooleanQueryWithSpanQueries() throws IOException {

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java Sun Sep 23 21:39:18 2012
@@ -37,7 +37,6 @@ import org.apache.lucene.util._TestUtil;
 public class TestFileSwitchDirectory extends LuceneTestCase {
   /**
    * Test if writing doc stores to disk and everything else to ram works.
-   * @throws IOException
    */
   public void testBasic() throws IOException {
     Set<String> fileExtensions = new HashSet<String>();

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java Sun Sep 23 21:39:18 2012
@@ -140,7 +140,7 @@ public class IndexFiles {
    *  
    * @param writer Writer to the index where the given file/dir info will be stored
    * @param file The file to index, or the directory to recurse into to find files to index
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error
    */
   static void indexDocs(IndexWriter writer, File file)
     throws IOException {

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/enhancements/EnhancementsDocumentBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/enhancements/EnhancementsDocumentBuilder.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/enhancements/EnhancementsDocumentBuilder.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/enhancements/EnhancementsDocumentBuilder.java Sun Sep 23 21:39:18 2012
@@ -43,7 +43,6 @@ import org.apache.lucene.facet.taxonomy.
 public class EnhancementsDocumentBuilder extends CategoryDocumentBuilder {
 
   /**
-   * @param taxonomyWriter
    * @param params
    *            Indexing params which include {@link CategoryEnhancement}s.
    */

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/enhancements/EnhancementsPayloadIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/enhancements/EnhancementsPayloadIterator.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/enhancements/EnhancementsPayloadIterator.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/enhancements/EnhancementsPayloadIterator.java Sun Sep 23 21:39:18 2012
@@ -50,7 +50,7 @@ public class EnhancementsPayloadIterator
    *            A reader of the index.
    * @param term
    *            The category term to iterate.
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public EnhancementsPayloadIterator(
       List<CategoryEnhancement> enhancementsList,

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/index/CategoryContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/index/CategoryContainer.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/index/CategoryContainer.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/index/CategoryContainer.java Sun Sep 23 21:39:18 2012
@@ -204,7 +204,7 @@ public class CategoryContainer implement
    * {@link ObjectOutputStream}.<br>
    * NOTE: {@link CategoryProperty}s are {@link Serializable}, but do not
    * assume that Lucene's {@link Attribute}s are as well
-   * @throws IOException 
+   * @throws IOException If there is a low-level I/O error.
    */
   protected void serializeCategoryAttribute(ObjectOutputStream out,
       CategoryAttribute ca) throws IOException {

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java Sun Sep 23 21:39:18 2012
@@ -128,7 +128,7 @@ public class CategoryDocumentBuilder {
    * @return This CategoryDocumentBuilder, to enable this one line call:
    *         {@code new} {@link #CategoryDocumentBuilder(TaxonomyWriter)}.
    *         {@link #setCategoryPaths(Iterable)}.{@link #build(Document)}.
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public CategoryDocumentBuilder setCategoryPaths(
       Iterable<CategoryPath> categoryPaths) throws IOException {
@@ -150,7 +150,7 @@ public class CategoryDocumentBuilder {
    * @return This CategoryDocumentBuilder, to enable this one line call:
    *         {@code new} {@link #CategoryDocumentBuilder(TaxonomyWriter)}.
    *         {@link #setCategories(Iterable)}.{@link #build(Document)}.
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public CategoryDocumentBuilder setCategories(
       Iterable<CategoryAttribute> categories) throws IOException {
@@ -277,7 +277,7 @@ public class CategoryDocumentBuilder {
    *            relevant data.
    * @return The {@link CategoryTokenizer} to be used in creating category
    *         tokens.
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   protected CategoryTokenizer getCategoryTokenizer(TokenStream categoryStream)
       throws IOException {

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/index/params/PerDimensionIndexingParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/index/params/PerDimensionIndexingParams.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/index/params/PerDimensionIndexingParams.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/index/params/PerDimensionIndexingParams.java Sun Sep 23 21:39:18 2012
@@ -95,9 +95,6 @@ public class PerDimensionIndexingParams 
   /**
    * Add a CategoryListParams for a given CategoryPath's dimension or
    * "zero-th" category.
-   * 
-   * @param category
-   * @param clParams
    */
   public void addCategoryListParams(CategoryPath category, CategoryListParams clParams) {
     clParamsMap.put(category.getComponent(0), clParams);

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/search/FacetsAccumulator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/search/FacetsAccumulator.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/search/FacetsAccumulator.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/search/FacetsAccumulator.java Sun Sep 23 21:39:18 2012
@@ -81,7 +81,7 @@ public abstract class FacetsAccumulator 
   public abstract List<FacetResult> accumulate(ScoredDocIDs docids) throws IOException;
 
   /**
-   * @return the complement threshold
+   * Returns the complement threshold.
    * @see #setComplementThreshold(double)
    */
   public double getComplementThreshold() {
@@ -107,6 +107,7 @@ public abstract class FacetsAccumulator 
    * <p>
    * To disable complements pass {@link #DISABLE_COMPLEMENT}.
    * @param complementThreshold the complement threshold to set
+   * @see #getComplementThreshold()
    */
   public void setComplementThreshold(double complementThreshold) {
     this.complementThreshold = complementThreshold;

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/search/SamplingWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/search/SamplingWrapper.java?rev=1389149&r1=1389148&r2=1389149&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/search/SamplingWrapper.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/search/SamplingWrapper.java Sun Sep 23 21:39:18 2012
@@ -88,18 +88,11 @@ public class SamplingWrapper extends Fac
     return fixedRes; 
   }
 
-  /**
-   * @see FacetsAccumulator#getComplementThreshold()
-   */
   @Override
   public double getComplementThreshold() {
     return delegee.getComplementThreshold();
   }
 
-  /**
-   * @param complementThreshold
-   * @see FacetsAccumulator#setComplementThreshold(double)
-   */
   @Override
   public void setComplementThreshold(double complementThreshold) {
     delegee.setComplementThreshold(complementThreshold);



Mime
View raw message