Minor code simplification.

diff --git a/src/com/hughes/android/dictionary/engine/Index.java b/src/com/hughes/android/dictionary/engine/Index.java
index ef6d11cadaaf41f02e33aeba51bdd5c20740ab62..7304dcd2a06e1eead94fcb7fef9a86dcd9279dc4 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/Index.java
+++ b/src/com/hughes/android/dictionary/engine/Index.java
@@ -158,9 +158,7 @@ public final class Index implements RAFSerializable<Index> {
         raf.writeUTF(sortLanguage.getIsoCode());
         raf.writeUTF(normalizerRules);
         raf.writeBoolean(swapPairEntries);
-        if (dict.dictFileVersion >= 2) {
-            raf.writeInt(mainTokenCount);
-        }
+        raf.writeInt(mainTokenCount);
         RAFList.write(raf, sortedIndexEntries, new IndexEntrySerializer(null), 32, true);
         StringUtil.writeVarInt(raf, stoplist.size());
         for (String i : stoplist) {

diff --git a/src/com/hughes/android/dictionary/engine/PairEntry.java b/src/com/hughes/android/dictionary/engine/PairEntry.java
index afa677f6d53a87ed0d5c340b825b4550f3c5bb2c..b9ac07cea6a85bf64bb9441aa606cf692cbaf260 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/PairEntry.java
+++ b/src/com/hughes/android/dictionary/engine/PairEntry.java
@@ -62,10 +62,10 @@ public class PairEntry extends AbstractEntry implements RAFSerializable<PairEntr
     public void write(DataOutput raf) throws IOException {
         super.write(raf);
         StringUtil.writeVarInt(raf, pairs.size());
-        for (int i = 0; i < pairs.size(); ++i) {
-            assert pairs.get(i).lang1.length() > 0;
-            raf.writeUTF(pairs.get(i).lang1);
-            raf.writeUTF(pairs.get(i).lang2);
+        for (Pair p : pairs) {
+            assert p.lang1.length() > 0;
+            raf.writeUTF(p.lang1);
+            raf.writeUTF(p.lang2);
         }
     }