go

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

diff --git a/src/com/hughes/android/dictionary/engine/PairEntry.java b/src/com/hughes/android/dictionary/engine/PairEntry.java
index 5406ed5b2468ff9d9393c79ea738e0e36a953fd4..9160ac0ca05d55593906981dafaefffe5965ce33 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/PairEntry.java
+++ b/src/com/hughes/android/dictionary/engine/PairEntry.java
@@ -3,68 +3,39 @@ package com.hughes.android.dictionary.engine;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.RandomAccessFile;
+import java.util.ArrayList;
+import java.util.List;
 
 import com.hughes.util.raf.RAFSerializable;
 import com.hughes.util.raf.RAFSerializer;
 
 public class PairEntry extends Entry implements RAFSerializable<PairEntry>, Comparable<PairEntry> {
   
-  public static final class Pair {
-    
-    public final String lang1;
-    public final String lang2;
-    
-    public Pair(final String lang1, final String lang2) {
-      this.lang1 = lang1;
-      this.lang2 = lang2;
-    }
+  public final List<Pair> pairs;
 
-    public Pair(final String lang1, final String lang2, final boolean swap) {
-      this(swap ? lang2 : lang1, swap ? lang1 : lang2);
-    }
-
-    public String toString() {
-      return lang1 + " :: " + lang2;
-    }
-
-    public String toStringTab() {
-      return lang1 + "\t" + lang2;
-    }
-
-    public String get(int i) {
-      if (i == 0) {
-        return lang1;
-      } else if (i == 1) {
-        return lang2;
-      }
-      throw new IllegalArgumentException();
-    }
-
-  }
-  
-  public final Pair[] pairs;
-  
-  public PairEntry(final Pair[] pairs) {
-    this.pairs = pairs;
+  public PairEntry() {
+    pairs = new ArrayList<Pair>(1);
   }
-  
+
   public PairEntry(final String lang1, final String lang2) {
-    this.pairs = new Pair[] { new Pair(lang1, lang2) };
+    pairs = new ArrayList<Pair>(1);
+    this.pairs.add(new Pair(lang1, lang2));
   }
   
   public PairEntry(final RandomAccessFile raf) throws IOException {
-    pairs = new Pair[raf.readInt()];
-    for (int i = 0; i < pairs.length; ++i) {
-      pairs[i] = new Pair(raf.readUTF(), raf.readUTF());
+    final int size = raf.readInt();
+    pairs = new ArrayList<PairEntry.Pair>(size);
+    for (int i = 0; i < size; ++i) {
+      pairs.add(new Pair(raf.readUTF(), raf.readUTF()));
     }
   }
   @Override
   public void write(RandomAccessFile raf) throws IOException {
     // TODO: this could be a short.
-    raf.writeInt(pairs.length);
-    for (int i = 0; i < pairs.length; ++i) {
-      raf.writeUTF(pairs[i].lang1);
-      raf.writeUTF(pairs[i].lang2);
+    raf.writeInt(pairs.size());
+    for (int i = 0; i < pairs.size(); ++i) {
+      raf.writeUTF(pairs.get(i).lang1);
+      raf.writeUTF(pairs.get(i).lang2);
     }
   }
   
@@ -100,8 +71,8 @@ public class PairEntry extends Entry implements RAFSerializable<PairEntry>, Comp
     @Override
     public void print(PrintStream out) {
       final PairEntry pairEntry = getEntry();
-      for (int i = 0; i < pairEntry.pairs.length; ++i) {
-        out.print((i == 0 ? "  " : "    ") + pairEntry.pairs[i]);
+      for (int i = 0; i < pairEntry.pairs.size(); ++i) {
+        out.print((i == 0 ? "  " : "    ") + pairEntry.pairs.get(i));
         out.println();
       }
     }
@@ -116,21 +87,21 @@ public class PairEntry extends Entry implements RAFSerializable<PairEntry>, Comp
 
   public String getRawText(final boolean compact) {
     if (compact) {
-      return this.pairs[0].toStringTab();
+      return this.pairs.get(0).toStringTab();
     }
     final StringBuilder builder = new StringBuilder();
-    for (int i = 0; i < this.pairs.length; ++i) {
+    for (int i = 0; i < this.pairs.size(); ++i) {
       if (i > 0) {
         builder.append(" | ");
       }
-      builder.append(this.pairs[i].lang1);
+      builder.append(this.pairs.get(i).lang1);
     }
     builder.append("\t");
-    for (int i = 0; i < this.pairs.length; ++i) {
+    for (int i = 0; i < this.pairs.size(); ++i) {
       if (i > 0) {
         builder.append(" | ");
       }
-      builder.append(this.pairs[i].lang2);
+      builder.append(this.pairs.get(i).lang2);
     }
     return builder.toString();
   }
@@ -144,6 +115,42 @@ public class PairEntry extends Entry implements RAFSerializable<PairEntry>, Comp
   public String toString() {
     return getRawText(false);
   }
+
+  // -----------------------------------------------------------------------
+  
+  public static final class Pair {
+    
+    public final String lang1;
+    public final String lang2;
+    
+    public Pair(final String lang1, final String lang2) {
+      this.lang1 = lang1;
+      this.lang2 = lang2;
+      //assert lang1.trim().length() > 0 || lang2.trim().length() > 0 : "Empty pair!!!";
+    }
+
+    public Pair(final String lang1, final String lang2, final boolean swap) {
+      this(swap ? lang2 : lang1, swap ? lang1 : lang2);
+    }
+
+    public String toString() {
+      return lang1 + " :: " + lang2;
+    }
+
+    public String toStringTab() {
+      return lang1 + "\t" + lang2;
+    }
+
+    public String get(int i) {
+      if (i == 0) {
+        return lang1;
+      } else if (i == 1) {
+        return lang2;
+      }
+      throw new IllegalArgumentException();
+    }
+
+  }
   
 
 }