Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E786217C8D for ; Sat, 7 Feb 2015 10:10:41 +0000 (UTC) Received: (qmail 31329 invoked by uid 500); 7 Feb 2015 10:10:41 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 31078 invoked by uid 99); 7 Feb 2015 10:10:41 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 Feb 2015 10:10:41 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 2ED28AC0175; Sat, 7 Feb 2015 10:10:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1658040 [4/4] - in /lucene/dev/trunk/lucene: ./ analysis/common/src/java/org/apache/lucene/analysis/bg/ analysis/common/src/java/org/apache/lucene/analysis/charfilter/ analysis/common/src/java/org/apache/lucene/analysis/cjk/ analysis/commo... Date: Sat, 07 Feb 2015 10:10:37 -0000 To: commits@lucene.apache.org From: rmuir@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150207101041.2ED28AC0175@hades.apache.org> Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeFilterBuilder.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeFilterBuilder.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeFilterBuilder.java (original) +++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeFilterBuilder.java Sat Feb 7 10:10:34 2015 @@ -85,7 +85,7 @@ import java.io.IOException; * 4 * * - *

+ *

* If an error occurs parsing the supplied lowerTerm or * upperTerm into the numeric type specified by type, then the * error will be silently ignored and the resulting filter will not match any @@ -99,13 +99,13 @@ public class NumericRangeFilterBuilder i /** * Specifies how this {@link NumericRangeFilterBuilder} will handle errors. - *

+ *

* If this is set to true, {@link #getFilter(Element)} will throw a * {@link ParserException} if it is unable to parse the lowerTerm or upperTerm * into the appropriate numeric type. If this is set to false, then this * exception will be silently ignored and the resulting filter will not match * any documents. - *

+ *

* Defaults to false. */ public void setStrictMode(boolean strictMode) { Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeQueryBuilder.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeQueryBuilder.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeQueryBuilder.java (original) +++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeQueryBuilder.java Sat Feb 7 10:10:34 2015 @@ -80,7 +80,7 @@ import org.w3c.dom.Element; * 4 * * - *

+ *

* A {@link ParserException} will be thrown if an error occurs parsing the * supplied lowerTerm or upperTerm into the numeric type * specified by type. Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpanOrQueryNodeBuilder.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpanOrQueryNodeBuilder.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpanOrQueryNodeBuilder.java (original) +++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpanOrQueryNodeBuilder.java Sat Feb 7 10:10:34 2015 @@ -28,8 +28,8 @@ import org.apache.lucene.search.spans.Sp import org.apache.lucene.search.spans.SpanQuery; /** - * This builder creates {@link SpanOrQuery}s from a {@link BooleanQueryNode}.
- *
+ * This builder creates {@link SpanOrQuery}s from a {@link BooleanQueryNode}.
+ *
* * It assumes that the {@link BooleanQueryNode} instance has at least one child. */ Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansQueryConfigHandler.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansQueryConfigHandler.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansQueryConfigHandler.java (original) +++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansQueryConfigHandler.java Sat Feb 7 10:10:34 2015 @@ -22,8 +22,8 @@ import org.apache.lucene.queryparser.fle import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; /** - * This query config handler only adds the {@link UniqueFieldAttribute} to it.
- *
+ * This query config handler only adds the {@link UniqueFieldAttribute} to it.
+ *
* * It does not return any configuration for a field in specific. */ Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansQueryTreeBuilder.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansQueryTreeBuilder.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansQueryTreeBuilder.java (original) +++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansQueryTreeBuilder.java Sat Feb 7 10:10:34 2015 @@ -27,12 +27,12 @@ import org.apache.lucene.search.spans.Sp /** * Sets up a query tree builder to build a span query tree from a query node - * tree.
- *
+ * tree.
+ *
* - * The defined map is:
- * - every BooleanQueryNode instance is delegated to the SpanOrQueryNodeBuilder
- * - every FieldQueryNode instance is delegated to the SpanTermQueryNodeBuilder
+ * The defined map is:
+ * - every BooleanQueryNode instance is delegated to the SpanOrQueryNodeBuilder
+ * - every FieldQueryNode instance is delegated to the SpanTermQueryNodeBuilder
* */ public class SpansQueryTreeBuilder extends QueryTreeBuilder implements Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansValidatorQueryNodeProcessor.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansValidatorQueryNodeProcessor.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansValidatorQueryNodeProcessor.java (original) +++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansValidatorQueryNodeProcessor.java Sat Feb 7 10:10:34 2015 @@ -33,8 +33,8 @@ import org.apache.lucene.queryparser.fle * Validates every query node in a query node tree. This processor will pass * fine if the query nodes are only {@link BooleanQueryNode}s, * {@link OrQueryNode}s or {@link FieldQueryNode}s, otherwise an exception will - * be thrown.
- *
+ * be thrown.
+ *
* * If they are {@link AndQueryNode} or an instance of anything else that * implements {@link FieldQueryNode} the exception will also be thrown. Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/TestSpanQueryParser.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/TestSpanQueryParser.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/TestSpanQueryParser.java (original) +++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/TestSpanQueryParser.java Sat Feb 7 10:10:34 2015 @@ -31,33 +31,33 @@ import org.apache.lucene.search.Query; import org.apache.lucene.util.LuceneTestCase; /** - * This test case demonstrates how the new query parser can be used.
- *
+ * This test case demonstrates how the new query parser can be used.
+ *
* * It tests queries likes "term", "field:term" "term1 term2" "term1 OR term2", * which are all already supported by the current syntax parser ( - * {@link StandardSyntaxParser}).
- *
+ * {@link StandardSyntaxParser}).
+ *
* * The goals is to create a new query parser that supports only the pair * "field:term" or a list of pairs separated or not by an OR operator, and from * this query generate {@link SpanQuery} objects instead of the regular * {@link Query} objects. Basically, every pair will be converted to a * {@link SpanTermQuery} object and if there are more than one pair they will be - * grouped by an {@link OrQueryNode}.
- *
+ * grouped by an {@link OrQueryNode}.
+ *
* * Another functionality that will be added is the ability to convert every - * field defined in the query to an unique specific field.
- *
+ * field defined in the query to an unique specific field.
+ *
* * The query generation is divided in three different steps: parsing (syntax), - * processing (semantic) and building.
- *
+ * processing (semantic) and building.
+ *
* * The parsing phase, as already mentioned will be performed by the current - * query parser: {@link StandardSyntaxParser}.
- *
+ * query parser: {@link StandardSyntaxParser}.
+ *
* * The processing phase will be performed by a processor pipeline which is * compound by 2 processors: {@link SpansValidatorQueryNodeProcessor} and @@ -79,8 +79,8 @@ import org.apache.lucene.util.LuceneTest * * The building phase is performed by the {@link SpansQueryTreeBuilder}, which * basically contains a map that defines which builder will be used to generate - * {@link SpanQuery} objects from {@link QueryNode} objects.
- *
+ * {@link SpanQuery} objects from {@link QueryNode} objects.
+ *
* * @see SpansQueryConfigHandler * @see SpansQueryTreeBuilder Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/TestSpanQueryParserSimpleSample.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/TestSpanQueryParserSimpleSample.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/TestSpanQueryParserSimpleSample.java (original) +++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/TestSpanQueryParserSimpleSample.java Sat Feb 7 10:10:34 2015 @@ -30,33 +30,33 @@ import org.apache.lucene.search.spans.Sp import org.apache.lucene.util.LuceneTestCase; /** - * This test case demonstrates how the new query parser can be used.
- *
+ * This test case demonstrates how the new query parser can be used.
+ *
* * It tests queries likes "term", "field:term" "term1 term2" "term1 OR term2", * which are all already supported by the current syntax parser ( - * {@link StandardSyntaxParser}).
- *
+ * {@link StandardSyntaxParser}).
+ *
* * The goals is to create a new query parser that supports only the pair * "field:term" or a list of pairs separated or not by an OR operator, and from * this query generate {@link SpanQuery} objects instead of the regular * {@link Query} objects. Basically, every pair will be converted to a * {@link SpanTermQuery} object and if there are more than one pair they will be - * grouped by an {@link OrQueryNode}.
- *
+ * grouped by an {@link OrQueryNode}.
+ *
* * Another functionality that will be added is the ability to convert every - * field defined in the query to an unique specific field.
- *
+ * field defined in the query to an unique specific field.
+ *
* * The query generation is divided in three different steps: parsing (syntax), - * processing (semantic) and building.
- *
+ * processing (semantic) and building.
+ *
* * The parsing phase, as already mentioned will be performed by the current - * query parser: {@link StandardSyntaxParser}.
- *
+ * query parser: {@link StandardSyntaxParser}.
+ *
* * The processing phase will be performed by a processor pipeline which is * compound by 2 processors: {@link SpansValidatorQueryNodeProcessor} and @@ -78,8 +78,8 @@ import org.apache.lucene.util.LuceneTest * * The building phase is performed by the {@link SpansQueryTreeBuilder}, which * basically contains a map that defines which builder will be used to generate - * {@link SpanQuery} objects from {@link QueryNode} objects.
- *
+ * {@link SpanQuery} objects from {@link QueryNode} objects.
+ *
* * @see TestSpanQueryParser for a more advanced example * Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldAttribute.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldAttribute.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldAttribute.java (original) +++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldAttribute.java Sat Feb 7 10:10:34 2015 @@ -23,8 +23,7 @@ import org.apache.lucene.util.Attribute; /** * This attribute is used by the {@link UniqueFieldQueryNodeProcessor} * processor. It holds a value that defines which is the unique field name that - * should be set in every {@link FieldableNode}.
- *
+ * should be set in every {@link FieldableNode}. * * @see UniqueFieldQueryNodeProcessor */ Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldAttributeImpl.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldAttributeImpl.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldAttributeImpl.java (original) +++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldAttributeImpl.java Sat Feb 7 10:10:34 2015 @@ -23,8 +23,7 @@ import org.apache.lucene.util.AttributeI /** * This attribute is used by the {@link UniqueFieldQueryNodeProcessor} * processor. It holds a value that defines which is the unique field name that - * should be set in every {@link FieldableNode}.
- *
+ * should be set in every {@link FieldableNode}. * * @see UniqueFieldQueryNodeProcessor */ Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldQueryNodeProcessor.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldQueryNodeProcessor.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldQueryNodeProcessor.java (original) +++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldQueryNodeProcessor.java Sat Feb 7 10:10:34 2015 @@ -30,8 +30,7 @@ import org.apache.lucene.queryparser.fle * node contained in the query tree to the field name defined in the * {@link UniqueFieldAttribute}. So, the {@link UniqueFieldAttribute} must be * defined in the {@link QueryConfigHandler} object set in this processor, - * otherwise it throws an exception.
- *
+ * otherwise it throws an exception. * * @see UniqueFieldAttribute */ Modified: lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java (original) +++ lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java Sat Feb 7 10:10:34 2015 @@ -59,7 +59,7 @@ public class DuplicateFilter extends Fil /** * "Full" processing mode starts by setting all bits to false and only setting bits * for documents that contain the given field and are identified as none-duplicates. - *

+ *

* "Fast" processing sets all bits to true then unsets all duplicate docs found for the * given field. This approach avoids the need to read DocsEnum for terms that are seen * to have a document frequency of exactly "1" (i.e. no duplicates). While a potentially Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/SpatialStrategy.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/SpatialStrategy.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/SpatialStrategy.java (original) +++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/SpatialStrategy.java Sat Feb 7 10:10:34 2015 @@ -32,7 +32,7 @@ import org.apache.lucene.spatial.query.S /** * The SpatialStrategy encapsulates an approach to indexing and searching based * on shapes. - *

+ *

* Different implementations will support different features. A strategy should * document these common elements: *

    @@ -46,10 +46,10 @@ import org.apache.lucene.spatial.query.S * If a strategy only supports certain shapes at index or query time, then in * general it will throw an exception if given an incompatible one. It will not * be coerced into compatibility. - *

    + *

    * Note that a SpatialStrategy is not involved with the Lucene stored field * values of shapes, which is immaterial to indexing and search. - *

    + *

    * Thread-safe. * * @lucene.experimental @@ -88,7 +88,7 @@ public abstract class SpatialStrategy { * Returns the IndexableField(s) from the {@code shape} that are to be * added to the {@link org.apache.lucene.document.Document}. These fields * are expected to be marked as indexed and not stored. - *

    + *

    * Note: If you want to store the shape as a string for retrieval in * search results, you could add it like this: * 

    document.add(new StoredField(fieldName,ctx.toString(shape)));
    @@ -133,7 +133,7 @@ public abstract class SpatialStrategy { /** * Make a Filter based principally on {@link org.apache.lucene.spatial.query.SpatialOperation} * and {@link Shape} from the supplied {@code args}. - *

    + *

    * If a subclasses implements * {@link #makeQuery(org.apache.lucene.spatial.query.SpatialArgs)} * then this method could be simply: Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxOverlapRatioValueSource.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxOverlapRatioValueSource.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxOverlapRatioValueSource.java (original) +++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxOverlapRatioValueSource.java Sat Feb 7 10:10:34 2015 @@ -23,8 +23,7 @@ import org.apache.lucene.search.Explanat /** * The algorithm is implemented as envelope on envelope (rect on rect) overlays rather than * complex polygon on complex polygon overlays. - *

    - *

    + *

    * Spatial relevance scoring algorithm: *

    *
    queryArea
    the area of the input query envelope
    @@ -43,11 +42,11 @@ import org.apache.lucene.search.Explanat * area is calculated (queryArea, targetArea, intersectionArea). This allows for points or horizontal/vertical lines * to be used as the query shape and in such case the descending order should have smallest boxes up front. Without * this, a point or line query shape typically scores everything with the same value since there is 0 area. - *

    + *

    * Note: The actual computation of queryRatio and targetRatio is more complicated so that it considers * points and lines. Lines have the ratio of overlap, and points are either 1.0 or 0.0 depending on whether * it intersects or not. - *

    + *

    * Originally based on Geoportal's * * SpatialRankingValueSource but modified quite a bit. GeoPortal's algorithm will yield a score of 0 Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxSimilarityValueSource.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxSimilarityValueSource.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxSimilarityValueSource.java (original) +++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxSimilarityValueSource.java Sat Feb 7 10:10:34 2015 @@ -32,7 +32,7 @@ import java.util.Map; * A base class for calculating a spatial relevance rank per document from a provided * {@link ValueSource} in which {@link FunctionValues#objectVal(int)} returns a {@link * com.spatial4j.core.shape.Rectangle}. - *

    + *

    * Implementers: remember to implement equals and hashCode if you have * fields! * Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java (original) +++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java Sat Feb 7 10:10:34 2015 @@ -53,7 +53,7 @@ import com.spatial4j.core.shape.Shape; * href="http://geoportal.svn.sourceforge.net/svnroot/geoportal/Geoportal/trunk/src/com/esri/gpt/catalog/lucene/SpatialClauseAdapter.java">SpatialClauseAdapter. *

    * Characteristics: - *

    + *
    *

      *
    • Only indexes Rectangles; just one per field value. Other shapes can be provided * and the bounding box will be used.
      • Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/AbstractVisitingPrefixTreeFilter.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/AbstractVisitingPrefixTreeFilter.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/AbstractVisitingPrefixTreeFilter.java (original) +++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/AbstractVisitingPrefixTreeFilter.java Sat Feb 7 10:10:34 2015 @@ -34,7 +34,7 @@ import org.apache.lucene.util.BytesRef; * Traverses a {@link SpatialPrefixTree} indexed field, using the template and * visitor design patterns for subclasses to guide the traversal and collect * matching documents. - *

      + *

      * Subclasses implement {@link #getDocIdSet(org.apache.lucene.index.LeafReaderContext, * org.apache.lucene.util.Bits)} by instantiating a custom {@link * VisitorTemplate} subclass (i.e. an anonymous inner class) and implement the Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeStrategy.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeStrategy.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeStrategy.java (original) +++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeStrategy.java Sat Feb 7 10:10:34 2015 @@ -41,7 +41,7 @@ import org.apache.lucene.spatial.util.Sh * approximate spatial search filter. *

      * Characteristics: - *

      + *
      *

        *
      • Can index any shape; however only {@link RecursivePrefixTreeStrategy} * can effectively search non-point shapes.
        • Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/TermQueryPrefixTreeStrategy.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/TermQueryPrefixTreeStrategy.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/TermQueryPrefixTreeStrategy.java (original) +++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/TermQueryPrefixTreeStrategy.java Sat Feb 7 10:10:34 2015 @@ -39,7 +39,7 @@ import java.util.List; * {@link TermsFilter} of all the cells from * {@link SpatialPrefixTree#getTreeCellIterator(com.spatial4j.core.shape.Shape, int)}. * It only supports the search of indexed Point shapes. - *

        + *

        * The precision of query shapes (distErrPct) is an important factor in using * this Strategy. If the precision is too precise then it will result in many * terms which will amount to a slower query. Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/Cell.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/Cell.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/Cell.java (original) +++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/Cell.java Sat Feb 7 10:10:34 2015 @@ -86,9 +86,9 @@ public interface Cell { * {@code shapeFilter}. The returned cells should have {@link #getShapeRel()} set to * their relation with {@code shapeFilter}. In addition, for non-points {@link #isLeaf()} * must be true when that relation is WITHIN. - *

        + *

        * IMPORTANT: Cells returned from this iterator can be shared, as well as the bytes. - *

        + *

        * Precondition: Never called when getLevel() == maxLevel. * * @param shapeFilter an optional filter for the returned cells. Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/DateRangePrefixTree.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/DateRangePrefixTree.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/DateRangePrefixTree.java (original) +++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/DateRangePrefixTree.java Sat Feb 7 10:10:34 2015 @@ -32,7 +32,7 @@ import com.spatial4j.core.shape.Shape; * months, ...). You pass in {@link Calendar} objects with the desired fields set and the unspecified * fields unset, which conveys the precision. The implementation makes some optimization assumptions about a * {@link java.util.GregorianCalendar}; others could probably be supported easily. - *

        + *

        * Warning: If you construct a Calendar and then get something from the object like a field (e.g. year) or * milliseconds, then every field is fully set by side-effect. So after setting the fields, pass it to this * API first. Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/LegacyCell.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/LegacyCell.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/LegacyCell.java (original) +++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/LegacyCell.java Sat Feb 7 10:10:34 2015 @@ -154,7 +154,7 @@ public abstract class LegacyCell impleme /** * Performant implementations are expected to implement this efficiently by * considering the current cell's boundary. - *

        + *

        * Precondition: Never called when getLevel() == maxLevel. * Precondition: this.getShape().relate(p) != DISJOINT. */ Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/NumberRangePrefixTree.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/NumberRangePrefixTree.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/NumberRangePrefixTree.java (original) +++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/NumberRangePrefixTree.java Sat Feb 7 10:10:34 2015 @@ -32,7 +32,7 @@ import org.apache.lucene.util.StringHelp /** * A SpatialPrefixTree for single-dimensional numbers and number ranges of fixed precision values (not floating point). * Despite its name, the indexed values (and queries) need not actually be ranges, they can be unit instance/values. - *

        + *

        * Why might you use this instead of Lucene's built-in integer/long support? Here are some reasons with features based * on code in this class, or are possible based on this class but require a subclass to fully realize it. *

          Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTree.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTree.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTree.java (original) +++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTree.java Sat Feb 7 10:10:34 2015 @@ -26,7 +26,7 @@ import org.apache.lucene.util.BytesRef; * at variable lengths corresponding to variable precision. Each string * corresponds to a rectangular spatial region. This approach is * also referred to "Grids", "Tiles", and "Spatial Tiers". - *

          + *

          * Implementations of this class should be thread-safe and immutable once * initialized. * Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialArgsParser.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialArgsParser.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialArgsParser.java (original) +++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialArgsParser.java Sat Feb 7 10:10:34 2015 @@ -36,7 +36,7 @@ import java.util.StringTokenizer; * 

            *   Intersects(ENVELOPE(-10,-8,22,20)) distErrPct=0.025
  *
          - *

          + *

          * In the future it would be good to support something at least semi-standardized like a * variant of * [E]CQL. Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/vector/PointVectorStrategy.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/vector/PointVectorStrategy.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/vector/PointVectorStrategy.java (original) +++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/vector/PointVectorStrategy.java Sat Feb 7 10:10:34 2015 @@ -49,7 +49,7 @@ import org.apache.lucene.spatial.util.Va * *

          * Characteristics: - *

          + *
          *

            *
          • Only indexes points; just one per field value.
            • *
          • Can query by a rectangle or circle.
            • @@ -68,7 +68,7 @@ import org.apache.lucene.spatial.util.Va * an x and y pair of fields. A Circle query does the same bbox query but adds a * ValueSource filter on * {@link #makeDistanceValueSource(com.spatial4j.core.shape.Point)}. - *

            + *

            * One performance shortcoming with this strategy is that a scenario involving * both a search using a Circle and sort will result in calculations for the * spatial distance being done twice -- once for the filter and second for the Modified: lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/spell/PlainTextDictionary.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/spell/PlainTextDictionary.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/spell/PlainTextDictionary.java (original) +++ lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/spell/PlainTextDictionary.java Sat Feb 7 10:10:34 2015 @@ -35,10 +35,10 @@ import org.apache.lucene.util.IOUtils; /** * Dictionary represented by a text file. * - *

            Format allowed: 1 word per line:
            - * word1
            - * word2
            - * word3
            + *

            Format allowed: 1 word per line:
            + * word1
            + * word2
            + * word3
            */ public class PlainTextDictionary implements Dictionary { Modified: lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java (original) +++ lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java Sat Feb 7 10:10:34 2015 @@ -49,7 +49,7 @@ import org.apache.lucene.util.BytesRefIt /** *

            - * Spell Checker class (Main class)
            + * Spell Checker class (Main class).
            * (initially inspired by the David Spencer code). *

            * Modified: lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/spell/SuggestWord.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/spell/SuggestWord.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/spell/SuggestWord.java (original) +++ lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/spell/SuggestWord.java Sat Feb 7 10:10:34 2015 @@ -19,11 +19,9 @@ package org.apache.lucene.search.spell; */ /** - * SuggestWord, used in suggestSimilar method in SpellChecker class. - *

            + * SuggestWord, used in suggestSimilar method in SpellChecker class. + *

            * Default sort is first by score, then by frequency. - * - * */ public final class SuggestWord{ Modified: lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/FileDictionary.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/FileDictionary.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/FileDictionary.java (original) +++ lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/FileDictionary.java Sat Feb 7 10:10:34 2015 @@ -31,15 +31,15 @@ import org.apache.lucene.util.IOUtils; /** * Dictionary represented by a text file. * - *

            Format allowed: 1 entry per line:
            - * An entry can be:
            + *

            Format allowed: 1 entry per line:
            + * An entry can be:
            *

              *
            • suggestion
              • *
            • suggestion fieldDelimiter weight
              • *
            • suggestion fieldDelimiter weight fieldDelimiter payload
              • *
            - * where the default fieldDelimiter is {@value #DEFAULT_FIELD_DELIMITER}
            - *

            + * where the default fieldDelimiter is {@value #DEFAULT_FIELD_DELIMITER}
            + *

            * NOTE: *

              *
            • In order to have payload enabled, the first entry has to have a payload
              • @@ -49,11 +49,11 @@ import org.apache.lucene.util.IOUtils; * then an empty payload is returned *
            • An entry cannot have more than two fieldDelimiter
              • *
            - *

            - * Example:
            - * word1 word2 TAB 100 TAB payload1
            - * word3 TAB 101
            - * word4 word3 TAB 102
            + *

            + * Example:
            + * word1 word2 TAB 100 TAB payload1
            + * word3 TAB 101
            + * word4 word3 TAB 102
            */ public class FileDictionary implements Dictionary { Modified: lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java (original) +++ lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java Sat Feb 7 10:10:34 2015 @@ -47,21 +47,22 @@ import org.apache.lucene.util.RamUsageEs * Implementation of a Ternary Search Trie, a data structure for storing * String objects that combines the compact size of a binary search * tree with the speed of a digital search trie, and is therefore ideal for - * practical use in sorting and searching data.

            - *

            + * practical use in sorting and searching data. * + *

            * This data structure is faster than hashing for many typical search problems, * and supports a broader range of useful problems and operations. Ternary * searches are faster than hashing and more powerful, too. *

            - *

            * + *

            * The theory of ternary search trees was described at a symposium in 1997 (see * "Fast Algorithms for Sorting and Searching Strings," by J.L. Bentley and R. * Sedgewick, Proceedings of the 8th Annual ACM-SIAM Symposium on Discrete * Algorithms, January 1997). Algorithms in C, Third Edition, by Robert * Sedgewick (Addison-Wesley, 1998) provides yet another view of ternary search * trees. + *

            * * @deprecated Migrate to one of the newer suggesters which are much more RAM efficient. */ Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/mockfile/package-info.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/mockfile/package-info.java?rev=1658040&r1=1658039&r2=1658040&view=diff ============================================================================== --- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/mockfile/package-info.java (original) +++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/mockfile/package-info.java Sat Feb 7 10:10:34 2015 @@ -25,6 +25,5 @@ *
          • {@link org.apache.lucene.mockfile.WindowsFS}: Acts like windows. *
          • {@link org.apache.lucene.mockfile.DisableFsyncFS}: Makes actual fsync calls a no-op. *
          - *

          */ package org.apache.lucene.mockfile;