yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-04 10:19:33 +02:00
Code Issues Releases Wiki Activity

code uniformization

Browse source
This commit is contained in:
Nikolay Pultsin 2011-06-26 15:13:14 +01:00
parent dd3844c43c
commit f7d1ad84c4
3 changed files with 24 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java
View file

@ -78,7 +78,7 @@ class SQLiteNetworkDatabase extends NetworkDatabase {
} }
@Override @Override
protected List<INetworkLink> loadLinks() { protected List<INetworkLink> listLinks() {
final List<INetworkLink> links = new LinkedList<INetworkLink>(); final List<INetworkLink> links = new LinkedList<INetworkLink>();
final Cursor cursor = myDatabase.rawQuery("SELECT link_id,title,site_name,summary FROM Links", null); final Cursor cursor = myDatabase.rawQuery("SELECT link_id,title,site_name,summary FROM Links", null);
@ -121,11 +121,11 @@ class SQLiteNetworkDatabase extends NetworkDatabase {
private SQLiteStatement myUpdateCustomLinkUrlStatement; private SQLiteStatement myUpdateCustomLinkUrlStatement;
private SQLiteStatement myDeleteCustomLinkUrlStatement; private SQLiteStatement myDeleteCustomLinkUrlStatement;
@Override @Override
protected void saveCustomLink(final ICustomNetworkLink link) { protected void saveLink(final INetworkLink link) {
executeAsATransaction(new Runnable() { executeAsATransaction(new Runnable() {
public void run() { public void run() {
final SQLiteStatement statement; final SQLiteStatement statement;
if (link.getId() == ICustomNetworkLink.INVALID_ID) { if (link.getId() == INetworkLink.INVALID_ID) {
if (myInsertCustomLinkStatement == null) { if (myInsertCustomLinkStatement == null) {
myInsertCustomLinkStatement = myDatabase.compileStatement( myInsertCustomLinkStatement = myDatabase.compileStatement(
"INSERT INTO Links (title,site_name,summary,is_predefined,is_enabled) VALUES (?,?,?,?,?)" "INSERT INTO Links (title,site_name,summary,is_predefined,is_enabled) VALUES (?,?,?,?,?)"
@ -215,32 +215,23 @@ class SQLiteNetworkDatabase extends NetworkDatabase {
}); });
} }
private SQLiteStatement myDeleteAllCustomLinksStatement;
private SQLiteStatement myDeleteCustomLinkStatement;
@Override @Override
protected void deleteCustomLink(final ICustomNetworkLink link) { protected void deleteLink(final INetworkLink link) {
if (link.getId() == ICustomNetworkLink.INVALID_ID) { if (link.getId() == INetworkLink.INVALID_ID) {
return; return;
} }
executeAsATransaction(new Runnable() { executeAsATransaction(new Runnable() {
public void run() { public void run() {
final long id = link.getId(); final String stringLinkId = String.valueOf(link.getId());
if (myDeleteAllCustomLinksStatement == null) { myDatabase.rawQuery(
myDeleteAllCustomLinksStatement = myDatabase.compileStatement( "DELETE FROM LinkUrls WHERE link_id = ?",
"DELETE FROM LinkUrls WHERE link_id = ?"); new String[] { stringLinkId }
} );
myDeleteAllCustomLinksStatement.bindLong(1, id); myDatabase.rawQuery(
myDeleteAllCustomLinksStatement.execute(); "DELETE FROM Links WHERE link_id = ?",
new String[] { stringLinkId }
if (myDeleteCustomLinkStatement == null) { );
myDeleteCustomLinkStatement = myDatabase.compileStatement( link.setId(INetworkLink.INVALID_ID);
"DELETE FROM Links WHERE link_id = ?"
);
}
myDeleteCustomLinkStatement.bindLong(1, id);
myDeleteCustomLinkStatement.execute();
link.setId(ICustomNetworkLink.INVALID_ID);
} }
}); });
} }
@ -260,7 +251,7 @@ class SQLiteNetworkDatabase extends NetworkDatabase {
@Override @Override
protected void setLinkExtras(INetworkLink link, Map<String,String> extras) { protected void setLinkExtras(INetworkLink link, Map<String,String> extras) {
if (link.getId() == -1) { if (link.getId() == INetworkLink.INVALID_ID) {
return; return;
} }
final String stringLinkId = String.valueOf(link.getId()); final String stringLinkId = String.valueOf(link.getId());

7
src/org/geometerplus/fbreader/network/NetworkDatabase.java
View file

@ -45,9 +45,10 @@ public abstract class NetworkDatabase {
return new OPDSCustomLink(id, siteName, title, summary, infos); return new OPDSCustomLink(id, siteName, title, summary, infos);
} }
protected abstract List<INetworkLink> loadLinks(); protected abstract List<INetworkLink> listLinks();
protected abstract void saveCustomLink(ICustomNetworkLink link); protected abstract void saveLink(INetworkLink link);
protected abstract void deleteCustomLink(ICustomNetworkLink link); protected abstract void deleteLink(INetworkLink link);
protected abstract Map<String,String> getLinkExtras(INetworkLink link); protected abstract Map<String,String> getLinkExtras(INetworkLink link);
protected abstract void setLinkExtras(INetworkLink link, Map<String,String> extras); protected abstract void setLinkExtras(INetworkLink link, Map<String,String> extras);
} }

8
src/org/geometerplus/fbreader/network/NetworkLibrary.java
View file

@ -179,7 +179,7 @@ public class NetworkLibrary {
final NetworkDatabase db = NetworkDatabase.Instance(); final NetworkDatabase db = NetworkDatabase.Instance();
if (db != null) { if (db != null) {
myLinks.addAll(db.loadLinks()); myLinks.addAll(db.listLinks());
} }
myIsAlreadyInitialized = true; myIsAlreadyInitialized = true;
@ -238,7 +238,7 @@ public class NetworkLibrary {
final ICustomNetworkLink customLink = (ICustomNetworkLink)link; final ICustomNetworkLink customLink = (ICustomNetworkLink)link;
if (customLink.isObsolete(12 * 60 * 60 * 1000)) { // 12 hours if (customLink.isObsolete(12 * 60 * 60 * 1000)) { // 12 hours
customLink.reloadInfo(true); customLink.reloadInfo(true);
NetworkDatabase.Instance().saveCustomLink(customLink); NetworkDatabase.Instance().saveLink(customLink);
} }
} }
} }
@ -483,13 +483,13 @@ public class NetworkLibrary {
} }
} }
} }
NetworkDatabase.Instance().saveCustomLink(link); NetworkDatabase.Instance().saveLink(link);
invalidateChildren(); invalidateChildren();
} }
public void removeCustomLink(ICustomNetworkLink link) { public void removeCustomLink(ICustomNetworkLink link) {
myLinks.remove(link); myLinks.remove(link);
NetworkDatabase.Instance().deleteCustomLink(link); NetworkDatabase.Instance().deleteLink(link);
invalidateChildren(); invalidateChildren();
} }
} }