nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup (A103) 

Change-Id: Ib5ebddfdb87ef71a2f8d859fb45d3ac78040e97a
main
Jean Chalard 2012-07-10 20:50:52 +09:00
parent 5e21ea1a35
commit e4e7e5fc82
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
java/src/com/android/inputmethod/latin/BinaryDictionary.java
View File

@ -116,7 +116,8 @@ public class BinaryDictionary extends Dictionary {
? null : StringUtils.toCodePointArray(prevWord.toString()); ? null : StringUtils.toCodePointArray(prevWord.toString());
final int composerSize = composer.size(); final int composerSize = composer.size();
if (composerSize <= 1 || !composer.isBatchMode()) { final boolean isGesture = composer.isBatchMode();
if (composerSize <= 1 || !isGesture) {
if (composerSize > MAX_WORD_LENGTH - 1) return null; if (composerSize > MAX_WORD_LENGTH - 1) return null;
for (int i = 0; i < composerSize; i++) { for (int i = 0; i < composerSize; i++) {
mInputCodes[i] = composer.getCodeAt(i); mInputCodes[i] = composer.getCodeAt(i);
@ -124,7 +125,7 @@ public class BinaryDictionary extends Dictionary {
} }
final int count; final int count;
if (!composer.isBatchMode() && composer.size() <= 1) { if (!isGesture && composerSize <= 1) {
if (TextUtils.isEmpty(prevWord)) return null; if (TextUtils.isEmpty(prevWord)) return null;
int tmpCount = getBigramsNative(mNativeDict, prevWordCodePointArray, int tmpCount = getBigramsNative(mNativeDict, prevWordCodePointArray,
prevWordCodePointArray.length, mInputCodes, composerSize, prevWordCodePointArray.length, mInputCodes, composerSize,
@ -132,23 +133,17 @@ public class BinaryDictionary extends Dictionary {
count = Math.min(tmpCount, MAX_BIGRAMS); count = Math.min(tmpCount, MAX_BIGRAMS);
} else { } else {
final InputPointers ips = composer.getInputPointers(); final InputPointers ips = composer.getInputPointers();
final boolean isGesture = composer.isBatchMode(); final int codesSize = isGesture ? ips.getPointerSize() : composerSize;
final int codesSize;
if (isGesture) {
codesSize = ips.getPointerSize();
} else {
codesSize = composer.size();
}
// proximityInfo and/or prevWordForBigrams may not be null. // proximityInfo and/or prevWordForBigrams may not be null.
count = getSuggestionsNative(mNativeDict, proximityInfo.getNativeProximityInfo(), count = getSuggestionsNative(mNativeDict, proximityInfo.getNativeProximityInfo(),
ips.getXCoordinates(), ips.getYCoordinates(), ips.getTimes(), ips.getPointerIds(), ips.getXCoordinates(), ips.getYCoordinates(), ips.getTimes(), ips.getPointerIds(),
mInputCodes, codesSize, 0 /* unused */, isGesture, prevWordCodePointArray, mInputCodes, codesSize, 0 /* unused */, isGesture, prevWordCodePointArray,
mUseFullEditDistance, mOutputChars, mOutputScores, mSpaceIndices); mUseFullEditDistance, mOutputChars, mOutputScores, mSpaceIndices);
} }
final ArrayList<SuggestedWordInfo> suggestions = new ArrayList<SuggestedWordInfo>(); final ArrayList<SuggestedWordInfo> suggestions = new ArrayList<SuggestedWordInfo>();
for (int j = 0; j < count; ++j) { for (int j = 0; j < count; ++j) {
if (composer.size() > 0 && mOutputScores[j] < 1) break; if (composerSize > 0 && mOutputScores[j] < 1) break;
final int start = j * MAX_WORD_LENGTH; final int start = j * MAX_WORD_LENGTH;
int len = 0; int len = 0;
while (len < MAX_WORD_LENGTH && mOutputChars[start + len] != 0) { while (len < MAX_WORD_LENGTH && mOutputChars[start + len] != 0) {