From 2e2519ee914d4bf9462950553840557a4c19faed Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Tue, 13 Mar 2012 20:05:00 +0900
Subject: [PATCH] Make still more members of the Builder final.
Change-Id: Ic455f97247da5e40d4939555ab639ecffef36e2d
---
.../android/inputmethod/latin/LatinIME.java | 13 ++++++-------
.../inputmethod/latin/SettingsValues.java | 4 ++++
.../com/android/inputmethod/latin/Suggest.java | 9 ++++++---
.../inputmethod/latin/SuggestedWords.java | 18 ++++++------------
4 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 2bbda78482..f41972e8b8 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -927,10 +927,10 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
SuggestedWords.Builder.getFromApplicationSpecifiedCompletions(
applicationSpecifiedCompletions);
SuggestedWords.Builder builder = new SuggestedWords.Builder(applicationSuggestedWords,
+ false /* typedWordValid */,
+ false /* hasMinimalSuggestion */,
false /* allowsToBeAutoCorrected */,
- false /* isPunctuationSuggestions */)
- .setTypedWordValid(false)
- .setHasMinimalSuggestion(false);
+ false /* isPunctuationSuggestions */);
// When in fullscreen mode, show completions generated by the application
final SuggestedWords words = builder.build();
final boolean isAutoCorrection = false;
@@ -1789,11 +1789,10 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
typedWord, previousSuggestions);
final SuggestedWords.Builder obsoleteSuggestionsBuilder =
new SuggestedWords.Builder(typedWordAndPreviousSuggestions,
+ false /* typedWordValid */,
+ false /* hasMinimalSuggestion */,
false /* allowsToBeAutoCorrected */,
- false /* isPunctuationSuggestions */)
- .setTypedWordValid(false)
- .setHasMinimalSuggestion(false);
-
+ false /* isPunctuationSuggestions */);
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 c5198b3370..0a4aea1408 100644
--- a/java/src/com/android/inputmethod/latin/SettingsValues.java
+++ b/java/src/com/android/inputmethod/latin/SettingsValues.java
@@ -184,6 +184,8 @@ public class SettingsValues {
}
}
final SuggestedWords.Builder builder = new SuggestedWords.Builder(puncList,
+ false /* typedWordValid */,
+ false /* hasMinimalSuggestion */,
false /* allowsToBeAutoCorrected */,
true /* isPunctuationSuggestions */);
return builder.build();
@@ -204,6 +206,8 @@ public class SettingsValues {
}
}
final SuggestedWords.Builder builder = new SuggestedWords.Builder(puncOutputTextList,
+ false /* typedWordValid */,
+ false /* hasMinimalSuggestion */,
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 28cbc9789f..28d3b44378 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -271,6 +271,8 @@ public class Suggest implements Dictionary.WordCallback {
return new SuggestedWords.Builder(
SuggestedWords.Builder.getFromCharSequenceList(mSuggestions),
+ false /* typedWordValid */,
+ false /* hasMinimalSuggestion */,
false /* allowsToBeAutoCorrected */,
false /* isPunctuationSuggestions */);
}
@@ -435,10 +437,11 @@ public class Suggest implements Dictionary.WordCallback {
}
// Don't auto-correct words with multiple capital letter
autoCorrectionAvailable &= !wordComposer.isMostlyCaps();
- builder = new SuggestedWords.Builder(scoreInfoList, allowsToBeAutoCorrected,
+ builder = new SuggestedWords.Builder(scoreInfoList,
+ !allowsToBeAutoCorrected /* typedWordValid */,
+ autoCorrectionAvailable /* hasMinimalSuggestion */,
+ allowsToBeAutoCorrected /* allowsToBeAutoCorrected */,
false /* isPunctuationSuggestions */);
- builder.setTypedWordValid(!allowsToBeAutoCorrected).setHasMinimalSuggestion(
- autoCorrectionAvailable);
if (allowsToBeAutoCorrected && builder.size() > 1 && mAutoCorrectionThreshold > 0
&& Suggest.shouldBlockAutoCorrectionBySafetyNet(typedWord, builder.getWord(1))) {
builder.setShouldBlockAutoCorrectionBySafetyNet();
diff --git a/java/src/com/android/inputmethod/latin/SuggestedWords.java b/java/src/com/android/inputmethod/latin/SuggestedWords.java
index f62e99cac6..144e674822 100644
--- a/java/src/com/android/inputmethod/latin/SuggestedWords.java
+++ b/java/src/com/android/inputmethod/latin/SuggestedWords.java
@@ -73,17 +73,21 @@ public class SuggestedWords {
}
public static class Builder {
- private boolean mTypedWordValid;
- private boolean mHasMinimalSuggestion;
+ private final boolean mTypedWordValid;
+ private final boolean mHasMinimalSuggestion;
private final boolean mIsPunctuationSuggestions;
private boolean mShouldBlockAutoCorrectionBySafetyNet;
private final boolean mAllowsToBeAutoCorrected;
private final List<SuggestedWordInfo> mSuggestedWordInfoList;
public Builder(final List<SuggestedWordInfo> suggestedWordInfoList,
+ final boolean typedWordValid,
+ final boolean hasMinimalSuggestion,
final boolean allowsToBeAutoCorrected,
final boolean isPunctuationSuggestions) {
mSuggestedWordInfoList = suggestedWordInfoList;
+ mTypedWordValid = typedWordValid;
+ mHasMinimalSuggestion = hasMinimalSuggestion;
mAllowsToBeAutoCorrected = allowsToBeAutoCorrected;
mIsPunctuationSuggestions = isPunctuationSuggestions;
}
@@ -106,16 +110,6 @@ public class SuggestedWords {
return result;
}
- public Builder setTypedWordValid(boolean typedWordValid) {
- mTypedWordValid = typedWordValid;
- return this;
- }
-
- public Builder setHasMinimalSuggestion(boolean hasMinimalSuggestion) {
- mHasMinimalSuggestion = hasMinimalSuggestion;
- return this;
- }
-
public Builder setShouldBlockAutoCorrectionBySafetyNet() {
mShouldBlockAutoCorrectionBySafetyNet = true;
return this;
--
GitLab