diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-10-21 15:10:07 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-10-21 15:10:07 +0000 |
| commit | d94645097a8aab6c44c6a20553f81954009dbc5b (patch) | |
| tree | 8743018b4a2fe61f16943783f5b2331592e3a69d /java/src/com/android/inputmethod/latin/makedict/WordProperty.java | |
| parent | 20ae86172e644b1aae97e0ea22c41433bd7ccc9e (diff) | |
| parent | 46a007261fcbfbe887e22ecdf16307f95b1e4024 (diff) | |
| download | latinime-d94645097a8aab6c44c6a20553f81954009dbc5b.tar.gz latinime-d94645097a8aab6c44c6a20553f81954009dbc5b.tar.xz latinime-d94645097a8aab6c44c6a20553f81954009dbc5b.zip | |
am 46a00726: Merge "Fix some compiler warnings"
* commit '46a007261fcbfbe887e22ecdf16307f95b1e4024':
Fix some compiler warnings
Diffstat (limited to 'java/src/com/android/inputmethod/latin/makedict/WordProperty.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/makedict/WordProperty.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/java/src/com/android/inputmethod/latin/makedict/WordProperty.java b/java/src/com/android/inputmethod/latin/makedict/WordProperty.java index 5c6d8f5cb..b129c3e40 100644 --- a/java/src/com/android/inputmethod/latin/makedict/WordProperty.java +++ b/java/src/com/android/inputmethod/latin/makedict/WordProperty.java @@ -18,6 +18,7 @@ package com.android.inputmethod.latin.makedict; import com.android.inputmethod.annotations.UsedForTesting; import com.android.inputmethod.latin.BinaryDictionary; +import com.android.inputmethod.latin.Dictionary; import com.android.inputmethod.latin.NgramContext; import com.android.inputmethod.latin.NgramContext.WordInfo; import com.android.inputmethod.latin.utils.CombinedFormatUtils; @@ -61,10 +62,8 @@ public final class WordProperty implements Comparable<WordProperty> { } else { mNgrams = new ArrayList<>(); final NgramContext ngramContext = new NgramContext(new WordInfo(mWord)); - if (bigrams != null) { - for (final WeightedString bigramTarget : bigrams) { - mNgrams.add(new NgramProperty(bigramTarget, ngramContext)); - } + for (final WeightedString bigramTarget : bigrams) { + mNgrams.add(new NgramProperty(bigramTarget, ngramContext)); } } mIsBeginningOfSentence = false; @@ -104,7 +103,8 @@ public final class WordProperty implements Comparable<WordProperty> { final int relatedNgramCount = ngramTargets.size(); final WordInfo currentWordInfo = - mIsBeginningOfSentence ? WordInfo.BEGINNING_OF_SENTENCE : new WordInfo(mWord); + mIsBeginningOfSentence ? WordInfo.BEGINNING_OF_SENTENCE_WORD_INFO + : new WordInfo(mWord); final NgramContext ngramContext = new NgramContext(currentWordInfo); for (int i = 0; i < relatedNgramCount; i++) { final String ngramTargetString = @@ -202,7 +202,7 @@ public final class WordProperty implements Comparable<WordProperty> { @UsedForTesting public boolean isValid() { - return getProbability() != BinaryDictionary.NOT_A_PROBABILITY; + return getProbability() != Dictionary.NOT_A_PROBABILITY; } @Override |