X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fengine%2FTokenRow.java;h=4565fcc80c3e254c3248cf7e41880a4678c2f549;hb=8674b09eae371994e01e0af541b546fced86c366;hp=96842e985bda925558f8451661f0fb1bff9f22d0;hpb=6b8d93c656bd93ad26fa57a5f3a07cfb481d4e7d;p=Dictionary.git

diff --git a/src/com/hughes/android/dictionary/engine/TokenRow.java b/src/com/hughes/android/dictionary/engine/TokenRow.java
index 96842e9..4565fcc 100644
--- a/src/com/hughes/android/dictionary/engine/TokenRow.java
+++ b/src/com/hughes/android/dictionary/engine/TokenRow.java
@@ -14,9 +14,9 @@
 
 package com.hughes.android.dictionary.engine;
 
+import java.io.DataInput;
 import java.io.IOException;
 import java.io.PrintStream;
-import java.io.RandomAccessFile;
 import java.util.List;
 import java.util.regex.Pattern;
 
@@ -24,59 +24,61 @@ import com.hughes.android.dictionary.engine.Index.IndexEntry;
 import com.ibm.icu.text.Transliterator;
 
 public class TokenRow extends RowBase {
-  
-  public final boolean hasMainEntry;
-  
-  TokenRow(final RandomAccessFile raf, final int thisRowIndex, final Index index, final boolean hasMainEntry) throws IOException {
-    super(raf, thisRowIndex, index);
-    this.hasMainEntry = hasMainEntry;
-  }
-
-  TokenRow(final int referenceIndex, final int thisRowIndex, final Index index, final boolean hasMainEntry) {
-    super(referenceIndex, thisRowIndex, index);
-    this.hasMainEntry = hasMainEntry;
-  }
-  
-  public String toString() {
-    return getToken() + "@" + referenceIndex;
-  }
-
-  @Override
-  public TokenRow getTokenRow(final boolean search) {
-    return this;
-  }
-
-  @Override
-  public void setTokenRow(TokenRow tokenRow) {
-    throw new RuntimeException("Shouldn't be setting TokenRow's TokenRow!");
-  }
-  
-  public String getToken() {
-    return getIndexEntry().token;
-  }
-  
-  public IndexEntry getIndexEntry() {
-      return index.sortedIndexEntries.get(referenceIndex);
-  }
-
-  @Override
-  public void print(final PrintStream out) {
-    final String surrounder = hasMainEntry ? "***" : "===";
-    out.println(surrounder + getToken() + surrounder);
-    for (final HtmlEntry htmlEntry : index.sortedIndexEntries.get(referenceIndex).htmlEntries) {
-        out.println("HtmlEntry: " + htmlEntry.title + " <<<" + htmlEntry.html + ">>>");
+
+    public final boolean hasMainEntry;
+
+    TokenRow(final DataInput raf, final int thisRowIndex, final Index index,
+             final boolean hasMainEntry, int extra) throws IOException {
+        super(raf, thisRowIndex, index, extra);
+        this.hasMainEntry = hasMainEntry;
     }
-  }
 
-  @Override
-  public String getRawText(boolean compact) {
-    return getToken();
-  }
+    TokenRow(final int referenceIndex, final int thisRowIndex, final Index index,
+             final boolean hasMainEntry) {
+        super(referenceIndex, thisRowIndex, index);
+        this.hasMainEntry = hasMainEntry;
+    }
 
-  @Override
-  public RowMatchType matches(List<String> searchTokens, final Pattern orderedMatchPattern, Transliterator normalizer, boolean swapPairEntries) {
-    return RowMatchType.NO_MATCH;
-  }
+    public String toString() {
+        return getToken() + "@" + referenceIndex;
+    }
 
+    @Override
+    public TokenRow getTokenRow(final boolean search) {
+        return this;
+    }
+
+    @Override
+    public void setTokenRow(TokenRow tokenRow) {
+        throw new RuntimeException("Shouldn't be setting TokenRow's TokenRow!");
+    }
+
+    public String getToken() {
+        return getIndexEntry().token;
+    }
+
+    public IndexEntry getIndexEntry() {
+        return index.sortedIndexEntries.get(referenceIndex);
+    }
+
+    @Override
+    public void print(final PrintStream out) {
+        final String surrounder = hasMainEntry ? "***" : "===";
+        out.println(surrounder + getToken() + surrounder);
+        for (final HtmlEntry htmlEntry : index.sortedIndexEntries.get(referenceIndex).htmlEntries) {
+            out.println("HtmlEntry: " + htmlEntry.title + " <<<" + htmlEntry.getHtml() + ">>>");
+        }
+    }
+
+    @Override
+    public String getRawText(boolean compact) {
+        return getToken();
+    }
+
+    @Override
+    public RowMatchType matches(List<String> searchTokens, final Pattern orderedMatchPattern,
+                                Transliterator normalizer, boolean swapPairEntries) {
+        return RowMatchType.NO_MATCH;
+    }
 
 }