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

src/org/geometerplus/android/fbreader/library/BookInfoActivity.java

@@ -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.ZLAndroidImageManager;
 
+import org.geometerplus.fbreader.book.*;
 import org.geometerplus.fbreader.library.*;
 import org.geometerplus.fbreader.network.HtmlUtil;
 

src/org/geometerplus/android/fbreader/library/SQLiteBooksDatabase.java

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

src/org/geometerplus/fbreader/book/Author.java

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

src/org/geometerplus/fbreader/book/SeriesInfo.java

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

src/org/geometerplus/fbreader/book/Tag.java

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

src/org/geometerplus/fbreader/fbreader/FBReaderApp.java

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

src/org/geometerplus/fbreader/formats/fb2/FB2MetaInfoReader.java

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

src/org/geometerplus/fbreader/formats/fb2/FB2TagManager.java

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

src/org/geometerplus/fbreader/library/AuthorTree.java

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

src/org/geometerplus/fbreader/library/Book.java

@@ -33,10 +33,10 @@ import org.geometerplus.zlibrary.core.image.ZLImage;
 
 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.book.*;
+import org.geometerplus.fbreader.bookmodel.BookReadingException;
+import org.geometerplus.fbreader.formats.*;
 
 public class Book {
 	public static Book getById(long bookId) {

src/org/geometerplus/fbreader/library/BookInSeriesTree.java

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

src/org/geometerplus/fbreader/library/BookTree.java

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

src/org/geometerplus/fbreader/library/BooksDatabase.java

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

src/org/geometerplus/fbreader/library/Library.java

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

src/org/geometerplus/fbreader/library/LibraryTree.java

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

src/org/geometerplus/fbreader/library/SeriesTree.java

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

src/org/geometerplus/fbreader/library/TagTree.java

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