From fbec1dc704f166c057e754bb4a651654abeb9f40 Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Mon, 14 Jan 2013 04:34:16 +0400
Subject: [PATCH] repackaging: some classes moved to book package
 (synchronization with library-service branch)

---
 .../android/fbreader/library/BookInfoActivity.java          | 1 +
 .../android/fbreader/library/SQLiteBooksDatabase.java       | 1 +
 src/org/geometerplus/fbreader/{library => book}/Author.java | 2 +-
 .../geometerplus/fbreader/{library => book}/SeriesInfo.java | 2 +-
 src/org/geometerplus/fbreader/{library => book}/Tag.java    | 2 +-
 src/org/geometerplus/fbreader/fbreader/FBReaderApp.java     | 5 ++---
 .../fbreader/formats/fb2/FB2MetaInfoReader.java             | 2 +-
 .../geometerplus/fbreader/formats/fb2/FB2TagManager.java    | 2 +-
 src/org/geometerplus/fbreader/library/AuthorTree.java       | 2 ++
 src/org/geometerplus/fbreader/library/Book.java             | 6 +++---
 src/org/geometerplus/fbreader/library/BookInSeriesTree.java | 1 +
 src/org/geometerplus/fbreader/library/BookTree.java         | 1 +
 src/org/geometerplus/fbreader/library/BooksDatabase.java    | 2 ++
 src/org/geometerplus/fbreader/library/Library.java          | 3 ++-
 src/org/geometerplus/fbreader/library/LibraryTree.java      | 1 +
 src/org/geometerplus/fbreader/library/SeriesTree.java       | 2 ++
 src/org/geometerplus/fbreader/library/TagTree.java          | 2 ++
 17 files changed, 25 insertions(+), 12 deletions(-)
 rename src/org/geometerplus/fbreader/{library => book}/Author.java (97%)
 rename src/org/geometerplus/fbreader/{library => book}/SeriesInfo.java (96%)
 rename src/org/geometerplus/fbreader/{library => book}/Tag.java (97%)

diff --git a/src/org/geometerplus/android/fbreader/library/BookInfoActivity.java b/src/org/geometerplus/android/fbreader/library/BookInfoActivity.java
index cd90ac697..836154fe1 100644
--- a/src/org/geometerplus/android/fbreader/library/BookInfoActivity.java
+++ b/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;
 
diff --git a/src/org/geometerplus/android/fbreader/library/SQLiteBooksDatabase.java b/src/org/geometerplus/android/fbreader/library/SQLiteBooksDatabase.java
index e0a097d57..c72a95526 100644
--- a/src/org/geometerplus/android/fbreader/library/SQLiteBooksDatabase.java
+++ b/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;
diff --git a/src/org/geometerplus/fbreader/library/Author.java b/src/org/geometerplus/fbreader/book/Author.java
similarity index 97%
rename from src/org/geometerplus/fbreader/library/Author.java
rename to src/org/geometerplus/fbreader/book/Author.java
index d94d19d4b..5f4ede4e0 100644
--- a/src/org/geometerplus/fbreader/library/Author.java
+++ b/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;
diff --git a/src/org/geometerplus/fbreader/library/SeriesInfo.java b/src/org/geometerplus/fbreader/book/SeriesInfo.java
similarity index 96%
rename from src/org/geometerplus/fbreader/library/SeriesInfo.java
rename to src/org/geometerplus/fbreader/book/SeriesInfo.java
index 2c937ae82..1a572a9e1 100644
--- a/src/org/geometerplus/fbreader/library/SeriesInfo.java
+++ b/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;
 
diff --git a/src/org/geometerplus/fbreader/library/Tag.java b/src/org/geometerplus/fbreader/book/Tag.java
similarity index 97%
rename from src/org/geometerplus/fbreader/library/Tag.java
rename to src/org/geometerplus/fbreader/book/Tag.java
index 0e66dab1b..a8ad91478 100644
--- a/src/org/geometerplus/fbreader/library/Tag.java
+++ b/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;
 
diff --git a/src/org/geometerplus/fbreader/fbreader/FBReaderApp.java b/src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
index 0f4b6b310..33a638ab6 100644
--- a/src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
+++ b/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 {
diff --git a/src/org/geometerplus/fbreader/formats/fb2/FB2MetaInfoReader.java b/src/org/geometerplus/fbreader/formats/fb2/FB2MetaInfoReader.java
index e933f9ad9..7dea2a9aa 100644
--- a/src/org/geometerplus/fbreader/formats/fb2/FB2MetaInfoReader.java
+++ b/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;
diff --git a/src/org/geometerplus/fbreader/formats/fb2/FB2TagManager.java b/src/org/geometerplus/fbreader/formats/fb2/FB2TagManager.java
index 820597001..0fcdbbd2b 100644
--- a/src/org/geometerplus/fbreader/formats/fb2/FB2TagManager.java
+++ b/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>>();
diff --git a/src/org/geometerplus/fbreader/library/AuthorTree.java b/src/org/geometerplus/fbreader/library/AuthorTree.java
index 847e65489..e801653d2 100644
--- a/src/org/geometerplus/fbreader/library/AuthorTree.java
+++ b/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;
 
diff --git a/src/org/geometerplus/fbreader/library/Book.java b/src/org/geometerplus/fbreader/library/Book.java
index 88e5f6c18..dbac9e361 100644
--- a/src/org/geometerplus/fbreader/library/Book.java
+++ b/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) {
diff --git a/src/org/geometerplus/fbreader/library/BookInSeriesTree.java b/src/org/geometerplus/fbreader/library/BookInSeriesTree.java
index a627596b0..95bc4456f 100644
--- a/src/org/geometerplus/fbreader/library/BookInSeriesTree.java
+++ b/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 {
diff --git a/src/org/geometerplus/fbreader/library/BookTree.java b/src/org/geometerplus/fbreader/library/BookTree.java
index 1628b2f71..a40fb0149 100644
--- a/src/org/geometerplus/fbreader/library/BookTree.java
+++ b/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 {
diff --git a/src/org/geometerplus/fbreader/library/BooksDatabase.java b/src/org/geometerplus/fbreader/library/BooksDatabase.java
index 6859cb026..2be9bb965 100644
--- a/src/org/geometerplus/fbreader/library/BooksDatabase.java
+++ b/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;
 
diff --git a/src/org/geometerplus/fbreader/library/Library.java b/src/org/geometerplus/fbreader/library/Library.java
index 776e63831..a4abc2204 100644
--- a/src/org/geometerplus/fbreader/library/Library.java
+++ b/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";
diff --git a/src/org/geometerplus/fbreader/library/LibraryTree.java b/src/org/geometerplus/fbreader/library/LibraryTree.java
index f2d57ded2..9d6986045 100644
--- a/src/org/geometerplus/fbreader/library/LibraryTree.java
+++ b/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 {
diff --git a/src/org/geometerplus/fbreader/library/SeriesTree.java b/src/org/geometerplus/fbreader/library/SeriesTree.java
index db391aa19..fc6157c20 100644
--- a/src/org/geometerplus/fbreader/library/SeriesTree.java
+++ b/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;
 
diff --git a/src/org/geometerplus/fbreader/library/TagTree.java b/src/org/geometerplus/fbreader/library/TagTree.java
index 361b5866a..c0604ecc7 100644
--- a/src/org/geometerplus/fbreader/library/TagTree.java
+++ b/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;