nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 69f94e19: Merge "Make the dictionary iterator shortcut-aware (B4)" 

* commit '69f94e1983f5b0d7b982d806afd9b937c8222b3d':
  Make the dictionary iterator shortcut-aware (B4)
main
Jean Chalard 2012-01-05 21:37:44 -08:00 committed by Android Git Automerger
parent bfe8ed28cd 69f94e1983
commit 88fbaa132c
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/makedict/src/com/android/inputmethod/latin/BinaryDictInputOutput.java
View File

@ -1003,8 +1003,7 @@ public class BinaryDictInputOutput {
new FusionDictionary.DictionaryOptions());
if (null != dict) {
for (Word w : dict) {
// TODO: pass the shortcut targets
newDict.add(w.mWord, w.mFrequency, null, w.mBigrams);
newDict.add(w.mWord, w.mFrequency, w.mShortcutTargets, w.mBigrams);
}
}

3
tools/makedict/src/com/android/inputmethod/latin/FusionDictionary.java
View File

@ -592,8 +592,7 @@ public class FusionDictionary implements Iterable<Word> {
}
if (currentGroup.mFrequency >= 0)
return new Word(mCurrentString.toString(), currentGroup.mFrequency,
// TODO: pass the shortcut targets here
currentGroup.mBigrams);
currentGroup.mShortcutTargets, currentGroup.mBigrams);
} else {
mPositions.removeLast();
currentPos = mPositions.getLast();

7
tools/makedict/src/com/android/inputmethod/latin/Word.java
View File

@ -28,11 +28,15 @@ import java.util.ArrayList;
public class Word implements Comparable<Word> {
final String mWord;
final int mFrequency;
final ArrayList<WeightedString> mShortcutTargets;
final ArrayList<WeightedString> mBigrams;
public Word(String word, int frequency, ArrayList<WeightedString> bigrams) {
public Word(final String word, final int frequency,
final ArrayList<WeightedString> shortcutTargets,
final ArrayList<WeightedString> bigrams) {
mWord = word;
mFrequency = frequency;
mShortcutTargets = shortcutTargets;
mBigrams = bigrams;
}
@ -60,6 +64,7 @@ public class Word implements Comparable<Word> {
if (!(o instanceof Word)) return false;
Word w = (Word)o;
return mFrequency == w.mFrequency && mWord.equals(w.mWord)
&& mShortcutTargets.equals(w.mShortcutTargets)
&& mBigrams.equals(w.mBigrams);
}
}