From 70d0217b6fcfcfa32ad795bf693f8e976ae38e9c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Reimar=20D=C3=B6ffinger?= <Reimar.Doeffinger@gmx.de>
Date: Sat, 11 Apr 2020 22:07:13 +0200
Subject: [PATCH] Minor code simplification.

---
 src/com/hughes/android/dictionary/engine/Index.java     | 4 +---
 src/com/hughes/android/dictionary/engine/PairEntry.java | 8 ++++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/com/hughes/android/dictionary/engine/Index.java b/src/com/hughes/android/dictionary/engine/Index.java
index ef6d11c..7304dcd 100644
--- 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 afa677f..b9ac07c 100644
--- 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);
         }
     }
 
-- 
2.43.0