diff --git a/english/src/test/java/org/apache/lucene/morphology/english/EnglishLuceneMorphTest.java b/english/src/test/java/org/apache/lucene/morphology/english/EnglishLuceneMorphTest.java index 461d1de..0b6ddd3 100644 --- a/english/src/test/java/org/apache/lucene/morphology/english/EnglishLuceneMorphTest.java +++ b/english/src/test/java/org/apache/lucene/morphology/english/EnglishLuceneMorphTest.java @@ -47,7 +47,7 @@ public class EnglishLuceneMorphTest { for (int i = 1; i < qa.length; i++) { result.add(qa[i]); } - Set stringList = new HashSet(luceneMorph.getMorhInfo(qa[0])); + Set stringList = new HashSet(luceneMorph.getNormalForms(qa[0])); assertThat(stringList, equalTo(result)); s = bufferedReader.readLine(); } diff --git a/morph/src/main/java/org/apache/lucene/morphology/LuceneMorphology.java b/morph/src/main/java/org/apache/lucene/morphology/LuceneMorphology.java index 128ae55..b2515d1 100644 --- a/morph/src/main/java/org/apache/lucene/morphology/LuceneMorphology.java +++ b/morph/src/main/java/org/apache/lucene/morphology/LuceneMorphology.java @@ -20,7 +20,6 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; -import java.util.List; public class LuceneMorphology extends MorphologyImpl { @@ -33,17 +32,6 @@ public class LuceneMorphology extends MorphologyImpl { super(inputStream, decoderEncoder); } - @Override - public List getMorhInfo(String s) { - ArrayList result = new ArrayList(); - int[] ints = decoderEncoder.encodeToArray(revertWord(s)); - int ruleId = findRuleId(ints); - for (Heuristic h : rules[rulesId[ruleId]]) { - result.add(h.transofrmWord(s)); - } - return result; - } - protected void readRules(BufferedReader bufferedReader) throws IOException { String s; Integer amount; diff --git a/morph/src/main/java/org/apache/lucene/morphology/Morphology.java b/morph/src/main/java/org/apache/lucene/morphology/Morphology.java index 2d78265..b35fb30 100644 --- a/morph/src/main/java/org/apache/lucene/morphology/Morphology.java +++ b/morph/src/main/java/org/apache/lucene/morphology/Morphology.java @@ -20,6 +20,8 @@ import java.util.List; public interface Morphology { - List getMorhInfo(String s); - + List getNormalForms(String s); + + List getMorfInfo(String s); + } diff --git a/morph/src/main/java/org/apache/lucene/morphology/MorphologyImpl.java b/morph/src/main/java/org/apache/lucene/morphology/MorphologyImpl.java index ed1b1ec..bba682f 100644 --- a/morph/src/main/java/org/apache/lucene/morphology/MorphologyImpl.java +++ b/morph/src/main/java/org/apache/lucene/morphology/MorphologyImpl.java @@ -63,7 +63,17 @@ public class MorphologyImpl implements Morphology { return grammaInfo; } - public List getMorhInfo(String s) { + public List getNormalForms(String s) { + ArrayList result = new ArrayList(); + int[] ints = decoderEncoder.encodeToArray(revertWord(s)); + int ruleId = findRuleId(ints); + for (Heuristic h : rules[rulesId[ruleId]]) { + result.add(h.transofrmWord(s)); + } + return result; + } + + public List getMorfInfo(String s) { ArrayList result = new ArrayList(); int[] ints = decoderEncoder.encodeToArray(revertWord(s)); int ruleId = findRuleId(ints); diff --git a/morph/src/main/java/org/apache/lucene/morphology/analayzer/MorphlogyFilter.java b/morph/src/main/java/org/apache/lucene/morphology/analayzer/MorphlogyFilter.java index 0f0076c..40c396a 100644 --- a/morph/src/main/java/org/apache/lucene/morphology/analayzer/MorphlogyFilter.java +++ b/morph/src/main/java/org/apache/lucene/morphology/analayzer/MorphlogyFilter.java @@ -56,7 +56,7 @@ public class MorphlogyFilter extends TokenFilter { if (!luceneMorph.checkString(nextToken.term())) { return nextToken; } - stack = luceneMorph.getMorhInfo(nextToken.term()); + stack = luceneMorph.getNormalForms(nextToken.term()); index = 0; current = (Token) nextToken.clone(); nextToken = createToken(stack.get(index++), current, reusableToken); diff --git a/russian/src/test/java/org/apache/lucene/morphology/russian/RussianLuceneMorphTest.java b/russian/src/test/java/org/apache/lucene/morphology/russian/RussianLuceneMorphTest.java index 9337521..645a77c 100644 --- a/russian/src/test/java/org/apache/lucene/morphology/russian/RussianLuceneMorphTest.java +++ b/russian/src/test/java/org/apache/lucene/morphology/russian/RussianLuceneMorphTest.java @@ -47,7 +47,7 @@ public class RussianLuceneMorphTest { for (int i = 1; i < qa.length; i++) { result.add(qa[i]); } - Set stringList = new HashSet(luceneMorph.getMorhInfo(qa[0])); + Set stringList = new HashSet(luceneMorph.getNormalForms(qa[0])); assertThat(stringList, equalTo(result)); s = bufferedReader.readLine(); }