Use singletonList for better performance.

[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 7610fab26c0182e8e4c05eaf77859ee770c9517d..1589f9bf715892d4af27911caddc423836568a33 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/PairEntry.java
+++ b/src/com/hughes/android/dictionary/engine/PairEntry.java
@@ -16,6 +16,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,6 +25,7 @@ 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;
 
@@ -46,9 +48,14 @@ public class PairEntry extends AbstractEntry implements RAFSerializable<PairEntr
     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<PairEntry.Pair>(size);
+            for (int i = 0; i < size; ++i) {
+                pairs.add(new Pair(raf.readUTF(), raf.readUTF()));
+            }
         }
     }
 
@@ -63,7 +70,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 +83,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);
@@ -213,10 +239,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 +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();
+        }
     }
 }