Remove some unnecessary/nonsense checks.

[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..305f034d2875c2b0bf568374b57e090b9f217785 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/PairEntry.java
+++ b/src/com/hughes/android/dictionary/engine/PairEntry.java
@@ -28,7 +28,7 @@ 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;
 
@@ -43,9 +43,9 @@ public class PairEntry extends AbstractEntry implements RAFSerializable<PairEntr
     }
 
     public PairEntry(final Dictionary dictionary, final DataInput raf, final int index)
-            throws IOException {
+    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,12 +99,12 @@ 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,
-                final Index index) {
+            final Index index) {
             super(referenceIndex, thisRowIndex, index);
         }
 
@@ -134,8 +134,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()];
@@ -213,10 +213,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!!!";
         }
 
@@ -241,5 +237,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();
+        }
     }
 }