diff --git a/src/org/geometerplus/android/fbreader/FBReader.java b/src/org/geometerplus/android/fbreader/FBReader.java index 377be9602..04219de5f 100644 --- a/src/org/geometerplus/android/fbreader/FBReader.java +++ b/src/org/geometerplus/android/fbreader/FBReader.java @@ -43,6 +43,7 @@ import org.geometerplus.fbreader.fbreader.FBReaderApp; import org.geometerplus.fbreader.bookmodel.BookModel; import org.geometerplus.fbreader.library.Book; +import org.geometerplus.android.fbreader.library.SQLiteBooksDatabase; import org.geometerplus.android.fbreader.library.KillerCallback; import org.geometerplus.android.fbreader.api.PluginApi; diff --git a/src/org/geometerplus/android/fbreader/ShowBookInfoAction.java b/src/org/geometerplus/android/fbreader/ShowBookInfoAction.java index 19537726a..50abf87c9 100644 --- a/src/org/geometerplus/android/fbreader/ShowBookInfoAction.java +++ b/src/org/geometerplus/android/fbreader/ShowBookInfoAction.java @@ -23,6 +23,8 @@ import android.content.Intent; import org.geometerplus.fbreader.fbreader.FBReaderApp; +import org.geometerplus.android.fbreader.library.BookInfoActivity; + class ShowBookInfoAction extends FBAndroidAction { ShowBookInfoAction(FBReader baseActivity, FBReaderApp fbreader) { super(baseActivity, fbreader); diff --git a/src/org/geometerplus/android/fbreader/BookInfoActivity.java b/src/org/geometerplus/android/fbreader/library/BookInfoActivity.java similarity index 99% rename from src/org/geometerplus/android/fbreader/BookInfoActivity.java rename to src/org/geometerplus/android/fbreader/library/BookInfoActivity.java index 6b4c94fbe..78d379f5a 100644 --- a/src/org/geometerplus/android/fbreader/BookInfoActivity.java +++ b/src/org/geometerplus/android/fbreader/library/BookInfoActivity.java @@ -17,7 +17,7 @@ * 02110-1301, USA. */ -package org.geometerplus.android.fbreader; +package org.geometerplus.android.fbreader.library; import java.io.File; import java.text.DateFormat; @@ -47,6 +47,7 @@ import org.geometerplus.zlibrary.ui.android.image.ZLAndroidImageManager; import org.geometerplus.fbreader.library.*; import org.geometerplus.fbreader.network.HtmlUtil; +import org.geometerplus.android.fbreader.FBReader; import org.geometerplus.android.fbreader.preferences.EditBookInfoActivity; public class BookInfoActivity extends Activity { diff --git a/src/org/geometerplus/android/fbreader/library/LibraryActivity.java b/src/org/geometerplus/android/fbreader/library/LibraryActivity.java index e47321025..ad981aacb 100644 --- a/src/org/geometerplus/android/fbreader/library/LibraryActivity.java +++ b/src/org/geometerplus/android/fbreader/library/LibraryActivity.java @@ -39,9 +39,7 @@ import org.geometerplus.android.util.UIUtil; import org.geometerplus.fbreader.library.*; import org.geometerplus.fbreader.tree.FBTree; -import org.geometerplus.android.fbreader.SQLiteBooksDatabase; import org.geometerplus.android.fbreader.FBReader; -import org.geometerplus.android.fbreader.BookInfoActivity; import org.geometerplus.android.fbreader.tree.BaseActivity; import org.geometerplus.android.fbreader.tree.ListAdapter; diff --git a/src/org/geometerplus/android/fbreader/SQLiteBooksDatabase.java b/src/org/geometerplus/android/fbreader/library/SQLiteBooksDatabase.java similarity index 99% rename from src/org/geometerplus/android/fbreader/SQLiteBooksDatabase.java rename to src/org/geometerplus/android/fbreader/library/SQLiteBooksDatabase.java index d3578d1f9..554794397 100644 --- a/src/org/geometerplus/android/fbreader/SQLiteBooksDatabase.java +++ b/src/org/geometerplus/android/fbreader/library/SQLiteBooksDatabase.java @@ -17,7 +17,7 @@ * 02110-1301, USA. */ -package org.geometerplus.android.fbreader; +package org.geometerplus.android.fbreader.library; import java.util.*; diff --git a/src/org/geometerplus/android/fbreader/preferences/EditBookInfoActivity.java b/src/org/geometerplus/android/fbreader/preferences/EditBookInfoActivity.java index 1afa98650..12d261677 100644 --- a/src/org/geometerplus/android/fbreader/preferences/EditBookInfoActivity.java +++ b/src/org/geometerplus/android/fbreader/preferences/EditBookInfoActivity.java @@ -32,8 +32,8 @@ import org.geometerplus.zlibrary.text.hyphenation.ZLTextHyphenator; import org.geometerplus.fbreader.library.Book; -import org.geometerplus.android.fbreader.BookInfoActivity; -import org.geometerplus.android.fbreader.SQLiteBooksDatabase; +import org.geometerplus.android.fbreader.library.BookInfoActivity; +import org.geometerplus.android.fbreader.library.SQLiteBooksDatabase; class BookTitlePreference extends ZLStringPreference { private final Book myBook;