go

diff --git a/src/com/hughes/android/dictionary/IndexBuilder.java b/src/com/hughes/android/dictionary/IndexBuilder.java
index 6e7eca7fdbba18e2d19847ca20bf2b2426f359e2..13dc1dbd59e8fd110bcf4e08409e75e98826f360 100755 (executable)
--- a/src/com/hughes/android/dictionary/IndexBuilder.java
+++ b/src/com/hughes/android/dictionary/IndexBuilder.java
@@ -36,7 +36,7 @@ public class IndexBuilder {
     rootBuilder.forEachNode(new Function<Node>() {\r
       @Override\r
       public void invoke(final Node node) {\r
-        for (final List<EntryDescriptor> entryDescriptors : node.entries.values()) {\r
+        for (final List<EntryDescriptor> entryDescriptors : node.entryDescriptorsMap.values()) {\r
           Collections.sort(entryDescriptors);\r
         }\r
       }});\r
@@ -78,7 +78,7 @@ public class IndexBuilder {
     final String normalizedWord;\r
     \r
     final TreeMap<String, Node> children = new TreeMap<String, Node>();\r
-    final TreeMap<String,List<EntryDescriptor>> entries = new TreeMap<String, List<EntryDescriptor>>();\r
+    final TreeMap<String,List<EntryDescriptor>> entryDescriptorsMap = new TreeMap<String, List<EntryDescriptor>>();\r
     \r
 //    final List<EntryDescriptor> offsets = new ArrayList<EntryDescriptor>();\r
     \r
@@ -198,7 +198,7 @@ public class IndexBuilder {
 \r
     @Override\r
     public String toString() {\r
-      return normalizedWord + ":" + offsets.size();\r
+      return normalizedWord;\r
     }\r
     \r
     void dump(final RandomAccessFile file) throws IOException {\r
@@ -215,9 +215,12 @@ public class IndexBuilder {
         file.writeInt(child.getValue().indexFileLocation);\r
       }\r
       \r
-      // Offsets.\r
-      file.writeInt(offsets.size());\r
-      for (int i = 0; i < offsets.size(); i++) {\r
+      // Entries.\r
+      file.writeInt(entryDescriptorsMap.size());\r
+      for (final Map.Entry<String, List<EntryDescriptor>> entry : entryDescriptorsMap.entrySet()) {\r
+        file.writeUTF(entry.getKey());\r
+        file.writeInt(entry.getValue().size());\r
+        \r
         file.writeInt(offsets.get(i).offset);\r
       }\r
       \r