From: thadh <thadh@thadh-macbookpro>
Date: Sat, 21 Jul 2012 17:42:25 +0000 (-0700)
Subject: Added WholeSection entry type.
X-Git-Url: http://gitweb.fperrin.net/?a=commitdiff_plain;h=bef1056a11983138018973d950aff8af87f3e13a;p=Dictionary.git

Added WholeSection entry type.
---

diff --git a/src/com/hughes/android/dictionary/engine/AbstractEntry.java b/src/com/hughes/android/dictionary/engine/AbstractEntry.java
index 24a1d82..7bae09b 100644
--- a/src/com/hughes/android/dictionary/engine/AbstractEntry.java
+++ b/src/com/hughes/android/dictionary/engine/AbstractEntry.java
@@ -39,6 +39,11 @@ public abstract class AbstractEntry {
     raf.writeShort(entrySource.index());
   }
 
+  /**
+   * @return this entry's position within the list just added to.
+   */
   public abstract int addToDictionary(final Dictionary dictionary);
 
+  public abstract RowBase CreateRow(int entryIndex, int rowIndex, Index dictionaryIndex);
+
 }
diff --git a/src/com/hughes/android/dictionary/engine/EntryTypeName.java b/src/com/hughes/android/dictionary/engine/EntryTypeName.java
index 356a433..737ddbb 100644
--- a/src/com/hughes/android/dictionary/engine/EntryTypeName.java
+++ b/src/com/hughes/android/dictionary/engine/EntryTypeName.java
@@ -17,6 +17,7 @@ package com.hughes.android.dictionary.engine;
 
 public enum EntryTypeName {
 
+  WIKTIONARY_TITLE_SINGLE_DETAIL(true, true, null),
   WIKTIONARY_TITLE_SINGLE(true, true, null),
   WIKTIONARY_INFLECTD_FORM_SINGLE(false, true, null),
 
@@ -25,6 +26,7 @@ public enum EntryTypeName {
   MULTIROW_HEAD_ONE_WORD(true, true, null),
   MULTIROW_TAIL_ONE_WORD(false, true, null),
 
+  WIKTIONARY_TITLE_MULTI_DETAIL(false, true, WIKTIONARY_TITLE_SINGLE_DETAIL),
   WIKTIONARY_TITLE_MULTI(false, true, WIKTIONARY_TITLE_SINGLE),
   WIKTIONARY_TRANSLITERATION(),
   WIKTIONARY_INFLECTED_FORM_MULTI(false, true, WIKTIONARY_INFLECTD_FORM_SINGLE),
diff --git a/src/com/hughes/android/dictionary/engine/HtmlEntry.java b/src/com/hughes/android/dictionary/engine/HtmlEntry.java
index d158ddf..3278be6 100644
--- a/src/com/hughes/android/dictionary/engine/HtmlEntry.java
+++ b/src/com/hughes/android/dictionary/engine/HtmlEntry.java
@@ -15,7 +15,15 @@ public class HtmlEntry extends AbstractEntry implements RAFSerializable<HtmlEntr
   
   final String title;
   final String html;
+  
+  
 
+  public HtmlEntry(final EntrySource entrySource, String title, String html) {
+    super(entrySource);
+    this.title = title;
+    this.html = html;
+  }
+  
   public HtmlEntry(Dictionary dictionary, RandomAccessFile raf) throws IOException {
     super(dictionary, raf);
     title = raf.readUTF();
@@ -34,6 +42,12 @@ public class HtmlEntry extends AbstractEntry implements RAFSerializable<HtmlEntr
     return dictionary.htmlEntries.size() - 1;
   }
   
+  @Override
+  public RowBase CreateRow(int entryIndex, int rowIndex, Index dictionaryIndex) {
+    return new Row(entryIndex, rowIndex, dictionaryIndex);
+  }
+
+  
   static final class Serializer implements RAFSerializer<HtmlEntry> {
     
     final Dictionary dictionary;
diff --git a/src/com/hughes/android/dictionary/engine/PairEntry.java b/src/com/hughes/android/dictionary/engine/PairEntry.java
index 02d72b9..c48298a 100644
--- a/src/com/hughes/android/dictionary/engine/PairEntry.java
+++ b/src/com/hughes/android/dictionary/engine/PairEntry.java
@@ -21,6 +21,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
 
+import com.hughes.android.dictionary.engine.HtmlEntry.Row;
 import com.hughes.util.raf.RAFSerializable;
 import com.hughes.util.raf.RAFSerializer;
 import com.ibm.icu.text.Transliterator;
@@ -84,6 +85,11 @@ public class PairEntry extends AbstractEntry implements RAFSerializable<PairEntr
     return dictionary.pairEntries.size() - 1;
   }
   
+  @Override
+  public RowBase CreateRow(int entryIndex, int rowIndex, Index dictionaryIndex) {
+    return new Row(entryIndex, rowIndex, dictionaryIndex);
+  }
+
 
   // --------------------------------------------------------------------
   
diff --git a/src/com/hughes/android/dictionary/engine/TextEntry.java b/src/com/hughes/android/dictionary/engine/TextEntry.java
index 8d878dd..d08b450 100644
--- a/src/com/hughes/android/dictionary/engine/TextEntry.java
+++ b/src/com/hughes/android/dictionary/engine/TextEntry.java
@@ -20,6 +20,7 @@ import java.io.RandomAccessFile;
 import java.util.List;
 import java.util.regex.Pattern;
 
+import com.hughes.android.dictionary.engine.HtmlEntry.Row;
 import com.hughes.util.raf.RAFSerializable;
 import com.hughes.util.raf.RAFSerializer;
 import com.ibm.icu.text.Transliterator;
@@ -64,6 +65,11 @@ public class TextEntry extends AbstractEntry implements RAFSerializable<TextEntr
     dictionary.textEntries.add(this);
     return dictionary.textEntries.size() - 1;
   }
+  
+  @Override
+  public RowBase CreateRow(int entryIndex, int rowIndex, Index dictionaryIndex) {
+    throw new UnsupportedOperationException("TextEntry's don't really exist.");
+  }
 
   public static class Row extends RowBase {