Fix issues noted by lint tools.

[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 7bae09b342f5a572a85096f77463e03df307f533..77d26db9298168bf09b59e1efc7eee5d6dbd6972 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/AbstractEntry.java
+++ b/src/com/hughes/android/dictionary/engine/AbstractEntry.java
@@ -14,36 +14,39 @@
 
 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 {
-  
-  final EntrySource entrySource;
-  
-  protected AbstractEntry(EntrySource entrySource) {
-    this.entrySource = entrySource;
-  }
-
-  public AbstractEntry(Dictionary dictionary, RandomAccessFile raf) throws IOException {
-    if (dictionary.dictFileVersion >= 1) {
-      final int entrySouceIdx = raf.readShort();
-      this.entrySource = dictionary.sources.get(entrySouceIdx);
-    } else {
-      this.entrySource = null;
+
+public abstract class AbstractEntry extends IndexedObject {
+
+    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());
+    }
 
-  /**
-   * @return this entry's position within the list just added to.
-   */
-  public abstract int addToDictionary(final Dictionary dictionary);
+    public abstract void addToDictionary(final Dictionary dictionary);
 
-  public abstract RowBase CreateRow(int entryIndex, int rowIndex, Index dictionaryIndex);
+    public abstract RowBase CreateRow(int rowIndex, Index dictionaryIndex);
 
 }