You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2013/04/01 20:13:15 UTC
svn commit: r1463232 - in /lucene/dev/trunk/lucene/analysis/common/src:
java/org/apache/lucene/analysis/ngram/
java/org/apache/lucene/analysis/pattern/
test/org/apache/lucene/analysis/charfilter/
Author: sarowe
Date: Mon Apr 1 18:13:15 2013
New Revision: 1463232
URL: http://svn.apache.org/r1463232
Log:
LUCENE-4877: fix minor analyzer factory issues
Modified:
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerFactory.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizerFactory.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilterFactory.java
Modified: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerFactory.java?rev=1463232&r1=1463231&r2=1463232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerFactory.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerFactory.java Mon Apr 1 18:13:15 2013
@@ -40,8 +40,8 @@ public class EdgeNGramTokenizerFactory e
/** Creates a new EdgeNGramTokenizerFactory */
public EdgeNGramTokenizerFactory(Map<String, String> args) {
super(args);
- minGramSize = getInt(args, "minGramSize", EdgeNGramTokenFilter.DEFAULT_MIN_GRAM_SIZE);
- maxGramSize = getInt(args, "maxGramSize", EdgeNGramTokenFilter.DEFAULT_MAX_GRAM_SIZE);
+ minGramSize = getInt(args, "minGramSize", EdgeNGramTokenizer.DEFAULT_MIN_GRAM_SIZE);
+ maxGramSize = getInt(args, "maxGramSize", EdgeNGramTokenizer.DEFAULT_MAX_GRAM_SIZE);
String sideArg = args.remove("side");
if (sideArg == null) {
Modified: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizerFactory.java?rev=1463232&r1=1463231&r2=1463232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizerFactory.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizerFactory.java Mon Apr 1 18:13:15 2013
@@ -71,13 +71,8 @@ public class PatternTokenizerFactory ext
public PatternTokenizerFactory(Map<String,String> args) {
super(args);
pattern = getPattern(args, PATTERN);
-
- String v = args.remove(GROUP);
- if (v == null) {
- group = -1; // use 'split'
- } else {
- group = Integer.parseInt(v);
- }
+ group = getInt(args, GROUP, -1);
+
if (!args.isEmpty()) {
throw new IllegalArgumentException("Unknown parameters: " + args);
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilterFactory.java?rev=1463232&r1=1463231&r2=1463232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilterFactory.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilterFactory.java Mon Apr 1 18:13:15 2013
@@ -17,14 +17,12 @@ package org.apache.lucene.analysis.charf
* limitations under the License.
*/
-import java.util.HashMap;
-
import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase;
public class TestMappingCharFilterFactory extends BaseTokenStreamFactoryTestCase {
public void testParseString() throws Exception {
- MappingCharFilterFactory f = new MappingCharFilterFactory(new HashMap<String,String>());
+ MappingCharFilterFactory f = (MappingCharFilterFactory)charFilterFactory("Mapping");
try {
f.parseString( "\\" );