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/03 00:20:26 UTC
svn commit: r1003906 - in /lucene/dev/trunk:
lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/projections/
lucene/src/test/org/apache/lucene/index/
modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/
modules/...
Author: rmuir
Date: Sat Oct 2 22:20:26 2010
New Revision: 1003906
URL: http://svn.apache.org/viewvc?rev=1003906&view=rev
Log:
clear up more compiler warnings
Modified:
lucene/dev/trunk/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/projections/SinusoidalProjector.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/ASCIITLD.jflex-macro
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29Tokenizer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java
lucene/dev/trunk/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/AbstractDictionary.java
lucene/dev/trunk/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BiSegGraph.java
lucene/dev/trunk/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/HHMMSegmenter.java
lucene/dev/trunk/modules/analysis/stempel/src/java/org/egothor/stemmer/MultiTrie2.java
Modified: lucene/dev/trunk/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/projections/SinusoidalProjector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/projections/SinusoidalProjector.java?rev=1003906&r1=1003905&r2=1003906&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/projections/SinusoidalProjector.java (original)
+++ lucene/dev/trunk/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/projections/SinusoidalProjector.java Sat Oct 2 22:20:26 2010
@@ -30,6 +30,7 @@ package org.apache.lucene.spatial.tier.p
*
* @deprecated Until we can put in place proper tests and a proper fix.
*/
+@Deprecated
public class SinusoidalProjector implements IProjector {
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java?rev=1003906&r1=1003905&r2=1003906&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java Sat Oct 2 22:20:26 2010
@@ -3860,6 +3860,7 @@ public class TestIndexWriter extends Luc
break;
case 3:
writer2.optimize();
+ break;
case 4:
writer2.commit();
}
Modified: lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java?rev=1003906&r1=1003905&r2=1003906&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java Sat Oct 2 22:20:26 2010
@@ -258,7 +258,7 @@ public class TernaryTree implements Clon
}
}
if (a[start + i] != 0) {
- return (int) -a[start + i];
+ return -a[start + i];
}
return 0;
Modified: lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/ASCIITLD.jflex-macro
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/ASCIITLD.jflex-macro?rev=1003906&r1=1003905&r2=1003906&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/ASCIITLD.jflex-macro (original)
+++ lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/ASCIITLD.jflex-macro Sat Oct 2 22:20:26 2010
@@ -15,8 +15,8 @@
*/
// Generated from IANA Root Zone Database <http://www.internic.net/zones/root.zone>
-// file version from Tuesday, September 14, 2010 11:34:20 AM UTC
-// generated on Wednesday, September 15, 2010 7:00:44 AM UTC
+// file version from Saturday, October 2, 2010 11:34:09 AM UTC
+// generated on Saturday, October 2, 2010 10:07:09 PM UTC
// by org.apache.lucene.analysis.standard.GenerateJflexTLDMacros
ASCIITLD = "." (
Modified: lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java?rev=1003906&r1=1003905&r2=1003906&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java Sat Oct 2 22:20:26 2010
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 9/15/10 3:01 AM */
+/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 10/2/10 6:07 PM */
package org.apache.lucene.analysis.standard;
@@ -33,8 +33,8 @@ import org.apache.lucene.analysis.tokena
/**
* This class is a scanner generated by
* <a href="http://www.jflex.de/">JFlex</a> 1.5.0-SNAPSHOT
- * on 9/15/10 3:01 AM from the specification file
- * <tt>c:/Users/us/IdeaProjects/lucene/test-dev-trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex</tt>
+ * on 10/2/10 6:07 PM from the specification file
+ * <tt>C:/Users/rmuir/workspace/lucene-clean/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex</tt>
*/
class ClassicTokenizerImpl implements StandardTokenizerInterface {
@@ -359,6 +359,7 @@ public static final int CJ
* @deprecated this solves a bug where HOSTs that end with '.' are identified
* as ACRONYMs.
*/
+@Deprecated
public static final int ACRONYM_DEP = StandardTokenizer.ACRONYM_DEP;
public static final String [] TOKEN_TYPES = StandardTokenizer.TOKEN_TYPES;
@@ -680,44 +681,44 @@ public final void getText(CharTermAttrib
zzMarkedPos = zzMarkedPosL;
switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
- case 5:
- { return NUM;
+ case 10:
+ { return EMAIL;
}
case 11: break;
- case 9:
- { return ACRONYM;
+ case 2:
+ { return ALPHANUM;
}
case 12: break;
- case 7:
- { return COMPANY;
+ case 4:
+ { return HOST;
}
case 13: break;
- case 10:
- { return EMAIL;
- }
- case 14: break;
case 1:
{ /* ignore */
}
+ case 14: break;
+ case 8:
+ { return ACRONYM_DEP;
+ }
case 15: break;
- case 6:
- { return APOSTROPHE;
+ case 5:
+ { return NUM;
}
case 16: break;
- case 3:
- { return CJ;
+ case 9:
+ { return ACRONYM;
}
case 17: break;
- case 8:
- { return ACRONYM_DEP;
+ case 7:
+ { return COMPANY;
}
case 18: break;
- case 2:
- { return ALPHANUM;
+ case 6:
+ { return APOSTROPHE;
}
case 19: break;
- case 4:
- { return HOST;
+ case 3:
+ { return CJ;
}
case 20: break;
default:
Modified: lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex?rev=1003906&r1=1003905&r2=1003906&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex (original)
+++ lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex Sat Oct 2 22:20:26 2010
@@ -51,6 +51,7 @@ public static final int CJ
* @deprecated this solves a bug where HOSTs that end with '.' are identified
* as ACRONYMs.
*/
+@Deprecated
public static final int ACRONYM_DEP = StandardTokenizer.ACRONYM_DEP;
public static final String [] TOKEN_TYPES = StandardTokenizer.TOKEN_TYPES;
Modified: lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java?rev=1003906&r1=1003905&r2=1003906&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java Sat Oct 2 22:20:26 2010
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 9/15/10 3:01 AM */
+/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 10/2/10 6:07 PM */
package org.apache.lucene.analysis.standard;
@@ -2712,36 +2712,36 @@ public final class StandardTokenizerImpl
zzMarkedPos = zzMarkedPosL;
switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
- case 1:
- { /* Not numeric, word, ideographic, hiragana, or SE Asian -- ignore it. */
+ case 2:
+ { return WORD_TYPE;
}
case 9: break;
- case 6:
- { return HIRAGANA_TYPE;
+ case 4:
+ { return SOUTH_EAST_ASIAN_TYPE;
}
case 10: break;
- case 2:
- { return WORD_TYPE;
- }
- case 11: break;
case 8:
{ return URL_TYPE;
}
+ case 11: break;
+ case 7:
+ { return EMAIL_TYPE;
+ }
case 12: break;
case 5:
{ return IDEOGRAPHIC_TYPE;
}
case 13: break;
- case 7:
- { return EMAIL_TYPE;
+ case 1:
+ { /* Not numeric, word, ideographic, hiragana, or SE Asian -- ignore it. */
}
case 14: break;
case 3:
{ return NUMERIC_TYPE;
}
case 15: break;
- case 4:
- { return SOUTH_EAST_ASIAN_TYPE;
+ case 6:
+ { return HIRAGANA_TYPE;
}
case 16: break;
default:
Modified: lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29Tokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29Tokenizer.java?rev=1003906&r1=1003905&r2=1003906&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29Tokenizer.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29Tokenizer.java Sat Oct 2 22:20:26 2010
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 9/15/10 3:01 AM */
+/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 10/2/10 6:07 PM */
package org.apache.lucene.analysis.standard;
@@ -802,28 +802,28 @@ public final class UAX29Tokenizer extend
zzMarkedPos = zzMarkedPosL;
switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
- case 5:
- { if (populateAttributes(IDEOGRAPHIC_TYPE)) return true;
+ case 2:
+ { if (populateAttributes(WORD_TYPE)) return true;
}
case 7: break;
- case 1:
- { /* Not numeric, word, ideographic, hiragana, or SE Asian -- ignore it. */
+ case 6:
+ { if (populateAttributes(HIRAGANA_TYPE)) return true;
}
case 8: break;
- case 3:
- { if (populateAttributes(NUMERIC_TYPE)) return true;
+ case 5:
+ { if (populateAttributes(IDEOGRAPHIC_TYPE)) return true;
}
case 9: break;
- case 6:
- { if (populateAttributes(HIRAGANA_TYPE)) return true;
- }
- case 10: break;
case 4:
{ if (populateAttributes(SOUTH_EAST_ASIAN_TYPE)) return true;
}
+ case 10: break;
+ case 3:
+ { if (populateAttributes(NUMERIC_TYPE)) return true;
+ }
case 11: break;
- case 2:
- { if (populateAttributes(WORD_TYPE)) return true;
+ case 1:
+ { /* Not numeric, word, ideographic, hiragana, or SE Asian -- ignore it. */
}
case 12: break;
default:
Modified: lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java?rev=1003906&r1=1003905&r2=1003906&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java Sat Oct 2 22:20:26 2010
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 5/31/10 3:11 PM */
+/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 10/2/10 6:07 PM */
package org.apache.lucene.analysis.wikipedia;
@@ -25,8 +25,8 @@ import org.apache.lucene.analysis.tokena
/**
* This class is a scanner generated by
* <a href="http://www.jflex.de/">JFlex</a> 1.5.0-SNAPSHOT
- * on 5/31/10 3:11 PM from the specification file
- * <tt>C:/Users/rmuir/workspace/solrcene/modules/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex</tt>
+ * on 10/2/10 6:07 PM from the specification file
+ * <tt>C:/Users/rmuir/workspace/lucene-clean/modules/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex</tt>
*/
class WikipediaTokenizerImpl {
Modified: lucene/dev/trunk/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/AbstractDictionary.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/AbstractDictionary.java?rev=1003906&r1=1003905&r2=1003906&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/AbstractDictionary.java (original)
+++ lucene/dev/trunk/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/AbstractDictionary.java Sat Oct 2 22:20:26 2010
@@ -113,8 +113,8 @@ abstract class AbstractDictionary {
// Should be a two-byte character
return -1;
}
- int b0 = (int) (buffer[0] & 0x0FF) - 161; // Code starts from A1, therefore subtract 0xA1=161
- int b1 = (int) (buffer[1] & 0x0FF) - 161; // There is no Chinese char for the first and last symbol.
+ int b0 = (buffer[0] & 0x0FF) - 161; // Code starts from A1, therefore subtract 0xA1=161
+ int b1 = (buffer[1] & 0x0FF) - 161; // There is no Chinese char for the first and last symbol.
// Therefore, each code page only has 16*6-2=94 characters.
return (short) (b0 * 94 + b1);
} catch (UnsupportedEncodingException e) {
Modified: lucene/dev/trunk/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BiSegGraph.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BiSegGraph.java?rev=1003906&r1=1003905&r2=1003906&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BiSegGraph.java (original)
+++ lucene/dev/trunk/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BiSegGraph.java Sat Oct 2 22:20:26 2010
@@ -208,7 +208,7 @@ class BiSegGraph {
current = preNode;
}
for (int j = rpath.size() - 1; j >= 0; j--) {
- Integer idInteger = (Integer) rpath.get(j);
+ Integer idInteger = rpath.get(j);
int id = idInteger.intValue();
SegToken t = segTokenList.get(id);
resultPath.add(t);
Modified: lucene/dev/trunk/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/HHMMSegmenter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/HHMMSegmenter.java?rev=1003906&r1=1003905&r2=1003906&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/HHMMSegmenter.java (original)
+++ lucene/dev/trunk/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/HHMMSegmenter.java Sat Oct 2 22:20:26 2010
@@ -38,6 +38,7 @@ public class HHMMSegmenter {
* @param sentence input sentence, without start and end markers
* @return {@link SegGraph} corresponding to the input sentence.
*/
+ @SuppressWarnings("fallthrough")
private SegGraph createSegGraph(String sentence) {
int i = 0, j;
int length = sentence.length();
@@ -100,7 +101,7 @@ public class HHMMSegmenter {
i++;
break;
case CharType.FULLWIDTH_LETTER:
- hasFullWidth = true;
+ hasFullWidth = true; /* intentional fallthrough */
case CharType.LETTER:
j = i + 1;
while (j < length
@@ -118,7 +119,7 @@ public class HHMMSegmenter {
i = j;
break;
case CharType.FULLWIDTH_DIGIT:
- hasFullWidth = true;
+ hasFullWidth = true; /* intentional fallthrough */
case CharType.DIGIT:
j = i + 1;
while (j < length
Modified: lucene/dev/trunk/modules/analysis/stempel/src/java/org/egothor/stemmer/MultiTrie2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/stempel/src/java/org/egothor/stemmer/MultiTrie2.java?rev=1003906&r1=1003905&r2=1003906&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/stempel/src/java/org/egothor/stemmer/MultiTrie2.java (original)
+++ lucene/dev/trunk/modules/analysis/stempel/src/java/org/egothor/stemmer/MultiTrie2.java Sat Oct 2 22:20:26 2010
@@ -314,6 +314,7 @@ public class MultiTrie2 extends MultiTri
return -1;
}
+ @SuppressWarnings("fallthrough")
private int lengthPP(CharSequence cmd) {
int len = 0;
for (int i = 0; i < cmd.length(); i++) {
@@ -323,7 +324,7 @@ public class MultiTrie2 extends MultiTri
len += cmd.charAt(i) - 'a' + 1;
break;
case 'R':
- len++;
+ len++; /* intentional fallthrough */
case 'I':
break;
}