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

jmethodID -> Method objects

Browse source
This commit is contained in:
Nikolay Pultsin 2012-03-30 12:26:35 +01:00
parent 4bc7d1541e
commit 181fbe9997
5 changed files with 57 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

27
jni/NativeFormats/JavaNativeFormatPlugin.cpp
View file

@ -20,6 +20,7 @@
#include <jni.h>
#include <AndroidUtil.h>
#include <JniEnvelope.h>
#include <ZLFileImage.h>
#include "fbreader/src/bookmodel/BookModel.h"
@ -44,24 +45,24 @@ static void fillMetaInfo(JNIEnv* env, jobject javaBook, Book &book) {
jstring javaString;
javaString = AndroidUtil::createJavaString(env, book.title());
env->CallVoidMethod(javaBook, AndroidUtil::MID_Book_setTitle, javaString);
AndroidUtil::Method_Book_setTitle->call(javaBook, javaString);
env->DeleteLocalRef(javaString);
javaString = AndroidUtil::createJavaString(env, book.language());
if (javaString != 0) {
env->CallVoidMethod(javaBook, AndroidUtil::MID_Book_setLanguage, javaString);
AndroidUtil::Method_Book_setLanguage->call(javaBook, javaString);
env->DeleteLocalRef(javaString);
}
javaString = AndroidUtil::createJavaString(env, book.encoding());
if (javaString != 0) {
env->CallVoidMethod(javaBook, AndroidUtil::MID_Book_setEncoding, javaString);
AndroidUtil::Method_Book_setEncoding->call(javaBook, javaString);
env->DeleteLocalRef(javaString);
}
javaString = AndroidUtil::createJavaString(env, book.seriesTitle());
if (javaString != 0) {
env->CallVoidMethod(javaBook, AndroidUtil::MID_Book_setSeriesInfo, javaString, (jfloat)book.indexInSeries());
AndroidUtil::Method_Book_setSeriesInfo->call(javaBook, javaString, (jfloat)book.indexInSeries());
env->DeleteLocalRef(javaString);
}
@ -70,7 +71,7 @@ static void fillMetaInfo(JNIEnv* env, jobject javaBook, Book &book) {
const Author &author = *authors[i];
javaString = env->NewStringUTF(author.name().c_str());
jstring key = env->NewStringUTF(author.sortKey().c_str());
env->CallVoidMethod(javaBook, AndroidUtil::MID_Book_addAuthor, javaString, key);
AndroidUtil::Method_Book_addAuthor->call(javaBook, javaString, key);
env->DeleteLocalRef(key);
env->DeleteLocalRef(javaString);
}
@ -78,7 +79,7 @@ static void fillMetaInfo(JNIEnv* env, jobject javaBook, Book &book) {
const TagList &tags = book.tags();
for (size_t i = 0; i < tags.size(); ++i) {
const Tag &tag = *tags[i];
env->CallVoidMethod(javaBook, AndroidUtil::MID_Book_addTag, tag.javaTag(env));
AndroidUtil::Method_Book_addTag->call(javaBook, tag.javaTag(env));
}
}
@ -87,13 +88,13 @@ void fillLanguageAndEncoding(JNIEnv* env, jobject javaBook, Book &book) {
javaString = AndroidUtil::createJavaString(env, book.language());
if (javaString != 0) {
env->CallVoidMethod(javaBook, AndroidUtil::MID_Book_setLanguage, javaString);
AndroidUtil::Method_Book_setLanguage->call(javaBook, javaString);
env->DeleteLocalRef(javaString);
}
javaString = AndroidUtil::createJavaString(env, book.encoding());
if (javaString != 0) {
env->CallVoidMethod(javaBook, AndroidUtil::MID_Book_setEncoding, javaString);
AndroidUtil::Method_Book_setEncoding->call(javaBook, javaString);
env->DeleteLocalRef(javaString);
}
@ -167,8 +168,7 @@ static bool initInternalHyperlinks(JNIEnv *env, jobject javaModel, BookModel &mo
jstring linksDirectoryName = env->NewStringUTF(allocator.directoryName().c_str());
jstring linksFileExtension = env->NewStringUTF(allocator.fileExtension().c_str());
jint linksBlocksNumber = allocator.blocksNumber();
env->CallVoidMethod(javaModel, AndroidUtil::MID_NativeBookModel_initInternalHyperlinks,
linksDirectoryName, linksFileExtension, linksBlocksNumber);
AndroidUtil::Method_NativeBookModel_initInternalHyperlinks->call(javaModel, linksDirectoryName, linksFileExtension, linksBlocksNumber);
env->DeleteLocalRef(linksDirectoryName);
env->DeleteLocalRef(linksFileExtension);
return !env->ExceptionCheck();
@ -230,8 +230,7 @@ static bool initTOC(JNIEnv *env, jobject javaModel, BookModel &model) {
jintArray javaChildrenNumbers = AndroidUtil::createJavaIntArray(env, childrenNumbers);
jintArray javaReferenceNumbers = AndroidUtil::createJavaIntArray(env, referenceNumbers);
env->CallVoidMethod(javaModel, AndroidUtil::MID_NativeBookModel_initTOC,
javaTextModel, javaChildrenNumbers, javaReferenceNumbers);
AndroidUtil::Method_NativeBookModel_initTOC->call(javaModel, javaTextModel, javaChildrenNumbers, javaReferenceNumbers);
env->DeleteLocalRef(javaTextModel);
env->DeleteLocalRef(javaChildrenNumbers);
@ -264,7 +263,7 @@ JNIEXPORT jboolean JNICALL Java_org_geometerplus_fbreader_formats_NativeFormatPl
if (javaTextModel == 0) {
return JNI_FALSE;
}
env->CallVoidMethod(javaModel, AndroidUtil::MID_NativeBookModel_setBookTextModel, javaTextModel);
AndroidUtil::Method_NativeBookModel_setBookTextModel->call(javaModel, javaTextModel);
if (env->ExceptionCheck()) {
return JNI_FALSE;
}
@ -277,7 +276,7 @@ JNIEXPORT jboolean JNICALL Java_org_geometerplus_fbreader_formats_NativeFormatPl
if (javaFootnoteModel == 0) {
return JNI_FALSE;
}
env->CallVoidMethod(javaModel, AndroidUtil::MID_NativeBookModel_setFootnoteModel, javaFootnoteModel);
AndroidUtil::Method_NativeBookModel_setFootnoteModel->call(javaModel, javaFootnoteModel);
if (env->ExceptionCheck()) {
return JNI_FALSE;
}

3
jni/NativeFormats/fbreader/src/bookmodel/BookReader.cpp
View file

@ -18,6 +18,7 @@
*/
#include <AndroidUtil.h>
#include <JniEnvelope.h>
#include <ZLImage.h>
#include <ZLFileImage.h>
@ -202,7 +203,7 @@ void BookReader::addImage(const std::string &id, shared_ptr<const ZLImage> image
jobject javaImage = AndroidUtil::createJavaImage(env, (const ZLFileImage&)*image);
jstring javaId = AndroidUtil::createJavaString(env, id);
env->CallVoidMethod(myModel.myJavaModel, AndroidUtil::MID_NativeBookModel_addImage, javaId, javaImage);
AndroidUtil::Method_NativeBookModel_addImage->call(myModel.myJavaModel, javaId, javaImage);
env->DeleteLocalRef(javaId);
env->DeleteLocalRef(javaImage);

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

@ -66,8 +66,8 @@ jmethodID AndroidUtil::SMID_PluginCollection_Instance;
jmethodID AndroidUtil::MID_Encoding_createConverter;
jfieldID AndroidUtil::FID_EncodingConverter_Name;
jmethodID AndroidUtil::MID_EncodingConverter_convert;
jmethodID AndroidUtil::MID_EncodingConverter_reset;
shared_ptr<IntMethod> AndroidUtil::Method_EncodingConverter_convert;
shared_ptr<VoidMethod> AndroidUtil::Method_EncodingConverter_reset;
jmethodID AndroidUtil::SMID_JavaEncodingCollection_Instance;
jmethodID AndroidUtil::MID_JavaEncodingCollection_getEncoding_int;
@ -90,23 +90,23 @@ jfieldID AndroidUtil::FID_Book_File;
jmethodID AndroidUtil::MID_Book_getTitle;
jmethodID AndroidUtil::MID_Book_getLanguage;
jmethodID AndroidUtil::MID_Book_getEncodingNoDetection;
jmethodID AndroidUtil::MID_Book_setTitle;
jmethodID AndroidUtil::MID_Book_setSeriesInfo;
jmethodID AndroidUtil::MID_Book_setLanguage;
jmethodID AndroidUtil::MID_Book_setEncoding;
jmethodID AndroidUtil::MID_Book_addAuthor;
jmethodID AndroidUtil::MID_Book_addTag;
shared_ptr<VoidMethod> AndroidUtil::Method_Book_setTitle;
shared_ptr<VoidMethod> AndroidUtil::Method_Book_setSeriesInfo;
shared_ptr<VoidMethod> AndroidUtil::Method_Book_setLanguage;
shared_ptr<VoidMethod> AndroidUtil::Method_Book_setEncoding;
shared_ptr<VoidMethod> AndroidUtil::Method_Book_addAuthor;
shared_ptr<VoidMethod> AndroidUtil::Method_Book_addTag;
jmethodID AndroidUtil::MID_Book_save;
jmethodID AndroidUtil::SMID_Tag_getTag;
jfieldID AndroidUtil::FID_NativeBookModel_Book;
jmethodID AndroidUtil::MID_NativeBookModel_initInternalHyperlinks;
jmethodID AndroidUtil::MID_NativeBookModel_initTOC;
shared_ptr<VoidMethod> AndroidUtil::Method_NativeBookModel_initInternalHyperlinks;
shared_ptr<VoidMethod> AndroidUtil::Method_NativeBookModel_initTOC;
jmethodID AndroidUtil::MID_NativeBookModel_createTextModel;
jmethodID AndroidUtil::MID_NativeBookModel_setBookTextModel;
jmethodID AndroidUtil::MID_NativeBookModel_setFootnoteModel;
jmethodID AndroidUtil::MID_NativeBookModel_addImage;
shared_ptr<VoidMethod> AndroidUtil::Method_NativeBookModel_setBookTextModel;
shared_ptr<VoidMethod> AndroidUtil::Method_NativeBookModel_setFootnoteModel;
shared_ptr<VoidMethod> AndroidUtil::Method_NativeBookModel_addImage;
jmethodID AndroidUtil::SMID_BookReadingException_throwForFile;
@ -166,8 +166,8 @@ bool AndroidUtil::init(JavaVM* jvm) {
CHECK_NULL( cls = env->FindClass(Class_EncodingConverter) );
CHECK_NULL( FID_EncodingConverter_Name = env->GetFieldID(cls, "Name", "Ljava/lang/String;") );
CHECK_NULL( MID_EncodingConverter_convert = env->GetMethodID(cls, "convert", "([BII[BI)I") );
CHECK_NULL( MID_EncodingConverter_reset = env->GetMethodID(cls, "reset", "()V") );
Method_EncodingConverter_convert = new IntMethod(env, cls, "convert", "([BII[BI)");
Method_EncodingConverter_reset = new VoidMethod(env, cls, "reset", "()");
env->DeleteLocalRef(cls);
CHECK_NULL( cls = env->FindClass(Class_JavaEncodingCollection) );
@ -200,12 +200,12 @@ bool AndroidUtil::init(JavaVM* jvm) {
CHECK_NULL( MID_Book_getTitle = env->GetMethodID(cls, "getTitle", "()Ljava/lang/String;") );
CHECK_NULL( MID_Book_getLanguage = env->GetMethodID(cls, "getLanguage", "()Ljava/lang/String;") );
CHECK_NULL( MID_Book_getEncodingNoDetection = env->GetMethodID(cls, "getEncodingNoDetection", "()Ljava/lang/String;") );
CHECK_NULL( MID_Book_setTitle = env->GetMethodID(cls, "setTitle", "(Ljava/lang/String;)V") );
CHECK_NULL( MID_Book_setSeriesInfo = env->GetMethodID(cls, "setSeriesInfo", "(Ljava/lang/String;F)V") );
CHECK_NULL( MID_Book_setLanguage = env->GetMethodID(cls, "setLanguage", "(Ljava/lang/String;)V") );
CHECK_NULL( MID_Book_setEncoding = env->GetMethodID(cls, "setEncoding", "(Ljava/lang/String;)V") );
CHECK_NULL( MID_Book_addAuthor = env->GetMethodID(cls, "addAuthor", "(Ljava/lang/String;Ljava/lang/String;)V") );
CHECK_NULL( MID_Book_addTag = env->GetMethodID(cls, "addTag", "(Lorg/geometerplus/fbreader/library/Tag;)V") );
Method_Book_setTitle = new VoidMethod(env, cls, "setTitle", "(Ljava/lang/String;)");
Method_Book_setSeriesInfo = new VoidMethod(env, cls, "setSeriesInfo", "(Ljava/lang/String;F)");
Method_Book_setLanguage = new VoidMethod(env, cls, "setLanguage", "(Ljava/lang/String;)");
Method_Book_setEncoding = new VoidMethod(env, cls, "setEncoding", "(Ljava/lang/String;)");
Method_Book_addAuthor = new VoidMethod(env, cls, "addAuthor", "(Ljava/lang/String;Ljava/lang/String;)");
Method_Book_addTag = new VoidMethod(env, cls, "addTag", "(Lorg/geometerplus/fbreader/library/Tag;)");
CHECK_NULL( MID_Book_save = env->GetMethodID(cls, "save", "()Z") );
env->DeleteLocalRef(cls);
@ -215,12 +215,12 @@ bool AndroidUtil::init(JavaVM* jvm) {
CHECK_NULL( cls = env->FindClass(Class_NativeBookModel) );
CHECK_NULL( FID_NativeBookModel_Book = env->GetFieldID(cls, "Book", "Lorg/geometerplus/fbreader/library/Book;") );
CHECK_NULL( MID_NativeBookModel_initInternalHyperlinks = env->GetMethodID(cls, "initInternalHyperlinks", "(Ljava/lang/String;Ljava/lang/String;I)V") );
CHECK_NULL( MID_NativeBookModel_initTOC = env->GetMethodID(cls, "initTOC", "(Lorg/geometerplus/zlibrary/text/model/ZLTextModel;[I[I)V") );
Method_NativeBookModel_initInternalHyperlinks = new VoidMethod(env, cls, "initInternalHyperlinks", "(Ljava/lang/String;Ljava/lang/String;I)");
Method_NativeBookModel_initTOC = new VoidMethod(env, cls, "initTOC", "(Lorg/geometerplus/zlibrary/text/model/ZLTextModel;[I[I)");
CHECK_NULL( MID_NativeBookModel_createTextModel = env->GetMethodID(cls, "createTextModel", "(Ljava/lang/String;Ljava/lang/String;I[I[I[I[I[BLjava/lang/String;Ljava/lang/String;I)Lorg/geometerplus/zlibrary/text/model/ZLTextModel;") );
CHECK_NULL( MID_NativeBookModel_setBookTextModel = env->GetMethodID(cls, "setBookTextModel", "(Lorg/geometerplus/zlibrary/text/model/ZLTextModel;)V") );
CHECK_NULL( MID_NativeBookModel_setFootnoteModel = env->GetMethodID(cls, "setFootnoteModel", "(Lorg/geometerplus/zlibrary/text/model/ZLTextModel;)V") );
CHECK_NULL( MID_NativeBookModel_addImage = env->GetMethodID(cls, "addImage", "(Ljava/lang/String;Lorg/geometerplus/zlibrary/core/image/ZLImage;)V") );
Method_NativeBookModel_setBookTextModel = new VoidMethod(env, cls, "setBookTextModel", "(Lorg/geometerplus/zlibrary/text/model/ZLTextModel;)");
Method_NativeBookModel_setFootnoteModel = new VoidMethod(env, cls, "setFootnoteModel", "(Lorg/geometerplus/zlibrary/text/model/ZLTextModel;)");
Method_NativeBookModel_addImage = new VoidMethod(env, cls, "addImage", "(Ljava/lang/String;Lorg/geometerplus/zlibrary/core/image/ZLImage;)");
env->DeleteLocalRef(cls);
CHECK_NULL( cls = env->FindClass(Class_BookReadingException) );

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

@ -93,8 +93,8 @@ public:
static jmethodID MID_Encoding_createConverter;
static jfieldID FID_EncodingConverter_Name;
static jmethodID MID_EncodingConverter_convert;
static jmethodID MID_EncodingConverter_reset;
static shared_ptr<IntMethod> Method_EncodingConverter_convert;
static shared_ptr<VoidMethod> Method_EncodingConverter_reset;
static jmethodID SMID_JavaEncodingCollection_Instance;
static jmethodID MID_JavaEncodingCollection_getEncoding_String;
@ -107,23 +107,23 @@ public:
static jmethodID MID_Book_getTitle;
static jmethodID MID_Book_getLanguage;
static jmethodID MID_Book_getEncodingNoDetection;
static jmethodID MID_Book_setTitle;
static jmethodID MID_Book_setSeriesInfo;
static jmethodID MID_Book_setLanguage;
static jmethodID MID_Book_setEncoding;
static jmethodID MID_Book_addAuthor;
static jmethodID MID_Book_addTag;
static shared_ptr<VoidMethod> Method_Book_setTitle;
static shared_ptr<VoidMethod> Method_Book_setSeriesInfo;
static shared_ptr<VoidMethod> Method_Book_setLanguage;
static shared_ptr<VoidMethod> Method_Book_setEncoding;
static shared_ptr<VoidMethod> Method_Book_addAuthor;
static shared_ptr<VoidMethod> Method_Book_addTag;
static jmethodID MID_Book_save;
static jmethodID SMID_Tag_getTag;
static jfieldID FID_NativeBookModel_Book;
static jmethodID MID_NativeBookModel_initInternalHyperlinks;
static jmethodID MID_NativeBookModel_initTOC;
static shared_ptr<VoidMethod> Method_NativeBookModel_initInternalHyperlinks;
static shared_ptr<VoidMethod> Method_NativeBookModel_initTOC;
static jmethodID MID_NativeBookModel_createTextModel;
static jmethodID MID_NativeBookModel_setBookTextModel;
static jmethodID MID_NativeBookModel_setFootnoteModel;
static jmethodID MID_NativeBookModel_addImage;
static shared_ptr<VoidMethod> Method_NativeBookModel_setBookTextModel;
static shared_ptr<VoidMethod> Method_NativeBookModel_setFootnoteModel;
static shared_ptr<VoidMethod> Method_NativeBookModel_addImage;
static jmethodID SMID_BookReadingException_throwForFile;

5
jni/NativeFormats/zlibrary/core/src/encoding/JavaEncodingConverter.cpp
View file

@ -18,6 +18,7 @@
*/
#include <AndroidUtil.h>
#include <JniEnvelope.h>
#include <ZLUnicodeUtil.h>
#include "JavaEncodingConverter.h"
@ -106,14 +107,14 @@ void JavaEncodingConverter::convert(std::string &dst, const char *srcStart, cons
}
env->SetByteArrayRegion(myInBuffer, 0, srcLen, (jbyte*)srcStart);
const jint dstLen = env->CallIntMethod(myJavaConverter, AndroidUtil::MID_EncodingConverter_convert, myInBuffer, 0, srcLen, myOutBuffer, 0);
const jint dstLen = AndroidUtil::Method_EncodingConverter_convert->call(myJavaConverter, myInBuffer, 0, srcLen, myOutBuffer, 0);
const int origLen = dst.size();
dst.append(dstLen, '\0');
env->GetByteArrayRegion(myOutBuffer, 0, dstLen, (jbyte*)dst.data() + origLen);
}
void JavaEncodingConverter::reset() {
AndroidUtil::getEnv()->CallVoidMethod(myJavaConverter, AndroidUtil::MID_EncodingConverter_reset);
AndroidUtil::Method_EncodingConverter_reset->call(myJavaConverter);
}
bool JavaEncodingConverter::fillTable(int *map) {