go

[DictionaryPC.git] / src / com / hughes / android / dictionary / engine / IndexBuilder.java

diff --git a/src/com/hughes/android/dictionary/engine/IndexBuilder.java b/src/com/hughes/android/dictionary/engine/IndexBuilder.java
index 0e25e3388b6dbbed2070dd7f43325188a92e75f7..0d6a3d938f87d8293756a0b1b9966e1459da85c9 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/IndexBuilder.java
+++ b/src/com/hughes/android/dictionary/engine/IndexBuilder.java
@@ -17,15 +17,14 @@ import com.hughes.android.dictionary.engine.Index.IndexEntry;
 public class IndexBuilder {
   
   final DictionaryBuilder dictionaryBuilder;
-  final Index index;
+  public final Index index;
 
   final SortedMap<String, TokenData> tokenToData;
 
-  @SuppressWarnings("unchecked")
-  IndexBuilder(final DictionaryBuilder dictionaryBuilder, final String shortName, final String longName, final Language language, final boolean swapPairEntries) {
+  IndexBuilder(final DictionaryBuilder dictionaryBuilder, final String shortName, final String longName, final Language language, final String normalizerRules, final boolean swapPairEntries) {
     this.dictionaryBuilder = dictionaryBuilder;
-    index = new Index(dictionaryBuilder.dictionary, shortName, longName, language, swapPairEntries);
-    tokenToData = new TreeMap<String, TokenData>(language.getSortCollator());
+    index = new Index(dictionaryBuilder.dictionary, shortName, longName, language, normalizerRules, swapPairEntries);
+    tokenToData = new TreeMap<String, TokenData>(new NormalizeComparator(index.normalizer, language.collator));
   }
   
   public void build() {