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

Make an add into a set. 

This method now only sets words, so it should be named set.
The functionality is identical since there are no more places
where the list is reused.
This will also allow to make the list final in an upcoming change.

Change-Id: I25b0c7d7f13c3fa5d89806f01f48f1026769603f
main
Jean Chalard 2012-03-13 16:36:21 +09:00
parent d6662ecd30
commit 674ffcdf93
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -927,7 +927,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
SuggestedWords.Builder.getFromApplicationSpecifiedCompletions(
applicationSpecifiedCompletions);
SuggestedWords.Builder builder = new SuggestedWords.Builder()
.addWords(applicationSuggestedWords)
.setWords(applicationSuggestedWords)
.setTypedWordValid(false)
.setHasMinimalSuggestion(false);
// When in fullscreen mode, show completions generated by the application
@ -1787,7 +1787,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
SuggestedWords.Builder.getTypedWordAndPreviousSuggestions(
typedWord, previousSuggestions);
final SuggestedWords.Builder obsoleteSuggestionsBuilder = new SuggestedWords.Builder()
.addWords(typedWordAndPreviousSuggestions)
.setWords(typedWordAndPreviousSuggestions)
.setTypedWordValid(false)
.setHasMinimalSuggestion(false);

4
java/src/com/android/inputmethod/latin/SettingsValues.java
View File

@ -184,7 +184,7 @@ public class SettingsValues {
}
}
final SuggestedWords.Builder builder = new SuggestedWords.Builder()
.addWords(puncList)
.setWords(puncList)
.setIsPunctuationSuggestions();
return builder.build();
}
@ -204,7 +204,7 @@ public class SettingsValues {
}
}
final SuggestedWords.Builder builder = new SuggestedWords.Builder()
.addWords(puncOutputTextList)
.setWords(puncOutputTextList)
.setIsPunctuationSuggestions();
return builder.build();
}

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

@ -270,7 +270,7 @@ public class Suggest implements Dictionary.WordCallback {
StringUtils.removeDupes(mSuggestions);
return new SuggestedWords.Builder()
.addWords(SuggestedWords.Builder.getFromCharSequenceList(mSuggestions))
.setWords(SuggestedWords.Builder.getFromCharSequenceList(mSuggestions))
.setAllowsToBeAutoCorrected(false)
.setHasAutoCorrection(false);
}
@ -424,12 +424,12 @@ public class Suggest implements Dictionary.WordCallback {
scoreInfoList.add(new SuggestedWords.SuggestedWordInfo(mSuggestions.get(i),
"--", false));
}
builder = new SuggestedWords.Builder().addWords(scoreInfoList)
builder = new SuggestedWords.Builder().setWords(scoreInfoList)
.setAllowsToBeAutoCorrected(allowsToBeAutoCorrected)
.setHasAutoCorrection(hasAutoCorrection);
} else {
builder = new SuggestedWords.Builder()
.addWords(SuggestedWords.Builder.getFromCharSequenceList(mSuggestions))
.setWords(SuggestedWords.Builder.getFromCharSequenceList(mSuggestions))
.setAllowsToBeAutoCorrected(allowsToBeAutoCorrected)
.setHasAutoCorrection(hasAutoCorrection);
}

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

@ -87,12 +87,13 @@ public class SuggestedWords {
// Nothing to do here.
}
// TODO: compatibility for tests. Remove this once tests are okay.
public Builder addWords(List<SuggestedWordInfo> suggestedWordInfoList) {
final int N = suggestedWordInfoList.size();
for (int i = 0; i < N; ++i) {
SuggestedWordInfo suggestedWordInfo = suggestedWordInfoList.get(i);
addWord(suggestedWordInfo.mWord, suggestedWordInfo);
}
return setWords(suggestedWordInfoList);
}
public Builder setWords(List<SuggestedWordInfo> suggestedWordInfoList) {
mSuggestedWordInfoList = suggestedWordInfoList;
return this;
}