From f6c2200890012708709964fb1a8933ed1c3e7dd8 Mon Sep 17 00:00:00 2001 From: Satoshi Kataoka Date: Fri, 10 Aug 2012 21:04:18 +0900 Subject: [PATCH] Workaround to stop init dict traverse session Change-Id: I3d46c54a96a9fc0359ef75b9d2f8590b44164a8b --- .../com/android/inputmethod/latin/DicTraverseSession.java | 8 ++++---- .../com_android_inputmethod_latin_DicTraverseSession.cpp | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/java/src/com/android/inputmethod/latin/DicTraverseSession.java b/java/src/com/android/inputmethod/latin/DicTraverseSession.java index 160752896..4c3654213 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 previwousWordLength); + //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) { diff --git a/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp b/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp index 827e9f4aa..6ff953874 100644 --- a/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp +++ b/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp @@ -22,11 +22,13 @@ #include "jni_common.h" namespace latinime { +class Dictionary; static jlong latinime_setDicTraverseSession(JNIEnv *env, jobject object, jstring localeJStr) { void *traverseSession = DicTraverseWrapper::getDicTraverseSession(env, localeJStr); return reinterpret_cast(traverseSession); } +#if 0 static void latinime_initDicTraverseSession(JNIEnv *env, jobject object, jlong traverseSession, jlong dictionary, jintArray previousWord, jint previousWordLength) { void *ts = reinterpret_cast(traverseSession); @@ -35,6 +37,7 @@ static void latinime_initDicTraverseSession(JNIEnv *env, jobject object, jlong t env->GetIntArrayRegion(previousWord, 0, previousWordLength, prevWord); DicTraverseWrapper::initDicTraverseSession(ts, dict, prevWord, previousWordLength); } +#endif static void latinime_DicTraverseSession_release( JNIEnv *env, jobject object, jlong traverseSession) { @@ -44,7 +47,7 @@ static void latinime_DicTraverseSession_release( static JNINativeMethod sMethods[] = { {"setDicTraverseSessionNative", "(Ljava/lang/String;)J", (void*)latinime_setDicTraverseSession}, - {"initDicTraverseSessionNative", "(JJ[II)V", (void*)latinime_initDicTraverseSession}, + //{"initDicTraverseSessionNative", "(JJ[II)V", (void*)latinime_initDicTraverseSession}, {"releaseDicTraverseSessionNative", "(J)V", (void*)latinime_DicTraverseSession_release} };