Revert "Make SuggestedWords immutable"

This reverts commit c208f4dfb7abe1b7a83c725d515edb3615d5d927

1 files changed, 29 insertions, 40 deletions

diff --git a/java/src/com/android/inputmethod/latin/SuggestedWords.java b/java/src/com/android/inputmethod/latin/SuggestedWords.java
index bc6c52787..ff8945f71 100644
--- a/java/src/com/android/inputmethod/latin/SuggestedWords.java
+++ b/java/src/com/android/inputmethod/latin/SuggestedWords.java
@@ -20,25 +20,22 @@ import android.text.TextUtils;
 import android.view.inputmethod.CompletionInfo;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 
 public class SuggestedWords {
-    public static final SuggestedWords EMPTY = new SuggestedWords(null, false, false, false, false,
-            null);
+    public static final SuggestedWords EMPTY = new SuggestedWords(null, false, false, false, null);
 
-    private final List<CharSequence> mWords;
+    public final List<CharSequence> mWords;
     public final boolean mTypedWordValid;
     public final boolean mHasAutoCorrectionCandidate;
     public final boolean mIsPunctuationSuggestions;
-    public final boolean mShouldBlockAutoCorrectionBySafetyNet;
     private final List<SuggestedWordInfo> mSuggestedWordInfoList;
+    private boolean mShouldBlockAutoCorrectionBySafetyNet;
 
-    SuggestedWords(List<CharSequence> words, boolean typedWordValid,
+    private SuggestedWords(List<CharSequence> words, boolean typedWordValid,
             boolean hasAutoCorrectionCandidate, boolean isPunctuationSuggestions,
-            boolean shouldBlockAutoCorrectionBySafetyNet,
             List<SuggestedWordInfo> suggestedWordInfoList) {
         if (words != null) {
             mWords = words;
@@ -48,8 +45,8 @@ public class SuggestedWords {
         mTypedWordValid = typedWordValid;
         mHasAutoCorrectionCandidate = hasAutoCorrectionCandidate;
         mIsPunctuationSuggestions = isPunctuationSuggestions;
-        mShouldBlockAutoCorrectionBySafetyNet = shouldBlockAutoCorrectionBySafetyNet;
         mSuggestedWordInfoList = suggestedWordInfoList;
+        mShouldBlockAutoCorrectionBySafetyNet = false;
     }
 
     public int size() {
@@ -65,23 +62,24 @@ public class SuggestedWords {
     }
 
     public boolean hasAutoCorrectionWord() {
-        return mHasAutoCorrectionCandidate && size() > 1 && mTypedWordValid;
+        return mHasAutoCorrectionCandidate && size() > 1 && !mTypedWordValid;
     }
 
-    public boolean willAutoCorrect() {
-        return !mTypedWordValid && mHasAutoCorrectionCandidate
-                && !mShouldBlockAutoCorrectionBySafetyNet;
+    public boolean isPunctuationSuggestions() {
+        return mIsPunctuationSuggestions;
+    }
+
+    public void setShouldBlockAutoCorrectionBySatefyNet() {
+        mShouldBlockAutoCorrectionBySafetyNet = true;
     }
 
-    @Override
-    public String toString() {
-        // Pretty-print method to help debug
-        return "SuggestedWords.Builder:"
-                + " mTypedWordValid = " + mTypedWordValid
-                + " mHasAutoCorrectionCandidate = " + mHasAutoCorrectionCandidate
-                + " mIsPunctuationSuggestions = " + mIsPunctuationSuggestions
-                + " mShouldBlockAutoCorrectionBySafetyNet" + mShouldBlockAutoCorrectionBySafetyNet
-                + " mWords=" + Arrays.toString(mWords.toArray());
+    public boolean shouldBlockAutoCorrectionBySafetyNet() {
+        return mShouldBlockAutoCorrectionBySafetyNet;
+    }
+
+    public boolean willAutoCorrect() {
+        return !mTypedWordValid && mHasAutoCorrectionCandidate
+                && !shouldBlockAutoCorrectionBySafetyNet();
     }
 
     public static class Builder {
@@ -89,7 +87,6 @@ public class SuggestedWords {
         private boolean mTypedWordValid;
         private boolean mHasMinimalSuggestion;
         private boolean mIsPunctuationSuggestions;
-        private boolean mShouldBlockAutoCorrectionBySafetyNet;
         private List<SuggestedWordInfo> mSuggestedWordInfoList =
                 new ArrayList<SuggestedWordInfo>();
 
@@ -154,11 +151,6 @@ public class SuggestedWords {
             return this;
         }
 
-        public Builder setShouldBlockAutoCorrectionBySafetyNet() {
-            mShouldBlockAutoCorrectionBySafetyNet = true;
-            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 Builder addTypedWordAndPreviousSuggestions(CharSequence typedWord,
@@ -184,8 +176,7 @@ public class SuggestedWords {
 
         public SuggestedWords build() {
             return new SuggestedWords(mWords, mTypedWordValid, mHasMinimalSuggestion,
-                    mIsPunctuationSuggestions, mShouldBlockAutoCorrectionBySafetyNet,
-                    mSuggestedWordInfoList);
+                    mIsPunctuationSuggestions, mSuggestedWordInfoList);
         }
 
         public int size() {
@@ -196,20 +187,18 @@ public class SuggestedWords {
             return mWords.get(pos);
         }
 
-        public boolean isTypedWordValid() {
-            return mTypedWordValid;
-        }
-
         @Override
         public String toString() {
             // Pretty-print method to help debug
-            return "SuggestedWords.Builder:"
-                    + " mTypedWordValid = " + mTypedWordValid
-                    + " mHasMinimalSuggestion = " + mHasMinimalSuggestion
-                    + " mIsPunctuationSuggestions = " + mIsPunctuationSuggestions
-                    + " mShouldBlockAutoCorrectionBySafetyNet"
-                    + mShouldBlockAutoCorrectionBySafetyNet
-                    + " mWords=" + Arrays.toString(mWords.toArray());
+            final StringBuilder sb = new StringBuilder("StringBuilder: mTypedWordValid = "
+                    + mTypedWordValid + " ; mHasMinimalSuggestion = " + mHasMinimalSuggestion
+                    + " ; mIsPunctuationSuggestions = " + mIsPunctuationSuggestions
+                    + " --- ");
+            for (CharSequence s : mWords) {
+                sb.append(s);
+                sb.append(" ; ");
+            }
+            return sb.toString();
         }
     }