Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 674ffcdf authored by Jean Chalard's avatar Jean Chalard
Browse files

Make an add into a set. 

This method now only sets words, so it should be named set.
The functionality is identical since there are no more places
where the list is reused.
This will also allow to make the list final in an upcoming change.

Change-Id: I25b0c7d7f13c3fa5d89806f01f48f1026769603f
parent d6662ecd

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

+2 −2
Original line number Diff line number Diff line
@@ -927,7 +927,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 
                    SuggestedWords.Builder.getFromApplicationSpecifiedCompletions(

                            applicationSpecifiedCompletions);

            SuggestedWords.Builder builder = new SuggestedWords.Builder()

                    .addWords(applicationSuggestedWords)

                    .setWords(applicationSuggestedWords)

                    .setTypedWordValid(false)

                    .setHasMinimalSuggestion(false);

            // When in fullscreen mode, show completions generated by the application
@@ -1787,7 +1787,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 
                    SuggestedWords.Builder.getTypedWordAndPreviousSuggestions(

                            typedWord, previousSuggestions);

            final SuggestedWords.Builder obsoleteSuggestionsBuilder = new SuggestedWords.Builder()

                    .addWords(typedWordAndPreviousSuggestions)

                    .setWords(typedWordAndPreviousSuggestions)

                    .setTypedWordValid(false)

                    .setHasMinimalSuggestion(false);

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

+2 −2
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ public class SettingsValues { 
            }

        }

        final SuggestedWords.Builder builder = new SuggestedWords.Builder()

                .addWords(puncList)

                .setWords(puncList)

                .setIsPunctuationSuggestions();

        return builder.build();

    }
@@ -204,7 +204,7 @@ public class SettingsValues { 
            }

        }

        final SuggestedWords.Builder builder = new SuggestedWords.Builder()

                .addWords(puncOutputTextList)

                .setWords(puncOutputTextList)

                .setIsPunctuationSuggestions();

        return builder.build();

    }

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

+3 −3
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ public class Suggest implements Dictionary.WordCallback { 
        StringUtils.removeDupes(mSuggestions);



        return new SuggestedWords.Builder()

                .addWords(SuggestedWords.Builder.getFromCharSequenceList(mSuggestions))

                .setWords(SuggestedWords.Builder.getFromCharSequenceList(mSuggestions))

                .setAllowsToBeAutoCorrected(false)

                .setHasAutoCorrection(false);

    }
@@ -424,12 +424,12 @@ public class Suggest implements Dictionary.WordCallback { 
                scoreInfoList.add(new SuggestedWords.SuggestedWordInfo(mSuggestions.get(i),

                        "--", false));

            }

            builder = new SuggestedWords.Builder().addWords(scoreInfoList)

            builder = new SuggestedWords.Builder().setWords(scoreInfoList)

                    .setAllowsToBeAutoCorrected(allowsToBeAutoCorrected)

                    .setHasAutoCorrection(hasAutoCorrection);

        } else {

            builder = new SuggestedWords.Builder()

                    .addWords(SuggestedWords.Builder.getFromCharSequenceList(mSuggestions))

                    .setWords(SuggestedWords.Builder.getFromCharSequenceList(mSuggestions))

                    .setAllowsToBeAutoCorrected(allowsToBeAutoCorrected)

                    .setHasAutoCorrection(hasAutoCorrection);

        }

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

+6 −5
Original line number Diff line number Diff line
@@ -87,12 +87,13 @@ public class SuggestedWords { 
            // Nothing to do here.

        }



        // TODO: compatibility for tests. Remove this once tests are okay.

        public Builder addWords(List<SuggestedWordInfo> suggestedWordInfoList) {

            final int N = suggestedWordInfoList.size();

            for (int i = 0; i < N; ++i) {

                SuggestedWordInfo suggestedWordInfo = suggestedWordInfoList.get(i);

                addWord(suggestedWordInfo.mWord, suggestedWordInfo);

            return setWords(suggestedWordInfoList);

        }



        public Builder setWords(List<SuggestedWordInfo> suggestedWordInfoList) {

            mSuggestedWordInfoList = suggestedWordInfoList;

            return this;

        }