X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fengine%2FAbstractEntry.java;h=77d26db9298168bf09b59e1efc7eee5d6dbd6972;hb=83d9dc7cd871082a82c2dd0dbb7a0ceabd7c83a0;hp=de221eafc0eae60fa64990ddeabdfc6b0314eb45;hpb=b084948c7f75bffbbcb52ed550345c4c8e99a534;p=Dictionary.git

diff --git a/src/com/hughes/android/dictionary/engine/AbstractEntry.java b/src/com/hughes/android/dictionary/engine/AbstractEntry.java
index de221ea..77d26db 100644
--- a/src/com/hughes/android/dictionary/engine/AbstractEntry.java
+++ b/src/com/hughes/android/dictionary/engine/AbstractEntry.java
@@ -15,36 +15,38 @@
 package com.hughes.android.dictionary.engine;
 
 import com.hughes.util.IndexedObject;
+import com.hughes.util.StringUtil;
 
+import java.io.DataInput;
+import java.io.DataOutput;
 import java.io.IOException;
-import java.io.RandomAccessFile;
-
 
 public abstract class AbstractEntry extends IndexedObject {
-  
-  final EntrySource entrySource;
-  
-  protected AbstractEntry(EntrySource entrySource) {
-    super(-1);
-    this.entrySource = entrySource;
-  }
-
-  public AbstractEntry(Dictionary dictionary, RandomAccessFile raf, final int index) throws IOException {
-    super(index);
-    if (dictionary.dictFileVersion >= 1) {
-      final int entrySouceIdx = raf.readShort();
-      this.entrySource = dictionary.sources.get(entrySouceIdx);
-    } else {
-      this.entrySource = null;
+
+    public final EntrySource entrySource;
+
+    AbstractEntry(EntrySource entrySource) {
+        super(-1);
+        this.entrySource = entrySource;
     }
-  }
 
-  public void write(RandomAccessFile raf) throws IOException {
-    raf.writeShort(entrySource.index());
-  }
+    AbstractEntry(Dictionary dictionary, DataInput raf, final int index)
+    throws IOException {
+        super(index);
+        if (dictionary.dictFileVersion >= 1) {
+            final int entrySourceIdx = dictionary.dictFileVersion >= 7 ? StringUtil.readVarInt(raf) : raf.readShort();
+            this.entrySource = dictionary.sources.get(entrySourceIdx);
+        } else {
+            this.entrySource = null;
+        }
+    }
+
+    void write(DataOutput raf) throws IOException {
+        StringUtil.writeVarInt(raf, entrySource.index());
+    }
 
-  public abstract void addToDictionary(final Dictionary dictionary);
+    public abstract void addToDictionary(final Dictionary dictionary);
 
-  public abstract RowBase CreateRow(int rowIndex, Index dictionaryIndex);
+    public abstract RowBase CreateRow(int rowIndex, Index dictionaryIndex);
 
 }