Major refactor of down dictionary list is stored by app.

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

diff --git a/src/com/hughes/android/dictionary/DictionaryInfo.java b/src/com/hughes/android/dictionary/DictionaryInfo.java
index 46aafead0216c9c1f9e4de2cab458280dcf8d46a..a291dc092824f2a29898460e22b39a738127a668 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryInfo.java
+++ b/src/com/hughes/android/dictionary/DictionaryInfo.java
@@ -15,43 +15,76 @@
 package com.hughes.android.dictionary;
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 
 public class DictionaryInfo implements Serializable {
   
   private static final long serialVersionUID = -6850863377577700388L;
   
+  public static final class IndexInfo implements Serializable {
+    private static final long serialVersionUID = 6524751236198309438L;
+
+    public IndexInfo(String shortName, int allTokenCount, int mainTokenCount) {
+      this.shortName = shortName;
+      this.allTokenCount = allTokenCount;
+      this.mainTokenCount = mainTokenCount;
+    }
+    public final String shortName;  // Often LangISO.
+    public final int allTokenCount;
+    public final int mainTokenCount;
+    
+    public static final int SIZE = 3;
+    
+    public StringBuilder append(StringBuilder result) {
+      result.append(shortName);
+      result.append("\t").append(allTokenCount);
+      result.append("\t").append(mainTokenCount);
+      return result;
+    }
+
+    public IndexInfo(final String[] fields, int i) {
+      shortName = fields[i++];
+      allTokenCount = Integer.parseInt(fields[i++]);
+      mainTokenCount = Integer.parseInt(fields[i++]);
+    }
+
+  }
+  
   // Stuff populated from the text file.
-  public final String[] langIsos = new String[2];
-  public String uncompressedFilename;
+  public String uncompressedFilename;  // used as a key throughout the program.
   public String downloadUrl;
   public long uncompressedSize;
   public long creationMillis;
-  public final int[] allTokenCounts = new int[2];
-  public final int[] mainTokenCounts = new int[2];
-
-  String name;  // Determined at runtime based on locale on device--user editable.
-  String localFile;  // Determined based on device's Environment.
+  public final List<IndexInfo> indexInfos = new ArrayList<DictionaryInfo.IndexInfo>();
+  public String dictInfo;
   
-  public String toTabSeparatedString() {
-    return String.format("%s\t%s\t%s\t%s\t%d\t%d\t%d\t%d\t%d\t%d", langIsos[0],
-        langIsos[1], uncompressedFilename, downloadUrl, creationMillis, uncompressedSize,
-        mainTokenCounts[0], mainTokenCounts[1], allTokenCounts[0],
-        allTokenCounts[1]);
+  public StringBuilder append(final StringBuilder result) {
+    result.append(uncompressedFilename);
+    result.append("\t").append(downloadUrl);
+    result.append("\t").append(creationMillis);
+    result.append("\t").append(uncompressedSize);
+    result.append("\t").append(indexInfos.size());
+    for (final IndexInfo indexInfo : indexInfos) {
+      indexInfo.append(result.append("\t"));
+    }
+    result.append("\t").append(dictInfo.replaceAll("\n", "\\\\n"));
+    return result;
   }
 
   public DictionaryInfo(final String line) {
     final String[] fields = line.split("\t");
     int i = 0;
-    langIsos[0] = fields[i++];
-    langIsos[1] = fields[i++];
     uncompressedFilename = fields[i++];
     downloadUrl = fields[i++];
     creationMillis = Long.parseLong(fields[i++]);
     uncompressedSize = Long.parseLong(fields[i++]);
-    mainTokenCounts[0] = Integer.parseInt(fields[i++]);
-    mainTokenCounts[1] = Integer.parseInt(fields[i++]);
-    allTokenCounts[0] = Integer.parseInt(fields[i++]);
-    allTokenCounts[1] = Integer.parseInt(fields[i++]);
+    final int size = Integer.parseInt(fields[i++]);
+    for (int j = 0; j < size; ++j) {
+      indexInfos.add(new IndexInfo(fields, i));
+      i += IndexInfo.SIZE;
+    }
+    dictInfo = fields[i++].replaceAll("\\n", "\n");
   }
 
   public DictionaryInfo() {
@@ -60,7 +93,7 @@ public class DictionaryInfo implements Serializable {
 
   @Override
   public String toString() {
-    return name;
+    return uncompressedFilename;
   }