From aaf12c8f175219b08c662fa7e6ab5835b1e8eda9 Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Fri, 1 Feb 2013 19:53:36 +0000 Subject: [PATCH] public => protected --- .../fbreader/libraryService/SQLiteBooksDatabase.java | 6 +++--- src/org/geometerplus/fbreader/book/BooksDatabase.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java b/src/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java index fabb310bc..5fde7f5e3 100644 --- a/src/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java +++ b/src/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java @@ -367,7 +367,7 @@ public final class SQLiteBooksDatabase extends BooksDatabase { myInsertBookAuthorStatement.execute(); } - public /*protected*/ List loadAuthors(long bookId) { + protected List loadAuthors(long bookId) { final Cursor cursor = myDatabase.rawQuery("SELECT Authors.name,Authors.sort_key FROM BookAuthor INNER JOIN Authors ON Authors.author_id = BookAuthor.author_id WHERE BookAuthor.book_id = ?", new String[] { "" + bookId }); if (!cursor.moveToNext()) { cursor.close(); @@ -459,7 +459,7 @@ public final class SQLiteBooksDatabase extends BooksDatabase { return tag; } - public /*protected*/ List loadTags(long bookId) { + protected List loadTags(long bookId) { final Cursor cursor = myDatabase.rawQuery("SELECT Tags.tag_id FROM BookTag INNER JOIN Tags ON Tags.tag_id = BookTag.tag_id WHERE BookTag.book_id = ?", new String[] { "" + bookId }); if (!cursor.moveToNext()) { cursor.close(); @@ -515,7 +515,7 @@ public final class SQLiteBooksDatabase extends BooksDatabase { } } - public /*protected*/ SeriesInfo loadSeriesInfo(long bookId) { + protected SeriesInfo loadSeriesInfo(long bookId) { final Cursor cursor = myDatabase.rawQuery("SELECT Series.name,BookSeries.book_index FROM BookSeries INNER JOIN Series ON Series.series_id = BookSeries.series_id WHERE BookSeries.book_id = ?", new String[] { "" + bookId }); SeriesInfo info = null; if (cursor.moveToNext()) { diff --git a/src/org/geometerplus/fbreader/book/BooksDatabase.java b/src/org/geometerplus/fbreader/book/BooksDatabase.java index 439cf5486..dcad33f35 100644 --- a/src/org/geometerplus/fbreader/book/BooksDatabase.java +++ b/src/org/geometerplus/fbreader/book/BooksDatabase.java @@ -62,9 +62,9 @@ public abstract class BooksDatabase { public /*protected*/ abstract void reloadBook(Book book); public /*protected*/ abstract Book loadBookByFile(long fileId, ZLFile file); - public /*protected*/ abstract List loadAuthors(long bookId); - public /*protected*/ abstract List loadTags(long bookId); - public /*protected*/ abstract SeriesInfo loadSeriesInfo(long bookId); + protected abstract List loadAuthors(long bookId); + protected abstract List loadTags(long bookId); + protected abstract SeriesInfo loadSeriesInfo(long bookId); public /*protected*/ abstract void updateBookInfo(long bookId, long fileId, String encoding, String language, String title); public /*protected*/ abstract long insertBookInfo(ZLFile file, String encoding, String language, String title); protected abstract void deleteAllBookAuthors(long bookId);