From 581f0c8afcbf677422ec8c22e26a0d1e27d6f896 Mon Sep 17 00:00:00 2001 From: Uwe Schindler Date: Sun, 8 Jul 2012 15:02:39 +0000 Subject: [PATCH] LUCENE-4199: Hide InputStream ctors from JFlex generated code git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene4199@1358754 13f79535-47bb-0310-9956-ffa450edef68 --- lucene/analysis/common/build.xml | 50 +++++++++++-------- .../standard/ClassicTokenizerImpl.java | 18 ++----- .../standard/SUPPLEMENTARY.jflex-macro | 2 +- .../standard/StandardTokenizerImpl.java | 14 ++---- .../standard/UAX29URLEmailTokenizerImpl.java | 12 +---- .../standard/UAX29URLEmailTokenizerImpl.jflex | 2 +- .../wikipedia/WikipediaTokenizerImpl.java | 18 ++----- 7 files changed, 45 insertions(+), 71 deletions(-) diff --git a/lucene/analysis/common/build.xml b/lucene/analysis/common/build.xml index 4c93341d4fd..ac6d999df0a 100644 --- a/lucene/analysis/common/build.xml +++ b/lucene/analysis/common/build.xml @@ -67,44 +67,50 @@ - + - - - - + + + - - - + + + + + + + + + + + + + + + diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java index f7bc82a9cca..97f65aea5e1 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java @@ -1,8 +1,8 @@ -/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 9/30/11 12:10 PM */ +/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 08.07.12 16:59 */ package org.apache.lucene.analysis.standard; -/* +/** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -33,8 +33,8 @@ import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; /** * This class is a scanner generated by * JFlex 1.5.0-SNAPSHOT - * on 9/30/11 12:10 PM from the specification file - * /lucene/jflex/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex + * on 08.07.12 16:59 from the specification file + * C:/Users/Uwe Schindler/Projects/lucene/lucene4199/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex */ class ClassicTokenizerImpl implements StandardTokenizerInterface { @@ -383,15 +383,7 @@ public final void getText(CharTermAttribute t) { this.zzReader = in; } - /** - * Creates a new scanner. - * There is also java.io.Reader version of this constructor. - * - * @param in the java.io.Inputstream to read input from. - */ - ClassicTokenizerImpl(java.io.InputStream in) { - this(new java.io.InputStreamReader(in)); - } + /** * Unpacks the compressed character translation table. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/SUPPLEMENTARY.jflex-macro b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/SUPPLEMENTARY.jflex-macro index 53d36f7d6f7..c8e4785f605 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/SUPPLEMENTARY.jflex-macro +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/SUPPLEMENTARY.jflex-macro @@ -14,7 +14,7 @@ * limitations under the License. */ -// Generated using ICU4J 4.8.0.0 on Friday, September 30, 2011 4:10:42 PM UTC +// Generated using ICU4J 4.8.1.1 on Sunday, July 8, 2012 2:59:49 PM UTC // by org.apache.lucene.analysis.icu.GenerateJFlexSupplementaryMacros diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java index ba0737e4705..4f4da053d93 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java @@ -1,8 +1,8 @@ -/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 9/30/11 12:10 PM */ +/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 08.07.12 16:59 */ package org.apache.lucene.analysis.standard; -/* +/** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -759,15 +759,7 @@ public final class StandardTokenizerImpl implements StandardTokenizerInterface { this.zzReader = in; } - /** - * Creates a new scanner. - * There is also java.io.Reader version of this constructor. - * - * @param in the java.io.Inputstream to read input from. - */ - public StandardTokenizerImpl(java.io.InputStream in) { - this(new java.io.InputStreamReader(in)); - } + /** * Unpacks the compressed character translation table. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java index 030b9fa5168..2556df36cb8 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java @@ -1,4 +1,4 @@ -/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 3/18/12 12:05 PM */ +/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 08.07.12 17:00 */ package org.apache.lucene.analysis.standard; @@ -3844,15 +3844,7 @@ public final class UAX29URLEmailTokenizerImpl implements StandardTokenizerInterf this.zzReader = in; } - /** - * Creates a new scanner. - * There is also java.io.Reader version of this constructor. - * - * @param in the java.io.Inputstream to read input from. - */ - public UAX29URLEmailTokenizerImpl(java.io.InputStream in) { - this(new java.io.InputStreamReader(in)); - } + /** * Unpacks the compressed character translation table. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex index fabe8f1aa74..9aa3e748c96 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex @@ -1,6 +1,6 @@ package org.apache.lucene.analysis.standard; -/** +/* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java index 51640988d4d..db868e6878c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java @@ -1,8 +1,8 @@ -/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 1/22/12 10:26 PM */ +/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 08.07.12 17:00 */ package org.apache.lucene.analysis.wikipedia; -/* +/** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -25,8 +25,8 @@ import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; /** * This class is a scanner generated by * JFlex 1.5.0-SNAPSHOT - * on 1/22/12 10:26 PM from the specification file - * /home/rmuir/workspace/lucene-clean-trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex + * on 08.07.12 17:00 from the specification file + * C:/Users/Uwe Schindler/Projects/lucene/lucene4199/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex */ class WikipediaTokenizerImpl { @@ -519,15 +519,7 @@ final void reset() { this.zzReader = in; } - /** - * Creates a new scanner. - * There is also java.io.Reader version of this constructor. - * - * @param in the java.io.Inputstream to read input from. - */ - WikipediaTokenizerImpl(java.io.InputStream in) { - this(new java.io.InputStreamReader(in)); - } + /** * Unpacks the compressed character translation table.