commit 33cc82537466fbc02c1aff0825c975a94c04c464
author Jean Chalard <jchalard@google.com> Wed Mar 14 15:33:47 2012 +0900
committer Jean Chalard <jchalard@google.com> Wed Mar 14 15:42:22 2012 +0900
tree 18dff5f6f0232f4ac4cee322a58ccd71a5f429e8
parent 7d55c891afdf7e74e505acac998a95a9ca7a9ec2

Match the constructor of SuggestedWords to the Builder call.

We have to match one way or another, and the argument order to the
Builder call is more logical.

Change-Id: Iac7c3a351c2687cb294d6a4924fd9cb20ca95177

java/src/com/android/inputmethod/latin/SuggestedWords.java

diff --git a/java/src/com/android/inputmethod/latin/SuggestedWords.java b/java/src/com/android/inputmethod/latin/SuggestedWords.java
index 758b81e..1bc02b5 100644
--- a/java/src/com/android/inputmethod/latin/SuggestedWords.java
+++ b/java/src/com/android/inputmethod/latin/SuggestedWords.java
@@ -24,8 +24,8 @@
 import java.util.List;
 
 public class SuggestedWords {
-    public static final SuggestedWords EMPTY = new SuggestedWords(false, false, false, false,
-            false, Collections.<SuggestedWordInfo>emptyList());
+    public static final SuggestedWords EMPTY = new SuggestedWords(
+            Collections.<SuggestedWordInfo>emptyList(), false, false, false, false, false);
 
     public final boolean mTypedWordValid;
     public final boolean mHasAutoCorrectionCandidate;
@@ -33,18 +33,18 @@
     public final boolean mAllowsToBeAutoCorrected;
     private final List<SuggestedWordInfo> mSuggestedWordInfoList;
 
-    private SuggestedWords(final boolean typedWordValid,
+    private SuggestedWords(final List<SuggestedWordInfo> suggestedWordInfoList,
+            final boolean typedWordValid,
             final boolean hasAutoCorrectionCandidate,
-            final boolean isPunctuationSuggestions,
-            final boolean shouldBlockAutoCorrectionBySafetyNet,
             final boolean allowsToBeAutoCorrected,
-            final List<SuggestedWordInfo> suggestedWordInfoList) {
+            final boolean isPunctuationSuggestions,
+            final boolean shouldBlockAutoCorrectionBySafetyNet) {
+        mSuggestedWordInfoList = suggestedWordInfoList;
         mTypedWordValid = typedWordValid;
         mHasAutoCorrectionCandidate = hasAutoCorrectionCandidate
                 && !shouldBlockAutoCorrectionBySafetyNet;
-        mIsPunctuationSuggestions = isPunctuationSuggestions;
         mAllowsToBeAutoCorrected = allowsToBeAutoCorrected;
-        mSuggestedWordInfoList = suggestedWordInfoList;
+        mIsPunctuationSuggestions = isPunctuationSuggestions;
     }
 
     public int size() {
@@ -99,9 +99,9 @@
         }
 
         public SuggestedWords build() {
-            return new SuggestedWords(mTypedWordValid, mHasMinimalSuggestion,
-                    mIsPunctuationSuggestions, mShouldBlockAutoCorrectionBySafetyNet,
-                    mAllowsToBeAutoCorrected, mSuggestedWordInfoList);
+            return new SuggestedWords(mSuggestedWordInfoList, mTypedWordValid,
+                    mHasMinimalSuggestion, mAllowsToBeAutoCorrected,
+                    mIsPunctuationSuggestions, mShouldBlockAutoCorrectionBySafetyNet);
         }
     }