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

unused class hierarchy has gone

Browse source
This commit is contained in:
Nikolay Pultsin 2015-04-23 07:10:48 +01:00
parent 3256027dd8
commit 3f34cd6c9b
7 changed files with 130 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

18
jni/NativeFormats/JavaNativeFormatPlugin.cpp
View file

@ -197,7 +197,7 @@ static bool initInternalHyperlinks(JNIEnv *env, jobject javaModel, BookModel &mo
JString linksDirectoryName(env, allocator.directoryName(), false);
JString linksFileExtension(env, allocator.fileExtension(), false);
jint linksBlocksNumber = allocator.blocksNumber();
AndroidUtil::Method_NativeBookModel_initInternalHyperlinks->call(javaModel, linksDirectoryName.j(), linksFileExtension.j(), linksBlocksNumber);
AndroidUtil::Method_BookModel_initInternalHyperlinks->call(javaModel, linksDirectoryName.j(), linksFileExtension.j(), linksBlocksNumber);
return !env->ExceptionCheck();
}
@ -224,7 +224,7 @@ static jobject createTextModel(JNIEnv *env, jobject javaModel, ZLTextModel &mode
jstring fileExtension = env->NewStringUTF(model.allocator().fileExtension().c_str());
jint blocksNumber = (jint) model.allocator().blocksNumber();
jobject textModel = AndroidUtil::Method_NativeBookModel_createTextModel->call(
jobject textModel = AndroidUtil::Method_BookModel_createTextModel->call(
javaModel,
id, language,
paragraphsNumber, entryIndices, entryOffsets,
@ -243,11 +243,11 @@ static void initTOC(JNIEnv *env, jobject javaModel, const ContentsTree &tree) {
for (std::vector<shared_ptr<ContentsTree> >::const_iterator it = children.begin(); it != children.end(); ++it) {
const ContentsTree &child = **it;
JString text(env, child.text());
AndroidUtil::Method_NativeBookModel_addTOCItem->call(javaModel, text.j(), child.reference());
AndroidUtil::Method_BookModel_addTOCItem->call(javaModel, text.j(), child.reference());
initTOC(env, javaModel, child);
AndroidUtil::Method_NativeBookModel_leaveTOCItem->call(javaModel);
AndroidUtil::Method_BookModel_leaveTOCItem->call(javaModel);
}
}
@ -275,7 +275,7 @@ JNIEXPORT jint JNICALL Java_org_geometerplus_fbreader_formats_NativeFormatPlugin
return 1;
}
jobject javaBook = AndroidUtil::Field_NativeBookModel_Book->value(javaModel);
jobject javaBook = AndroidUtil::Field_BookModel_Book->value(javaModel);
shared_ptr<Book> book = Book::loadFromJavaBook(env, javaBook);
shared_ptr<BookModel> model = new BookModel(book, javaModel);
@ -297,7 +297,7 @@ JNIEXPORT jint JNICALL Java_org_geometerplus_fbreader_formats_NativeFormatPlugin
if (javaTextModel == 0) {
return 5;
}
AndroidUtil::Method_NativeBookModel_setBookTextModel->call(javaModel, javaTextModel);
AndroidUtil::Method_BookModel_setBookTextModel->call(javaModel, javaTextModel);
if (env->ExceptionCheck()) {
return 6;
}
@ -310,7 +310,7 @@ JNIEXPORT jint JNICALL Java_org_geometerplus_fbreader_formats_NativeFormatPlugin
if (javaFootnoteModel == 0) {
return 7;
}
AndroidUtil::Method_NativeBookModel_setFootnoteModel->call(javaModel, javaFootnoteModel);
AndroidUtil::Method_BookModel_setFootnoteModel->call(javaModel, javaFootnoteModel);
if (env->ExceptionCheck()) {
return 8;
}
@ -325,7 +325,7 @@ JNIEXPORT jint JNICALL Java_org_geometerplus_fbreader_formats_NativeFormatPlugin
JString jString(env, lst[i]);
env->SetObjectArrayElement(jList, i, jString.j());
}
AndroidUtil::Method_NativeBookModel_registerFontFamilyList->call(javaModel, jList);
AndroidUtil::Method_BookModel_registerFontFamilyList->call(javaModel, jList);
env->DeleteLocalRef(jList);
}
@ -340,7 +340,7 @@ JNIEXPORT jint JNICALL Java_org_geometerplus_fbreader_formats_NativeFormatPlugin
jobject italic = createJavaFileInfo(env, it->second->Italic);
jobject boldItalic = createJavaFileInfo(env, it->second->BoldItalic);
AndroidUtil::Method_NativeBookModel_registerFontEntry->call(
AndroidUtil::Method_BookModel_registerFontEntry->call(
javaModel, family.j(), normal, bold, italic, boldItalic
);