commit 089c11a08665d3670be9ca1678ac06545ecfcd6f
author Jean Chalard <jchalard@google.com> Wed Jun 27 17:59:58 2012 +0900
committer Jean Chalard <jchalard@google.com> Wed Jun 27 17:59:58 2012 +0900
tree 3cc83ea79ffe2fe346e8cc869c993b4add3a5cee
parent d05d1d04d09324e967b53ac899a0dfd4fd09660e

Cleanup

Change-Id: I575f22330bf6881af1d9a35f22b51b7bf2198113

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

diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index 980d703..7c72f7f 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -231,7 +231,7 @@
                         localSuggestions.addAll(dictionary.getBigrams(wordComposer, lowerPrevWord));
                     }
                     for (final SuggestedWordInfo localSuggestion : localSuggestions) {
-                        addWord(localSuggestion, key, suggestionsContainer, consideredWord);
+                        addWord(localSuggestion, key, suggestionsContainer);
                     }
                 }
             }
@@ -254,7 +254,7 @@
                 final ArrayList<SuggestedWordInfo> localSuggestions = dictionary.getWords(
                         wordComposerForLookup, prevWordForBigram, proximityInfo);
                 for (final SuggestedWordInfo suggestion : localSuggestions) {
-                    addWord(suggestion, key, suggestionsContainer, consideredWord);
+                    addWord(suggestion, key, suggestionsContainer);
                 }
             }
         }
@@ -376,31 +376,22 @@
     private static final SuggestedWordInfoComparator sSuggestedWordInfoComparator =
             new SuggestedWordInfoComparator();
 
-    public boolean addWord(final SuggestedWordInfo wordInfo, final String dictTypeKey,
-            final ArrayList<SuggestedWordInfo> suggestions, final String consideredWord) {
-        final int prefMaxSuggestions = MAX_SUGGESTIONS;
-
-        final CharSequence word = wordInfo.mWord;
-        final int score = wordInfo.mScore;
-        int pos = 0;
-
+    public void addWord(final SuggestedWordInfo wordInfo, final String dictTypeKey,
+            final ArrayList<SuggestedWordInfo> suggestions) {
         final int index =
                 Collections.binarySearch(suggestions, wordInfo, sSuggestedWordInfoComparator);
         // binarySearch returns the index of an equal word info if found. If not found
         // it returns -insertionPoint - 1. We want the insertion point, so:
-        pos = index >= 0 ? index : -index - 1;
-        if (pos >= prefMaxSuggestions) {
-            return true;
-        }
+        final int pos = index >= 0 ? index : -index - 1;
+        if (pos >= MAX_SUGGESTIONS) return;
 
         final SuggestedWordInfo transformedWordInfo = getTransformedSuggestedWordInfo(wordInfo,
                 mLocale, mIsAllUpperCase, mIsFirstCharCapitalized, mTrailingSingleQuotesCount);
         suggestions.add(pos, transformedWordInfo);
-        if (suggestions.size() > prefMaxSuggestions) {
-            suggestions.remove(prefMaxSuggestions);
+        if (suggestions.size() > MAX_SUGGESTIONS) {
+            suggestions.remove(MAX_SUGGESTIONS);
         }
         LatinImeLogger.onAddSuggestedWord(transformedWordInfo.mWord.toString(), dictTypeKey);
-        return true;
     }
 
     private static SuggestedWordInfo getTransformedSuggestedWordInfo(