diff options
| author |   satok <satok@google.com> | 2012-03-23 03:24:08 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-03-23 03:24:08 -0700 |
| commit | 8980bd4a25e2a4368441d575c91bcbe8c8624969 (patch) | |
| tree | fb87026a97412b5d986b285d59bef1d60024c656 /java/src | |
| parent | c4f69e7d68b0f7a5aa58388cafe2c1cca98d897b (diff) | |
| parent | 9df4a4527a9bc2e671f644d6e2ec0121385740ec (diff) | |
| download | latinime-8980bd4a25e2a4368441d575c91bcbe8c8624969.tar.gz latinime-8980bd4a25e2a4368441d575c91bcbe8c8624969.tar.xz latinime-8980bd4a25e2a4368441d575c91bcbe8c8624969.zip | |
Merge "Cleanup jni 1"
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/BinaryDictionary.java | 8 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/WordComposer.java | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionary.java b/java/src/com/android/inputmethod/latin/BinaryDictionary.java index 7502513f7..a9df1ce12 100644 --- a/java/src/com/android/inputmethod/latin/BinaryDictionary.java +++ b/java/src/com/android/inputmethod/latin/BinaryDictionary.java @@ -205,9 +205,11 @@ public class BinaryDictionary extends Dictionary { Arrays.fill(mInputCodes, WordComposer.NOT_A_CODE); for (int i = 0; i < codesSize; i++) { - int[] alternatives = codes.getCodesAt(i); - System.arraycopy(alternatives, 0, mInputCodes, i * MAX_PROXIMITY_CHARS_SIZE, - Math.min(alternatives.length, MAX_PROXIMITY_CHARS_SIZE)); + final int[] alternatives = codes.getCodesAt(i); + if (alternatives == null || alternatives.length < 1) { + continue; + } + mInputCodes[i] = alternatives[0]; } Arrays.fill(outputChars, (char) 0); Arrays.fill(scores, 0); diff --git a/java/src/com/android/inputmethod/latin/WordComposer.java b/java/src/com/android/inputmethod/latin/WordComposer.java index ebd802fae..cabf68099 100644 --- a/java/src/com/android/inputmethod/latin/WordComposer.java +++ b/java/src/com/android/inputmethod/latin/WordComposer.java @@ -20,8 +20,6 @@ import com.android.inputmethod.keyboard.Key; import com.android.inputmethod.keyboard.KeyDetector; import com.android.inputmethod.keyboard.Keyboard; import com.android.inputmethod.keyboard.KeyboardActionListener; -import com.android.inputmethod.latin.spellcheck.AndroidSpellCheckerService; -import com.android.inputmethod.latin.spellcheck.SpellCheckerProximityInfo; import java.util.ArrayList; import java.util.Arrays; |