From fd998bd37a6373beb858d8d3c859c69b65776d4d Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Tue, 26 Jun 2012 15:29:01 +0900 Subject: [PATCH] Refactoring (A11) Change-Id: I86bd7587dd80773a51ba6db312ba55dc41e7c8c7 --- .../src/com/android/inputmethod/latin/Suggest.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java index 67c03f626..fb9de5062 100644 --- a/java/src/com/android/inputmethod/latin/Suggest.java +++ b/java/src/com/android/inputmethod/latin/Suggest.java @@ -239,16 +239,20 @@ public class Suggest implements Dictionary.WordCallback { if (wordComposer.size() <= 1 && isCorrectionEnabled) { // At first character typed, search only the bigrams if (!TextUtils.isEmpty(prevWordForBigram)) { + final CharSequence lowerPrevWord; if (StringUtils.hasUpperCase(prevWordForBigram)) { // TODO: Must pay attention to locale when changing case. - final CharSequence lowerPrevWord = prevWordForBigram.toString().toLowerCase(); - for (final Dictionary dictionary : mBigramDictionaries.values()) { + lowerPrevWord = prevWordForBigram.toString().toLowerCase(); + } else { + lowerPrevWord = null; + } + for (final String key : mBigramDictionaries.keySet()) { + final Dictionary dictionary = mBigramDictionaries.get(key); + dictionary.getBigrams(wordComposer, prevWordForBigram, this); + if (null != lowerPrevWord) { dictionary.getBigrams(wordComposer, lowerPrevWord, this); } } - for (final Dictionary dictionary : mBigramDictionaries.values()) { - dictionary.getBigrams(wordComposer, prevWordForBigram, this); - } } } else if (wordComposer.size() > 1) { final WordComposer wordComposerForLookup;