X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fengine%2FTextEntry.java;h=8dd88f4ac20c7f8977daa6e9c899903ffd91ad10;hb=8674b09eae371994e01e0af541b546fced86c366;hp=187216fe0eb1993ea28ba1a652a5919039268c6f;hpb=507a6c6f058d33536972b7980dbb99034ec4d61f;p=Dictionary.git

diff --git a/src/com/hughes/android/dictionary/engine/TextEntry.java b/src/com/hughes/android/dictionary/engine/TextEntry.java
index 187216f..8dd88f4 100644
--- a/src/com/hughes/android/dictionary/engine/TextEntry.java
+++ b/src/com/hughes/android/dictionary/engine/TextEntry.java
@@ -14,10 +14,6 @@
 
 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.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
@@ -25,15 +21,19 @@ import java.io.PrintStream;
 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> {
 
-    final String text;
+    public final String text;
 
-    public TextEntry(final Dictionary dictionary, final DataInput raf, final int index)
-            throws IOException {
+    private TextEntry(final Dictionary dictionary, final DataInput raf, final int index)
+    throws IOException {
         super(dictionary, raf, index);
         text = raf.readUTF();
-        throw new RuntimeException();
+        throw new RuntimeException("TextEntry constructor should be unreachable");
     }
 
     @Override
@@ -76,11 +76,11 @@ public class TextEntry extends AbstractEntry implements RAFSerializable<TextEntr
     public static class Row extends RowBase {
 
         Row(final DataInput raf, final int thisRowIndex,
-                final Index index) throws IOException {
-            super(raf, thisRowIndex, index);
+            final Index index, int extra) throws IOException {
+            super(raf, thisRowIndex, index, extra);
         }
 
-        public TextEntry getEntry() {
+        TextEntry getEntry() {
             return index.dict.textEntries.get(referenceIndex);
         }
 
@@ -96,8 +96,8 @@ public class TextEntry extends AbstractEntry implements RAFSerializable<TextEntr
 
         @Override
         public RowMatchType matches(final List<String> searchTokens,
-                final Pattern orderedMatchPattern, Transliterator normalizer,
-                boolean swapPairEntries) {
+                                    final Pattern orderedMatchPattern, Transliterator normalizer,
+                                    boolean swapPairEntries) {
             return null;
         }
     }