Arrows in UI to display HtmlEntry on Tokens.

[Dictionary.git] / src / com / hughes / android / dictionary / engine / HtmlEntry.java

diff --git a/src/com/hughes/android/dictionary/engine/HtmlEntry.java b/src/com/hughes/android/dictionary/engine/HtmlEntry.java
index af9651f437ab7cf443c12e59e09e8c57580dac65..d5fbebf97fc37fb948a789eeaa5a0c45f5241776 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/HtmlEntry.java
+++ b/src/com/hughes/android/dictionary/engine/HtmlEntry.java
@@ -1,30 +1,28 @@
 package com.hughes.android.dictionary.engine;
 
+import com.hughes.util.raf.RAFListSerializer;
+import com.hughes.util.raf.RAFSerializable;
+import com.ibm.icu.text.Transliterator;
+
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.RandomAccessFile;
 import java.util.List;
 import java.util.regex.Pattern;
 
-import com.hughes.android.dictionary.engine.PairEntry.Pair;
-import com.hughes.util.raf.RAFSerializable;
-import com.hughes.util.raf.RAFSerializer;
-import com.ibm.icu.text.Transliterator;
-
 public class HtmlEntry extends AbstractEntry implements RAFSerializable<HtmlEntry>, Comparable<HtmlEntry> {
   
-  final String title;
+  // Both are HTML escaped already.
+  public final String title;
   public String html;
   
-  
-
   public HtmlEntry(final EntrySource entrySource, String title) {
     super(entrySource);
     this.title = title;
   }
   
-  public HtmlEntry(Dictionary dictionary, RandomAccessFile raf) throws IOException {
-    super(dictionary, raf);
+  public HtmlEntry(Dictionary dictionary, RandomAccessFile raf, final int index) throws IOException {
+    super(dictionary, raf, index);
     title = raf.readUTF();
     html = raf.readUTF();
   }
@@ -36,18 +34,19 @@ public class HtmlEntry extends AbstractEntry implements RAFSerializable<HtmlEntr
   }
 
   @Override
-  public int addToDictionary(Dictionary dictionary) {
+  public void addToDictionary(Dictionary dictionary) {
+    assert index == -1;
     dictionary.htmlEntries.add(this);
-    return dictionary.htmlEntries.size() - 1;
+    index = dictionary.htmlEntries.size() - 1;
   }
   
   @Override
-  public RowBase CreateRow(int entryIndex, int rowIndex, Index dictionaryIndex) {
-    return new Row(entryIndex, rowIndex, dictionaryIndex);
+  public RowBase CreateRow(int rowIndex, Index dictionaryIndex) {
+    return new Row(this.index, rowIndex, dictionaryIndex);
   }
 
   
-  static final class Serializer implements RAFSerializer<HtmlEntry> {
+  static final class Serializer implements RAFListSerializer<HtmlEntry> {
     
     final Dictionary dictionary;
     
@@ -56,8 +55,8 @@ public class HtmlEntry extends AbstractEntry implements RAFSerializable<HtmlEntr
     }
 
     @Override
-    public HtmlEntry read(RandomAccessFile raf) throws IOException {
-      return new HtmlEntry(dictionary, raf);
+    public HtmlEntry read(RandomAccessFile raf, final int index) throws IOException {
+      return new HtmlEntry(dictionary, raf, index);
     }
 
     @Override
@@ -89,6 +88,8 @@ public class HtmlEntry extends AbstractEntry implements RAFSerializable<HtmlEntr
 
   public static class Row extends RowBase {
     
+    boolean isExpanded = false;
+    
     Row(final RandomAccessFile raf, final int thisRowIndex,
         final Index index) throws IOException {
       super(raf, thisRowIndex, index);
@@ -137,4 +138,12 @@ public class HtmlEntry extends AbstractEntry implements RAFSerializable<HtmlEntr
     
   }
 
+    public static String htmlBody(final List<HtmlEntry> htmlEntries) {
+        final StringBuilder result = new StringBuilder();
+        for (final HtmlEntry htmlEntry : htmlEntries) {
+            result.append(String.format("<h1>%s</h1>%s\n", htmlEntry.title, htmlEntry.html));
+        }
+        return result.toString();
+    }
+
 }