svn commit: r1483467 - in /lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis: position/PositionFilter.java synonym/SynonymFilterFactory.java

[ho...@apache.org]

Author: hossman
Date: Thu May 16 17:49:20 2013
New Revision: 1483467

URL: http://svn.apache.org/r1483467
Log:
fix compilation failures/warnings: added @Deprecated, and changed jdoc link to simple class name refrence since QueryParser isn't a module dependency (following FilteringTokenFilter's lead)

Modified:
    lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/position/PositionFilter.java
    lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java

Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/position/PositionFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/position/PositionFilter.java?rev=1483467&r1=1483466&r2=1483467&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/position/PositionFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/position/PositionFilter.java Thu May 16 17:49:20 2013
@@ -22,17 +22,15 @@ import java.io.IOException;
 import org.apache.lucene.analysis.TokenFilter;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
-import org.apache.lucene.queryparser.classic.QueryParser;
 
 /** Set the positionIncrement of all tokens to the "positionIncrement",
  * except the first return token which retains its original positionIncrement value.
  * The default positionIncrement value is zero.
  * @deprecated (4.4) PositionFilter makes {@link TokenStream} graphs inconsistent
  *             which can cause highlighting bugs. Its main use-case being to make
- *             {@link QueryParser} generate boolean queries instead of phrase
- *             queries, it is now advised to use
- *             {@link QueryParser#setAutoGeneratePhraseQueries(boolean) QueryParser.setAutoGeneratePhraseQueries(false)}
- *             (for simple cases) or to override {@link QueryParser#newFieldQuery}.
+ *             QueryParsers generate boolean queries instead of phrase
+ *             queries, it is now advised to use org.apache.lucene.queryparser.classic.QueryParser.setEnablePositionIncrements()
+ *             (for simple cases) or to override QueryParser.newFieldQuery.
  */
 @Deprecated
 public final class PositionFilter extends TokenFilter {

Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java?rev=1483467&r1=1483466&r2=1483467&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java Thu May 16 17:49:20 2013
@@ -83,6 +83,7 @@ public class SynonymFilterFactory extend
    * @deprecated Method exists only for testing 4x, will be removed in 5.0
    * @lucene.internal
    */
+  @Deprecated
   TokenFilterFactory getDelegator() {
     return delegator;
   }