X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fengine%2FPairEntry.java;h=d3fb060e1dc0570a3d02a326e0283ac8a58382cd;hb=0d6b69d8819c937eed8a911f491146b76a9b1300;hp=6e95d32a203cadf2e5cf5e5585da988a436d8bde;hpb=b51d6d5fd02ee3678dcbd3fcf0678946cc5c86e0;p=Dictionary.git

diff --git a/src/com/hughes/android/dictionary/engine/PairEntry.java b/src/com/hughes/android/dictionary/engine/PairEntry.java
index 6e95d32..d3fb060 100644
--- a/src/com/hughes/android/dictionary/engine/PairEntry.java
+++ b/src/com/hughes/android/dictionary/engine/PairEntry.java
@@ -14,19 +14,22 @@
 
 package com.hughes.android.dictionary.engine;
 
+import com.hughes.util.StringUtil;
 import com.hughes.util.raf.RAFListSerializer;
+import com.hughes.util.raf.RAFListSerializerSkippable;
 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;
 
 public class PairEntry extends AbstractEntry implements RAFSerializable<PairEntry>,
-        Comparable<PairEntry> {
+    Comparable<PairEntry> {
 
     public final List<Pair> pairs;
 
@@ -40,10 +43,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)
-            throws IOException {
+    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 +54,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);
@@ -62,7 +64,7 @@ public class PairEntry extends AbstractEntry implements RAFSerializable<PairEntr
         }
     }
 
-    static final class Serializer implements RAFListSerializer<PairEntry> {
+    static final class Serializer implements RAFListSerializerSkippable<PairEntry> {
 
         final Dictionary dictionary;
 
@@ -71,12 +73,31 @@ 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 skip(DataInput raf, int index) throws IOException {
+            final int size;
+            if (dictionary.dictFileVersion >= 7)
+            {
+                StringUtil.readVarInt(raf);
+                size = StringUtil.readVarInt(raf);
+            }
+            else
+            {
+                raf.skipBytes(2);
+                size = raf.readInt();
+            }
+            for (int i = 0; i < 2*size; ++i) {
+                int l = raf.readUnsignedShort();
+                raf.skipBytes(l);
+            }
+        }
+
+        @Override
+        public void write(DataOutput raf, PairEntry t) throws IOException {
             t.write(raf);
         }
     }
@@ -97,13 +118,13 @@ 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,
-                final Index index) {
+            final Index index) {
             super(referenceIndex, thisRowIndex, index);
         }
 
@@ -133,8 +154,8 @@ public class PairEntry extends AbstractEntry implements RAFSerializable<PairEntr
 
         @Override
         public RowMatchType matches(final List<String> searchTokens,
-                final Pattern orderedMatchPattern, final Transliterator normalizer,
-                final boolean swapPairEntries) {
+                                    final Pattern orderedMatchPattern, final Transliterator normalizer,
+                                    final boolean swapPairEntries) {
             final int side = swapPairEntries ? 1 : 0;
             final List<Pair> pairs = getEntry().pairs;
             final String[] pairSides = new String[pairs.size()];
@@ -212,10 +233,6 @@ public class PairEntry extends AbstractEntry implements RAFSerializable<PairEntr
         public Pair(final String lang1, final String lang2) {
             this.lang1 = lang1;
             this.lang2 = lang2;
-            if (!(lang1.trim().length() > 0 && lang2.trim().length() > 0)) {
-                System.err.println("poop");
-            }
-            assert lang1.trim().length() > 0 || lang2.trim().length() > 0 : "Empty pair!!!";
             assert lang1.trim().length() > 0 && lang2.trim().length() > 0 : "Empty pair!!!";
         }
 
@@ -240,5 +257,19 @@ public class PairEntry extends AbstractEntry implements RAFSerializable<PairEntr
             throw new IllegalArgumentException();
         }
 
+        @Override
+        public boolean equals(Object o)
+        {
+            if (o == this) return true;
+            if (!(o instanceof Pair)) return false;
+            Pair p = (Pair)o;
+            return p.lang1.equals(lang1) && p.lang2.equals(lang2);
+        }
+
+        @Override
+        public int hashCode()
+        {
+            return (lang1 + "|" + lang2).hashCode();
+        }
     }
 }