aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorsatok <satok@google.com>2012-08-12 18:29:15 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-12 18:29:16 -0700
commit814510305c21b3081414e75e040dec4b73f6cdf3 (patch)
treec7d1dc030f9dc4c8eb393de59e0d0c0fa159c1b4 /java/src
parent9b6b2798078d0b179af35a2cde894e19dbd11a05 (diff)
parent847c8dfe17c31c88d869ae469194edf574c9a474 (diff)
downloadlatinime-814510305c21b3081414e75e040dec4b73f6cdf3.tar.gz
latinime-814510305c21b3081414e75e040dec4b73f6cdf3.tar.xz
latinime-814510305c21b3081414e75e040dec4b73f6cdf3.zip
Merge "Fix JNI" into jb-mr1-dev
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/BinaryDictionary.java1
-rw-r--r--java/src/com/android/inputmethod/latin/DicTraverseSession.java8
2 files changed, 5 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionary.java b/java/src/com/android/inputmethod/latin/BinaryDictionary.java
index 9b85fb65a..f0f5cd320 100644
--- a/java/src/com/android/inputmethod/latin/BinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/BinaryDictionary.java
@@ -79,6 +79,7 @@ public class BinaryDictionary extends Dictionary {
mUseFullEditDistance = useFullEditDistance;
loadDictionary(filename, offset, length);
mDicTraverseSession = new DicTraverseSession(locale);
+ mDicTraverseSession.initSession(mNativeDict);
}
static {
diff --git a/java/src/com/android/inputmethod/latin/DicTraverseSession.java b/java/src/com/android/inputmethod/latin/DicTraverseSession.java
index 4c3654213..c76815363 100644
--- a/java/src/com/android/inputmethod/latin/DicTraverseSession.java
+++ b/java/src/com/android/inputmethod/latin/DicTraverseSession.java
@@ -23,8 +23,8 @@ public class DicTraverseSession {
JniUtils.loadNativeLibrary();
}
private native long setDicTraverseSessionNative(String locale);
- //private native void initDicTraverseSessionNative(long nativeDicTraverseSession,
- //long dictionary, int[] previousWord, int previousWordLength);
+ private native void initDicTraverseSessionNative(long nativeDicTraverseSession,
+ long dictionary, int[] previousWord, int previousWordLength);
private native void releaseDicTraverseSessionNative(long nativeDicTraverseSession);
private long mNativeDicTraverseSession;
@@ -43,8 +43,8 @@ public class DicTraverseSession {
}
public void initSession(long dictionary, int[] previousWord, int previousWordLength) {
- //initDicTraverseSessionNative(
- //mNativeDicTraverseSession, dictionary, previousWord, previousWordLength);
+ initDicTraverseSessionNative(
+ mNativeDicTraverseSession, dictionary, previousWord, previousWordLength);
}
private final long createNativeDicTraverseSession(String locale) {