package com.hughes.android.dictionary.engine;
-import com.hughes.util.raf.RAFListSerializer;
-import com.hughes.util.raf.RAFSerializable;
-import com.ibm.icu.text.Transliterator;
-
+import java.io.DataInput;
+import java.io.DataOutput;
import java.io.IOException;
import java.io.PrintStream;
-import java.io.RandomAccessFile;
import java.util.ArrayList;
+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;
public PairEntry(final EntrySource entrySource) {
super(entrySource);
- pairs = new ArrayList<Pair>(1);
+ pairs = new ArrayList<>(1);
}
public PairEntry(final EntrySource entrySource, final String lang1, final String lang2) {
this.pairs.add(new Pair(lang1, lang2));
}
- public PairEntry(final Dictionary dictionary, final RandomAccessFile raf, final int index)
- throws IOException {
+ public PairEntry(final Dictionary dictionary, final DataInput raf, final int index)
+ throws IOException {
super(dictionary, raf, index);
- final int size = raf.readInt();
- pairs = new ArrayList<PairEntry.Pair>(size);
- for (int i = 0; i < size; ++i) {
- pairs.add(new Pair(raf.readUTF(), raf.readUTF()));
+ final int size = dictionary.dictFileVersion >= 7 ? StringUtil.readVarInt(raf) : raf.readInt();
+ // Use singletonList for better performance in common case
+ if (size == 1) pairs = Collections.singletonList(new Pair(raf.readUTF(), raf.readUTF()));
+ else
+ {
+ pairs = new ArrayList<>(size);
+ for (int i = 0; i < size; ++i) {
+ pairs.add(new Pair(raf.readUTF(), raf.readUTF()));
+ }
}
}
@Override
- public void write(RandomAccessFile raf) throws IOException {
+ public void write(DataOutput raf) throws IOException {
super.write(raf);
- // TODO: this could be a short.
- raf.writeInt(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);
+ StringUtil.writeVarInt(raf, pairs.size());
+ for (Pair p : pairs) {
+ assert p.lang1.length() > 0;
+ raf.writeUTF(p.lang1);
+ raf.writeUTF(p.lang2);
}
}
- static final class Serializer implements RAFListSerializer<PairEntry> {
+ static final class Serializer implements RAFListSerializer
Skippable<PairEntry> {
final Dictionary dictionary;
}
@Override
- public PairEntry read(RandomAccessFile raf, int index) throws IOException {
+ public PairEntry read(DataInput raf, int index) throws IOException {
return new PairEntry(dictionary, raf, index);
}
@Override
- public void write(RandomAccessFile raf, PairEntry t) throws IOException {
+ public void skip(DataInput raf, int index) throws IOException {
+ final int size;
+ if (dictionary.dictFileVersion >= 7)
+ {
+ StringUtil.readVarInt(raf);
+ size = StringUtil.readVarInt(raf);
+ }
+ else
+ {
+ raf.skipBytes(2);
+ size = raf.readInt();
+ }
+ for (int i = 0; i < 2*size; ++i) {
+ int l = raf.readUnsignedShort();
+ raf.skipBytes(l);
+ }
+ }
+
+ @Override
+ public void write(DataOutput raf, PairEntry t) throws IOException {
t.write(raf);
}
- };
+ }
@Override
public void addToDictionary(final Dictionary dictionary) {
public static class Row extends RowBase {
- Row(final RandomAccessFile raf, final int thisRowIndex,
- final Index index) throws IOException {
- super(raf, thisRowIndex, index);
+ Row(final DataInput raf, final int thisRowIndex,
+ final Index index, int extra) throws IOException {
+ super(raf, thisRowIndex, index, extra);
}
Row(final int referenceIndex, final int thisRowIndex,
- final Index index) {
+ final Index index) {
super(referenceIndex, thisRowIndex, index);
}
@Override
public RowMatchType matches(final List<String> searchTokens,
- final Pattern orderedMatchPattern, final Transliterator normalizer,
- final boolean swapPairEntries) {
+ final Pattern orderedMatchPattern, final Transliterator normalizer,
+ final boolean swapPairEntries) {
final int side = swapPairEntries ? 1 : 0;
final List<Pair> pairs = getEntry().pairs;
final String[] pairSides = new String[pairs.size()];
}
- public String getRawText(final boolean compact) {
+ private String getRawText(final boolean compact) {
if (compact) {
return this.pairs.get(0).toStringTab();
}
}
@Override
- public int compareTo(final PairEntry that) {
+ public int compareTo(/*@NonNull*/ final PairEntry that) {
return this.getRawText(false).compareTo(that.getRawText(false));
}
public final String lang1;
public final String lang2;
+ @SuppressWarnings("WeakerAccess")
public Pair(final String lang1, final String lang2) {
this.lang1 = lang1;
this.lang2 = lang2;
- 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!!!";
}
return lang1 + " :: " + lang2;
}
- public String toStringTab() {
+ String toStringTab() {
return lang1 + "\t" + lang2;
}
throw new IllegalArgumentException();
}
+ @Override
+ public boolean equals(Object o)
+ {
+ if (o == this) return true;
+ if (!(o instanceof Pair)) return false;
+ Pair p = (Pair)o;
+ return p.lang1.equals(lang1) && p.lang2.equals(lang2);
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return (lang1 + "|" + lang2).hashCode();
+ }
}
}
projects / Dictionary.git / blobdiff