nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Yet another small cleanups"

Browse source
This commit is contained in:
Ken Wakasa 2013-01-08 01:01:54 -08:00 committed by Android (Google) Code Review
commit 398b79eea1
7 changed files with 23 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp
View file

@ -1,5 +1,5 @@
/* /*
* 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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

3
native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
View file

@ -1,5 +1,5 @@
/* /*
* 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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,7 +14,6 @@
* limitations under the License. * limitations under the License.
*/ */
#include <cstring> // for memset() #include <cstring> // for memset()
#define LOG_TAG "LatinIME: jni: BinaryDictionary" #define LOG_TAG "LatinIME: jni: BinaryDictionary"

2
native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp
View file

@ -1,5 +1,5 @@
/* /*
* 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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

33
native/jni/jni_common.cpp
View file

@ -1,5 +1,5 @@
/* /*
* 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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -25,45 +25,38 @@
#include "jni.h" #include "jni.h"
#include "jni_common.h" #include "jni_common.h"
using namespace latinime;
/* /*
* Returns the JNI version on success, -1 on failure. * Returns the JNI version on success, -1 on failure.
*/ */
jint JNI_OnLoad(JavaVM *vm, void *reserved) { jint JNI_OnLoad(JavaVM *vm, void *reserved) {
JNIEnv *env = 0; JNIEnv *env = 0;
jint result = -1;
if (vm->GetEnv(reinterpret_cast<void **>(&env), JNI_VERSION_1_6) != JNI_OK) { if (vm->GetEnv(reinterpret_cast<void **>(&env), JNI_VERSION_1_6) != JNI_OK) {
AKLOGE("ERROR: GetEnv failed"); AKLOGE("ERROR: GetEnv failed");
goto bail; return -1;
} }
assert(env); assert(env);
if (!env) {
if (!register_BinaryDictionary(env)) { AKLOGE("ERROR: JNIEnv is invalid");
return -1;
}
if (!latinime::register_BinaryDictionary(env)) {
AKLOGE("ERROR: BinaryDictionary native registration failed"); AKLOGE("ERROR: BinaryDictionary native registration failed");
goto bail; return -1;
} }
if (!latinime::register_DicTraverseSession(env)) {
if (!register_DicTraverseSession(env)) {
AKLOGE("ERROR: DicTraverseSession native registration failed"); AKLOGE("ERROR: DicTraverseSession native registration failed");
goto bail; return -1;
} }
if (!latinime::register_ProximityInfo(env)) {
if (!register_ProximityInfo(env)) {
AKLOGE("ERROR: ProximityInfo native registration failed"); AKLOGE("ERROR: ProximityInfo native registration failed");
goto bail; return -1;
} }
/* success -- return valid version number */ /* success -- return valid version number */
result = JNI_VERSION_1_6; return JNI_VERSION_1_6;
bail:
return result;
} }
namespace latinime { namespace latinime {
int registerNativeMethods(JNIEnv *env, const char *className, JNINativeMethod *methods, int registerNativeMethods(JNIEnv *env, const char *className, JNINativeMethod *methods,
int numMethods) { int numMethods) {
jclass clazz = env->FindClass(className); jclass clazz = env->FindClass(className);