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

Some code reorganization. 

Use the same local variable inside both branches of an if.

Change-Id: I61f7d506d984f3723ec90604416d1875dd97cd8c
main
Jean Chalard 2012-03-13 19:54:56 +09:00
parent b5eeb724fc
commit bd4ba23d2b
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
java/src/com/android/inputmethod/latin/Suggest.java
View File

@ -391,6 +391,7 @@ public class Suggest implements Dictionary.WordCallback {
StringUtils.removeDupes(mSuggestions); StringUtils.removeDupes(mSuggestions);
final SuggestedWords.Builder builder; final SuggestedWords.Builder builder;
final ArrayList<SuggestedWords.SuggestedWordInfo> scoreInfoList;
if (DBG) { if (DBG) {
// TODO: this doesn't take into account the fact that removing dupes from mSuggestions // TODO: this doesn't take into account the fact that removing dupes from mSuggestions
// may have made mScores[] and mSuggestions out of sync. // may have made mScores[] and mSuggestions out of sync.
@ -399,8 +400,7 @@ public class Suggest implements Dictionary.WordCallback {
double normalizedScore = BinaryDictionary.calcNormalizedScore( double normalizedScore = BinaryDictionary.calcNormalizedScore(
typedWord, autoCorrectionSuggestion.toString(), typedWord, autoCorrectionSuggestion.toString(),
autoCorrectionSuggestionScore); autoCorrectionSuggestionScore);
ArrayList<SuggestedWords.SuggestedWordInfo> scoreInfoList = scoreInfoList = new ArrayList<SuggestedWords.SuggestedWordInfo>();
new ArrayList<SuggestedWords.SuggestedWordInfo>();
scoreInfoList.add(new SuggestedWords.SuggestedWordInfo(autoCorrectionSuggestion, "+", scoreInfoList.add(new SuggestedWords.SuggestedWordInfo(autoCorrectionSuggestion, "+",
false)); false));
final int suggestionsSize = mSuggestions.size(); final int suggestionsSize = mSuggestions.size();
@ -424,13 +424,8 @@ public class Suggest implements Dictionary.WordCallback {
scoreInfoList.add(new SuggestedWords.SuggestedWordInfo(mSuggestions.get(i), scoreInfoList.add(new SuggestedWords.SuggestedWordInfo(mSuggestions.get(i),
"--", false)); "--", false));
} }
builder = new SuggestedWords.Builder(scoreInfoList, allowsToBeAutoCorrected,
false /* isPunctuationSuggestions */);
} else { } else {
builder = new SuggestedWords.Builder( scoreInfoList = SuggestedWords.Builder.getFromCharSequenceList(mSuggestions);
SuggestedWords.Builder.getFromCharSequenceList(mSuggestions),
allowsToBeAutoCorrected,
false /* isPunctuationSuggestions */);
} }
boolean autoCorrectionAvailable = hasAutoCorrection; boolean autoCorrectionAvailable = hasAutoCorrection;
@ -440,6 +435,8 @@ public class Suggest implements Dictionary.WordCallback {
} }
// Don't auto-correct words with multiple capital letter // Don't auto-correct words with multiple capital letter
autoCorrectionAvailable &= !wordComposer.isMostlyCaps(); autoCorrectionAvailable &= !wordComposer.isMostlyCaps();
builder = new SuggestedWords.Builder(scoreInfoList, allowsToBeAutoCorrected,
false /* isPunctuationSuggestions */);
builder.setTypedWordValid(!allowsToBeAutoCorrected).setHasMinimalSuggestion( builder.setTypedWordValid(!allowsToBeAutoCorrected).setHasMinimalSuggestion(
autoCorrectionAvailable); autoCorrectionAvailable);
if (allowsToBeAutoCorrected && builder.size() > 1 && mAutoCorrectionThreshold > 0 if (allowsToBeAutoCorrected && builder.size() > 1 && mAutoCorrectionThreshold > 0

2
java/src/com/android/inputmethod/latin/SuggestedWords.java
View File

@ -88,7 +88,7 @@ public class SuggestedWords {
mIsPunctuationSuggestions = isPunctuationSuggestions; mIsPunctuationSuggestions = isPunctuationSuggestions;
} }
public static List<SuggestedWordInfo> getFromCharSequenceList( public static ArrayList<SuggestedWordInfo> getFromCharSequenceList(
final List<CharSequence> wordList) { final List<CharSequence> wordList) {
final ArrayList<SuggestedWordInfo> result = new ArrayList<SuggestedWordInfo>(); final ArrayList<SuggestedWordInfo> result = new ArrayList<SuggestedWordInfo>();
for (CharSequence word : wordList) { for (CharSequence word : wordList) {