go

diff --git a/src/com/hughes/android/dictionary/engine/EntryTypeName.java b/src/com/hughes/android/dictionary/engine/EntryTypeName.java
index 409b6369f44c874f16721a6624256700b89a9553..2f9cc6e300efb7911a2c8a8e1ebd6e14e815f3e4 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/EntryTypeName.java
+++ b/src/com/hughes/android/dictionary/engine/EntryTypeName.java
@@ -3,9 +3,9 @@ package com.hughes.android.dictionary.engine;
 
 public enum EntryTypeName {
 
-  WIKTIONARY_TITLE_ONE_WORD(0),
-  WIKTIONARY_MEANING_ONE_WORD(0),
-  WIKTIONARY_TRANSLATION_ONE_WORD(0),
+//  WIKTIONARY_TITLE_ONE_WORD(0),
+//  WIKTIONARY_MEANING_ONE_WORD(0),
+//  WIKTIONARY_TRANSLATION_ONE_WORD(0),
   
   NOUN(0),
   VERB(0),
@@ -15,16 +15,16 @@ public enum EntryTypeName {
   MULTIROW_HEAD_ONE_WORD(0),
   MULTIROW_TAIL_ONE_WORD(0),
 
-  WIKTIONARY_TITLE_MULTI_WORD(0),
-  WIKTIONARY_PRONUNCIATION(0),
-  WIKTIONARY_MEANING_MULTI_WORD(0),
-  WIKTIONARY_FORM_OF(0),
-  WIKTIONARY_EXAMPLE_HEADWORDS(0),
+//  WIKTIONARY_TITLE_MULTI_WORD(0),
+//  WIKTIONARY_PRONUNCIATION(0),
+//  WIKTIONARY_MEANING_MULTI_WORD(0),
+//  WIKTIONARY_FORM_OF(0),
+//  WIKTIONARY_EXAMPLE_HEADWORDS(0),
   TWO_WORDS(0),
   THREE_WORDS(0),
   FOUR_WORDS(0),
   FIVE_OR_MORE_WORDS(0),
-  WIKTIONARY_EXAMPLE_OTHER_WORDS(0),
+//  WIKTIONARY_EXAMPLE_OTHER_WORDS(0),
   
   MULTIROW_HEAD_MANY_WORDS(0),
   MULTIROW_TAIL_MANY_WORDS(0),

diff --git a/src/com/hughes/android/dictionary/engine/RowBase.java b/src/com/hughes/android/dictionary/engine/RowBase.java
index 9104398bdf1675f806d17ae47a52d3ab7b4ab395..ceffa1bb58259adcba5daa3df14685218075e218 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/RowBase.java
+++ b/src/com/hughes/android/dictionary/engine/RowBase.java
@@ -101,6 +101,8 @@ public abstract class RowBase extends IndexedObject {
         return new PairEntry.Row(raf, listIndex, index);
       } else if (rowType == 1) {
         return new TokenRow(raf, listIndex, index);
+      } else if (rowType == 2) {
+        return new TextEntry.Row(raf, listIndex, index);
       }
       throw new RuntimeException("Invalid rowType:" + rowType);
     }
@@ -111,6 +113,8 @@ public abstract class RowBase extends IndexedObject {
         raf.writeByte(0);
       } else if (t instanceof TokenRow) {
         raf.writeByte(1);
+      } else if (t instanceof TextEntry.Row) {
+        raf.writeByte(2);
       }
       raf.writeInt(t.referenceIndex);
     }