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-02-19 21:27:18 +00:00
parent 31566a7d44
commit d89d4050b6
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/org/geometerplus/android/fbreader/api/ApiServerImplementation.java
View file

@ -314,7 +314,7 @@ public class ApiServerImplementation extends ApiInterface.Stub implements Api, A
} }
public int getParagraphsNumber() { public int getParagraphsNumber() {
return myReader.Model.BookTextModel.getParagraphsNumber(); return myReader.Model.getTextModel().getParagraphsNumber();
} }
public int getElementsNumber(int paragraphIndex) { public int getElementsNumber(int paragraphIndex) {

4
src/org/geometerplus/fbreader/bookmodel/BookModel.java
View file

@ -72,6 +72,10 @@ public final class BookModel {
//} //}
} }
public ZLTextModel getTextModel() {
return BookTextModel;
}
public ZLTextModel getFootnoteModel(String id) { public ZLTextModel getFootnoteModel(String id) {
ZLTextModel model = myFootnotes.get(id); ZLTextModel model = myFootnotes.get(id);
if (model == null) { if (model == null) {

2
src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
View file

@ -225,7 +225,7 @@ public final class FBReaderApp extends ZLApplication {
Model = BookModel.createModel(book); Model = BookModel.createModel(book);
if (Model != null) { if (Model != null) {
ZLTextHyphenator.Instance().load(book.getLanguage()); ZLTextHyphenator.Instance().load(book.getLanguage());
BookTextView.setModel(Model.BookTextModel); BookTextView.setModel(Model.getTextModel());
BookTextView.gotoPosition(book.getStoredPosition()); BookTextView.gotoPosition(book.getStoredPosition());
if (bookmark == null) { if (bookmark == null) {
setView(BookTextView); setView(BookTextView);