You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rj...@apache.org on 2014/10/09 09:55:23 UTC
svn commit: r1630311 - in
/lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40:
StandardTokenizer40.java StandardTokenizerImpl40.java
UAX29URLEmailTokenizerImpl40.java
Author: rjernst
Date: Thu Oct 9 07:55:23 2014
New Revision: 1630311
URL: http://svn.apache.org/r1630311
Log:
LUCENE-6000: Fix backport compile issue
Modified:
lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizer40.java
lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizerImpl40.java
lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/UAX29URLEmailTokenizerImpl40.java
Modified: lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizer40.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizer40.java?rev=1630311&r1=1630310&r2=1630311&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizer40.java (original)
+++ lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizer40.java Thu Oct 9 07:55:23 2014
@@ -21,7 +21,6 @@ import java.io.IOException;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.analysis.standard.StandardTokenizerInterface;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
@@ -35,7 +34,7 @@ import org.apache.lucene.util.AttributeF
@Deprecated
public final class StandardTokenizer40 extends Tokenizer {
/** A private instance of the JFlex-constructed scanner */
- private StandardTokenizerInterface scanner;
+ private StandardTokenizerImpl40 scanner;
public static final int ALPHANUM = 0;
/** @deprecated (3.1) */
@@ -140,7 +139,7 @@ public final class StandardTokenizer40 e
while(true) {
int tokenType = scanner.getNextToken();
- if (tokenType == StandardTokenizerInterface.YYEOF) {
+ if (tokenType == StandardTokenizerImpl40.YYEOF) {
return false;
}
Modified: lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizerImpl40.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizerImpl40.java?rev=1630311&r1=1630310&r2=1630311&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizerImpl40.java (original)
+++ lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizerImpl40.java Thu Oct 9 07:55:23 2014
@@ -19,7 +19,6 @@ 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;
@@ -29,7 +28,7 @@ import org.apache.lucene.analysis.tokena
* @deprecated This class is only for exact backwards compatibility
*/
-public final class StandardTokenizerImpl40 implements StandardTokenizerInterface {
+public final class StandardTokenizerImpl40 {
/** This character denotes the end of file */
public static final int YYEOF = -1;
@@ -1187,7 +1186,7 @@ public final class StandardTokenizerImpl
if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
zzAtEOF = true;
{
- return StandardTokenizerInterface.YYEOF;
+ return YYEOF;
}
}
else {
Modified: lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/UAX29URLEmailTokenizerImpl40.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/UAX29URLEmailTokenizerImpl40.java?rev=1630311&r1=1630310&r2=1630311&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/UAX29URLEmailTokenizerImpl40.java (original)
+++ lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/UAX29URLEmailTokenizerImpl40.java Thu Oct 9 07:55:23 2014
@@ -19,7 +19,6 @@ 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;
@@ -29,7 +28,7 @@ import org.apache.lucene.analysis.tokena
* @deprecated This class is only for exact backwards compatibility
*/
-public final class UAX29URLEmailTokenizerImpl40 implements StandardTokenizerInterface {
+public final class UAX29URLEmailTokenizerImpl40 {
/** This character denotes the end of file */
public static final int YYEOF = -1;
@@ -4388,7 +4387,7 @@ public final class UAX29URLEmailTokenize
if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
zzAtEOF = true;
{
- return StandardTokenizerInterface.YYEOF;
+ return YYEOF;
}
}
else {