DictionaryManager can launch dictionaries again.

[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 990f9e1f3f2226bde466a9619967a6822d0e6200..5d90589dbf85a797109692eb2ad4f26285848193 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryInfo.java
+++ b/src/com/hughes/android/dictionary/DictionaryInfo.java
@@ -25,16 +25,17 @@ public class DictionaryInfo implements Serializable {
   public static final class IndexInfo implements Serializable {
     private static final long serialVersionUID = 6524751236198309438L;
 
+    public static final int NUM_CSV_FIELDS = 3;
+
+    public final String shortName;  // Often LangISO.
+    public final int allTokenCount;
+    public final int mainTokenCount;
+    
     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);
@@ -48,13 +49,13 @@ public class DictionaryInfo implements Serializable {
       allTokenCount = Integer.parseInt(fields[i++]);
       mainTokenCount = Integer.parseInt(fields[i++]);
     }
-
   }
   
   // Stuff populated from the text file.
   public String uncompressedFilename;  // used as a key throughout the program.
   public String downloadUrl;
-  public long uncompressedSize;
+  public long uncompressedBytes;
+  public long zipBytes;
   public long creationMillis;
   public final List<IndexInfo> indexInfos = new ArrayList<DictionaryInfo.IndexInfo>();
   public String dictInfo;
@@ -67,7 +68,8 @@ public class DictionaryInfo implements Serializable {
     result.append(uncompressedFilename);
     result.append("\t").append(downloadUrl);
     result.append("\t").append(creationMillis);
-    result.append("\t").append(uncompressedSize);
+    result.append("\t").append(uncompressedBytes);
+    result.append("\t").append(zipBytes);
     result.append("\t").append(indexInfos.size());
     for (final IndexInfo indexInfo : indexInfos) {
       indexInfo.append(result.append("\t"));
@@ -82,13 +84,14 @@ public class DictionaryInfo implements Serializable {
     uncompressedFilename = fields[i++];
     downloadUrl = fields[i++];
     creationMillis = Long.parseLong(fields[i++]);
-    uncompressedSize = Long.parseLong(fields[i++]);
+    uncompressedBytes = Long.parseLong(fields[i++]);
+    zipBytes = Long.parseLong(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;
+      i += IndexInfo.NUM_CSV_FIELDS;
     }
-    dictInfo = fields[i++].replaceAll("\\n", "\n");
+    dictInfo = fields[i++].replaceAll("\\\\n", "\n");
   }
 
   @Override