From 251f302985bc491f4dd54983e9c69c5dc76cb834 Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Wed, 11 Jul 2012 12:56:57 +0900
Subject: [PATCH] Stop using a redundant method (A108)
Change-Id: Iffc0bae0a273419e7c50d69526c0c8e402c6461c
---
.../inputmethod/latin/BinaryDictionary.java | 23 ++++++++-----------
1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionary.java b/java/src/com/android/inputmethod/latin/BinaryDictionary.java
index db8d3077db..271119bfb4 100644
--- a/java/src/com/android/inputmethod/latin/BinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/BinaryDictionary.java
@@ -124,22 +124,17 @@ public class BinaryDictionary extends Dictionary {
}
}
- final int count;
- if (!isGesture && composerSize <= 1) {
- if (TextUtils.isEmpty(prevWord)) return null;
- int tmpCount = getBigramsNative(mNativeDict, prevWordCodePointArray,
- prevWordCodePointArray.length, mInputCodes, composerSize,
- mOutputChars, mOutputScores);
- count = Math.min(tmpCount, MAX_PREDICTIONS);
- } else {
- final InputPointers ips = composer.getInputPointers();
- final int codesSize = isGesture ? ips.getPointerSize() : composerSize;
- // proximityInfo and/or prevWordForBigrams may not be null.
- count = getSuggestionsNative(mNativeDict, proximityInfo.getNativeProximityInfo(),
- ips.getXCoordinates(), ips.getYCoordinates(), ips.getTimes(), ips.getPointerIds(),
+ // TODO: move this test to native code.
+ if (composerSize <= 1 && TextUtils.isEmpty(prevWord)) return null;
+ final InputPointers ips = composer.getInputPointers();
+ final int codesSize = isGesture ? ips.getPointerSize() : composerSize;
+ // proximityInfo and/or prevWordForBigrams may not be null.
+ final int tmpCount = getSuggestionsNative(mNativeDict,
+ proximityInfo.getNativeProximityInfo(), ips.getXCoordinates(),
+ ips.getYCoordinates(), ips.getTimes(), ips.getPointerIds(),
mInputCodes, codesSize, 0 /* unused */, isGesture, prevWordCodePointArray,
mUseFullEditDistance, mOutputChars, mOutputScores, mSpaceIndices);
- }
+ final int count = Math.min(tmpCount, MAX_PREDICTIONS);
final ArrayList<SuggestedWordInfo> suggestions = new ArrayList<SuggestedWordInfo>();
for (int j = 0; j < count; ++j) {
--
GitLab