X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fengine%2FPairEntry.java;h=a84bc2a102c033f76221cee22cfb429b37648d84;hb=1736ec57730a60b560f7afb16a88bb94460f4c39;hp=9160ac0ca05d55593906981dafaefffe5965ce33;hpb=9228648f55f10c44d4eb2ab4025ac4ce5da93072;p=Dictionary.git diff --git a/src/com/hughes/android/dictionary/engine/PairEntry.java b/src/com/hughes/android/dictionary/engine/PairEntry.java index 9160ac0..a84bc2a 100644 --- a/src/com/hughes/android/dictionary/engine/PairEntry.java +++ b/src/com/hughes/android/dictionary/engine/PairEntry.java @@ -9,7 +9,7 @@ import java.util.List; import com.hughes.util.raf.RAFSerializable; import com.hughes.util.raf.RAFSerializer; -public class PairEntry extends Entry implements RAFSerializable, Comparable { +public class PairEntry extends AbstractEntry implements RAFSerializable, Comparable { public final List pairs; @@ -51,6 +51,15 @@ public class PairEntry extends Entry implements RAFSerializable, Comp } }; + @Override + public int addToDictionary(final Dictionary dictionary) { + dictionary.pairEntries.add(this); + return dictionary.pairEntries.size() - 1; + } + + + // -------------------------------------------------------------------- + public static class Row extends RowBase { @@ -126,7 +135,11 @@ public class PairEntry extends Entry implements RAFSerializable, Comp public Pair(final String lang1, final String lang2) { this.lang1 = lang1; this.lang2 = lang2; - //assert lang1.trim().length() > 0 || lang2.trim().length() > 0 : "Empty pair!!!"; + if (!(lang1.trim().length() > 0 && lang2.trim().length() > 0)) { + System.err.println("poop"); + } + assert lang1.trim().length() > 0 || lang2.trim().length() > 0 : "Empty pair!!!"; + assert lang1.trim().length() > 0 && lang2.trim().length() > 0 : "Empty pair!!!"; } public Pair(final String lang1, final String lang2, final boolean swap) { @@ -151,6 +164,4 @@ public class PairEntry extends Entry implements RAFSerializable, Comp } } - - }