go

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

diff --git a/src/com/hughes/android/dictionary/engine/Dictionary.java b/src/com/hughes/android/dictionary/engine/Dictionary.java
index 1472d310623de67fcc369d96c3f28bc7351e4947..cbe76fb716adcc359522bf80620c251307cd7ba0 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/Dictionary.java
+++ b/src/com/hughes/android/dictionary/engine/Dictionary.java
@@ -14,14 +14,20 @@ import com.hughes.util.raf.RAFSerializable;
 
 public class Dictionary implements RAFSerializable<Dictionary> {
   
+  static final int CACHE_SIZE = 5000;
+  
+  static final String END_OF_DICTIONARY = "END OF DICTIONARY";
+  
   // persisted
-  final String dictInfo;
-  final List<PairEntry> pairEntries;
-  final List<TextEntry> textEntries;
-  final List<EntrySource> sources;
-  final List<Index> indices;
+  final int dictFileVersion;
+  public final String dictInfo;
+  public final List<PairEntry> pairEntries;
+  public final List<TextEntry> textEntries;
+  public final List<EntrySource> sources;
+  public final List<Index> indices;
   
   public Dictionary(final String dictInfo) {
+    this.dictFileVersion = 0;
     this.dictInfo = dictInfo;
     pairEntries = new ArrayList<PairEntry>();
     textEntries = new ArrayList<TextEntry>();
@@ -30,35 +36,30 @@ public class Dictionary implements RAFSerializable<Dictionary> {
   }
 
   public Dictionary(final RandomAccessFile raf) throws IOException {
+    dictFileVersion = raf.readInt();
+    if (dictFileVersion != 0) {
+      throw new IOException("Invalid dictionary version: " + dictFileVersion);
+    }
     dictInfo = raf.readUTF();
-
-    sources = RAFList.create(raf, EntrySource.SERIALIZER, raf.getFilePointer());
-
-    // TODO: caching
-    pairEntries = RAFList.create(raf, PairEntry.SERIALIZER, raf.getFilePointer());
-
-    // TODO: caching
-    textEntries = RAFList.create(raf, TextEntry.SERIALIZER, raf.getFilePointer());
-
-    final List<Index> rawIndices = RAFList.create(raf, indexSerializer, raf.getFilePointer());
-    indices = CachingList.create(rawIndices, rawIndices.size());
-  }
-  
-  public void print(final PrintStream out) {
-    out.println("dictInfo=" + dictInfo);
-    for (final Index index : indices) {
-      index.print(out);
-      out.println();
+    sources = CachingList.createFullyCached(RAFList.create(raf, EntrySource.SERIALIZER, raf.getFilePointer()));
+    pairEntries = CachingList.create(RAFList.create(raf, PairEntry.SERIALIZER, raf.getFilePointer()), CACHE_SIZE);
+    textEntries = CachingList.create(RAFList.create(raf, TextEntry.SERIALIZER, raf.getFilePointer()), CACHE_SIZE);
+    indices = CachingList.createFullyCached(RAFList.create(raf, indexSerializer, raf.getFilePointer()));
+    final String end = raf.readUTF(); 
+    if (!end.equals(END_OF_DICTIONARY)) {
+      throw new IOException("Dictionary seems corrupt: " + end);
     }
   }
-
+  
   @Override
   public void write(RandomAccessFile raf) throws IOException {
+    raf.writeInt(dictFileVersion);
     raf.writeUTF(dictInfo);
     RAFList.write(raf, sources, EntrySource.SERIALIZER);
     RAFList.write(raf, pairEntries, PairEntry.SERIALIZER);
     RAFList.write(raf, textEntries, TextEntry.SERIALIZER);
     RAFList.write(raf, indices, indexSerializer);
+    raf.writeUTF(END_OF_DICTIONARY);
   }
 
   private final RAFListSerializer<Index> indexSerializer = new RAFListSerializer<Index>() {
@@ -70,5 +71,14 @@ public class Dictionary implements RAFSerializable<Dictionary> {
     public void write(RandomAccessFile raf, Index t) throws IOException {
       t.write(raf);
     }};
+    
+    public void print(final PrintStream out) {
+      out.println("dictInfo=" + dictInfo);
+      for (final Index index : indices) {
+        index.print(out);
+        out.println();
+      }
+    }
+
 
 }
\ No newline at end of file