From d8bb1ad5857ea17f8399e596ca611ceef10ec79e Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Sat, 9 Feb 2013 23:52:42 +0400 Subject: [PATCH] naming/access rights cleanup --- .../fbreader/libraryService/SQLiteBooksDatabase.java | 4 ++-- .../android/fbreader/network/SQLiteNetworkDatabase.java | 8 ++++---- src/org/geometerplus/fbreader/book/Book.java | 2 +- src/org/geometerplus/fbreader/book/BookCollection.java | 2 +- src/org/geometerplus/fbreader/book/BooksDatabase.java | 2 +- src/org/geometerplus/fbreader/book/FileInfoSet.java | 2 +- .../geometerplus/fbreader/network/NetworkDatabase.java | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java b/src/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java index 394f35202..37dd10041 100644 --- a/src/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java +++ b/src/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java @@ -51,7 +51,7 @@ public final class SQLiteBooksDatabase extends BooksDatabase { migrate(context); } - public /*protected*/ void executeAsATransaction(Runnable actions) { + protected void executeAsTransaction(Runnable actions) { boolean transactionStarted = false; try { myDatabase.beginTransaction(); @@ -681,7 +681,7 @@ public final class SQLiteBooksDatabase extends BooksDatabase { "INSERT OR IGNORE INTO RecentBooks (book_id) VALUES (?)" ); } - executeAsATransaction(new Runnable() { + executeAsTransaction(new Runnable() { public void run() { myDatabase.delete("RecentBooks", null, null); for (long id : ids) { diff --git a/src/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java b/src/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java index 5dd92f0ca..25740e8ff 100644 --- a/src/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java +++ b/src/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java @@ -73,7 +73,7 @@ class SQLiteNetworkDatabase extends NetworkDatabase { myDatabase.setVersion(currentCodeVersion); } - protected void executeAsATransaction(Runnable actions) { + protected void executeAsTransaction(Runnable actions) { myDatabase.beginTransaction(); try { actions.run(); @@ -131,7 +131,7 @@ class SQLiteNetworkDatabase extends NetworkDatabase { private SQLiteStatement myUpdateCustomLinkUrlStatement; @Override protected synchronized void saveLink(final INetworkLink link) { - executeAsATransaction(new Runnable() { + executeAsTransaction(new Runnable() { public void run() { final SQLiteStatement statement; if (link.getId() == INetworkLink.INVALID_ID) { @@ -232,7 +232,7 @@ class SQLiteNetworkDatabase extends NetworkDatabase { if (link.getId() == INetworkLink.INVALID_ID) { return; } - executeAsATransaction(new Runnable() { + executeAsTransaction(new Runnable() { public void run() { final String stringLinkId = String.valueOf(link.getId()); myDatabase.delete("Links", "link_id = ?", new String[] { stringLinkId }); @@ -258,7 +258,7 @@ class SQLiteNetworkDatabase extends NetworkDatabase { @Override protected synchronized void setLinkExtras(final INetworkLink link, final Map extras) { - executeAsATransaction(new Runnable() { + executeAsTransaction(new Runnable() { public void run() { if (link.getId() == INetworkLink.INVALID_ID) { return; diff --git a/src/org/geometerplus/fbreader/book/Book.java b/src/org/geometerplus/fbreader/book/Book.java index d18c0c329..b4e5462a3 100644 --- a/src/org/geometerplus/fbreader/book/Book.java +++ b/src/org/geometerplus/fbreader/book/Book.java @@ -426,7 +426,7 @@ public class Book { return false; } - database.executeAsATransaction(new Runnable() { + database.executeAsTransaction(new Runnable() { public void run() { if (myId >= 0) { final FileInfoSet fileInfos = new FileInfoSet(database, File); diff --git a/src/org/geometerplus/fbreader/book/BookCollection.java b/src/org/geometerplus/fbreader/book/BookCollection.java index bbf6594a6..59308d044 100644 --- a/src/org/geometerplus/fbreader/book/BookCollection.java +++ b/src/org/geometerplus/fbreader/book/BookCollection.java @@ -593,7 +593,7 @@ public class BookCollection extends AbstractBookCollection { // Step 4: save changes into database fileInfos.save(); - myDatabase.executeAsATransaction(new Runnable() { + myDatabase.executeAsTransaction(new Runnable() { public void run() { for (Book book : newBooks) { saveBook(book, false); diff --git a/src/org/geometerplus/fbreader/book/BooksDatabase.java b/src/org/geometerplus/fbreader/book/BooksDatabase.java index 5b76fbdaa..44361ae61 100644 --- a/src/org/geometerplus/fbreader/book/BooksDatabase.java +++ b/src/org/geometerplus/fbreader/book/BooksDatabase.java @@ -53,7 +53,7 @@ public abstract class BooksDatabase { book.setSeriesInfoWithNoCheck(series, index); } - public /*protected*/ abstract void executeAsATransaction(Runnable actions); + protected abstract void executeAsTransaction(Runnable actions); // returns map fileId -> book protected abstract Map loadBooks(FileInfoSet infos, boolean existing); diff --git a/src/org/geometerplus/fbreader/book/FileInfoSet.java b/src/org/geometerplus/fbreader/book/FileInfoSet.java index cd70f8709..282e7ad3f 100644 --- a/src/org/geometerplus/fbreader/book/FileInfoSet.java +++ b/src/org/geometerplus/fbreader/book/FileInfoSet.java @@ -85,7 +85,7 @@ public final class FileInfoSet { } public void save() { - myDatabase.executeAsATransaction(new Runnable() { + myDatabase.executeAsTransaction(new Runnable() { public void run() { for (FileInfo info : myInfosToRemove) { myDatabase.removeFileInfo(info.Id); diff --git a/src/org/geometerplus/fbreader/network/NetworkDatabase.java b/src/org/geometerplus/fbreader/network/NetworkDatabase.java index 5cad4009d..8ecd27ee9 100644 --- a/src/org/geometerplus/fbreader/network/NetworkDatabase.java +++ b/src/org/geometerplus/fbreader/network/NetworkDatabase.java @@ -37,7 +37,7 @@ public abstract class NetworkDatabase { ourInstance = this; } - protected abstract void executeAsATransaction(Runnable actions); + protected abstract void executeAsTransaction(Runnable actions); protected INetworkLink createLink(int id, INetworkLink.Type type, String predefinedId, String siteName, String title, String summary, String language, UrlInfoCollection infos) { if (siteName == null || title == null || infos.getInfo(UrlInfo.Type.Catalog) == null) {