Skippable optimization also for HtmlEntry.

diff --git a/src/com/hughes/android/dictionary/engine/Dictionary.java b/src/com/hughes/android/dictionary/engine/Dictionary.java
index 4543b7bbc7866a8f0ad022cc52225cfcb26e032e..dfac548fd27d038900c0c1391f12a81416951068 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/Dictionary.java
+++ b/src/com/hughes/android/dictionary/engine/Dictionary.java
@@ -95,7 +95,7 @@ public class Dictionary implements RAFSerializable<Dictionary> {
             if (dictFileVersion >= 5) {
                 htmlEntries = CachingList.create(
                                   RAFList.create(ch, new HtmlEntry.Serializer(this, ch), ch.position(), dictFileVersion, dictInfo + " html: "),
-                                  CACHE_SIZE, true);
+                                  CACHE_SIZE, false);
             } else {
                 htmlEntries = Collections.emptyList();
             }

diff --git a/src/com/hughes/android/dictionary/engine/HtmlEntry.java b/src/com/hughes/android/dictionary/engine/HtmlEntry.java
index f69a325d83a61686359285c659f3b636a4dd143d..c12091b09e6838cf7abb8128d1f7a54ea430b046 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/HtmlEntry.java
+++ b/src/com/hughes/android/dictionary/engine/HtmlEntry.java
@@ -3,6 +3,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.ibm.icu.text.Transliterator;
 
 import java.io.DataInput;
@@ -71,7 +72,7 @@ public class HtmlEntry extends AbstractEntry implements Comparable<HtmlEntry> {
         return new Row(this.index, rowIndex, dictionaryIndex);
     }
 
-    static final class Serializer implements RAFListSerializer<HtmlEntry> {
+    static final class Serializer implements RAFListSerializerSkippable<HtmlEntry> {
 
         final Dictionary dictionary;
         final FileChannel ch;
@@ -86,6 +87,20 @@ public class HtmlEntry extends AbstractEntry implements Comparable<HtmlEntry> {
             return new HtmlEntry(dictionary, ch, raf, index);
         }
 
+        @Override
+        public void skip(DataInput raf, final int index) throws IOException {
+            if (dictionary.dictFileVersion >= 7)
+            {
+                StringUtil.readVarInt(raf);
+            }
+            else
+            {
+                raf.skipBytes(2);
+            }
+            int l = raf.readUnsignedShort();
+            raf.skipBytes(l);
+       }
+
         @Override
         public void write(DataOutput raf, HtmlEntry t) throws IOException {
             t.writeBase(raf);