1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 10:49:24 +02:00

fixed hyphenations after book info editing; fixed possible NPE in library

This commit is contained in:
Nikolay Pultsin 2011-01-03 13:41:26 +00:00
parent d163878097
commit aac0fc50d1
9 changed files with 53 additions and 20 deletions

View file

@ -33,9 +33,12 @@ import org.geometerplus.zlibrary.core.application.ZLApplication;
import org.geometerplus.zlibrary.core.filesystem.ZLFile;
import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.zlibrary.core.view.ZLView;
import org.geometerplus.zlibrary.text.view.ZLTextFixedPosition;
import org.geometerplus.zlibrary.text.view.ZLTextPosition;
import org.geometerplus.zlibrary.text.view.ZLTextView;
import org.geometerplus.zlibrary.text.hyphenation.ZLTextHyphenator;
import org.geometerplus.zlibrary.ui.android.R;
import org.geometerplus.zlibrary.ui.android.library.ZLAndroidActivity;
import org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication;
@ -43,6 +46,8 @@ import org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication;
import org.geometerplus.fbreader.fbreader.ActionCode;
import org.geometerplus.fbreader.fbreader.FBReaderApp;
import org.geometerplus.fbreader.fbreader.FBView;
import org.geometerplus.fbreader.bookmodel.BookModel;
import org.geometerplus.fbreader.library.Book;
import org.geometerplus.android.fbreader.library.KillerCallback;
@ -228,6 +233,14 @@ public final class FBReader extends ZLAndroidActivity {
case REPAINT_CODE:
{
final FBReaderApp fbreader = (FBReaderApp)ZLApplication.Instance();
final BookModel model = fbreader.Model;
if (model != null) {
final Book book = model.Book;
if (book != null) {
book.reloadInfoFromDatabase();
ZLTextHyphenator.Instance().load(book.getLanguage());
}
}
fbreader.clearTextCaches();
fbreader.repaintView();
break;