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

Move stuff around for readability (A86)

Browse source 
Change-Id: I5f4a18e43f3012acf96978d625325bf7c69c9c80
This commit is contained in:
Jean Chalard 2012-07-09 17:35:47 +09:00
parent 82009901ea
commit 4e42e378fa
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
java/src/com/android/inputmethod/latin/ExpandableDictionary.java
View file

@ -263,6 +263,27 @@ public class ExpandableDictionary extends Dictionary {
return suggestions; return suggestions;
} }
// @VisibleForTesting
boolean reloadDictionaryIfRequired() {
synchronized (mUpdatingLock) {
// If we need to update, start off a background task
if (mRequiresReload) startDictionaryLoadingTaskLocked();
// Currently updating contacts, don't return any results.
return mUpdatingDictionary;
}
}
@Override
public ArrayList<SuggestedWordInfo> getBigrams(final WordComposer codes,
final CharSequence previousWord) {
if (!reloadDictionaryIfRequired()) {
final ArrayList<SuggestedWordInfo> suggestions = new ArrayList<SuggestedWordInfo>();
runBigramReverseLookUp(previousWord, suggestions);
return suggestions;
}
return null;
}
protected final ArrayList<SuggestedWordInfo> getWordsInner(final WordComposer codes, protected final ArrayList<SuggestedWordInfo> getWordsInner(final WordComposer codes,
final CharSequence prevWordForBigrams, final ProximityInfo proximityInfo) { final CharSequence prevWordForBigrams, final ProximityInfo proximityInfo) {
final ArrayList<SuggestedWordInfo> suggestions = new ArrayList<SuggestedWordInfo>(); final ArrayList<SuggestedWordInfo> suggestions = new ArrayList<SuggestedWordInfo>();
@ -589,16 +610,6 @@ public class ExpandableDictionary extends Dictionary {
return searchWord(childNode.mChildren, word, depth + 1, childNode); return searchWord(childNode.mChildren, word, depth + 1, childNode);
} }
// @VisibleForTesting
boolean reloadDictionaryIfRequired() {
synchronized (mUpdatingLock) {
// If we need to update, start off a background task
if (mRequiresReload) startDictionaryLoadingTaskLocked();
// Currently updating contacts, don't return any results.
return mUpdatingDictionary;
}
}
private void runBigramReverseLookUp(final CharSequence previousWord, private void runBigramReverseLookUp(final CharSequence previousWord,
final ArrayList<SuggestedWordInfo> suggestions) { 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
@ -610,17 +621,6 @@ public class ExpandableDictionary extends Dictionary {
} }
} }
@Override
public ArrayList<SuggestedWordInfo> getBigrams(final WordComposer codes,
final CharSequence previousWord) {
if (!reloadDictionaryIfRequired()) {
final ArrayList<SuggestedWordInfo> suggestions = new ArrayList<SuggestedWordInfo>();
runBigramReverseLookUp(previousWord, suggestions);
return suggestions;
}
return null;
}
/** /**
* Used for testing purposes and in the spell checker * Used for testing purposes and in the spell checker
* This function will wait for loading from database to be done * This function will wait for loading from database to be done