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 7fc5012cfd51db70c426e32cef38442cf4133116..4563017bcc2a15afc44c0bcaf6c439c8311524ab 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/AbstractEntry.java
+++ b/src/com/hughes/android/dictionary/engine/AbstractEntry.java
@@ -14,9 +14,39 @@
 
 package com.hughes.android.dictionary.engine;
 
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
 
-public abstract class AbstractEntry {
+import com.hughes.util.IndexedObject;
+import com.hughes.util.StringUtil;
+
+public abstract class AbstractEntry extends IndexedObject {
+
+    public final EntrySource entrySource;
+
+    AbstractEntry(EntrySource entrySource) {
+        super(-1);
+        this.entrySource = entrySource;
+    }
+
+    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 RowBase CreateRow(int rowIndex, Index dictionaryIndex);
 
-  public abstract int addToDictionary(final Dictionary dictionary);
-  
 }