Optimize imports, update dictionary info.

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

diff --git a/src/com/hughes/android/dictionary/engine/EntrySource.java b/src/com/hughes/android/dictionary/engine/EntrySource.java
index f624817d29057d75f2501e73649fa5930c786b59..7991fdcf6fd605c02ae1e38ca2bdc36e006281a9 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/EntrySource.java
+++ b/src/com/hughes/android/dictionary/engine/EntrySource.java
@@ -14,46 +14,63 @@
 
 package com.hughes.android.dictionary.engine;
 
+import com.hughes.util.IndexedObject;
+import com.hughes.util.raf.RAFListSerializer;
+
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.io.Serializable;
 
-import com.hughes.util.IndexedObject;
-import com.hughes.util.raf.RAFListSerializer;
-
 public class EntrySource extends IndexedObject implements Serializable {
   
   private static final long serialVersionUID = -1323165134846120269L;
   
   final String name;
-  final int pairEntryStart;
+  int numEntries;
   
-  public EntrySource(final int index, final String name, final int pairEntryStart) {
+  public EntrySource(final int index, final String name, int numEntries) {
     super(index);
     this.name = name;
-    this.pairEntryStart = pairEntryStart;
+    this.numEntries = numEntries;
   }
   
   @Override
   public String toString() {
     return name;
   }
+  
+  
 
 
-  public static RAFListSerializer<EntrySource> SERIALIZER = new RAFListSerializer<EntrySource>() {
+  public int getNumEntries() {
+    return numEntries;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+
+  public static final class Serializer implements RAFListSerializer<EntrySource> {
+    
+    final Dictionary dictionary;
+    
+    Serializer(Dictionary dictionary) {
+      this.dictionary = dictionary;
+    }
 
     @Override
     public EntrySource read(RandomAccessFile raf, int readIndex)
         throws IOException {
       final String name = raf.readUTF();
-      final int pairEntryStart = raf.readInt();
-      return new EntrySource(readIndex, name, pairEntryStart);
+      final int numEntries = dictionary.dictFileVersion >= 3 ? raf.readInt() : 0;
+      return new EntrySource(readIndex, name, numEntries);
     }
 
     @Override
     public void write(RandomAccessFile raf, EntrySource t) throws IOException {
       raf.writeUTF(t.name);
-      raf.writeInt(t.pairEntryStart);
+      raf.writeInt(t.numEntries);
     }    
   };