yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-03 17:59:33 +02:00
Code Issues Releases Wiki Activity

synchronization with native branch

Browse source
This commit is contained in:
Nikolay Pultsin 2012-03-02 00:55:11 +00:00
parent b9e9dda107
commit 925975f7e3
3 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
jni/NativeFormats/JavaPluginCollection.cpp
View file

@ -23,14 +23,15 @@
#include <AndroidUtil.h> #include <AndroidUtil.h>
#include "fbreader/src/formats/FormatPlugin.h"
extern "C" extern "C"
JNIEXPORT jobjectArray JNICALL Java_org_geometerplus_fbreader_formats_PluginCollection_nativePlugins(JNIEnv* env, jobject thiz) { JNIEXPORT jobjectArray JNICALL Java_org_geometerplus_fbreader_formats_PluginCollection_nativePlugins(JNIEnv* env, jobject thiz) {
//const std::vector<shared_ptr<FormatPlugin> > plugins = PluginCollection::Instance().plugins(); const std::vector<shared_ptr<FormatPlugin> > plugins = PluginCollection::Instance().plugins();
const size_t size = 0;//plugins.size(); const size_t size = plugins.size();
jclass cls = env->FindClass(AndroidUtil::Class_NativeFormatPlugin); jclass cls = env->FindClass(AndroidUtil::Class_NativeFormatPlugin);
jobjectArray javaPlugins = env->NewObjectArray(size, cls, 0); jobjectArray javaPlugins = env->NewObjectArray(size, cls, 0);
/*
for (size_t i = 0; i < size; ++i) { for (size_t i = 0; i < size; ++i) {
jstring fileType = AndroidUtil::createJavaString(env, plugins[i]->supportedFileType()); jstring fileType = AndroidUtil::createJavaString(env, plugins[i]->supportedFileType());
env->SetObjectArrayElement( env->SetObjectArrayElement(
@ -38,7 +39,6 @@ JNIEXPORT jobjectArray JNICALL Java_org_geometerplus_fbreader_formats_PluginColl
env->NewObject(cls, AndroidUtil::MID_NativeFormatPlugin_init, fileType) env->NewObject(cls, AndroidUtil::MID_NativeFormatPlugin_init, fileType)
); );
} }
*/
return javaPlugins; return javaPlugins;
} }

8
jni/NativeFormats/util/AndroidUtil.cpp
View file

@ -44,6 +44,8 @@ jmethodID AndroidUtil::MID_java_io_InputStream_skip;
jmethodID AndroidUtil::SMID_ZLibrary_Instance; jmethodID AndroidUtil::SMID_ZLibrary_Instance;
jmethodID AndroidUtil::MID_ZLibrary_getVersionName; jmethodID AndroidUtil::MID_ZLibrary_getVersionName;
jmethodID AndroidUtil::MID_NativeFormatPlugin_init;
jmethodID AndroidUtil::SMID_PluginCollection_Instance; jmethodID AndroidUtil::SMID_PluginCollection_Instance;
jmethodID AndroidUtil::SMID_ZLFile_createFileByPath; jmethodID AndroidUtil::SMID_ZLFile_createFileByPath;
@ -98,6 +100,12 @@ bool AndroidUtil::init(JavaVM* jvm) {
CHECK_NULL( MID_ZLibrary_getVersionName = env->GetMethodID(cls, "getVersionName", "()Ljava/lang/String;") ); CHECK_NULL( MID_ZLibrary_getVersionName = env->GetMethodID(cls, "getVersionName", "()Ljava/lang/String;") );
env->DeleteLocalRef(cls); env->DeleteLocalRef(cls);
CHECK_NULL( cls = env->FindClass(Class_NativeFormatPlugin) );
CHECK_NULL( MID_NativeFormatPlugin_init = env->GetMethodID(cls, "<init>", "(Ljava/lang/String;)V") );
//CHECK_NULL( MID_NativeFormatPlugin_supportedFileType = env->GetMethodID(cls, "supportedFileType", "()Ljava/lang/String;") );
//CHECK_NULL( SMID_NativeFormatPlugin_createImage = env->GetStaticMethodID(cls, "createImage", "(Ljava/lang/String;Ljava/lang/String;II)Lorg/geometerplus/zlibrary/core/image/ZLImage;") );
env->DeleteLocalRef(cls);
CHECK_NULL( cls = env->FindClass(Class_PluginCollection) ); CHECK_NULL( cls = env->FindClass(Class_PluginCollection) );
CHECK_NULL( SMID_PluginCollection_Instance = env->GetStaticMethodID(cls, "Instance", "()Lorg/geometerplus/fbreader/formats/PluginCollection;") ); CHECK_NULL( SMID_PluginCollection_Instance = env->GetStaticMethodID(cls, "Instance", "()Lorg/geometerplus/fbreader/formats/PluginCollection;") );
env->DeleteLocalRef(cls); env->DeleteLocalRef(cls);

2
jni/NativeFormats/util/AndroidUtil.h
View file

@ -61,6 +61,8 @@ public:
static jmethodID MID_ZLFile_isDirectory; static jmethodID MID_ZLFile_isDirectory;
static jmethodID MID_ZLFile_size; static jmethodID MID_ZLFile_size;
static jmethodID MID_NativeFormatPlugin_init;
static jmethodID SMID_PluginCollection_Instance; static jmethodID SMID_PluginCollection_Instance;
static jmethodID SMID_Paths_cacheDirectory; static jmethodID SMID_Paths_cacheDirectory;