Make use of the new skippable CachingList optimizations.

[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 d47ae893831cf2597fc776de9d4fbe3975d605d6..d3fb060e1dc0570a3d02a326e0283ac8a58382cd 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;
 
@@ -63,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;
 
@@ -76,6 +77,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 +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!!!";
         }