aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/DictionaryCollection.java
diff options
context:
space:
mode:
authorKeisuke Kuroyanagi <ksk@google.com>2014-06-06 10:47:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-06 10:47:10 +0000
commitab74fd6db773b342283a1bd6093a6b7d2be52d72 (patch)
tree66a181b13c8efd95f34fd9aa13b3c26dfc68f04a /java/src/com/android/inputmethod/latin/DictionaryCollection.java
parent7950d2358e958ff7879edcbddd9b3b3ecd4fe0f4 (diff)
parent7640bb15054a84e9c2f044bd90e1a6ee429b3325 (diff)
downloadlatinime-ab74fd6db773b342283a1bd6093a6b7d2be52d72.tar.gz
latinime-ab74fd6db773b342283a1bd6093a6b7d2be52d72.tar.xz
latinime-ab74fd6db773b342283a1bd6093a6b7d2be52d72.zip
am 7640bb15: Merge "Make Distracter filter use getMaxFrequencyOfExactMatches()."
* commit '7640bb15054a84e9c2f044bd90e1a6ee429b3325': Make Distracter filter use getMaxFrequencyOfExactMatches().
Diffstat (limited to 'java/src/com/android/inputmethod/latin/DictionaryCollection.java')
-rw-r--r--java/src/com/android/inputmethod/latin/DictionaryCollection.java14
1 files changed, 11 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/DictionaryCollection.java b/java/src/com/android/inputmethod/latin/DictionaryCollection.java
index 53be28139..53c78fd00 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryCollection.java
+++ b/java/src/com/android/inputmethod/latin/DictionaryCollection.java
@@ -89,9 +89,17 @@ public final class DictionaryCollection extends Dictionary {
int maxFreq = -1;
for (int i = mDictionaries.size() - 1; i >= 0; --i) {
final int tempFreq = mDictionaries.get(i).getFrequency(word);
- if (tempFreq >= maxFreq) {
- maxFreq = tempFreq;
- }
+ maxFreq = Math.max(tempFreq, maxFreq);
+ }
+ return maxFreq;
+ }
+
+ @Override
+ public int getMaxFrequencyOfExactMatches(final String word) {
+ int maxFreq = -1;
+ for (int i = mDictionaries.size() - 1; i >= 0; --i) {
+ final int tempFreq = mDictionaries.get(i).getMaxFrequencyOfExactMatches(word);
+ maxFreq = Math.max(tempFreq, maxFreq);
}
return maxFreq;
}