From 33cc82537466fbc02c1aff0825c975a94c04c464 Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Wed, 14 Mar 2012 15:33:47 +0900 Subject: [PATCH] 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 --- .../inputmethod/latin/SuggestedWords.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/java/src/com/android/inputmethod/latin/SuggestedWords.java b/java/src/com/android/inputmethod/latin/SuggestedWords.java index 758b81e94..1bc02b52b 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.HashSet; import java.util.List; public class SuggestedWords { - public static final SuggestedWords EMPTY = new SuggestedWords(false, false, false, false, - false, Collections.emptyList()); + public static final SuggestedWords EMPTY = new SuggestedWords( + Collections.emptyList(), false, false, false, false, false); public final boolean mTypedWordValid; public final boolean mHasAutoCorrectionCandidate; @@ -33,18 +33,18 @@ public class SuggestedWords { public final boolean mAllowsToBeAutoCorrected; private final List mSuggestedWordInfoList; - private SuggestedWords(final boolean typedWordValid, + private SuggestedWords(final List suggestedWordInfoList, + final boolean typedWordValid, final boolean hasAutoCorrectionCandidate, - final boolean isPunctuationSuggestions, - final boolean shouldBlockAutoCorrectionBySafetyNet, final boolean allowsToBeAutoCorrected, - final List 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 class SuggestedWords { } public SuggestedWords build() { - return new SuggestedWords(mTypedWordValid, mHasMinimalSuggestion, - mIsPunctuationSuggestions, mShouldBlockAutoCorrectionBySafetyNet, - mAllowsToBeAutoCorrected, mSuggestedWordInfoList); + return new SuggestedWords(mSuggestedWordInfoList, mTypedWordValid, + mHasMinimalSuggestion, mAllowsToBeAutoCorrected, + mIsPunctuationSuggestions, mShouldBlockAutoCorrectionBySafetyNet); } }