Remove unnecessary class variables.

[Dictionary.git] / src / com / hughes / android / dictionary / engine / Index.java

diff --git a/src/com/hughes/android/dictionary/engine/Index.java b/src/com/hughes/android/dictionary/engine/Index.java
index 01cd12576748ca879ff9ac4f16bc0d0242f61b83..65b8e970906eb0d9a2b73d54090a23aedab14ca4 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/Index.java
+++ b/src/com/hughes/android/dictionary/engine/Index.java
@@ -106,8 +106,7 @@ public final class Index implements RAFSerializable<Index> {
      */
     public synchronized Transliterator normalizer() {
         if (normalizer == null) {
-            normalizer = Transliterator
-                    .createFromRules("", normalizerRules, Transliterator.FORWARD);
+            normalizer = TransliteratorManager.get(normalizerRules);
         }
         return normalizer;
     }
@@ -192,17 +191,14 @@ public final class Index implements RAFSerializable<Index> {
     };
 
     public static final class IndexEntry implements RAFSerializable<Index.IndexEntry> {
-        private final Index index;
         public final String token;
         private final String normalizedToken;
         public final int startRow;
         public final int numRows; // doesn't count the token row!
         public List<HtmlEntry> htmlEntries;
-        private int[] htmlEntryIndices;
 
         public IndexEntry(final Index index, final String token, final String normalizedToken,
                 final int startRow, final int numRows) {
-            this.index = index;
             assert token.equals(token.trim());
             assert token.length() > 0;
             this.token = token;
@@ -213,7 +209,6 @@ public final class Index implements RAFSerializable<Index> {
         }
 
         public IndexEntry(final Index index, final DataInput raf) throws IOException {
-            this.index = index;
             token = raf.readUTF();
             if (index.dict.dictFileVersion >= 7) {
                 startRow = StringUtil.readVarInt(raf);
@@ -224,10 +219,9 @@ public final class Index implements RAFSerializable<Index> {
             }
             final boolean hasNormalizedForm = raf.readBoolean();
             normalizedToken = hasNormalizedForm ? raf.readUTF() : token;
-            htmlEntryIndices = null;
             if (index.dict.dictFileVersion >= 7) {
                 int size = StringUtil.readVarInt(raf);
-                htmlEntryIndices = new int[size];
+                final int[] htmlEntryIndices = new int[size];
                 for (int i = 0; i < size; ++i) {
                     htmlEntryIndices[i] = StringUtil.readVarInt(raf);
                 }
@@ -310,7 +304,7 @@ public final class Index implements RAFSerializable<Index> {
             }
             final IndexEntry midEntry = sortedIndexEntries.get(mid);
 
-            int comp = NormalizeComparator.compareWithoutLeadingDash(token, midEntry.normalizedToken(), sortCollator, dict.dictFileVersion);
+            int comp = NormalizeComparator.compareWithoutDash(token, midEntry.normalizedToken(), sortCollator, dict.dictFileVersion);
             if (comp == 0)
                 comp = sortCollator.compare(token, midEntry.normalizedToken());
             if (comp == 0) {