aboutsummaryrefslogtreecommitdiffstats
path: root/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp
diff options
context:
space:
mode:
authorsatok <satok@google.com>2012-08-11 01:10:31 +0900
committersatok <satok@google.com>2012-08-11 13:54:01 +0900
commit847c8dfe17c31c88d869ae469194edf574c9a474 (patch)
tree57cf7a21b641cfd87d6cbe680f645f3f84d7753d /native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp
parent063c3e2171e546957d8c40575740c29f234e307c (diff)
downloadlatinime-847c8dfe17c31c88d869ae469194edf574c9a474.tar.gz
latinime-847c8dfe17c31c88d869ae469194edf574c9a474.tar.xz
latinime-847c8dfe17c31c88d869ae469194edf574c9a474.zip
Fix JNI
Change-Id: If134baf52e78fbe18b78611a23870f5d10c80955
Diffstat (limited to 'native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp')
-rw-r--r--native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp b/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp
index 6ff953874..806ff1f1d 100644
--- a/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp
+++ b/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp
@@ -28,18 +28,20 @@ static jlong latinime_setDicTraverseSession(JNIEnv *env, jobject object, jstring
return reinterpret_cast<jlong>(traverseSession);
}
-#if 0
static void latinime_initDicTraverseSession(JNIEnv *env, jobject object, jlong traverseSession,
jlong dictionary, jintArray previousWord, jint previousWordLength) {
void *ts = reinterpret_cast<void*>(traverseSession);
Dictionary *dict = reinterpret_cast<Dictionary*>(dictionary);
+ if (!previousWord) {
+ DicTraverseWrapper::initDicTraverseSession(ts, dict, 0, 0);
+ return;
+ }
int prevWord[previousWordLength];
env->GetIntArrayRegion(previousWord, 0, previousWordLength, prevWord);
DicTraverseWrapper::initDicTraverseSession(ts, dict, prevWord, previousWordLength);
}
-#endif
-static void latinime_DicTraverseSession_release(
+static void latinime_releaseDicTraverseSession(
JNIEnv *env, jobject object, jlong traverseSession) {
void *ts = reinterpret_cast<void*>(traverseSession);
DicTraverseWrapper::releaseDicTraverseSession(ts);
@@ -47,8 +49,8 @@ static void latinime_DicTraverseSession_release(
static JNINativeMethod sMethods[] = {
{"setDicTraverseSessionNative", "(Ljava/lang/String;)J", (void*)latinime_setDicTraverseSession},
- //{"initDicTraverseSessionNative", "(JJ[II)V", (void*)latinime_initDicTraverseSession},
- {"releaseDicTraverseSessionNative", "(J)V", (void*)latinime_DicTraverseSession_release}
+ {"initDicTraverseSessionNative", "(JJ[II)V", (void*)latinime_initDicTraverseSession},
+ {"releaseDicTraverseSessionNative", "(J)V", (void*)latinime_releaseDicTraverseSession}
};
int register_DicTraverseSession(JNIEnv *env) {