From c4e4dfe17dd60d200b851d228ce718543900a1fc Mon Sep 17 00:00:00 2001 From: Satoshi Kataoka Date: Wed, 8 Aug 2012 19:40:44 +0900 Subject: [PATCH] Add traverse session Bug: 6942265 Change-Id: I384cf701f5ee44c4b1037e5b8ddfa3d570286f55 --- .../inputmethod/latin/BinaryDictionary.java | 3 + .../inputmethod/latin/DicTraverseSession.java | 59 +++++++++++++++++++ native/jni/Android.mk | 1 + ...d_inputmethod_latin_DicTraverseSession.cpp | 49 +++++++++++++++ ...oid_inputmethod_latin_DicTraverseSession.h | 46 +++++++++++++++ native/jni/jni_common.cpp | 6 ++ 6 files changed, 164 insertions(+) create mode 100644 java/src/com/android/inputmethod/latin/DicTraverseSession.java create mode 100644 native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp create mode 100644 native/jni/com_android_inputmethod_latin_DicTraverseSession.h diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionary.java b/java/src/com/android/inputmethod/latin/BinaryDictionary.java index 534cffb2d..7e6c53e2f 100644 --- a/java/src/com/android/inputmethod/latin/BinaryDictionary.java +++ b/java/src/com/android/inputmethod/latin/BinaryDictionary.java @@ -58,6 +58,7 @@ public class BinaryDictionary extends Dictionary { private final int[] mOutputTypes = new int[MAX_RESULTS]; private final boolean mUseFullEditDistance; + private final DicTraverseSession mDicTraverseSession; /** * Constructor for the binary dictionary. This is supposed to be called from the @@ -76,6 +77,7 @@ public class BinaryDictionary extends Dictionary { super(dictType); mUseFullEditDistance = useFullEditDistance; loadDictionary(filename, offset, length); + mDicTraverseSession = new DicTraverseSession(locale); } static { @@ -187,6 +189,7 @@ public class BinaryDictionary extends Dictionary { @Override public synchronized void close() { + mDicTraverseSession.close(); closeInternal(); } diff --git a/java/src/com/android/inputmethod/latin/DicTraverseSession.java b/java/src/com/android/inputmethod/latin/DicTraverseSession.java new file mode 100644 index 000000000..d0c70f3ad --- /dev/null +++ b/java/src/com/android/inputmethod/latin/DicTraverseSession.java @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2012, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.inputmethod.latin; + +import java.util.Locale; + +public class DicTraverseSession { + static { + JniUtils.loadNativeLibrary(); + } + + private long mNativeDicTraverseSession; + + public DicTraverseSession(Locale locale) { + mNativeDicTraverseSession = createNativeDicTraverseSession( + locale != null ? locale.toString() : ""); + } + + private native long setDicTraverseSessionNative(String locale); + private native void releaseDicTraverseSessionNative(long nativeDicTraverseSession); + + private final long createNativeDicTraverseSession(String locale) { + return setDicTraverseSessionNative(locale); + } + + private void closeInternal() { + if (mNativeDicTraverseSession != 0) { + releaseDicTraverseSessionNative(mNativeDicTraverseSession); + mNativeDicTraverseSession = 0; + } + } + + public void close() { + closeInternal(); + } + + @Override + protected void finalize() throws Throwable { + try { + closeInternal(); + } finally { + super.finalize(); + } + } +} diff --git a/native/jni/Android.mk b/native/jni/Android.mk index 9f9958377..1b7301b19 100644 --- a/native/jni/Android.mk +++ b/native/jni/Android.mk @@ -36,6 +36,7 @@ LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function LATIN_IME_JNI_SRC_FILES := \ com_android_inputmethod_keyboard_ProximityInfo.cpp \ com_android_inputmethod_latin_BinaryDictionary.cpp \ + com_android_inputmethod_latin_DicTraverseSession.cpp \ com_android_inputmethod_latin_NativeUtils.cpp \ jni_common.cpp diff --git a/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp b/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp new file mode 100644 index 000000000..8ee0450e4 --- /dev/null +++ b/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2012, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#define LOG_TAG "LatinIME: jni: Session" + +#include "com_android_inputmethod_latin_DicTraverseSession.h" +#include "jni.h" +#include "jni_common.h" + +namespace latinime { +void *(*DicTraverseWrapper::sDicTraverseSessionFactoryMethod)() = 0; +void (*DicTraverseWrapper::sDicTraverseSessionReleaseMethod)(void *) = 0; + +static jlong latinime_setDicTraverseSession(JNIEnv *env, jobject object, + jstring localejStr) { + void *session = DicTraverseWrapper::getDicTraverseSession(); + return reinterpret_cast(session); +} + +static void latinime_DicTraverseSession_release(JNIEnv *env, jobject object, jlong session) { + void *pi = reinterpret_cast(session); + if (!pi) return; + DicTraverseWrapper::releaseDicTraverseSession(pi); +} + +static JNINativeMethod sMethods[] = { + {"setDicTraverseSessionNative", "(Ljava/lang/String;)J", (void*)latinime_setDicTraverseSession}, + {"releaseDicTraverseSessionNative", "(J)V", (void*)latinime_DicTraverseSession_release} +}; + +int register_DicTraverseSession(JNIEnv *env) { + const char *const kClassPathName = "com/android/inputmethod/latin/DicTraverseSession"; + return registerNativeMethods(env, kClassPathName, sMethods, + sizeof(sMethods) / sizeof(sMethods[0])); +} +} // namespace latinime diff --git a/native/jni/com_android_inputmethod_latin_DicTraverseSession.h b/native/jni/com_android_inputmethod_latin_DicTraverseSession.h new file mode 100644 index 000000000..5238fd0af --- /dev/null +++ b/native/jni/com_android_inputmethod_latin_DicTraverseSession.h @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2012, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef _COM_ANDROID_INPUTMETHOD_LATIN_DICTRAVERSESESSION_H +#define _COM_ANDROID_INPUTMETHOD_LATIN_DICTRAVERSESESSION_H + +#include "defines.h" +#include "jni.h" + +namespace latinime { + +// TODO: Remove +class DicTraverseWrapper { + public: + static void *getDicTraverseSession() { + if (sDicTraverseSessionFactoryMethod) { + return sDicTraverseSessionFactoryMethod(); + } + return 0; + } + static void releaseDicTraverseSession(void *session) { + if (sDicTraverseSessionReleaseMethod) { + sDicTraverseSessionReleaseMethod(session); + } + } + private: + DISALLOW_IMPLICIT_CONSTRUCTORS(DicTraverseWrapper); + static void *(*sDicTraverseSessionFactoryMethod)(); + static void (*sDicTraverseSessionReleaseMethod)(void *); +}; +int register_DicTraverseSession(JNIEnv *env); +} // namespace latinime +#endif // _COM_ANDROID_INPUTMETHOD_LATIN_DICTRAVERSESESSION_H diff --git a/native/jni/jni_common.cpp b/native/jni/jni_common.cpp index 105a4dc4c..dde5f644e 100644 --- a/native/jni/jni_common.cpp +++ b/native/jni/jni_common.cpp @@ -18,6 +18,7 @@ #include "com_android_inputmethod_keyboard_ProximityInfo.h" #include "com_android_inputmethod_latin_BinaryDictionary.h" +#include "com_android_inputmethod_latin_DicTraverseSession.h" #include "com_android_inputmethod_latin_NativeUtils.h" #include "defines.h" #include "jni.h" @@ -45,6 +46,11 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) { goto bail; } + if (!register_DicTraverseSession(env)) { + AKLOGE("ERROR: DicTraverseSession native registration failed"); + goto bail; + } + if (!register_ProximityInfo(env)) { AKLOGE("ERROR: ProximityInfo native registration failed"); goto bail;