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

Merge "Make an add into a set."

main
Jean Chalard 2012-03-13 03:35:17 -07:00 committed by Android (Google) Code Review
parent 728fd52b63 674ffcdf93
commit 9ffaae71d9
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( SuggestedWords.Builder.getFromApplicationSpecifiedCompletions(
applicationSpecifiedCompletions); applicationSpecifiedCompletions);
SuggestedWords.Builder builder = new SuggestedWords.Builder() SuggestedWords.Builder builder = new SuggestedWords.Builder()
.addWords(applicationSuggestedWords) .setWords(applicationSuggestedWords)
.setTypedWordValid(false) .setTypedWordValid(false)
.setHasMinimalSuggestion(false); .setHasMinimalSuggestion(false);
// When in fullscreen mode, show completions generated by the application // When in fullscreen mode, show completions generated by the application
@ -1787,7 +1787,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
SuggestedWords.Builder.getTypedWordAndPreviousSuggestions( SuggestedWords.Builder.getTypedWordAndPreviousSuggestions(
typedWord, previousSuggestions); typedWord, previousSuggestions);
final SuggestedWords.Builder obsoleteSuggestionsBuilder = new SuggestedWords.Builder() final SuggestedWords.Builder obsoleteSuggestionsBuilder = new SuggestedWords.Builder()
.addWords(typedWordAndPreviousSuggestions) .setWords(typedWordAndPreviousSuggestions)
.setTypedWordValid(false) .setTypedWordValid(false)
.setHasMinimalSuggestion(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() final SuggestedWords.Builder builder = new SuggestedWords.Builder()
.addWords(puncList) .setWords(puncList)
.setIsPunctuationSuggestions(); .setIsPunctuationSuggestions();
return builder.build(); return builder.build();
} }
@ -204,7 +204,7 @@ public class SettingsValues {
} }
} }
final SuggestedWords.Builder builder = new SuggestedWords.Builder() final SuggestedWords.Builder builder = new SuggestedWords.Builder()
.addWords(puncOutputTextList) .setWords(puncOutputTextList)
.setIsPunctuationSuggestions(); .setIsPunctuationSuggestions();
return builder.build(); 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); StringUtils.removeDupes(mSuggestions);
return new SuggestedWords.Builder() return new SuggestedWords.Builder()
.addWords(SuggestedWords.Builder.getFromCharSequenceList(mSuggestions)) .setWords(SuggestedWords.Builder.getFromCharSequenceList(mSuggestions))
.setAllowsToBeAutoCorrected(false) .setAllowsToBeAutoCorrected(false)
.setHasAutoCorrection(false); .setHasAutoCorrection(false);
} }
@ -424,12 +424,12 @@ 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().addWords(scoreInfoList) builder = new SuggestedWords.Builder().setWords(scoreInfoList)
.setAllowsToBeAutoCorrected(allowsToBeAutoCorrected) .setAllowsToBeAutoCorrected(allowsToBeAutoCorrected)
.setHasAutoCorrection(hasAutoCorrection); .setHasAutoCorrection(hasAutoCorrection);
} else { } else {
builder = new SuggestedWords.Builder() builder = new SuggestedWords.Builder()
.addWords(SuggestedWords.Builder.getFromCharSequenceList(mSuggestions)) .setWords(SuggestedWords.Builder.getFromCharSequenceList(mSuggestions))
.setAllowsToBeAutoCorrected(allowsToBeAutoCorrected) .setAllowsToBeAutoCorrected(allowsToBeAutoCorrected)
.setHasAutoCorrection(hasAutoCorrection); .setHasAutoCorrection(hasAutoCorrection);
} }

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

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