diff --git a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java index dd26cf862..f68b0b3dd 100644 --- a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java +++ b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java @@ -239,8 +239,8 @@ public class AddCustomCatalogActivity extends Activity { setErrorByKey("invalidUrl"); return; } - final HashMap infos = new HashMap(); - infos.put(INetworkLink.URL_MAIN, new UrlInfo(textUrl)); + final HashMap infos = new HashMap(); + infos.put(INetworkLink.URL_MAIN, new UrlInfoWithDate(textUrl)); myLink = new OPDSCustomLink( ICustomNetworkLink.INVALID_ID, siteName, null, null, infos ); diff --git a/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java index b4d9d820c..629974a69 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java @@ -71,7 +71,7 @@ public class NetworkLibraryActivity extends NetworkBaseActivity { uri.getHost(), intent.getStringExtra(ADD_CATALOG_TITLE_KEY), intent.getStringExtra(ADD_CATALOG_SUMMARY_KEY), - (HashMap)intent.getSerializableExtra(ADD_CATALOG_URLS_MAP_KEY) + (HashMap)intent.getSerializableExtra(ADD_CATALOG_URLS_MAP_KEY) ); } diff --git a/src/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java b/src/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java index 9880ed79c..227470afa 100644 --- a/src/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java +++ b/src/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java @@ -30,7 +30,7 @@ import org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication; import org.geometerplus.fbreader.network.ICustomNetworkLink; import org.geometerplus.fbreader.network.NetworkDatabase; -import org.geometerplus.fbreader.network.UrlInfo; +import org.geometerplus.fbreader.network.UrlInfoWithDate; import org.geometerplus.android.util.SQLiteUtil; @@ -77,7 +77,7 @@ class SQLiteNetworkDatabase extends NetworkDatabase { @Override protected void loadCustomLinks(ICustomLinksHandler handler) { final Cursor cursor = myDatabase.rawQuery("SELECT link_id,title,site_name,summary FROM Links", null); - final HashMap linksMap = new HashMap(); + final HashMap linksMap = new HashMap(); while (cursor.moveToNext()) { final int id = cursor.getInt(0); final String title = cursor.getString(1); @@ -89,7 +89,7 @@ class SQLiteNetworkDatabase extends NetworkDatabase { while (linksCursor.moveToNext()) { linksMap.put( linksCursor.getString(0), - new UrlInfo( + new UrlInfoWithDate( linksCursor.getString(1), SQLiteUtil.getDate(linksCursor, 2) ) @@ -134,7 +134,7 @@ class SQLiteNetworkDatabase extends NetworkDatabase { SQLiteUtil.bindString(statement, 3, link.getSummary()); final long id; - final HashMap linksMap = new HashMap(); + final HashMap linksMap = new HashMap(); if (statement == myInsertCustomLinkStatement) { id = statement.executeInsert(); @@ -148,7 +148,7 @@ class SQLiteNetworkDatabase extends NetworkDatabase { while (linksCursor.moveToNext()) { linksMap.put( linksCursor.getString(0), - new UrlInfo( + new UrlInfoWithDate( linksCursor.getString(1), SQLiteUtil.getDate(linksCursor, 2) ) @@ -158,8 +158,8 @@ class SQLiteNetworkDatabase extends NetworkDatabase { } for (String key : link.getUrlKeys()) { - final UrlInfo info = link.getUrlInfo(key); - final UrlInfo dbInfo = linksMap.remove(key); + final UrlInfoWithDate info = link.getUrlInfo(key); + final UrlInfoWithDate dbInfo = linksMap.remove(key); final SQLiteStatement urlStatement; if (dbInfo == null) { if (myInsertCustomLinkUrlStatement == null) { diff --git a/src/org/geometerplus/fbreader/network/AbstractNetworkLink.java b/src/org/geometerplus/fbreader/network/AbstractNetworkLink.java index e4d5e61b7..d399e2e90 100644 --- a/src/org/geometerplus/fbreader/network/AbstractNetworkLink.java +++ b/src/org/geometerplus/fbreader/network/AbstractNetworkLink.java @@ -29,7 +29,7 @@ public abstract class AbstractNetworkLink implements INetworkLink, Basket { protected String myTitle; protected String mySummary; protected final String myLanguage; - protected final TreeMap myInfos; + protected final TreeMap myInfos; private ZLStringListOption myBooksInBasketOption; @@ -42,12 +42,12 @@ public abstract class AbstractNetworkLink implements INetworkLink, Basket { * @param language language of the catalog. If null we assume this catalog is multilanguage. * @param infos map contains URL infos with their identifiers; must always contain one URL with URL_MAIN identifier */ - public AbstractNetworkLink(String siteName, String title, String summary, String language, Map infos) { + public AbstractNetworkLink(String siteName, String title, String summary, String language, Map infos) { mySiteName = siteName; myTitle = title; mySummary = summary; myLanguage = language != null ? language : "multi"; - myInfos = new TreeMap(infos); + myInfos = new TreeMap(infos); } public final String getSiteName() { @@ -66,13 +66,13 @@ public abstract class AbstractNetworkLink implements INetworkLink, Basket { return myLanguage; } - public final HashMap urlInfoMap() { - return new HashMap(myInfos); + public final HashMap urlInfoMap() { + return new HashMap(myInfos); } - public final UrlInfo getUrlInfo(String urlKey) { - final UrlInfo info = myInfos.get(urlKey); - return info != null ? info : UrlInfo.NULL; + public final UrlInfoWithDate getUrlInfo(String urlKey) { + final UrlInfoWithDate info = myInfos.get(urlKey); + return info != null ? info : UrlInfoWithDate.NULL; } public final Set getUrlKeys() { diff --git a/src/org/geometerplus/fbreader/network/ICustomNetworkLink.java b/src/org/geometerplus/fbreader/network/ICustomNetworkLink.java index b99172214..b5a649b17 100644 --- a/src/org/geometerplus/fbreader/network/ICustomNetworkLink.java +++ b/src/org/geometerplus/fbreader/network/ICustomNetworkLink.java @@ -33,7 +33,7 @@ public interface ICustomNetworkLink extends INetworkLink { void setTitle(String title); void setSummary(String summary); - HashMap urlInfoMap(); + HashMap urlInfoMap(); void setUrl(String urlKey, String url); void removeUrl(String urlKey); diff --git a/src/org/geometerplus/fbreader/network/INetworkLink.java b/src/org/geometerplus/fbreader/network/INetworkLink.java index 949dc8dc2..f6f0f6f06 100644 --- a/src/org/geometerplus/fbreader/network/INetworkLink.java +++ b/src/org/geometerplus/fbreader/network/INetworkLink.java @@ -40,7 +40,7 @@ public interface INetworkLink { String getTitle(); String getSummary(); - UrlInfo getUrlInfo(String urlKey); + UrlInfoWithDate getUrlInfo(String urlKey); Set getUrlKeys(); /** diff --git a/src/org/geometerplus/fbreader/network/NetworkDatabase.java b/src/org/geometerplus/fbreader/network/NetworkDatabase.java index 5c50013c8..f4463f5d9 100644 --- a/src/org/geometerplus/fbreader/network/NetworkDatabase.java +++ b/src/org/geometerplus/fbreader/network/NetworkDatabase.java @@ -35,7 +35,7 @@ public abstract class NetworkDatabase { protected abstract void executeAsATransaction(Runnable actions); public interface ICustomLinksHandler { - void handleCustomLinkData(int id, String siteName, String title, String summary, Map infos); + void handleCustomLinkData(int id, String siteName, String title, String summary, Map infos); } protected abstract void loadCustomLinks(ICustomLinksHandler handler); diff --git a/src/org/geometerplus/fbreader/network/NetworkLibrary.java b/src/org/geometerplus/fbreader/network/NetworkLibrary.java index 019e02893..58235341f 100644 --- a/src/org/geometerplus/fbreader/network/NetworkLibrary.java +++ b/src/org/geometerplus/fbreader/network/NetworkLibrary.java @@ -179,7 +179,7 @@ public class NetworkLibrary { db.loadCustomLinks( new NetworkDatabase.ICustomLinksHandler() { public void handleCustomLinkData(int id, String siteName, - String title, String summary, Map infos) { + String title, String summary, Map infos) { if (title != null && siteName != null && infos.get(INetworkLink.URL_MAIN) != null) { diff --git a/src/org/geometerplus/fbreader/network/UrlInfo.java b/src/org/geometerplus/fbreader/network/UrlInfoWithDate.java similarity index 81% rename from src/org/geometerplus/fbreader/network/UrlInfo.java rename to src/org/geometerplus/fbreader/network/UrlInfoWithDate.java index cf6d2598c..608544c9d 100644 --- a/src/org/geometerplus/fbreader/network/UrlInfo.java +++ b/src/org/geometerplus/fbreader/network/UrlInfoWithDate.java @@ -24,20 +24,20 @@ import java.io.Serializable; import org.geometerplus.zlibrary.core.util.ZLMiscUtil; -public final class UrlInfo implements Serializable { +public final class UrlInfoWithDate implements Serializable { private static final long serialVersionUID = -893514485257787222L; - public static final UrlInfo NULL = new UrlInfo(null, null); + public static final UrlInfoWithDate NULL = new UrlInfoWithDate(null, null); public final String URL; public final Date Updated; - public UrlInfo(String url, Date updated) { + public UrlInfoWithDate(String url, Date updated) { URL = url; Updated = updated; } - public UrlInfo(String url) { + public UrlInfoWithDate(String url) { this(url, new Date()); } @@ -46,11 +46,11 @@ public final class UrlInfo implements Serializable { if (o == this) { return true; } - if (!(o instanceof UrlInfo)) { + if (!(o instanceof UrlInfoWithDate)) { return false; } - final UrlInfo info = (UrlInfo)o; + final UrlInfoWithDate info = (UrlInfoWithDate)o; return ZLMiscUtil.equals(URL, info.URL) && ZLMiscUtil.equals(Updated, info.Updated); } diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSCustomLink.java b/src/org/geometerplus/fbreader/network/opds/OPDSCustomLink.java index a43ea1f07..aec0ff877 100644 --- a/src/org/geometerplus/fbreader/network/opds/OPDSCustomLink.java +++ b/src/org/geometerplus/fbreader/network/opds/OPDSCustomLink.java @@ -31,7 +31,7 @@ import org.geometerplus.zlibrary.core.util.ZLMiscUtil; import org.geometerplus.fbreader.network.ICustomNetworkLink; import org.geometerplus.fbreader.network.NetworkException; -import org.geometerplus.fbreader.network.UrlInfo; +import org.geometerplus.fbreader.network.UrlInfoWithDate; public class OPDSCustomLink extends OPDSNetworkLink implements ICustomNetworkLink { private int myId; @@ -45,7 +45,7 @@ public class OPDSCustomLink extends OPDSNetworkLink implements ICustomNetworkLin return siteName; } - public OPDSCustomLink(int id, String siteName, String title, String summary, Map infos) { + public OPDSCustomLink(int id, String siteName, String title, String summary, Map infos) { super(removeWWWPrefix(siteName), title, summary, null, infos, false); myId = id; } @@ -82,12 +82,12 @@ public class OPDSCustomLink extends OPDSNetworkLink implements ICustomNetworkLin } public final void setUrl(String urlKey, String url) { - myInfos.put(urlKey, new UrlInfo(url, new Date())); + myInfos.put(urlKey, new UrlInfoWithDate(url, new Date())); myHasChanges = true; } public final void removeUrl(String urlKey) { - final UrlInfo oldUrl = myInfos.remove(urlKey); + final UrlInfoWithDate oldUrl = myInfos.remove(urlKey); myHasChanges = myHasChanges || oldUrl != null; } diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java b/src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java index 34c9678a9..4ff64718c 100644 --- a/src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java +++ b/src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java @@ -30,7 +30,7 @@ import org.geometerplus.zlibrary.core.xml.ZLStringMap; import org.geometerplus.fbreader.network.INetworkLink; import org.geometerplus.fbreader.network.NetworkLibrary; import org.geometerplus.fbreader.network.NetworkCatalogItem; -import org.geometerplus.fbreader.network.UrlInfo; +import org.geometerplus.fbreader.network.UrlInfoWithDate; import org.geometerplus.fbreader.network.atom.ATOMLink; import org.geometerplus.fbreader.network.atom.ATOMUpdated; import org.geometerplus.fbreader.network.authentication.NetworkAuthenticationManager; @@ -99,7 +99,7 @@ class OPDSLinkXMLReader extends OPDSXMLReader implements OPDSConstants, MimeType final String summary = entry.Content; final String language = entry.DCLanguage; - final HashMap infos = new HashMap(); + final HashMap infos = new HashMap(); final HashMap urlConditions = new HashMap(); for (ATOMLink link: entry.Links) { @@ -108,35 +108,35 @@ class OPDSLinkXMLReader extends OPDSXMLReader implements OPDSConstants, MimeType final String rel = link.getRel(); if (rel == REL_IMAGE_THUMBNAIL || rel == REL_THUMBNAIL) { if (type == MIME_IMAGE_PNG || type == MIME_IMAGE_JPEG) { - infos.put(INetworkLink.URL_ICON, new UrlInfo(href)); + infos.put(INetworkLink.URL_ICON, new UrlInfoWithDate(href)); } } else if ((rel != null && rel.startsWith(REL_IMAGE_PREFIX)) || rel == REL_COVER) { if (infos.get(INetworkLink.URL_ICON) == null && (type == MIME_IMAGE_PNG || type == MIME_IMAGE_JPEG)) { - infos.put(INetworkLink.URL_ICON, new UrlInfo(href)); + infos.put(INetworkLink.URL_ICON, new UrlInfoWithDate(href)); } } else if (rel == null) { if (type == MIME_APP_ATOM) { - infos.put(INetworkLink.URL_MAIN, new UrlInfo(href)); + infos.put(INetworkLink.URL_MAIN, new UrlInfoWithDate(href)); } } else if (rel == "search") { if (type == MIME_APP_ATOM) { final OpenSearchDescription descr = OpenSearchDescription.createDefault(href); if (descr.isValid()) { // TODO: May be do not use '%s'??? Use Description instead??? (this needs to rewrite SEARCH engine logic a little) - infos.put(INetworkLink.URL_SEARCH, new UrlInfo(descr.makeQuery("%s"))); + infos.put(INetworkLink.URL_SEARCH, new UrlInfoWithDate(descr.makeQuery("%s"))); } } } else if (rel == REL_LINK_SIGN_IN) { - infos.put(INetworkLink.URL_SIGN_IN, new UrlInfo(href)); + infos.put(INetworkLink.URL_SIGN_IN, new UrlInfoWithDate(href)); } else if (rel == REL_LINK_SIGN_OUT) { - infos.put(INetworkLink.URL_SIGN_OUT, new UrlInfo(href)); + infos.put(INetworkLink.URL_SIGN_OUT, new UrlInfoWithDate(href)); } else if (rel == REL_LINK_SIGN_UP) { - infos.put(INetworkLink.URL_SIGN_UP, new UrlInfo(href)); + infos.put(INetworkLink.URL_SIGN_UP, new UrlInfoWithDate(href)); } else if (rel == REL_LINK_TOPUP) { - infos.put(INetworkLink.URL_TOPUP, new UrlInfo(href)); + infos.put(INetworkLink.URL_TOPUP, new UrlInfoWithDate(href)); } else if (rel == REL_LINK_RECOVER_PASSWORD) { - infos.put(INetworkLink.URL_RECOVER_PASSWORD, new UrlInfo(href)); + infos.put(INetworkLink.URL_RECOVER_PASSWORD, new UrlInfoWithDate(href)); } else if (rel == REL_CONDITION_NEVER) { urlConditions.put(href, NetworkCatalogItem.Accessibility.NEVER); } else if (rel == REL_CONDITION_SIGNED_IN) { @@ -166,7 +166,7 @@ class OPDSLinkXMLReader extends OPDSXMLReader implements OPDSConstants, MimeType String title, String summary, String language, - Map infos, + Map infos, HashMap urlConditions, String sslCertificate ) { diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSNetworkLink.java b/src/org/geometerplus/fbreader/network/opds/OPDSNetworkLink.java index eb672271e..25c3e5468 100644 --- a/src/org/geometerplus/fbreader/network/opds/OPDSNetworkLink.java +++ b/src/org/geometerplus/fbreader/network/opds/OPDSNetworkLink.java @@ -44,7 +44,7 @@ public class OPDSNetworkLink extends AbstractNetworkLink { private final boolean myHasStableIdentifiers; OPDSNetworkLink(String siteName, String title, String summary, String language, - Map infos, boolean hasStableIdentifiers) { + Map infos, boolean hasStableIdentifiers) { super(siteName, title, summary, language, infos); myHasStableIdentifiers = hasStableIdentifiers; }