Clean up order of imports.

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

diff --git a/src/com/hughes/android/dictionary/engine/AbstractEntry.java b/src/com/hughes/android/dictionary/engine/AbstractEntry.java
index 931f9a1bf3e4a53ae38384e773caf9072daa1cb5..4563017bcc2a15afc44c0bcaf6c439c8311524ab 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/AbstractEntry.java
+++ b/src/com/hughes/android/dictionary/engine/AbstractEntry.java
@@ -14,33 +14,35 @@
 
 package com.hughes.android.dictionary.engine;
 
-import com.hughes.util.IndexedObject;
-
+import java.io.DataInput;
+import java.io.DataOutput;
 import java.io.IOException;
-import java.io.RandomAccessFile;
+
+import com.hughes.util.IndexedObject;
+import com.hughes.util.StringUtil;
 
 public abstract class AbstractEntry extends IndexedObject {
 
     public final EntrySource entrySource;
 
-    protected AbstractEntry(EntrySource entrySource) {
+    AbstractEntry(EntrySource entrySource) {
         super(-1);
         this.entrySource = entrySource;
     }
 
-    public AbstractEntry(Dictionary dictionary, RandomAccessFile raf, final int index)
-            throws IOException {
+    AbstractEntry(Dictionary dictionary, DataInput raf, final int index)
+    throws IOException {
         super(index);
         if (dictionary.dictFileVersion >= 1) {
-            final int entrySouceIdx = raf.readShort();
-            this.entrySource = dictionary.sources.get(entrySouceIdx);
+            final int entrySourceIdx = dictionary.dictFileVersion >= 7 ? StringUtil.readVarInt(raf) : raf.readShort();
+            this.entrySource = dictionary.sources.get(entrySourceIdx);
         } else {
             this.entrySource = null;
         }
     }
 
-    public void write(RandomAccessFile raf) throws IOException {
-        raf.writeShort(entrySource.index());
+    void write(DataOutput raf) throws IOException {
+        StringUtil.writeVarInt(raf, entrySource.index());
     }
 
     public abstract void addToDictionary(final Dictionary dictionary);