From 26ca704ec0be5db8aca9bb7caeb97b3584ceedfa Mon Sep 17 00:00:00 2001 From: "alexander.a.kuznetsov" Date: Fri, 16 Oct 2009 15:31:01 +0000 Subject: [PATCH] =?UTF-8?q?=D0=BA=D1=83=D0=B0=D1=84refactor=20class=20for?= =?UTF-8?q?=20encoding=20letters?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://russianmorphology.googlecode.com/svn/trunk@61 d817d54c-26ab-11de-abc9-2f7d1455ff7a --- .../dictionary/DictonaryReader.java | 2 +- .../dictionary/FlexiaModel.java | 2 +- .../dictionary/FrequentyReader.java | 2 +- .../dictionary/GrammaReader.java | 2 +- .../dictionary/IgnoredFormReader.java | 2 +- .../dictionary/StatiticsCollector.java | 2 +- .../{morpholgy => morphology}/dictionary/WordCard.java | 2 +- .../dictionary/WordProccessor.java | 2 +- .../generator/EnglishHeuristicBuilder.java | 10 +++++----- .../generator/RussianHeuristicBuilder.java | 8 ++++---- .../english/EnglishLetterDecoderEncoder.java | 2 +- .../english/EnglishLetterDecoderEncoderTest.java | 2 +- .../english/EnglishLuceneMorphTest.java | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) rename dictionary-reader/src/main/java/org/apache/lucene/{morpholgy => morphology}/dictionary/DictonaryReader.java (98%) rename dictionary-reader/src/main/java/org/apache/lucene/{morpholgy => morphology}/dictionary/FlexiaModel.java (93%) rename dictionary-reader/src/main/java/org/apache/lucene/{morpholgy => morphology}/dictionary/FrequentyReader.java (94%) rename dictionary-reader/src/main/java/org/apache/lucene/{morpholgy => morphology}/dictionary/GrammaReader.java (95%) rename dictionary-reader/src/main/java/org/apache/lucene/{morpholgy => morphology}/dictionary/IgnoredFormReader.java (94%) rename dictionary-reader/src/main/java/org/apache/lucene/{morpholgy => morphology}/dictionary/StatiticsCollector.java (99%) rename dictionary-reader/src/main/java/org/apache/lucene/{morpholgy => morphology}/dictionary/WordCard.java (97%) rename dictionary-reader/src/main/java/org/apache/lucene/{morpholgy => morphology}/dictionary/WordProccessor.java (94%) rename dictionary-reader/src/main/java/org/apache/lucene/{morpholgy => morphology}/generator/EnglishHeuristicBuilder.java (80%) rename dictionary-reader/src/main/java/org/apache/lucene/{morpholgy => morphology}/generator/RussianHeuristicBuilder.java (84%) rename english/src/main/java/org/apache/lucene/{morpholgy => morphology}/english/EnglishLetterDecoderEncoder.java (98%) rename english/src/test/java/org/apache/lucene/{morpholgy => morphology}/english/EnglishLetterDecoderEncoderTest.java (97%) rename english/src/test/java/org/apache/lucene/{morpholgy => morphology}/english/EnglishLuceneMorphTest.java (97%) diff --git a/dictionary-reader/src/main/java/org/apache/lucene/morpholgy/dictionary/DictonaryReader.java b/dictionary-reader/src/main/java/org/apache/lucene/morphology/dictionary/DictonaryReader.java similarity index 98% rename from dictionary-reader/src/main/java/org/apache/lucene/morpholgy/dictionary/DictonaryReader.java rename to dictionary-reader/src/main/java/org/apache/lucene/morphology/dictionary/DictonaryReader.java index 3b63266..ff72d7c 100644 --- a/dictionary-reader/src/main/java/org/apache/lucene/morpholgy/dictionary/DictonaryReader.java +++ b/dictionary-reader/src/main/java/org/apache/lucene/morphology/dictionary/DictonaryReader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.lucene.morpholgy.dictionary; +package org.apache.lucene.morphology.dictionary; import java.io.BufferedReader; diff --git a/dictionary-reader/src/main/java/org/apache/lucene/morpholgy/dictionary/FlexiaModel.java b/dictionary-reader/src/main/java/org/apache/lucene/morphology/dictionary/FlexiaModel.java similarity index 93% rename from dictionary-reader/src/main/java/org/apache/lucene/morpholgy/dictionary/FlexiaModel.java rename to dictionary-reader/src/main/java/org/apache/lucene/morphology/dictionary/FlexiaModel.java index 72b83d7..9b51950 100644 --- a/dictionary-reader/src/main/java/org/apache/lucene/morpholgy/dictionary/FlexiaModel.java +++ b/dictionary-reader/src/main/java/org/apache/lucene/morphology/dictionary/FlexiaModel.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.lucene.morpholgy.dictionary; +package org.apache.lucene.morphology.dictionary; /** * Represent inofrmation of how word form created form it imutible part. diff --git a/dictionary-reader/src/main/java/org/apache/lucene/morpholgy/dictionary/FrequentyReader.java b/dictionary-reader/src/main/java/org/apache/lucene/morphology/dictionary/FrequentyReader.java similarity index 94% rename from dictionary-reader/src/main/java/org/apache/lucene/morpholgy/dictionary/FrequentyReader.java rename to dictionary-reader/src/main/java/org/apache/lucene/morphology/dictionary/FrequentyReader.java index 8537adb..a262cce 100644 --- a/dictionary-reader/src/main/java/org/apache/lucene/morpholgy/dictionary/FrequentyReader.java +++ b/dictionary-reader/src/main/java/org/apache/lucene/morphology/dictionary/FrequentyReader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.lucene.morpholgy.dictionary; +package org.apache.lucene.morphology.dictionary; import java.io.BufferedReader; import java.io.FileInputStream; diff --git a/dictionary-reader/src/main/java/org/apache/lucene/morpholgy/dictionary/GrammaReader.java b/dictionary-reader/src/main/java/org/apache/lucene/morphology/dictionary/GrammaReader.java similarity index 95% rename from dictionary-reader/src/main/java/org/apache/lucene/morpholgy/dictionary/GrammaReader.java rename to dictionary-reader/src/main/java/org/apache/lucene/morphology/dictionary/GrammaReader.java index aac0609..7d32727 100644 --- a/dictionary-reader/src/main/java/org/apache/lucene/morpholgy/dictionary/GrammaReader.java +++ b/dictionary-reader/src/main/java/org/apache/lucene/morphology/dictionary/GrammaReader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.lucene.morpholgy.dictionary; +package org.apache.lucene.morphology.dictionary; import java.io.BufferedReader; import java.io.FileInputStream; diff --git a/dictionary-reader/src/main/java/org/apache/lucene/morpholgy/dictionary/IgnoredFormReader.java b/dictionary-reader/src/main/java/org/apache/lucene/morphology/dictionary/IgnoredFormReader.java similarity index 94% rename from dictionary-reader/src/main/java/org/apache/lucene/morpholgy/dictionary/IgnoredFormReader.java rename to dictionary-reader/src/main/java/org/apache/lucene/morphology/dictionary/IgnoredFormReader.java index 6a140d4..2f38828 100644 --- a/dictionary-reader/src/main/java/org/apache/lucene/morpholgy/dictionary/IgnoredFormReader.java +++ b/dictionary-reader/src/main/java/org/apache/lucene/morphology/dictionary/IgnoredFormReader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.lucene.morpholgy.dictionary; +package org.apache.lucene.morphology.dictionary; import java.io.BufferedReader; import java.io.FileInputStream; diff --git a/dictionary-reader/src/main/java/org/apache/lucene/morpholgy/dictionary/StatiticsCollector.java b/dictionary-reader/src/main/java/org/apache/lucene/morphology/dictionary/StatiticsCollector.java similarity index 99% rename from dictionary-reader/src/main/java/org/apache/lucene/morpholgy/dictionary/StatiticsCollector.java rename to dictionary-reader/src/main/java/org/apache/lucene/morphology/dictionary/StatiticsCollector.java index 8aff57c..4dfef5e 100644 --- a/dictionary-reader/src/main/java/org/apache/lucene/morpholgy/dictionary/StatiticsCollector.java +++ b/dictionary-reader/src/main/java/org/apache/lucene/morphology/dictionary/StatiticsCollector.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.lucene.morpholgy.dictionary; +package org.apache.lucene.morphology.dictionary; import org.apache.lucene.morphology.Heuristic; diff --git a/dictionary-reader/src/main/java/org/apache/lucene/morpholgy/dictionary/WordCard.java b/dictionary-reader/src/main/java/org/apache/lucene/morphology/dictionary/WordCard.java similarity index 97% rename from dictionary-reader/src/main/java/org/apache/lucene/morpholgy/dictionary/WordCard.java rename to dictionary-reader/src/main/java/org/apache/lucene/morphology/dictionary/WordCard.java index 4132479..ef79061 100644 --- a/dictionary-reader/src/main/java/org/apache/lucene/morpholgy/dictionary/WordCard.java +++ b/dictionary-reader/src/main/java/org/apache/lucene/morphology/dictionary/WordCard.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.lucene.morpholgy.dictionary; +package org.apache.lucene.morphology.dictionary; import java.util.ArrayList; import java.util.List; diff --git a/dictionary-reader/src/main/java/org/apache/lucene/morpholgy/dictionary/WordProccessor.java b/dictionary-reader/src/main/java/org/apache/lucene/morphology/dictionary/WordProccessor.java similarity index 94% rename from dictionary-reader/src/main/java/org/apache/lucene/morpholgy/dictionary/WordProccessor.java rename to dictionary-reader/src/main/java/org/apache/lucene/morphology/dictionary/WordProccessor.java index b0dc69d..e9edb46 100644 --- a/dictionary-reader/src/main/java/org/apache/lucene/morpholgy/dictionary/WordProccessor.java +++ b/dictionary-reader/src/main/java/org/apache/lucene/morphology/dictionary/WordProccessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.lucene.morpholgy.dictionary; +package org.apache.lucene.morphology.dictionary; import java.io.IOException; diff --git a/dictionary-reader/src/main/java/org/apache/lucene/morpholgy/generator/EnglishHeuristicBuilder.java b/dictionary-reader/src/main/java/org/apache/lucene/morphology/generator/EnglishHeuristicBuilder.java similarity index 80% rename from dictionary-reader/src/main/java/org/apache/lucene/morpholgy/generator/EnglishHeuristicBuilder.java rename to dictionary-reader/src/main/java/org/apache/lucene/morphology/generator/EnglishHeuristicBuilder.java index 4ad98bb..c1ff7d9 100644 --- a/dictionary-reader/src/main/java/org/apache/lucene/morpholgy/generator/EnglishHeuristicBuilder.java +++ b/dictionary-reader/src/main/java/org/apache/lucene/morphology/generator/EnglishHeuristicBuilder.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.apache.lucene.morpholgy.generator; +package org.apache.lucene.morphology.generator; -import org.apache.lucene.morpholgy.dictionary.DictonaryReader; -import org.apache.lucene.morpholgy.dictionary.GrammaReader; -import org.apache.lucene.morpholgy.dictionary.StatiticsCollector; -import org.apache.lucene.morpholgy.english.EnglishLetterDecoderEncoder; +import org.apache.lucene.morphology.dictionary.DictonaryReader; +import org.apache.lucene.morphology.dictionary.GrammaReader; +import org.apache.lucene.morphology.dictionary.StatiticsCollector; +import org.apache.lucene.morphology.english.EnglishLetterDecoderEncoder; import java.io.IOException; import java.util.HashSet; diff --git a/dictionary-reader/src/main/java/org/apache/lucene/morpholgy/generator/RussianHeuristicBuilder.java b/dictionary-reader/src/main/java/org/apache/lucene/morphology/generator/RussianHeuristicBuilder.java similarity index 84% rename from dictionary-reader/src/main/java/org/apache/lucene/morpholgy/generator/RussianHeuristicBuilder.java rename to dictionary-reader/src/main/java/org/apache/lucene/morphology/generator/RussianHeuristicBuilder.java index 9542d38..d38ab67 100644 --- a/dictionary-reader/src/main/java/org/apache/lucene/morpholgy/generator/RussianHeuristicBuilder.java +++ b/dictionary-reader/src/main/java/org/apache/lucene/morphology/generator/RussianHeuristicBuilder.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.apache.lucene.morpholgy.generator; +package org.apache.lucene.morphology.generator; -import org.apache.lucene.morpholgy.dictionary.DictonaryReader; -import org.apache.lucene.morpholgy.dictionary.GrammaReader; -import org.apache.lucene.morpholgy.dictionary.StatiticsCollector; +import org.apache.lucene.morphology.dictionary.DictonaryReader; +import org.apache.lucene.morphology.dictionary.GrammaReader; +import org.apache.lucene.morphology.dictionary.StatiticsCollector; import org.apache.lucene.morphology.russian.RussianLetterDecoderEncoder; import java.io.IOException; diff --git a/english/src/main/java/org/apache/lucene/morpholgy/english/EnglishLetterDecoderEncoder.java b/english/src/main/java/org/apache/lucene/morphology/english/EnglishLetterDecoderEncoder.java similarity index 98% rename from english/src/main/java/org/apache/lucene/morpholgy/english/EnglishLetterDecoderEncoder.java rename to english/src/main/java/org/apache/lucene/morphology/english/EnglishLetterDecoderEncoder.java index 8586a11..e4e9a8a 100644 --- a/english/src/main/java/org/apache/lucene/morpholgy/english/EnglishLetterDecoderEncoder.java +++ b/english/src/main/java/org/apache/lucene/morphology/english/EnglishLetterDecoderEncoder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.morpholgy.english; +package org.apache.lucene.morphology.english; import org.apache.lucene.morphology.LetterDecoderEncoder; import org.apache.lucene.morphology.SuffixToLongException; diff --git a/english/src/test/java/org/apache/lucene/morpholgy/english/EnglishLetterDecoderEncoderTest.java b/english/src/test/java/org/apache/lucene/morphology/english/EnglishLetterDecoderEncoderTest.java similarity index 97% rename from english/src/test/java/org/apache/lucene/morpholgy/english/EnglishLetterDecoderEncoderTest.java rename to english/src/test/java/org/apache/lucene/morphology/english/EnglishLetterDecoderEncoderTest.java index 4cd7d12..bc6f872 100644 --- a/english/src/test/java/org/apache/lucene/morpholgy/english/EnglishLetterDecoderEncoderTest.java +++ b/english/src/test/java/org/apache/lucene/morphology/english/EnglishLetterDecoderEncoderTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.morpholgy.english; +package org.apache.lucene.morphology.english; import static org.hamcrest.core.IsEqual.equalTo; import static org.junit.Assert.assertThat; diff --git a/english/src/test/java/org/apache/lucene/morpholgy/english/EnglishLuceneMorphTest.java b/english/src/test/java/org/apache/lucene/morphology/english/EnglishLuceneMorphTest.java similarity index 97% rename from english/src/test/java/org/apache/lucene/morpholgy/english/EnglishLuceneMorphTest.java rename to english/src/test/java/org/apache/lucene/morphology/english/EnglishLuceneMorphTest.java index 4dfe340..2bc9ec7 100644 --- a/english/src/test/java/org/apache/lucene/morpholgy/english/EnglishLuceneMorphTest.java +++ b/english/src/test/java/org/apache/lucene/morphology/english/EnglishLuceneMorphTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.morpholgy.english; +package org.apache.lucene.morphology.english; import org.apache.lucene.morphology.LuceneMorph; import org.junit.Before;