Extended error messages and additional null checks.

[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 8a956775ce95c25168fc8095b8ac44936763daa5..81c8f5d687aae2662534f0ebc000f68086292e2a 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryInfo.java
+++ b/src/com/hughes/android/dictionary/DictionaryInfo.java
@@ -57,7 +57,7 @@ public class DictionaryInfo implements Serializable {
     public long uncompressedBytes;
     public long zipBytes;
     public long creationMillis;
-    public final List<IndexInfo> indexInfos = new ArrayList<DictionaryInfo.IndexInfo>();
+    public final ArrayList<IndexInfo> indexInfos = new ArrayList<IndexInfo>();
     public String dictInfo;
 
     public DictionaryInfo() {
@@ -65,7 +65,7 @@ public class DictionaryInfo implements Serializable {
     }
 
     public boolean isValid() {
-        return !indexInfos.isEmpty();
+        return indexInfos != null && !indexInfos.isEmpty();
     }
 
     public StringBuilder append(final StringBuilder result) {
@@ -91,6 +91,7 @@ public class DictionaryInfo implements Serializable {
         uncompressedBytes = Long.parseLong(fields[i++]);
         zipBytes = Long.parseLong(fields[i++]);
         final int size = Integer.parseInt(fields[i++]);
+        indexInfos.ensureCapacity(size);
         for (int j = 0; j < size; ++j) {
             indexInfos.add(new IndexInfo(fields, i));
             i += IndexInfo.NUM_CSV_FIELDS;