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

Move up the static methods of the Builder 

Change-Id: Ic3e07b745b7b24cae0f772ea49e0de615b44caf9
main
Jean Chalard 2012-03-13 20:39:21 +09:00
parent 8e19b1183e
commit 88bf1ba526
3 changed files with 42 additions and 42 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

@ -924,7 +924,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
} }
final List<SuggestedWords.SuggestedWordInfo> applicationSuggestedWords = final List<SuggestedWords.SuggestedWordInfo> applicationSuggestedWords =
SuggestedWords.Builder.getFromApplicationSpecifiedCompletions( SuggestedWords.getFromApplicationSpecifiedCompletions(
applicationSpecifiedCompletions); applicationSpecifiedCompletions);
SuggestedWords.Builder builder = new SuggestedWords.Builder(applicationSuggestedWords, SuggestedWords.Builder builder = new SuggestedWords.Builder(applicationSuggestedWords,
false /* typedWordValid */, false /* typedWordValid */,
@ -1788,7 +1788,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
previousSuggestions = SuggestedWords.EMPTY; previousSuggestions = SuggestedWords.EMPTY;
} }
final ArrayList<SuggestedWords.SuggestedWordInfo> typedWordAndPreviousSuggestions = final ArrayList<SuggestedWords.SuggestedWordInfo> typedWordAndPreviousSuggestions =
SuggestedWords.Builder.getTypedWordAndPreviousSuggestions( SuggestedWords.getTypedWordAndPreviousSuggestions(
typedWord, previousSuggestions); typedWord, previousSuggestions);
final SuggestedWords.Builder obsoleteSuggestionsBuilder = final SuggestedWords.Builder obsoleteSuggestionsBuilder =
new SuggestedWords.Builder(typedWordAndPreviousSuggestions, new SuggestedWords.Builder(typedWordAndPreviousSuggestions,

4
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(
SuggestedWords.Builder.getFromCharSequenceList(mSuggestions), SuggestedWords.getFromCharSequenceList(mSuggestions),
false /* typedWordValid */, false /* typedWordValid */,
false /* hasMinimalSuggestion */, false /* hasMinimalSuggestion */,
false /* allowsToBeAutoCorrected */, false /* allowsToBeAutoCorrected */,
@ -428,7 +428,7 @@ public class Suggest implements Dictionary.WordCallback {
"--", false)); "--", false));
} }
} else { } else {
scoreInfoList = SuggestedWords.Builder.getFromCharSequenceList(mSuggestions); scoreInfoList = SuggestedWords.getFromCharSequenceList(mSuggestions);
} }
boolean autoCorrectionAvailable = hasAutoCorrection; boolean autoCorrectionAvailable = hasAutoCorrection;

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

@ -98,6 +98,13 @@ public class SuggestedWords {
mShouldBlockAutoCorrectionBySafetyNet = shouldBlockAutoCorrectionBySafetyNet; mShouldBlockAutoCorrectionBySafetyNet = shouldBlockAutoCorrectionBySafetyNet;
} }
public SuggestedWords build() {
return new SuggestedWords(mTypedWordValid, mHasMinimalSuggestion,
mIsPunctuationSuggestions, mShouldBlockAutoCorrectionBySafetyNet,
mAllowsToBeAutoCorrected, mSuggestedWordInfoList);
}
}
public static ArrayList<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>();
@ -136,13 +143,6 @@ public class SuggestedWords {
return suggestionsList; return suggestionsList;
} }
public SuggestedWords build() {
return new SuggestedWords(mTypedWordValid, mHasMinimalSuggestion,
mIsPunctuationSuggestions, mShouldBlockAutoCorrectionBySafetyNet,
mAllowsToBeAutoCorrected, mSuggestedWordInfoList);
}
}
public static class SuggestedWordInfo { public static class SuggestedWordInfo {
public final CharSequence mWord; public final CharSequence mWord;
private final CharSequence mDebugString; private final CharSequence mDebugString;