You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2010/10/02 21:58:37 UTC
svn commit: r1003873 - in /lucene/dev/trunk:
lucene/src/java/org/apache/lucene/queryParser/
lucene/src/java/org/apache/lucene/search/
modules/analysis/common/src/java/org/apache/lucene/analysis/commongrams/
modules/analysis/common/src/java/org/apache/l...
Author: rmuir
Date: Sat Oct 2 19:58:35 2010
New Revision: 1003873
URL: http://svn.apache.org/viewvc?rev=1003873&view=rev
Log:
clean up some fallthru/deprecation warnings
Modified:
lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/QueryParser.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/QueryParser.jj
lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/FilteredTermsEnum.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilter.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/core/LetterTokenizer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseTokenizer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemmer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemmer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/tartarus/snowball/TestApp.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilter.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizer.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymFilter.java
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/QueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/QueryParser.java?rev=1003873&r1=1003872&r2=1003873&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/QueryParser.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/QueryParser.java Sat Oct 2 19:58:35 2010
@@ -156,12 +156,15 @@ public class QueryParser implements Quer
Collator rangeCollator = null;
/** @deprecated remove when getFieldQuery is removed */
+ @Deprecated
private static final VirtualMethod<QueryParser> getFieldQueryMethod =
new VirtualMethod<QueryParser>(QueryParser.class, "getFieldQuery", String.class, String.class);
/** @deprecated remove when getFieldQuery is removed */
+ @Deprecated
private static final VirtualMethod<QueryParser> getFieldQueryWithQuotedMethod =
new VirtualMethod<QueryParser>(QueryParser.class, "getFieldQuery", String.class, String.class, boolean.class);
/** @deprecated remove when getFieldQuery is removed */
+ @Deprecated
private final boolean hasNewAPI =
VirtualMethod.compareImplementationDistance(getClass(),
getFieldQueryWithQuotedMethod, getFieldQueryMethod) >= 0; // its ok for both to be overridden
@@ -1622,12 +1625,6 @@ public class QueryParser implements Quer
finally { jj_save(0, xla); }
}
- private boolean jj_3R_2() {
- if (jj_scan_token(TERM)) return true;
- if (jj_scan_token(COLON)) return true;
- return false;
- }
-
private boolean jj_3_1() {
Token xsp;
xsp = jj_scanpos;
@@ -1644,6 +1641,12 @@ public class QueryParser implements Quer
return false;
}
+ private boolean jj_3R_2() {
+ if (jj_scan_token(TERM)) return true;
+ if (jj_scan_token(COLON)) return true;
+ return false;
+ }
+
/** Generated Token Manager. */
public QueryParserTokenManager token_source;
/** Current token. */
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/QueryParser.jj
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/QueryParser.jj?rev=1003873&r1=1003872&r2=1003873&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/QueryParser.jj (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/QueryParser.jj Sat Oct 2 19:58:35 2010
@@ -180,12 +180,15 @@ public class QueryParser {
Collator rangeCollator = null;
/** @deprecated remove when getFieldQuery is removed */
+ @Deprecated
private static final VirtualMethod<QueryParser> getFieldQueryMethod =
new VirtualMethod<QueryParser>(QueryParser.class, "getFieldQuery", String.class, String.class);
/** @deprecated remove when getFieldQuery is removed */
+ @Deprecated
private static final VirtualMethod<QueryParser> getFieldQueryWithQuotedMethod =
new VirtualMethod<QueryParser>(QueryParser.class, "getFieldQuery", String.class, String.class, boolean.class);
/** @deprecated remove when getFieldQuery is removed */
+ @Deprecated
private final boolean hasNewAPI =
VirtualMethod.compareImplementationDistance(getClass(),
getFieldQueryWithQuotedMethod, getFieldQueryMethod) >= 0; // its ok for both to be overridden
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/FilteredTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/FilteredTermsEnum.java?rev=1003873&r1=1003872&r2=1003873&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/FilteredTermsEnum.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/FilteredTermsEnum.java Sat Oct 2 19:58:35 2010
@@ -183,6 +183,7 @@ public abstract class FilteredTermsEnum
tenum.cacheCurrentTerm();
}
+ @SuppressWarnings("fallthrough")
@Override
public BytesRef next() throws IOException {
if (tenum == null)
Modified: lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilter.java?rev=1003873&r1=1003872&r2=1003873&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilter.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilter.java Sat Oct 2 19:58:35 2010
@@ -62,11 +62,13 @@ public final class CommonGramsFilter ext
private State savedState;
/** @deprecated Use {@link #CommonGramsFilter(Version, TokenStream, Set)} instead */
+ @Deprecated
public CommonGramsFilter(TokenStream input, Set<?> commonWords) {
this(Version.LUCENE_29, input, commonWords);
}
/** @deprecated Use {@link #CommonGramsFilter(Version, TokenStream, Set, boolean)} instead */
+ @Deprecated
public CommonGramsFilter(TokenStream input, Set<?> commonWords, boolean ignoreCase) {
this(Version.LUCENE_29, input, commonWords, ignoreCase);
}
Modified: lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/core/LetterTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/core/LetterTokenizer.java?rev=1003873&r1=1003872&r2=1003873&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/core/LetterTokenizer.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/core/LetterTokenizer.java Sat Oct 2 19:58:35 2010
@@ -93,6 +93,7 @@ public class LetterTokenizer extends Cha
* @deprecated use {@link #LetterTokenizer(Version, Reader)} instead. This
* will be removed in Lucene 4.0.
*/
+ @Deprecated
public LetterTokenizer(Reader in) {
super(Version.LUCENE_30, in);
}
@@ -103,6 +104,7 @@ public class LetterTokenizer extends Cha
* use {@link #LetterTokenizer(Version, AttributeSource, Reader)} instead.
* This will be removed in Lucene 4.0.
*/
+ @Deprecated
public LetterTokenizer(AttributeSource source, Reader in) {
super(Version.LUCENE_30, source, in);
}
@@ -114,6 +116,7 @@ public class LetterTokenizer extends Cha
* @deprecated use {@link #LetterTokenizer(Version, AttributeSource.AttributeFactory, Reader)}
* instead. This will be removed in Lucene 4.0.
*/
+ @Deprecated
public LetterTokenizer(AttributeFactory factory, Reader in) {
super(Version.LUCENE_30, factory, in);
}
Modified: lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseTokenizer.java?rev=1003873&r1=1003872&r2=1003873&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseTokenizer.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseTokenizer.java Sat Oct 2 19:58:35 2010
@@ -106,6 +106,7 @@ public final class LowerCaseTokenizer ex
* @deprecated use {@link #LowerCaseTokenizer(AttributeSource, Reader)}
* instead. This will be removed in Lucene 4.0.
*/
+ @Deprecated
public LowerCaseTokenizer(AttributeSource source, Reader in) {
super(Version.LUCENE_30, source, in);
}
@@ -117,6 +118,7 @@ public final class LowerCaseTokenizer ex
* @deprecated use {@link #LowerCaseTokenizer(AttributeSource.AttributeFactory, Reader)}
* instead. This will be removed in Lucene 4.0.
*/
+ @Deprecated
public LowerCaseTokenizer(AttributeFactory factory, Reader in) {
super(Version.LUCENE_30, factory, in);
}
Modified: lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemmer.java?rev=1003873&r1=1003872&r2=1003873&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemmer.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemmer.java Sat Oct 2 19:58:35 2010
@@ -25,6 +25,7 @@ package org.apache.lucene.analysis.en;
* Donna Harman.
*/
public class EnglishMinimalStemmer {
+ @SuppressWarnings("fallthrough")
public int stem(char s[], int len) {
if (len < 3 || s[len-1] != 's')
return len;
@@ -38,7 +39,7 @@ public class EnglishMinimalStemmer {
return len - 2;
}
if (s[len-3] == 'i' || s[len-3] == 'a' || s[len-3] == 'o' || s[len-3] == 'e')
- return len;
+ return len; /* intentional fallthrough */
default: return len - 1;
}
}
Modified: lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemmer.java?rev=1003873&r1=1003872&r2=1003873&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemmer.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemmer.java Sat Oct 2 19:58:35 2010
@@ -202,6 +202,7 @@ public class HungarianLightStemmer {
return len;
}
+ @SuppressWarnings("fallthrough")
private int removePlural(char s[], int len) {
if (len > 3 && s[len-1] == 'k')
switch(s[len-2]) {
Modified: lucene/dev/trunk/modules/analysis/common/src/java/org/tartarus/snowball/TestApp.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/java/org/tartarus/snowball/TestApp.java?rev=1003873&r1=1003872&r2=1003873&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/java/org/tartarus/snowball/TestApp.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/java/org/tartarus/snowball/TestApp.java Sat Oct 2 19:58:35 2010
@@ -89,7 +89,7 @@ public class TestApp {
int character;
while ((character = reader.read()) != -1) {
char ch = (char) character;
- if (Character.isWhitespace((char) ch)) {
+ if (Character.isWhitespace(ch)) {
if (input.length() > 0) {
stemmer.setCurrent(input.toString());
for (int i = repeat; i != 0; i--) {
Modified: lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilter.java?rev=1003873&r1=1003872&r2=1003873&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilter.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilter.java Sat Oct 2 19:58:35 2010
@@ -72,6 +72,7 @@ public class TestTrimFilter extends Base
/**
* @deprecated does not support custom attributes
*/
+ @Deprecated
private static class IterTokenStream extends TokenStream {
final Token tokens[];
int index = 0;
Modified: lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizer.java?rev=1003873&r1=1003872&r2=1003873&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizer.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizer.java Sat Oct 2 19:58:35 2010
@@ -98,6 +98,7 @@ public class TestPatternTokenizer extend
* TODO: rewrite tests not to use string comparison.
* @deprecated only tests TermAttribute!
*/
+ @Deprecated
private static String tsToString(TokenStream in) throws IOException {
StringBuilder out = new StringBuilder();
CharTermAttribute termAtt = in.addAttribute(CharTermAttribute.class);
Modified: lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java?rev=1003873&r1=1003872&r2=1003873&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java Sat Oct 2 19:58:35 2010
@@ -73,6 +73,7 @@ public class TestSnowball extends BaseTo
* Test turkish lowercasing (old buggy behavior)
* @deprecated Remove this when support for 3.0 indexes is no longer required
*/
+ @Deprecated
public void testTurkishBWComp() throws Exception {
Analyzer a = new SnowballAnalyzer(Version.LUCENE_30, "Turkish");
// AÄACI in turkish lowercases to aÄacı, but with lowercase filter aÄaci.
Modified: lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymFilter.java?rev=1003873&r1=1003872&r2=1003873&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymFilter.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymFilter.java Sat Oct 2 19:58:35 2010
@@ -334,6 +334,7 @@ public class TestSynonymFilter extends B
* a,1,10,11 => "a" with positionIncrement=1, startOffset=10, endOffset=11
* @deprecated does not support attributes api
*/
+ @Deprecated
private List<Token> tokens(String str) {
String[] arr = str.split(" ");
List<Token> result = new ArrayList<Token>();
@@ -379,6 +380,7 @@ public class TestSynonymFilter extends B
/**
* @deprecated does not support custom attributes
*/
+ @Deprecated
private static class IterTokenStream extends TokenStream {
final Token tokens[];
int index = 0;