aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2012-07-10 20:47:01 +0900
committerJean Chalard <jchalard@google.com>2012-07-11 14:57:51 +0900
commitd6c610400e910ef2870371439c7d940842a1b73d (patch)
tree7ccf3b4e11ad0a8e3abb92793840680bcda53457 /java/src
parenteb1443883f0b645459976f2d0471ccbb42ee946e (diff)
downloadlatinime-d6c610400e910ef2870371439c7d940842a1b73d.tar.gz
latinime-d6c610400e910ef2870371439c7d940842a1b73d.tar.xz
latinime-d6c610400e910ef2870371439c7d940842a1b73d.zip
Inline a wrapper method (A101)
Change-Id: I6ce856ff49a8f8c696851b2487590704010fc758
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/BinaryDictionary.java18
1 files changed, 4 insertions, 14 deletions
diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionary.java b/java/src/com/android/inputmethod/latin/BinaryDictionary.java
index 3b294462e..90a037372 100644
--- a/java/src/com/android/inputmethod/latin/BinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/BinaryDictionary.java
@@ -126,7 +126,10 @@ public class BinaryDictionary extends Dictionary {
final int count;
if (!composer.isBatchMode() && composer.size() <= 1) {
if (TextUtils.isEmpty(prevWord)) return null;
- count = getBigramsInternal(composer, prevWordCodePointArray);
+ int tmpCount = getBigramsNative(mNativeDict, prevWordCodePointArray,
+ prevWordCodePointArray.length, mInputCodes, composerSize,
+ mOutputChars, mOutputScores, MAX_WORD_LENGTH, MAX_BIGRAMS);
+ count = Math.min(tmpCount, MAX_BIGRAMS);
} else {
count = getWordsInternal(composer, prevWordCodePointArray, proximityInfo);
}
@@ -148,19 +151,6 @@ public class BinaryDictionary extends Dictionary {
}
// TODO: move to native code
- private int getBigramsInternal(final WordComposer codes,
- final int[] previousWord) {
- int codesSize = codes.size();
-
- int count = getBigramsNative(mNativeDict, previousWord, previousWord.length, mInputCodes,
- codesSize, mOutputChars, mOutputScores, MAX_WORD_LENGTH, MAX_BIGRAMS);
- if (count > MAX_BIGRAMS) {
- count = MAX_BIGRAMS;
- }
- return count;
- }
-
- // TODO: move to native code
// proximityInfo and/or prevWordForBigrams may not be null.
private int getWordsInternal(final WordComposer codes,
final int[] prevWord, final ProximityInfo proximityInfo) {