Remove last Java-deserialization based code.

Also remove several unused interface implementations.

diff --git a/Util b/Util
index 3e042511775429bd219a95e7743d074ffd5e9b65..199760729eb2bd35b50f893b1814b5b44bfcbef7 160000 (submodule)
--- a/Util
+++ b/Util
@@ -1 +1 @@
-Subproject commit 3e042511775429bd219a95e7743d074ffd5e9b65
+Subproject commit 199760729eb2bd35b50f893b1814b5b44bfcbef7

diff --git a/src/com/hughes/android/dictionary/engine/Dictionary.java b/src/com/hughes/android/dictionary/engine/Dictionary.java
index b9a46a01545c19d7eed612d84266e69a0e52ee17..cb7371442e3bd380cfafe31d32690d02e70546ca 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/Dictionary.java
+++ b/src/com/hughes/android/dictionary/engine/Dictionary.java
@@ -31,9 +31,8 @@ import com.hughes.util.CachingList;
 import com.hughes.util.DataInputBuffer;
 import com.hughes.util.raf.RAFList;
 import com.hughes.util.raf.RAFListSerializer;
-import com.hughes.util.raf.RAFSerializable;
 
-public class Dictionary implements RAFSerializable<Dictionary> {
+public class Dictionary {
 
     private static final int CACHE_SIZE = 5000;
 
@@ -119,7 +118,6 @@ public class Dictionary implements RAFSerializable<Dictionary> {
         }
     }
 
-    @Override
     public void write(DataOutput out) throws IOException {
         RandomAccessFile raf = (RandomAccessFile)out;
         if (dictFileVersion < 7) throw new RuntimeException("write function cannot write formats older than v7!");

diff --git a/src/com/hughes/android/dictionary/engine/Index.java b/src/com/hughes/android/dictionary/engine/Index.java
index 364f5b857accdbf8f6ea2224ef99413627137937..5b7b43d5aadd20a39a3de5e047b3ca348cdd7b83 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/Index.java
+++ b/src/com/hughes/android/dictionary/engine/Index.java
@@ -41,13 +41,11 @@ import com.hughes.util.DataInputBuffer;
 import com.hughes.util.StringUtil;
 import com.hughes.util.TransformingList;
 import com.hughes.util.raf.RAFList;
-import com.hughes.util.raf.RAFSerializable;
 import com.hughes.util.raf.RAFSerializer;
-import com.hughes.util.raf.SerializableSerializer;
 import com.hughes.util.raf.UniformRAFList;
 import com.ibm.icu.text.Transliterator;
 
-public final class Index implements RAFSerializable<Index> {
+public final class Index {
 
     private static final int CACHE_SIZE = 5000;
 
@@ -138,7 +136,14 @@ public final class Index implements RAFSerializable<Index> {
                 stoplist.add(raf.readUTF());
             }
         } else if (dict.dictFileVersion >= 4) {
-            stoplist = new SerializableSerializer<Set<String>>().read(raf);
+            raf.readInt(); // length
+            raf.skipBytes(52);
+            stoplist = new HashSet<>();
+            byte b;
+            while ((b = raf.readByte()) == 0x74) {
+                stoplist.add(raf.readUTF());
+            }
+            if (b != 0x78) throw new IOException("Invalid data in dictionary stoplist!");
         } else {
             stoplist = Collections.emptySet();
         }
@@ -147,7 +152,6 @@ public final class Index implements RAFSerializable<Index> {
                    CACHE_SIZE, true);
     }
 
-    @Override
     public void write(final DataOutput out) throws IOException {
         RandomAccessFile raf = (RandomAccessFile)out;
         raf.writeUTF(shortName);
@@ -182,7 +186,7 @@ public final class Index implements RAFSerializable<Index> {
         }
     }
 
-    public static final class IndexEntry implements RAFSerializable<Index.IndexEntry> {
+    public static final class IndexEntry {
         public final String token;
         private final String normalizedToken;
         public final int startRow;

diff --git a/src/com/hughes/android/dictionary/engine/PairEntry.java b/src/com/hughes/android/dictionary/engine/PairEntry.java
index d779485ee2a3299ab8fd1f54421e54643a47d84b..a0bcfeeac0a8e793071149cb2fc3e5bc456b222d 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/PairEntry.java
+++ b/src/com/hughes/android/dictionary/engine/PairEntry.java
@@ -25,11 +25,9 @@ import java.util.regex.Pattern;
 
 import com.hughes.util.StringUtil;
 import com.hughes.util.raf.RAFListSerializerSkippable;
-import com.hughes.util.raf.RAFSerializable;
 import com.ibm.icu.text.Transliterator;
 
-public class PairEntry extends AbstractEntry implements RAFSerializable<PairEntry>,
-    Comparable<PairEntry> {
+public class PairEntry extends AbstractEntry implements Comparable<PairEntry> {
 
     public final List<Pair> pairs;
 

diff --git a/src/com/hughes/android/dictionary/engine/TextEntry.java b/src/com/hughes/android/dictionary/engine/TextEntry.java
index 8dd88f4ac20c7f8977daa6e9c899903ffd91ad10..1856753da87f24c430e5a6e53445ed265506c49d 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/TextEntry.java
+++ b/src/com/hughes/android/dictionary/engine/TextEntry.java
@@ -22,10 +22,9 @@ import java.util.List;
 import java.util.regex.Pattern;
 
 import com.hughes.util.raf.RAFListSerializer;
-import com.hughes.util.raf.RAFSerializable;
 import com.ibm.icu.text.Transliterator;
 
-public class TextEntry extends AbstractEntry implements RAFSerializable<TextEntry> {
+public class TextEntry extends AbstractEntry {
 
     public final String text;