From b5eeb724fc98bb7169683539027d9ba54ffb8b14 Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Tue, 13 Mar 2012 19:40:24 +0900
Subject: [PATCH] Make some more Builder attributes final.
Change-Id: I3132b7fe4ee97c566736bfc21c3783cfc79fc7ff
---
.../android/inputmethod/latin/LatinIME.java | 12 +++++++----
.../inputmethod/latin/SettingsValues.java | 10 ++++++----
.../android/inputmethod/latin/Suggest.java | 14 +++++++------
.../inputmethod/latin/SuggestedWords.java | 20 +++++++------------
4 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index bd502a030f..2bbda78482 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -926,7 +926,9 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
final List<SuggestedWords.SuggestedWordInfo> applicationSuggestedWords =
SuggestedWords.Builder.getFromApplicationSpecifiedCompletions(
applicationSpecifiedCompletions);
- SuggestedWords.Builder builder = new SuggestedWords.Builder(applicationSuggestedWords)
+ SuggestedWords.Builder builder = new SuggestedWords.Builder(applicationSuggestedWords,
+ false /* allowsToBeAutoCorrected */,
+ false /* isPunctuationSuggestions */)
.setTypedWordValid(false)
.setHasMinimalSuggestion(false);
// When in fullscreen mode, show completions generated by the application
@@ -1786,9 +1788,11 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
SuggestedWords.Builder.getTypedWordAndPreviousSuggestions(
typedWord, previousSuggestions);
final SuggestedWords.Builder obsoleteSuggestionsBuilder =
- new SuggestedWords.Builder(typedWordAndPreviousSuggestions)
- .setTypedWordValid(false)
- .setHasMinimalSuggestion(false);
+ new SuggestedWords.Builder(typedWordAndPreviousSuggestions,
+ false /* allowsToBeAutoCorrected */,
+ false /* isPunctuationSuggestions */)
+ .setTypedWordValid(false)
+ .setHasMinimalSuggestion(false);
showSuggestions(obsoleteSuggestionsBuilder.build(), typedWord);
}
diff --git a/java/src/com/android/inputmethod/latin/SettingsValues.java b/java/src/com/android/inputmethod/latin/SettingsValues.java
index 591f9f5a78..c5198b3370 100644
--- a/java/src/com/android/inputmethod/latin/SettingsValues.java
+++ b/java/src/com/android/inputmethod/latin/SettingsValues.java
@@ -183,8 +183,9 @@ public class SettingsValues {
KeySpecParser.getLabel(puncSpec)));
}
}
- final SuggestedWords.Builder builder = new SuggestedWords.Builder(puncList)
- .setIsPunctuationSuggestions();
+ final SuggestedWords.Builder builder = new SuggestedWords.Builder(puncList,
+ false /* allowsToBeAutoCorrected */,
+ true /* isPunctuationSuggestions */);
return builder.build();
}
@@ -202,8 +203,9 @@ public class SettingsValues {
}
}
}
- final SuggestedWords.Builder builder = new SuggestedWords.Builder(puncOutputTextList)
- .setIsPunctuationSuggestions();
+ final SuggestedWords.Builder builder = new SuggestedWords.Builder(puncOutputTextList,
+ false /* allowsToBeAutoCorrected */,
+ true /* isPunctuationSuggestions */);
return builder.build();
}
diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index 40e9ef8e72..fd813c9a29 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -270,8 +270,9 @@ public class Suggest implements Dictionary.WordCallback {
StringUtils.removeDupes(mSuggestions);
return new SuggestedWords.Builder(
- SuggestedWords.Builder.getFromCharSequenceList(mSuggestions))
- .setAllowsToBeAutoCorrected(false);
+ SuggestedWords.Builder.getFromCharSequenceList(mSuggestions),
+ false /* allowsToBeAutoCorrected */,
+ false /* isPunctuationSuggestions */);
}
// TODO: cleanup dictionaries looking up and suggestions building with SuggestedWords.Builder
@@ -423,12 +424,13 @@ public class Suggest implements Dictionary.WordCallback {
scoreInfoList.add(new SuggestedWords.SuggestedWordInfo(mSuggestions.get(i),
"--", false));
}
- builder = new SuggestedWords.Builder(scoreInfoList)
- .setAllowsToBeAutoCorrected(allowsToBeAutoCorrected);
+ builder = new SuggestedWords.Builder(scoreInfoList, allowsToBeAutoCorrected,
+ false /* isPunctuationSuggestions */);
} else {
builder = new SuggestedWords.Builder(
- SuggestedWords.Builder.getFromCharSequenceList(mSuggestions))
- .setAllowsToBeAutoCorrected(allowsToBeAutoCorrected);
+ SuggestedWords.Builder.getFromCharSequenceList(mSuggestions),
+ allowsToBeAutoCorrected,
+ false /* isPunctuationSuggestions */);
}
boolean autoCorrectionAvailable = hasAutoCorrection;
diff --git a/java/src/com/android/inputmethod/latin/SuggestedWords.java b/java/src/com/android/inputmethod/latin/SuggestedWords.java
index 676563e1d2..d41f84798f 100644
--- a/java/src/com/android/inputmethod/latin/SuggestedWords.java
+++ b/java/src/com/android/inputmethod/latin/SuggestedWords.java
@@ -75,13 +75,17 @@ public class SuggestedWords {
public static class Builder {
private boolean mTypedWordValid;
private boolean mHasMinimalSuggestion;
- private boolean mIsPunctuationSuggestions;
+ private final boolean mIsPunctuationSuggestions;
private boolean mShouldBlockAutoCorrectionBySafetyNet;
- private boolean mAllowsToBeAutoCorrected;
+ private final boolean mAllowsToBeAutoCorrected;
private final List<SuggestedWordInfo> mSuggestedWordInfoList;
- public Builder(final List<SuggestedWordInfo> suggestedWordInfoList) {
+ public Builder(final List<SuggestedWordInfo> suggestedWordInfoList,
+ final boolean allowsToBeAutoCorrected,
+ final boolean isPunctuationSuggestions) {
mSuggestedWordInfoList = suggestedWordInfoList;
+ mAllowsToBeAutoCorrected = allowsToBeAutoCorrected;
+ mIsPunctuationSuggestions = isPunctuationSuggestions;
}
public static List<SuggestedWordInfo> getFromCharSequenceList(
@@ -112,21 +116,11 @@ public class SuggestedWords {
return this;
}
- public Builder setIsPunctuationSuggestions() {
- mIsPunctuationSuggestions = true;
- return this;
- }
-
public Builder setShouldBlockAutoCorrectionBySafetyNet() {
mShouldBlockAutoCorrectionBySafetyNet = true;
return this;
}
- public Builder setAllowsToBeAutoCorrected(final boolean allowsToBeAutoCorrected) {
- mAllowsToBeAutoCorrected = allowsToBeAutoCorrected;
- return this;
- }
-
// Should get rid of the first one (what the user typed previously) from suggestions
// and replace it with what the user currently typed.
public static ArrayList<SuggestedWordInfo> getTypedWordAndPreviousSuggestions(
--
GitLab