X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fengine%2FPairEntry.java;h=afa677f6d53a87ed0d5c340b825b4550f3c5bb2c;hb=a6dcf86c19971cea1e7585a43bc65f12f189636c;hp=e19e334da224c4444204b482e370d5dae855726e;hpb=8500d63029ad2e54d55a750fc1d9f59781102b27;p=Dictionary.git

diff --git a/src/com/hughes/android/dictionary/engine/PairEntry.java b/src/com/hughes/android/dictionary/engine/PairEntry.java
index e19e334..afa677f 100644
--- a/src/com/hughes/android/dictionary/engine/PairEntry.java
+++ b/src/com/hughes/android/dictionary/engine/PairEntry.java
@@ -15,7 +15,7 @@
 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;
 
@@ -24,17 +24,18 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.util.ArrayList;
+import java.util.Collections;
 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;
 
     public PairEntry(final EntrySource entrySource) {
         super(entrySource);
-        pairs = new ArrayList<Pair>(1);
+        pairs = new ArrayList<>(1);
     }
 
     public PairEntry(final EntrySource entrySource, final String lang1, final String lang2) {
@@ -43,12 +44,17 @@ 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 = 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()));
+        // Use singletonList for better performance in common case
+        if (size == 1) pairs = Collections.singletonList(new Pair(raf.readUTF(), raf.readUTF()));
+        else
+        {
+            pairs = new ArrayList<>(size);
+            for (int i = 0; i < size; ++i) {
+                pairs.add(new Pair(raf.readUTF(), raf.readUTF()));
+            }
         }
     }
 
@@ -63,7 +69,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;
 
@@ -76,6 +82,25 @@ public class PairEntry extends AbstractEntry implements RAFSerializable<PairEntr
             return new PairEntry(dictionary, raf, index);
         }
 
+        @Override
+        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);
@@ -99,12 +124,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, int extra) throws IOException {
+            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 +159,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()];
@@ -172,7 +197,7 @@ public class PairEntry extends AbstractEntry implements RAFSerializable<PairEntr
 
     }
 
-    public String getRawText(final boolean compact) {
+    private String getRawText(final boolean compact) {
         if (compact) {
             return this.pairs.get(0).toStringTab();
         }
@@ -194,7 +219,7 @@ public class PairEntry extends AbstractEntry implements RAFSerializable<PairEntr
     }
 
     @Override
-    public int compareTo(final PairEntry that) {
+    public int compareTo(/*@NonNull*/ final PairEntry that) {
         return this.getRawText(false).compareTo(that.getRawText(false));
     }
 
@@ -210,13 +235,10 @@ public class PairEntry extends AbstractEntry implements RAFSerializable<PairEntr
         public final String lang1;
         public final String lang2;
 
+        @SuppressWarnings("WeakerAccess")
         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!!!";
         }
 
@@ -228,7 +250,7 @@ public class PairEntry extends AbstractEntry implements RAFSerializable<PairEntr
             return lang1 + " :: " + lang2;
         }
 
-        public String toStringTab() {
+        String toStringTab() {
             return lang1 + "\t" + lang2;
         }
 
@@ -241,5 +263,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();
+        }
     }
 }