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 6e95d32a203cadf2e5cf5e5585da988a436d8bde..e19e334da224c4444204b482e370d5dae855726e 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/PairEntry.java
+++ b/src/com/hughes/android/dictionary/engine/PairEntry.java
@@ -14,13 +14,15 @@
 
 package com.hughes.android.dictionary.engine;
 
+import com.hughes.util.StringUtil;
 import com.hughes.util.raf.RAFListSerializer;
 import com.hughes.util.raf.RAFSerializable;
 import com.ibm.icu.text.Transliterator;
 
+import java.io.DataInput;
+import java.io.DataOutput;
 import java.io.IOException;
 import java.io.PrintStream;
-import java.io.RandomAccessFile;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
@@ -40,10 +42,10 @@ public class PairEntry extends AbstractEntry implements RAFSerializable<PairEntr
         this.pairs.add(new Pair(lang1, lang2));
     }
 
-    public PairEntry(final Dictionary dictionary, final RandomAccessFile raf, final int index)
+    public PairEntry(final Dictionary dictionary, final DataInput raf, final int index)
             throws IOException {
         super(dictionary, raf, index);
-        final int size = raf.readInt();
+        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()));
@@ -51,10 +53,9 @@ public class PairEntry extends AbstractEntry implements RAFSerializable<PairEntr
     }
 
     @Override
-    public void write(RandomAccessFile raf) throws IOException {
+    public void write(DataOutput raf) throws IOException {
         super.write(raf);
-        // TODO: this could be a short.
-        raf.writeInt(pairs.size());
+        StringUtil.writeVarInt(raf, pairs.size());
         for (int i = 0; i < pairs.size(); ++i) {
             assert pairs.get(i).lang1.length() > 0;
             raf.writeUTF(pairs.get(i).lang1);
@@ -71,12 +72,12 @@ public class PairEntry extends AbstractEntry implements RAFSerializable<PairEntr
         }
 
         @Override
-        public PairEntry read(RandomAccessFile raf, int index) throws IOException {
+        public PairEntry read(DataInput raf, int index) throws IOException {
             return new PairEntry(dictionary, raf, index);
         }
 
         @Override
-        public void write(RandomAccessFile raf, PairEntry t) throws IOException {
+        public void write(DataOutput raf, PairEntry t) throws IOException {
             t.write(raf);
         }
     }
@@ -97,9 +98,9 @@ public class PairEntry extends AbstractEntry implements RAFSerializable<PairEntr
 
     public static class Row extends RowBase {
 
-        Row(final RandomAccessFile raf, final int thisRowIndex,
-                final Index index) throws IOException {
-            super(raf, thisRowIndex, index);
+        Row(final DataInput raf, final int thisRowIndex,
+                final Index index, int extra) throws IOException {
+            super(raf, thisRowIndex, index, extra);
         }
 
         Row(final int referenceIndex, final int thisRowIndex,