From aaefc4b30c2cfac105374eb2ae83cf34c975a0cc Mon Sep 17 00:00:00 2001 From: Ken Wakasa Date: Tue, 8 Jan 2013 17:57:26 +0900 Subject: [PATCH] Yet another small cleanups Change-Id: Ie940c4d4d9d85c95e2f04ba23f00a54ba3dc53bf --- ...oid_inputmethod_keyboard_ProximityInfo.cpp | 4 +-- ...droid_inputmethod_keyboard_ProximityInfo.h | 2 +- ...oid_inputmethod_latin_BinaryDictionary.cpp | 5 ++- ...droid_inputmethod_latin_BinaryDictionary.h | 2 +- ...d_inputmethod_latin_DicTraverseSession.cpp | 4 +-- ...oid_inputmethod_latin_DicTraverseSession.h | 2 +- native/jni/jni_common.cpp | 35 ++++++++----------- 7 files changed, 23 insertions(+), 31 deletions(-) diff --git a/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp b/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp index 2423bb53b..4c83c582d 100644 --- a/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp +++ b/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2011, The Android Open Source Project + * Copyright (C) 2011 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 + * 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, diff --git a/native/jni/com_android_inputmethod_keyboard_ProximityInfo.h b/native/jni/com_android_inputmethod_keyboard_ProximityInfo.h index f35287144..c3503c8c3 100644 --- a/native/jni/com_android_inputmethod_keyboard_ProximityInfo.h +++ b/native/jni/com_android_inputmethod_keyboard_ProximityInfo.h @@ -5,7 +5,7 @@ * 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 + * 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, diff --git a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp index c0b858e52..4e34f98e9 100644 --- a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp +++ b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2009, The Android Open Source Project + * Copyright (C) 2009 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 + * 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, @@ -14,7 +14,6 @@ * limitations under the License. */ - #include // for memset() #define LOG_TAG "LatinIME: jni: BinaryDictionary" diff --git a/native/jni/com_android_inputmethod_latin_BinaryDictionary.h b/native/jni/com_android_inputmethod_latin_BinaryDictionary.h index 1951ba0fc..2a07f9936 100644 --- a/native/jni/com_android_inputmethod_latin_BinaryDictionary.h +++ b/native/jni/com_android_inputmethod_latin_BinaryDictionary.h @@ -5,7 +5,7 @@ * 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 + * 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, diff --git a/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp b/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp index 7bb8dc56e..73ac84cd7 100644 --- a/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp +++ b/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2012, The Android Open Source Project + * 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 + * 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, diff --git a/native/jni/com_android_inputmethod_latin_DicTraverseSession.h b/native/jni/com_android_inputmethod_latin_DicTraverseSession.h index dec130f16..badcbb9ea 100644 --- a/native/jni/com_android_inputmethod_latin_DicTraverseSession.h +++ b/native/jni/com_android_inputmethod_latin_DicTraverseSession.h @@ -5,7 +5,7 @@ * 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 + * 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, diff --git a/native/jni/jni_common.cpp b/native/jni/jni_common.cpp index 0da166903..7b97cf4db 100644 --- a/native/jni/jni_common.cpp +++ b/native/jni/jni_common.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2011, The Android Open Source Project + * Copyright (C) 2011 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 + * 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, @@ -25,45 +25,38 @@ #include "jni.h" #include "jni_common.h" -using namespace latinime; - /* * Returns the JNI version on success, -1 on failure. */ jint JNI_OnLoad(JavaVM *vm, void *reserved) { JNIEnv *env = 0; - jint result = -1; if (vm->GetEnv(reinterpret_cast(&env), JNI_VERSION_1_6) != JNI_OK) { AKLOGE("ERROR: GetEnv failed"); - goto bail; + return -1; } assert(env); - - if (!register_BinaryDictionary(env)) { + if (!env) { + AKLOGE("ERROR: JNIEnv is invalid"); + return -1; + } + if (!latinime::register_BinaryDictionary(env)) { AKLOGE("ERROR: BinaryDictionary native registration failed"); - goto bail; + return -1; } - - if (!register_DicTraverseSession(env)) { + if (!latinime::register_DicTraverseSession(env)) { AKLOGE("ERROR: DicTraverseSession native registration failed"); - goto bail; + return -1; } - - if (!register_ProximityInfo(env)) { + if (!latinime::register_ProximityInfo(env)) { AKLOGE("ERROR: ProximityInfo native registration failed"); - goto bail; + return -1; } - /* success -- return valid version number */ - result = JNI_VERSION_1_6; - -bail: - return result; + return JNI_VERSION_1_6; } namespace latinime { - int registerNativeMethods(JNIEnv *env, const char *className, JNINativeMethod *methods, int numMethods) { jclass clazz = env->FindClass(className);