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

Merge "Remove another dependency to WordCallback (A4)"

main
Jean Chalard 2012-06-25 23:31:39 -07:00 committed by Android (Google) Code Review
parent 3ec249c6d1 d7b9e8f503
commit fac8a16c6f
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
java/src/com/android/inputmethod/latin/ExpandableDictionary.java
View File

@ -600,13 +600,13 @@ public class ExpandableDictionary extends Dictionary {
} }
private void runBigramReverseLookUp(final CharSequence previousWord, private void runBigramReverseLookUp(final CharSequence previousWord,
final WordCallback callback) { final ArrayList<SuggestedWordInfo> suggestions) {
// Search for the lowercase version of the word only, because that's where bigrams // Search for the lowercase version of the word only, because that's where bigrams
// store their sons. // store their sons.
Node prevWord = searchNode(mRoots, previousWord.toString().toLowerCase(), 0, Node prevWord = searchNode(mRoots, previousWord.toString().toLowerCase(), 0,
previousWord.length()); previousWord.length());
if (prevWord != null && prevWord.mNGrams != null) { if (prevWord != null && prevWord.mNGrams != null) {
reverseLookUp(prevWord.mNGrams, callback); reverseLookUp(prevWord.mNGrams, suggestions);
} }
} }
@ -614,7 +614,9 @@ public class ExpandableDictionary extends Dictionary {
public void getBigrams(final WordComposer codes, final CharSequence previousWord, public void getBigrams(final WordComposer codes, final CharSequence previousWord,
final WordCallback callback) { final WordCallback callback) {
if (!reloadDictionaryIfRequired()) { if (!reloadDictionaryIfRequired()) {
runBigramReverseLookUp(previousWord, callback); final ArrayList<SuggestedWordInfo> suggestions = new ArrayList<SuggestedWordInfo>();
runBigramReverseLookUp(previousWord, suggestions);
Utils.addAllSuggestions(mDicTypeId, Dictionary.BIGRAM, suggestions, callback);
} }
} }
@ -642,11 +644,12 @@ public class ExpandableDictionary extends Dictionary {
/** /**
* reverseLookUp retrieves the full word given a list of terminal nodes and adds those words * reverseLookUp retrieves the full word given a list of terminal nodes and adds those words
* through callback. * to the suggestions list passed as an argument.
* @param terminalNodes list of terminal nodes we want to add * @param terminalNodes list of terminal nodes we want to add
* @param suggestions the suggestion collection to add the word to
*/ */
private void reverseLookUp(LinkedList<NextWord> terminalNodes, private void reverseLookUp(LinkedList<NextWord> terminalNodes,
final WordCallback callback) { final ArrayList<SuggestedWordInfo> suggestions) {
Node node; Node node;
int freq; int freq;
for (NextWord nextWord : terminalNodes) { for (NextWord nextWord : terminalNodes) {
@ -660,9 +663,9 @@ public class ExpandableDictionary extends Dictionary {
} while (node != null); } while (node != null);
if (freq >= 0) { if (freq >= 0) {
callback.addWord(mLookedUpString, null, index, suggestions.add(new SuggestedWordInfo(new String(mLookedUpString, index,
BinaryDictionary.MAX_WORD_LENGTH - index, freq, mDicTypeId, BinaryDictionary.MAX_WORD_LENGTH - index),
Dictionary.BIGRAM); freq, SuggestedWordInfo.KIND_CORRECTION));
} }
} }
} }