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

repackaging: some classes moved to book package (synchronization with library-service branch)

Browse source
This commit is contained in:
Nikolay Pultsin 2013-01-14 04:34:16 +04:00
parent 840b03f68e
commit fbec1dc704
17 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/org/geometerplus/android/fbreader/library/BookInfoActivity.java
View file

@ -45,6 +45,7 @@ import org.geometerplus.zlibrary.ui.android.R;
import org.geometerplus.zlibrary.ui.android.image.ZLAndroidImageData; import org.geometerplus.zlibrary.ui.android.image.ZLAndroidImageData;
import org.geometerplus.zlibrary.ui.android.image.ZLAndroidImageManager; import org.geometerplus.zlibrary.ui.android.image.ZLAndroidImageManager;
import org.geometerplus.fbreader.book.*;
import org.geometerplus.fbreader.library.*; import org.geometerplus.fbreader.library.*;
import org.geometerplus.fbreader.network.HtmlUtil; import org.geometerplus.fbreader.network.HtmlUtil;

1
src/org/geometerplus/android/fbreader/library/SQLiteBooksDatabase.java
View file

@ -35,6 +35,7 @@ import org.geometerplus.zlibrary.core.config.ZLConfig;
import org.geometerplus.zlibrary.text.view.ZLTextPosition; import org.geometerplus.zlibrary.text.view.ZLTextPosition;
import org.geometerplus.zlibrary.text.view.ZLTextFixedPosition; import org.geometerplus.zlibrary.text.view.ZLTextFixedPosition;
import org.geometerplus.fbreader.book.*;
import org.geometerplus.fbreader.library.*; import org.geometerplus.fbreader.library.*;
import org.geometerplus.android.util.UIUtil; import org.geometerplus.android.util.UIUtil;

2
src/org/geometerplus/fbreader/library/Author.java → src/org/geometerplus/fbreader/book/Author.java
View file

@ -17,7 +17,7 @@
* 02110-1301, USA. * 02110-1301, USA.
*/ */
package org.geometerplus.fbreader.library; package org.geometerplus.fbreader.book;
public final class Author { public final class Author {
public final String DisplayName; public final String DisplayName;

2
src/org/geometerplus/fbreader/library/SeriesInfo.java → src/org/geometerplus/fbreader/book/SeriesInfo.java
View file

@ -17,7 +17,7 @@
* 02110-1301, USA. * 02110-1301, USA.
*/ */
package org.geometerplus.fbreader.library; package org.geometerplus.fbreader.book;
import java.math.BigDecimal; import java.math.BigDecimal;

2
src/org/geometerplus/fbreader/library/Tag.java → src/org/geometerplus/fbreader/book/Tag.java
View file

@ -17,7 +17,7 @@
* 02110-1301, USA. * 02110-1301, USA.
*/ */
package org.geometerplus.fbreader.library; package org.geometerplus.fbreader.book;
import java.util.HashMap; import java.util.HashMap;

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

@ -31,9 +31,8 @@ import org.geometerplus.zlibrary.core.util.ZLColor;
import org.geometerplus.zlibrary.text.hyphenation.ZLTextHyphenator; import org.geometerplus.zlibrary.text.hyphenation.ZLTextHyphenator;
import org.geometerplus.zlibrary.text.view.*; import org.geometerplus.zlibrary.text.view.*;
import org.geometerplus.fbreader.bookmodel.BookModel; import org.geometerplus.fbreader.book.*;
import org.geometerplus.fbreader.bookmodel.BookReadingException; import org.geometerplus.fbreader.bookmodel.*;
import org.geometerplus.fbreader.bookmodel.TOCTree;
import org.geometerplus.fbreader.library.*; import org.geometerplus.fbreader.library.*;
public final class FBReaderApp extends ZLApplication { public final class FBReaderApp extends ZLApplication {

2
src/org/geometerplus/fbreader/formats/fb2/FB2MetaInfoReader.java
View file

@ -25,9 +25,9 @@ import java.io.IOException;
import org.geometerplus.zlibrary.core.filesystem.ZLFile; import org.geometerplus.zlibrary.core.filesystem.ZLFile;
import org.geometerplus.zlibrary.core.xml.*; import org.geometerplus.zlibrary.core.xml.*;
import org.geometerplus.fbreader.book.Tag;
import org.geometerplus.fbreader.bookmodel.BookReadingException; import org.geometerplus.fbreader.bookmodel.BookReadingException;
import org.geometerplus.fbreader.library.Book; import org.geometerplus.fbreader.library.Book;
import org.geometerplus.fbreader.library.Tag;
public class FB2MetaInfoReader extends ZLXMLReaderAdapter { public class FB2MetaInfoReader extends ZLXMLReaderAdapter {
private final static int READ_NOTHING = 0; private final static int READ_NOTHING = 0;

2
src/org/geometerplus/fbreader/formats/fb2/FB2TagManager.java
View file

@ -24,7 +24,7 @@ import java.util.*;
import org.geometerplus.zlibrary.core.filesystem.ZLResourceFile; import org.geometerplus.zlibrary.core.filesystem.ZLResourceFile;
import org.geometerplus.zlibrary.core.xml.*; import org.geometerplus.zlibrary.core.xml.*;
import org.geometerplus.fbreader.library.Tag; import org.geometerplus.fbreader.book.Tag;
abstract class FB2TagManager { abstract class FB2TagManager {
private static final HashMap<String,ArrayList<Tag>> ourMap = new HashMap<String,ArrayList<Tag>>(); private static final HashMap<String,ArrayList<Tag>> ourMap = new HashMap<String,ArrayList<Tag>>();

2
src/org/geometerplus/fbreader/library/AuthorTree.java
View file

@ -19,6 +19,8 @@
package org.geometerplus.fbreader.library; package org.geometerplus.fbreader.library;
import org.geometerplus.fbreader.book.Author;
public class AuthorTree extends LibraryTree { public class AuthorTree extends LibraryTree {
public final Author Author; public final Author Author;

6
src/org/geometerplus/fbreader/library/Book.java
View file

@ -33,10 +33,10 @@ import org.geometerplus.zlibrary.core.image.ZLImage;
import org.geometerplus.zlibrary.text.view.ZLTextPosition; import org.geometerplus.zlibrary.text.view.ZLTextPosition;
import org.geometerplus.fbreader.formats.*;
import org.geometerplus.fbreader.bookmodel.BookReadingException;
import org.geometerplus.fbreader.Paths; import org.geometerplus.fbreader.Paths;
import org.geometerplus.fbreader.book.*;
import org.geometerplus.fbreader.bookmodel.BookReadingException;
import org.geometerplus.fbreader.formats.*;
public class Book { public class Book {
public static Book getById(long bookId) { public static Book getById(long bookId) {

1
src/org/geometerplus/fbreader/library/BookInSeriesTree.java
View file

@ -21,6 +21,7 @@ package org.geometerplus.fbreader.library;
import java.math.BigDecimal; import java.math.BigDecimal;
import org.geometerplus.fbreader.book.SeriesInfo;
import org.geometerplus.fbreader.tree.FBTree; import org.geometerplus.fbreader.tree.FBTree;
public final class BookInSeriesTree extends BookTree { public final class BookInSeriesTree extends BookTree {

1
src/org/geometerplus/fbreader/library/BookTree.java
View file

@ -21,6 +21,7 @@ package org.geometerplus.fbreader.library;
import org.geometerplus.zlibrary.core.image.ZLImage; import org.geometerplus.zlibrary.core.image.ZLImage;
import org.geometerplus.fbreader.book.Author;
import org.geometerplus.fbreader.tree.FBTree; import org.geometerplus.fbreader.tree.FBTree;
public class BookTree extends LibraryTree { public class BookTree extends LibraryTree {

2
src/org/geometerplus/fbreader/library/BooksDatabase.java
View file

@ -25,6 +25,8 @@ import org.geometerplus.zlibrary.core.filesystem.ZLFile;
import org.geometerplus.zlibrary.text.view.ZLTextPosition; import org.geometerplus.zlibrary.text.view.ZLTextPosition;
import org.geometerplus.fbreader.book.*;
public abstract class BooksDatabase { public abstract class BooksDatabase {
private static BooksDatabase ourInstance; private static BooksDatabase ourInstance;

3
src/org/geometerplus/fbreader/library/Library.java
View file

@ -24,9 +24,10 @@ import java.util.*;
import org.geometerplus.zlibrary.core.filesystem.*; import org.geometerplus.zlibrary.core.filesystem.*;
import org.geometerplus.fbreader.tree.FBTree;
import org.geometerplus.fbreader.Paths; import org.geometerplus.fbreader.Paths;
import org.geometerplus.fbreader.book.*;
import org.geometerplus.fbreader.bookmodel.BookReadingException; import org.geometerplus.fbreader.bookmodel.BookReadingException;
import org.geometerplus.fbreader.tree.FBTree;
public final class Library extends AbstractLibrary { public final class Library extends AbstractLibrary {
public static final String ROOT_FOUND = "found"; public static final String ROOT_FOUND = "found";

1
src/org/geometerplus/fbreader/library/LibraryTree.java
View file

@ -21,6 +21,7 @@ package org.geometerplus.fbreader.library;
import java.util.*; import java.util.*;
import org.geometerplus.fbreader.book.*;
import org.geometerplus.fbreader.tree.FBTree; import org.geometerplus.fbreader.tree.FBTree;
public abstract class LibraryTree extends FBTree { public abstract class LibraryTree extends FBTree {

2
src/org/geometerplus/fbreader/library/SeriesTree.java
View file

@ -21,6 +21,8 @@ package org.geometerplus.fbreader.library;
import java.util.Collections; import java.util.Collections;
import org.geometerplus.fbreader.book.SeriesInfo;
public final class SeriesTree extends LibraryTree { public final class SeriesTree extends LibraryTree {
public final String Series; public final String Series;

2
src/org/geometerplus/fbreader/library/TagTree.java
View file

@ -19,6 +19,8 @@
package org.geometerplus.fbreader.library; package org.geometerplus.fbreader.library;
import org.geometerplus.fbreader.book.Tag;
public final class TagTree extends LibraryTree { public final class TagTree extends LibraryTree {
public final Tag Tag; public final Tag Tag;