Faster multi search, exact search, moved Normalization around.

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

diff --git a/src/com/hughes/android/dictionary/engine/TextEntry.java b/src/com/hughes/android/dictionary/engine/TextEntry.java
index fa3dc5326a8f65885eb56a11a7f2afbbb0eef30f..8d878dd87a35a5dd00c8d9623fbbaf76a00c6eee 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/TextEntry.java
+++ b/src/com/hughes/android/dictionary/engine/TextEntry.java
@@ -17,26 +17,39 @@ package com.hughes.android.dictionary.engine;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.RandomAccessFile;
+import java.util.List;
+import java.util.regex.Pattern;
 
 import com.hughes.util.raf.RAFSerializable;
 import com.hughes.util.raf.RAFSerializer;
+import com.ibm.icu.text.Transliterator;
 
 public class TextEntry extends AbstractEntry implements RAFSerializable<TextEntry> {
   
   final String text;
   
-  public TextEntry(final RandomAccessFile raf) throws IOException {
+  public TextEntry(final Dictionary dictionary, final RandomAccessFile raf) throws IOException {
+    super(dictionary, raf);
     text = raf.readUTF();
+    throw new RuntimeException();
   }
   @Override
   public void write(RandomAccessFile raf) throws IOException {
+    super.write(raf);
     raf.writeUTF(text);
   }
   
-  static final RAFSerializer<TextEntry> SERIALIZER = new RAFSerializer<TextEntry>() {
+  static final class Serializer implements RAFSerializer<TextEntry> {
+    
+    final Dictionary dictionary;
+    
+    Serializer(Dictionary dictionary) {
+      this.dictionary = dictionary;
+    }
+
     @Override
     public TextEntry read(RandomAccessFile raf) throws IOException {
-      return new TextEntry(raf);
+      return new TextEntry(dictionary, raf);
     }
 
     @Override
@@ -44,6 +57,7 @@ public class TextEntry extends AbstractEntry implements RAFSerializable<TextEntr
       t.write(raf);
     }
   };
+
   
   @Override
   public int addToDictionary(final Dictionary dictionary) {
@@ -71,6 +85,11 @@ public class TextEntry extends AbstractEntry implements RAFSerializable<TextEntr
     public String getRawText(boolean compact) {
       return getEntry().text;
     }
+    
+    @Override
+    public RowMatchType matches(final List<String> searchTokens, final Pattern orderedMatchPattern, Transliterator normalizer, boolean swapPairEntries) {
+      return null;
+    }
   }