You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2015/08/15 14:03:29 UTC
svn commit: r1696039 - in /lucene/dev/branches/lucene_solr_5_3: ./ lucene/
lucene/analysis/
lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/
lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/
lucene/analysis/comm...
Author: uschindler
Date: Sat Aug 15 12:03:28 2015
New Revision: 1696039
URL: http://svn.apache.org/r1696039
Log:
Merged revision(s) 1696036 from lucene/dev/branches/branch_5x (because of inability to regenerate jflex autogenerated files):
Merged revision(s) 1696035 from lucene/dev/trunk:
LUCENE-6740: Reduce warnings emitted by javac
(I also had to fix the old, deprecated jflex grammars, because they got out of sync with java code)
Modified:
lucene/dev/branches/lucene_solr_5_3/ (props changed)
lucene/dev/branches/lucene_solr_5_3/lucene/ (props changed)
lucene/dev/branches/lucene_solr_5_3/lucene/analysis/ (props changed)
lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java
lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex
lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java
lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex
lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java
lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex
lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java
lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex
lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizerImpl40.java (contents, props changed)
lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizerImpl40.jflex (contents, props changed)
lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/UAX29URLEmailTokenizerImpl40.java (contents, props changed)
lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/UAX29URLEmailTokenizerImpl40.jflex (contents, props changed)
lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java
lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex
Modified: lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java?rev=1696039&r1=1696038&r2=1696039&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java (original)
+++ lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java Sat Aug 15 12:03:28 2015
@@ -33,6 +33,7 @@ import org.apache.lucene.analysis.util.O
/**
* A CharFilter that wraps another Reader and attempts to strip out HTML constructs.
*/
+@SuppressWarnings("fallthrough")
public final class HTMLStripCharFilter extends BaseCharFilter {
Modified: lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex?rev=1696039&r1=1696038&r2=1696039&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex (original)
+++ lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex Sat Aug 15 12:03:28 2015
@@ -31,6 +31,7 @@ import org.apache.lucene.analysis.util.O
/**
* A CharFilter that wraps another Reader and attempts to strip out HTML constructs.
*/
+@SuppressWarnings("fallthrough")
%%
%unicode 6.3
Modified: lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java?rev=1696039&r1=1696038&r2=1696039&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java (original)
+++ lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java Sat Aug 15 12:03:28 2015
@@ -29,6 +29,7 @@ WARNING: if you change ClassicTokenizerI
import java.io.Reader;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
+@SuppressWarnings("fallthrough")
/**
* This class implements the classic lucene StandardTokenizer up until 3.0
*/
Modified: lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex?rev=1696039&r1=1696038&r2=1696039&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex (original)
+++ lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex Sat Aug 15 12:03:28 2015
@@ -27,6 +27,7 @@ WARNING: if you change ClassicTokenizerI
import java.io.Reader;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
+@SuppressWarnings("fallthrough")
/**
* This class implements the classic lucene StandardTokenizer up until 3.0
*/
Modified: lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java?rev=1696039&r1=1696038&r2=1696039&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java (original)
+++ lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java Sat Aug 15 12:03:28 2015
@@ -38,6 +38,7 @@ import org.apache.lucene.analysis.tokena
* <li><HANGUL>: A sequence of Hangul characters</li>
* </ul>
*/
+@SuppressWarnings("fallthrough")
public final class StandardTokenizerImpl {
Modified: lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex?rev=1696039&r1=1696038&r2=1696039&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex (original)
+++ lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex Sat Aug 15 12:03:28 2015
@@ -36,6 +36,7 @@ import org.apache.lucene.analysis.tokena
* <li><HANGUL>: A sequence of Hangul characters</li>
* </ul>
*/
+@SuppressWarnings("fallthrough")
%%
%unicode 6.3
Modified: lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java?rev=1696039&r1=1696038&r2=1696039&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java (original)
+++ lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java Sat Aug 15 12:03:28 2015
@@ -41,6 +41,7 @@ import org.apache.lucene.analysis.tokena
* <li><HANGUL>: A sequence of Hangul characters</li>
* </ul>
*/
+@SuppressWarnings("fallthrough")
public final class UAX29URLEmailTokenizerImpl {
Modified: lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex?rev=1696039&r1=1696038&r2=1696039&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex (original)
+++ lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex Sat Aug 15 12:03:28 2015
@@ -39,6 +39,7 @@ import org.apache.lucene.analysis.tokena
* <li><HANGUL>: A sequence of Hangul characters</li>
* </ul>
*/
+@SuppressWarnings("fallthrough")
%%
%unicode 6.3
Modified: lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizerImpl40.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizerImpl40.java?rev=1696039&r1=1696038&r2=1696039&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizerImpl40.java (original)
+++ lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizerImpl40.java Sat Aug 15 12:03:28 2015
@@ -23,6 +23,7 @@ import org.apache.lucene.analysis.standa
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
@Deprecated
+@SuppressWarnings("fallthrough")
/**
* This class implements StandardTokenizer using Unicode 6.1.0.
* @deprecated This class is only for exact backwards compatibility
Modified: lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizerImpl40.jflex
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizerImpl40.jflex?rev=1696039&r1=1696038&r2=1696039&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizerImpl40.jflex (original)
+++ lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizerImpl40.jflex Sat Aug 15 12:03:28 2015
@@ -17,11 +17,11 @@ package org.apache.lucene.analysis.stand
* limitations under the License.
*/
-import org.apache.lucene.analysis.standard.StandardTokenizerInterface;
import org.apache.lucene.analysis.standard.StandardTokenizer;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
@Deprecated
+@SuppressWarnings("fallthrough")
/**
* This class implements StandardTokenizer using Unicode 6.1.0.
* @deprecated This class is only for exact backwards compatibility
@@ -33,7 +33,6 @@ import org.apache.lucene.analysis.tokena
%final
%public
%class StandardTokenizerImpl40
-%implements StandardTokenizerInterface
%function getNextToken
%char
%buffer 4096
@@ -114,7 +113,7 @@ HiraganaEx = {Hiragana} ({Format} | {Ext
// UAX#29 WB1. sot ÷
// WB2. ÷ eot
//
-<<EOF>> { return StandardTokenizerInterface.YYEOF; }
+<<EOF>> { return YYEOF; }
// UAX#29 WB8. Numeric à Numeric
// WB11. Numeric (MidNum | MidNumLet) Ã Numeric
Modified: lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/UAX29URLEmailTokenizerImpl40.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/UAX29URLEmailTokenizerImpl40.java?rev=1696039&r1=1696038&r2=1696039&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/UAX29URLEmailTokenizerImpl40.java (original)
+++ lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/UAX29URLEmailTokenizerImpl40.java Sat Aug 15 12:03:28 2015
@@ -22,6 +22,7 @@ package org.apache.lucene.analysis.stand
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
@Deprecated
+@SuppressWarnings("fallthrough")
/**
* This class implements UAX29URLEmailTokenizer using Unicode 6.1.0.
* @deprecated This class is only for exact backwards compatibility
Modified: lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/UAX29URLEmailTokenizerImpl40.jflex
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/UAX29URLEmailTokenizerImpl40.jflex?rev=1696039&r1=1696038&r2=1696039&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/UAX29URLEmailTokenizerImpl40.jflex (original)
+++ lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/UAX29URLEmailTokenizerImpl40.jflex Sat Aug 15 12:03:28 2015
@@ -17,11 +17,10 @@ package org.apache.lucene.analysis.stand
* limitations under the License.
*/
-import org.apache.lucene.analysis.standard.StandardTokenizerInterface;
-import org.apache.lucene.analysis.standard.UAX29URLEmailTokenizer;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
@Deprecated
+@SuppressWarnings("fallthrough")
/**
* This class implements UAX29URLEmailTokenizer using Unicode 6.1.0.
* @deprecated This class is only for exact backwards compatibility
@@ -33,7 +32,6 @@ import org.apache.lucene.analysis.tokena
%final
%public
%class UAX29URLEmailTokenizerImpl40
-%implements StandardTokenizerInterface
%function getNextToken
%char
%buffer 4096
@@ -147,10 +145,10 @@ EMAIL = {EMAILlocalPart} "@" ({DomainNam
%{
/** Alphanumeric sequences */
- public static final int WORD_TYPE = UAX29URLEmailTokenizer.ALPHANUM;
+ public static final int WORD_TYPE = UAX29URLEmailTokenizer40.ALPHANUM;
/** Numbers */
- public static final int NUMERIC_TYPE = UAX29URLEmailTokenizer.NUM;
+ public static final int NUMERIC_TYPE = UAX29URLEmailTokenizer40.NUM;
/**
* Chars in class \p{Line_Break = Complex_Context} are from South East Asian
@@ -160,19 +158,19 @@ EMAIL = {EMAILlocalPart} "@" ({DomainNam
* <p>
* See Unicode Line Breaking Algorithm: http://www.unicode.org/reports/tr14/#SA
*/
- public static final int SOUTH_EAST_ASIAN_TYPE = UAX29URLEmailTokenizer.SOUTHEAST_ASIAN;
+ public static final int SOUTH_EAST_ASIAN_TYPE = UAX29URLEmailTokenizer40.SOUTHEAST_ASIAN;
- public static final int IDEOGRAPHIC_TYPE = UAX29URLEmailTokenizer.IDEOGRAPHIC;
+ public static final int IDEOGRAPHIC_TYPE = UAX29URLEmailTokenizer40.IDEOGRAPHIC;
- public static final int HIRAGANA_TYPE = UAX29URLEmailTokenizer.HIRAGANA;
+ public static final int HIRAGANA_TYPE = UAX29URLEmailTokenizer40.HIRAGANA;
- public static final int KATAKANA_TYPE = UAX29URLEmailTokenizer.KATAKANA;
+ public static final int KATAKANA_TYPE = UAX29URLEmailTokenizer40.KATAKANA;
- public static final int HANGUL_TYPE = UAX29URLEmailTokenizer.HANGUL;
+ public static final int HANGUL_TYPE = UAX29URLEmailTokenizer40.HANGUL;
- public static final int EMAIL_TYPE = UAX29URLEmailTokenizer.EMAIL;
+ public static final int EMAIL_TYPE = UAX29URLEmailTokenizer40.EMAIL;
- public static final int URL_TYPE = UAX29URLEmailTokenizer.URL;
+ public static final int URL_TYPE = UAX29URLEmailTokenizer40.URL;
public final int yychar()
{
@@ -196,7 +194,7 @@ EMAIL = {EMAILlocalPart} "@" ({DomainNam
// UAX#29 WB1. sot ÷
// WB2. ÷ eot
//
-<<EOF>> { return StandardTokenizerInterface.YYEOF; }
+<<EOF>> { return YYEOF; }
{URL} { return URL_TYPE; }
Modified: lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java?rev=1696039&r1=1696038&r2=1696039&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java (original)
+++ lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java Sat Aug 15 12:03:28 2015
@@ -24,6 +24,7 @@ import org.apache.lucene.analysis.tokena
/**
* JFlex-generated tokenizer that is aware of Wikipedia syntax.
*/
+@SuppressWarnings("fallthrough")
class WikipediaTokenizerImpl {
Modified: lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex?rev=1696039&r1=1696038&r2=1696039&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex (original)
+++ lucene/dev/branches/lucene_solr_5_3/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex Sat Aug 15 12:03:28 2015
@@ -22,6 +22,7 @@ import org.apache.lucene.analysis.tokena
/**
* JFlex-generated tokenizer that is aware of Wikipedia syntax.
*/
+@SuppressWarnings("fallthrough")
%%
%class WikipediaTokenizerImpl