commit de19ab878dd70ca9b2a9a3b18ee48c44a93a0b38
author Jean Chalard <jchalard@google.com> Thu Mar 08 22:22:56 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 08 22:22:56 2012 -0800
tree 7a4e04e05da6e22e2e6f1940fc37449912f56ade
parent 5a7cb9305a03746e779770b3677ee0c9c85ea4ca
parent 92146f29269a799935c00c530d05829d7f17cc9e

Merge "Remove useless tests (B5)"

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 a00ccca..b6a7ce7 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -277,11 +277,9 @@
         final String consideredWord = mTrailingSingleQuotesCount > 0
                 ? typedWord.substring(0, typedWord.length() - mTrailingSingleQuotesCount)
                 : typedWord;
-        if (typedWord != null) {
-            // Treating USER_TYPED as UNIGRAM suggestion for logging now.
-            LatinImeLogger.onAddSuggestedWord(typedWord, Suggest.DIC_USER_TYPED,
-                    Dictionary.UNIGRAM);
-        }
+        // Treating USER_TYPED as UNIGRAM suggestion for logging now.
+        LatinImeLogger.onAddSuggestedWord(typedWord, Suggest.DIC_USER_TYPED,
+                Dictionary.UNIGRAM);
         mConsideredWord = consideredWord;
 
         if (wordComposer.size() <= 1 && (correctionMode == CORRECTION_FULL_BIGRAM)) {
@@ -340,8 +338,7 @@
                 }
             }
         }
-        final String consideredWordString =
-                consideredWord == null ? null : consideredWord.toString();
+        final String consideredWordString = consideredWord.toString();
 
         CharSequence whitelistedWord = capitalizeWord(mIsAllUpperCase, mIsFirstCharCapitalized,
                 mWhiteListDictionary.getWhitelistedWord(consideredWordString));
@@ -369,9 +366,7 @@
             }
         }
 
-        if (typedWord != null) {
-            mSuggestions.add(0, typedWord.toString());
-        }
+        mSuggestions.add(0, typedWord.toString());
         StringUtils.removeDupes(mSuggestions);
 
         if (DBG) {