X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fengine%2FPairEntry.java;h=a0bcfeeac0a8e793071149cb2fc3e5bc456b222d;hb=5f7b259669237dad4cbfdec8536537815846979b;hp=2fac99f75201f0d73f73aa7f83ee536b10c95c9a;hpb=3ce0dd16e69302365d3bc802f298a5388b293d86;p=Dictionary.git

diff --git a/src/com/hughes/android/dictionary/engine/PairEntry.java b/src/com/hughes/android/dictionary/engine/PairEntry.java
index 2fac99f..a0bcfee 100644
--- a/src/com/hughes/android/dictionary/engine/PairEntry.java
+++ b/src/com/hughes/android/dictionary/engine/PairEntry.java
@@ -14,13 +14,6 @@
 
 package com.hughes.android.dictionary.engine;
 
-import android.support.annotation.NonNull;
-
-import com.hughes.util.StringUtil;
-import com.hughes.util.raf.RAFListSerializerSkippable;
-import com.hughes.util.raf.RAFSerializable;
-import com.ibm.icu.text.Transliterator;
-
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
@@ -30,8 +23,11 @@ import java.util.Collections;
 import java.util.List;
 import java.util.regex.Pattern;
 
-public class PairEntry extends AbstractEntry implements RAFSerializable<PairEntry>,
-    Comparable<PairEntry> {
+import com.hughes.util.StringUtil;
+import com.hughes.util.raf.RAFListSerializerSkippable;
+import com.ibm.icu.text.Transliterator;
+
+public class PairEntry extends AbstractEntry implements Comparable<PairEntry> {
 
     public final List<Pair> pairs;
 
@@ -64,10 +60,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);
         }
     }
 
@@ -221,7 +217,7 @@ public class PairEntry extends AbstractEntry implements RAFSerializable<PairEntr
     }
 
     @Override
-    public int compareTo(@NonNull final PairEntry that) {
+    public int compareTo(/*@NonNull*/ final PairEntry that) {
         return this.getRawText(false).compareTo(that.getRawText(false));
     }