diff options
author | Christian Strømme <christian.stromme@digia.com> | 2014-08-06 17:24:52 +0200 |
---|---|---|
committer | Christian Stromme <christian.stromme@digia.com> | 2014-09-26 23:45:00 +0200 |
commit | afece6e49697983e7fd55647e1674504f7bc7235 (patch) | |
tree | 276528d684b484fb3b3e55feb141c9c252382c4b /src/corelib/kernel/qjni.cpp | |
parent | 8b0d9a16db7bcfb5d6439b8863aded5c583f9ed5 (diff) |
Android: Add findClass() function to the QJNIEnvironmentPrivate class.
The static QJNIEnvironmentPrivate::findClass() function exposes the
cache and the class finding code in qjni.
Change-Id: I42043dc993cf9cace042faf763f2a647ba79d97f
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Diffstat (limited to 'src/corelib/kernel/qjni.cpp')
-rw-r--r-- | src/corelib/kernel/qjni.cpp | 138 |
1 files changed, 90 insertions, 48 deletions
diff --git a/src/corelib/kernel/qjni.cpp b/src/corelib/kernel/qjni.cpp index 46e7d739fb..173127b063 100644 --- a/src/corelib/kernel/qjni.cpp +++ b/src/corelib/kernel/qjni.cpp @@ -75,28 +75,58 @@ static inline bool exceptionCheckAndClear(JNIEnv *env) typedef QHash<QString, jclass> JClassHash; Q_GLOBAL_STATIC(JClassHash, cachedClasses) -static jclass getCachedClass(JNIEnv *env, const char *className) +static QString toDotEncodedClassName(const char *className) +{ + return QString::fromLatin1(className).replace(QLatin1Char('/'), QLatin1Char('.')); +} + +static jclass getCachedClass(const QString &classDotEnc) { - jclass clazz = 0; - QString classDotEnc = QString::fromLatin1(className).replace(QLatin1Char('/'), QLatin1Char('.')); QHash<QString, jclass>::iterator it = cachedClasses->find(classDotEnc); - if (it == cachedClasses->end()) { - QJNIObjectPrivate classLoader = QtAndroidPrivate::classLoader(); - if (!classLoader.isValid()) - return 0; - QJNIObjectPrivate stringName = QJNIObjectPrivate::fromString(classDotEnc); - QJNIObjectPrivate classObject = classLoader.callObjectMethod("loadClass", - "(Ljava/lang/String;)Ljava/lang/Class;", - stringName.object()); + if (it == cachedClasses->end()) + return 0; - if (!exceptionCheckAndClear(env) && classObject.isValid()) - clazz = static_cast<jclass>(env->NewGlobalRef(classObject.object())); + return it.value(); +} - cachedClasses->insert(classDotEnc, clazz); - } else { - clazz = it.value(); +static jclass findClass(const char *className, JNIEnv *env) +{ + const QString &classDotEnc = toDotEncodedClassName(className); + jclass clazz = getCachedClass(classDotEnc); + if (clazz != 0) + return clazz; + + jclass fclazz = env->FindClass(className); + if (!exceptionCheckAndClear(env)) { + clazz = static_cast<jclass>(env->NewGlobalRef(fclazz)); + env->DeleteLocalRef(fclazz); } + + cachedClasses->insert(classDotEnc, clazz); + return clazz; +} + +static jclass loadClass(const char *className, JNIEnv *env) +{ + const QString &classDotEnc = toDotEncodedClassName(className); + jclass clazz = getCachedClass(classDotEnc); + if (clazz != 0) + return clazz; + + QJNIObjectPrivate classLoader = QtAndroidPrivate::classLoader(); + if (!classLoader.isValid()) + return 0; + + QJNIObjectPrivate stringName = QJNIObjectPrivate::fromString(classDotEnc); + QJNIObjectPrivate classObject = classLoader.callObjectMethod("loadClass", + "(Ljava/lang/String;)Ljava/lang/Class;", + stringName.object()); + + if (!exceptionCheckAndClear(env) && classObject.isValid()) + clazz = static_cast<jclass>(env->NewGlobalRef(classObject.object())); + + cachedClasses->insert(classDotEnc, clazz); return clazz; } @@ -192,6 +222,18 @@ JNIEnv *QJNIEnvironmentPrivate::operator->() return jniEnv; } +jclass QJNIEnvironmentPrivate::findClass(const char *className, JNIEnv *env) +{ + jclass clazz = 0; + if (env != 0) + clazz = ::findClass(className, env); + + if (clazz == 0) + clazz = loadClass(className, QJNIEnvironmentPrivate()); + + return clazz; +} + QJNIEnvironmentPrivate::operator JNIEnv* () const { return jniEnv; @@ -228,7 +270,7 @@ QJNIObjectPrivate::QJNIObjectPrivate(const char *className) : d(new QJNIObjectData()) { QJNIEnvironmentPrivate env; - d->m_jclass = getCachedClass(env, className); + d->m_jclass = loadClass(className, env); d->m_own_jclass = false; if (d->m_jclass) { // get default constructor @@ -247,7 +289,7 @@ QJNIObjectPrivate::QJNIObjectPrivate(const char *className, const char *sig, ... : d(new QJNIObjectData()) { QJNIEnvironmentPrivate env; - d->m_jclass = getCachedClass(env, className); + d->m_jclass = loadClass(className, env); d->m_own_jclass = false; if (d->m_jclass) { jmethodID constructorId = getCachedMethodID(env, d->m_jclass, "<init>", sig); @@ -268,7 +310,7 @@ QJNIObjectPrivate::QJNIObjectPrivate(const char *className, const char *sig, va_ : d(new QJNIObjectData()) { QJNIEnvironmentPrivate env; - d->m_jclass = getCachedClass(env, className); + d->m_jclass = loadClass(className, env); d->m_own_jclass = false; if (d->m_jclass) { jmethodID constructorId = getCachedMethodID(env, d->m_jclass, "<init>", sig); @@ -610,7 +652,7 @@ void QJNIObjectPrivate::callStaticMethod<void>(const char *className, va_list args) { QJNIEnvironmentPrivate env; - jclass clazz = getCachedClass(env, className); + jclass clazz = loadClass(className, env); if (clazz) { jmethodID id = getCachedMethodID(env, clazz, methodName, sig, true); if (id) { @@ -664,7 +706,7 @@ jboolean QJNIObjectPrivate::callStaticMethod<jboolean>(const char *className, { QJNIEnvironmentPrivate env; jboolean res = 0; - jclass clazz = getCachedClass(env, className); + jclass clazz = loadClass(className, env); if (clazz) { jmethodID id = getCachedMethodID(env, clazz, methodName, sig, true); if (id) { @@ -725,7 +767,7 @@ jbyte QJNIObjectPrivate::callStaticMethod<jbyte>(const char *className, { QJNIEnvironmentPrivate env; jbyte res = 0; - jclass clazz = getCachedClass(env, className); + jclass clazz = loadClass(className, env); if (clazz) { jmethodID id = getCachedMethodID(env, clazz, methodName, sig, true); if (id) { @@ -786,7 +828,7 @@ jchar QJNIObjectPrivate::callStaticMethod<jchar>(const char *className, { QJNIEnvironmentPrivate env; jchar res = 0; - jclass clazz = getCachedClass(env, className); + jclass clazz = loadClass(className, env); if (clazz) { jmethodID id = getCachedMethodID(env, clazz, methodName, sig, true); if (id) { @@ -847,7 +889,7 @@ jshort QJNIObjectPrivate::callStaticMethod<jshort>(const char *className, { QJNIEnvironmentPrivate env; jshort res = 0; - jclass clazz = getCachedClass(env, className); + jclass clazz = loadClass(className, env); if (clazz) { jmethodID id = getCachedMethodID(env, clazz, methodName, sig, true); if (id) { @@ -908,7 +950,7 @@ jint QJNIObjectPrivate::callStaticMethod<jint>(const char *className, { QJNIEnvironmentPrivate env; jint res = 0; - jclass clazz = getCachedClass(env, className); + jclass clazz = loadClass(className, env); if (clazz) { jmethodID id = getCachedMethodID(env, clazz, methodName, sig, true); if (id) { @@ -969,7 +1011,7 @@ jlong QJNIObjectPrivate::callStaticMethod<jlong>(const char *className, { QJNIEnvironmentPrivate env; jlong res = 0; - jclass clazz = getCachedClass(env, className); + jclass clazz = loadClass(className, env); if (clazz) { jmethodID id = getCachedMethodID(env, clazz, methodName, sig, true); if (id) { @@ -1030,7 +1072,7 @@ jfloat QJNIObjectPrivate::callStaticMethod<jfloat>(const char *className, { QJNIEnvironmentPrivate env; jfloat res = 0.f; - jclass clazz = getCachedClass(env, className); + jclass clazz = loadClass(className, env); if (clazz) { jmethodID id = getCachedMethodID(env, clazz, methodName, sig, true); if (id) { @@ -1091,7 +1133,7 @@ jdouble QJNIObjectPrivate::callStaticMethod<jdouble>(const char *className, { QJNIEnvironmentPrivate env; jdouble res = 0.; - jclass clazz = getCachedClass(env, className); + jclass clazz = loadClass(className, env); if (clazz) { jmethodID id = getCachedMethodID(env, clazz, methodName, sig, true); if (id) { @@ -1336,7 +1378,7 @@ QJNIObjectPrivate QJNIObjectPrivate::callStaticObjectMethod(const char *classNam { QJNIEnvironmentPrivate env; jobject res = 0; - jclass clazz = getCachedClass(env, className); + jclass clazz = loadClass(className, env); if (clazz) { jmethodID id = getCachedMethodID(env, clazz, methodName, sig, true); if (id) { @@ -1507,7 +1549,7 @@ jboolean QJNIObjectPrivate::getStaticField<jboolean>(const char *className, cons { QJNIEnvironmentPrivate env; jboolean res = 0; - jclass clazz = getCachedClass(env, className); + jclass clazz = loadClass(className, env); if (clazz) res = getStaticField<jboolean>(clazz, fieldName); @@ -1531,7 +1573,7 @@ jbyte QJNIObjectPrivate::getStaticField<jbyte>(const char *className, const char { QJNIEnvironmentPrivate env; jbyte res = 0; - jclass clazz = getCachedClass(env, className); + jclass clazz = loadClass(className, env); if (clazz) res = getStaticField<jbyte>(clazz, fieldName); @@ -1555,7 +1597,7 @@ jchar QJNIObjectPrivate::getStaticField<jchar>(const char *className, const char { QJNIEnvironmentPrivate env; jchar res = 0; - jclass clazz = getCachedClass(env, className); + jclass clazz = loadClass(className, env); if (clazz) res = getStaticField<jchar>(clazz, fieldName); @@ -1579,7 +1621,7 @@ jshort QJNIObjectPrivate::getStaticField<jshort>(const char *className, const ch { QJNIEnvironmentPrivate env; jshort res = 0; - jclass clazz = getCachedClass(env, className); + jclass clazz = loadClass(className, env); if (clazz) res = getStaticField<jshort>(clazz, fieldName); @@ -1603,7 +1645,7 @@ jint QJNIObjectPrivate::getStaticField<jint>(const char *className, const char * { QJNIEnvironmentPrivate env; jint res = 0; - jclass clazz = getCachedClass(env, className); + jclass clazz = loadClass(className, env); if (clazz) res = getStaticField<jint>(clazz, fieldName); @@ -1627,7 +1669,7 @@ jlong QJNIObjectPrivate::getStaticField<jlong>(const char *className, const char { QJNIEnvironmentPrivate env; jlong res = 0; - jclass clazz = getCachedClass(env, className); + jclass clazz = loadClass(className, env); if (clazz) res = getStaticField<jlong>(clazz, fieldName); @@ -1651,7 +1693,7 @@ jfloat QJNIObjectPrivate::getStaticField<jfloat>(const char *className, const ch { QJNIEnvironmentPrivate env; jfloat res = 0.f; - jclass clazz = getCachedClass(env, className); + jclass clazz = loadClass(className, env); if (clazz) res = getStaticField<jfloat>(clazz, fieldName); @@ -1675,7 +1717,7 @@ jdouble QJNIObjectPrivate::getStaticField<jdouble>(const char *className, const { QJNIEnvironmentPrivate env; jdouble res = 0.; - jclass clazz = getCachedClass(env, className); + jclass clazz = loadClass(className, env); if (clazz) res = getStaticField<jdouble>(clazz, fieldName); @@ -1705,7 +1747,7 @@ QJNIObjectPrivate QJNIObjectPrivate::getStaticObjectField(const char *className, { QJNIEnvironmentPrivate env; QJNIObjectPrivate res; - jclass clazz = getCachedClass(env, className); + jclass clazz = loadClass(className, env); if (clazz) res = getStaticObjectField(clazz, fieldName, sig); @@ -1941,7 +1983,7 @@ void QJNIObjectPrivate::setStaticField<jboolean>(const char *className, jboolean value) { QJNIEnvironmentPrivate env; - jclass clazz = getCachedClass(env, className); + jclass clazz = loadClass(className, env); if (clazz) setStaticField<jboolean>(clazz, fieldName, value); } @@ -1963,7 +2005,7 @@ void QJNIObjectPrivate::setStaticField<jbyte>(const char *className, jbyte value) { QJNIEnvironmentPrivate env; - jclass clazz = getCachedClass(env, className); + jclass clazz = loadClass(className, env); if (clazz) setStaticField<jbyte>(clazz, fieldName, value); } @@ -1985,7 +2027,7 @@ void QJNIObjectPrivate::setStaticField<jchar>(const char *className, jchar value) { QJNIEnvironmentPrivate env; - jclass clazz = getCachedClass(env, className); + jclass clazz = loadClass(className, env); if (clazz) setStaticField<jchar>(clazz, fieldName, value); } @@ -2007,7 +2049,7 @@ void QJNIObjectPrivate::setStaticField<jshort>(const char *className, jshort value) { QJNIEnvironmentPrivate env; - jclass clazz = getCachedClass(env, className); + jclass clazz = loadClass(className, env); if (clazz) setStaticField<jshort>(clazz, fieldName, value); } @@ -2029,7 +2071,7 @@ void QJNIObjectPrivate::setStaticField<jint>(const char *className, jint value) { QJNIEnvironmentPrivate env; - jclass clazz = getCachedClass(env, className); + jclass clazz = loadClass(className, env); if (clazz) setStaticField<jint>(clazz, fieldName, value); } @@ -2051,7 +2093,7 @@ void QJNIObjectPrivate::setStaticField<jlong>(const char *className, jlong value) { QJNIEnvironmentPrivate env; - jclass clazz = getCachedClass(env, className); + jclass clazz = loadClass(className, env); if (clazz) setStaticField<jlong>(clazz, fieldName, value); } @@ -2073,7 +2115,7 @@ void QJNIObjectPrivate::setStaticField<jfloat>(const char *className, jfloat value) { QJNIEnvironmentPrivate env; - jclass clazz = getCachedClass(env, className); + jclass clazz = loadClass(className, env); if (clazz) setStaticField<jfloat>(clazz, fieldName, value); } @@ -2095,7 +2137,7 @@ void QJNIObjectPrivate::setStaticField<jdouble>(const char *className, jdouble value) { QJNIEnvironmentPrivate env; - jclass clazz = getCachedClass(env, className); + jclass clazz = loadClass(className, env); if (clazz) setStaticField<jdouble>(clazz, fieldName, value); } @@ -2119,7 +2161,7 @@ void QJNIObjectPrivate::setStaticField<jobject>(const char *className, jobject value) { QJNIEnvironmentPrivate env; - jclass clazz = getCachedClass(env, className); + jclass clazz = loadClass(className, env); if (clazz) setStaticField<jobject>(clazz, fieldName, sig, value); } @@ -2150,7 +2192,7 @@ bool QJNIObjectPrivate::isClassAvailable(const char *className) if (!env) return false; - jclass clazz = getCachedClass(env, className); + jclass clazz = loadClass(className, env); return (clazz != 0); } |