Fix comparison for entries starting with "-".

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

diff --git a/src/com/hughes/android/dictionary/engine/PairEntry.java b/src/com/hughes/android/dictionary/engine/PairEntry.java
index ad9625caaf3ac7ec450ceecb788dee36bd54a9d5..e19e334da224c4444204b482e370d5dae855726e 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/PairEntry.java
+++ b/src/com/hughes/android/dictionary/engine/PairEntry.java
@@ -45,7 +45,7 @@ public class PairEntry extends AbstractEntry implements RAFSerializable<PairEntr
     public PairEntry(final Dictionary dictionary, final DataInput raf, final int index)
             throws IOException {
         super(dictionary, raf, index);
-        final int size = StringUtil.readVarInt(raf);
+        final int size = dictionary.dictFileVersion >= 7 ? StringUtil.readVarInt(raf) : raf.readInt();
         pairs = new ArrayList<PairEntry.Pair>(size);
         for (int i = 0; i < size; ++i) {
             pairs.add(new Pair(raf.readUTF(), raf.readUTF()));
@@ -99,8 +99,8 @@ public class PairEntry extends AbstractEntry implements RAFSerializable<PairEntr
     public static class Row extends RowBase {
 
         Row(final DataInput raf, final int thisRowIndex,
-                final Index index) throws IOException {
-            super(raf, thisRowIndex, index);
+                final Index index, int extra) throws IOException {
+            super(raf, thisRowIndex, index, extra);
         }
 
         Row(final int referenceIndex, final int thisRowIndex,