Optimize comparisons for TreeMap.

diff --git a/src/com/hughes/android/dictionary/engine/IndexBuilder.java b/src/com/hughes/android/dictionary/engine/IndexBuilder.java
index 680cf4adc5dee305793dced0a21c5b4be27ed0a8..d37f9d1fc7543bb67204cb4327c3ab73daf69e5a 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/IndexBuilder.java
+++ b/src/com/hughes/android/dictionary/engine/IndexBuilder.java
@@ -34,12 +34,12 @@ public class IndexBuilder {
     public final Index index;
     final Set<String> stoplist;
 
-    final SortedMap<String, TokenData> tokenToData;
+    final SortedMap<FastCompareString, TokenData> tokenToData;
 
     IndexBuilder(final DictionaryBuilder dictionaryBuilder, final String shortName, final String longName, final Language language, final String normalizerRules, final Set<String> stoplist, final boolean swapPairEntries) {
         this.dictionaryBuilder = dictionaryBuilder;
         index = new Index(dictionaryBuilder.dictionary, shortName, longName, language, normalizerRules, swapPairEntries, stoplist);
-        tokenToData = new TreeMap<>(index.getSortComparator());
+        tokenToData = new TreeMap<>(new FastNormalizeComparator(index.getSortComparator()));
         this.stoplist = stoplist;
     }
 
@@ -125,10 +125,11 @@ public class IndexBuilder {
     }
 
     public TokenData getOrCreateTokenData(final String token) {
-        TokenData tokenData = tokenToData.get(token);
+        final FastCompareString c = new FastCompareString(token);
+        TokenData tokenData = tokenToData.get(c);
         if (tokenData == null) {
             tokenData = new TokenData(token);
-            tokenToData.put(token, tokenData);
+            tokenToData.put(c, tokenData);
         }
         return tokenData;
     }