From a42feda147345a4467ef3217e76d12dfbe1baf04 Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Sat, 19 Oct 2013 13:37:13 +0100 Subject: [PATCH] formatting --- src/org/geometerplus/fbreader/formats/fb2/FB2Tag.java | 2 +- .../network/authentication/NetworkAuthenticationManager.java | 2 +- .../network/authentication/litres/LitResGenreMap.java | 4 ++-- .../geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java | 2 +- .../geometerplus/fbreader/network/opds/OPDSNetworkLink.java | 4 ++-- src/org/geometerplus/fbreader/network/opds/OPDSXMLReader.java | 2 +- .../fbreader/network/rss/AbstractRSSChannelHandler.java | 2 +- .../geometerplus/fbreader/network/tree/NetworkAuthorTree.java | 4 ++-- src/org/geometerplus/zlibrary/core/xml/ZLXMLParser.java | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/org/geometerplus/fbreader/formats/fb2/FB2Tag.java b/src/org/geometerplus/fbreader/formats/fb2/FB2Tag.java index 5e8262377..90bd60804 100644 --- a/src/org/geometerplus/fbreader/formats/fb2/FB2Tag.java +++ b/src/org/geometerplus/fbreader/formats/fb2/FB2Tag.java @@ -62,7 +62,7 @@ final class FB2Tag { public static final byte DESCRIPTION = 35; - private static final HashMap ourTagByName = new HashMap(256, 0.2f); + private static final HashMap ourTagByName = new HashMap(256, 0.2f); private static final Byte ourUnknownTag; static { diff --git a/src/org/geometerplus/fbreader/network/authentication/NetworkAuthenticationManager.java b/src/org/geometerplus/fbreader/network/authentication/NetworkAuthenticationManager.java index 4fae668fc..3c5be16a6 100644 --- a/src/org/geometerplus/fbreader/network/authentication/NetworkAuthenticationManager.java +++ b/src/org/geometerplus/fbreader/network/authentication/NetworkAuthenticationManager.java @@ -31,7 +31,7 @@ import org.geometerplus.fbreader.network.authentication.litres.LitResAuthenticat import org.geometerplus.fbreader.network.urlInfo.*; public abstract class NetworkAuthenticationManager { - private static final HashMap ourManagers = new HashMap(); + private static final HashMap ourManagers = new HashMap(); public static NetworkAuthenticationManager createManager(INetworkLink link, Class managerClass) { NetworkAuthenticationManager mgr = ourManagers.get(link.getSiteName()); diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResGenreMap.java b/src/org/geometerplus/fbreader/network/authentication/litres/LitResGenreMap.java index 85154b18a..0a79c757e 100644 --- a/src/org/geometerplus/fbreader/network/authentication/litres/LitResGenreMap.java +++ b/src/org/geometerplus/fbreader/network/authentication/litres/LitResGenreMap.java @@ -27,8 +27,8 @@ class LitResGenreMap { private static LitResGenreMap ourInstance; LinkedList myGenresTree; - HashMap myGenresMap; - HashMap myGenresTitles; + HashMap myGenresMap; + HashMap myGenresTitles; public static LitResGenreMap Instance() { if (ourInstance == null) { diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java b/src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java index 4dc542f00..24ac3b511 100644 --- a/src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java +++ b/src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java @@ -38,7 +38,7 @@ class OPDSLinkXMLReader extends OPDSXMLReader implements OPDSConstants { private String myAuthenticationType; private final LinkedList myUrlRewritingRules = new LinkedList(); - private final HashMap myRelationAliases = new HashMap(); + private final HashMap myRelationAliases = new HashMap(); private final LinkedHashMap myExtraData = new LinkedHashMap(); List links() { diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSNetworkLink.java b/src/org/geometerplus/fbreader/network/opds/OPDSNetworkLink.java index f2a260edf..9c0b838d3 100644 --- a/src/org/geometerplus/fbreader/network/opds/OPDSNetworkLink.java +++ b/src/org/geometerplus/fbreader/network/opds/OPDSNetworkLink.java @@ -46,9 +46,9 @@ public abstract class OPDSNetworkLink extends AbstractNetworkLink { super(id, siteName, title, summary, language, infos); } - final void setRelationAliases(Map relationAliases) { + final void setRelationAliases(Map relationAliases) { if (relationAliases != null && relationAliases.size() > 0) { - myRelationAliases = new TreeMap(relationAliases); + myRelationAliases = new TreeMap(relationAliases); } else { myRelationAliases = null; } diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSXMLReader.java b/src/org/geometerplus/fbreader/network/opds/OPDSXMLReader.java index 3e04d5774..27abc5898 100644 --- a/src/org/geometerplus/fbreader/network/opds/OPDSXMLReader.java +++ b/src/org/geometerplus/fbreader/network/opds/OPDSXMLReader.java @@ -25,7 +25,7 @@ import org.geometerplus.zlibrary.core.xml.*; import org.geometerplus.fbreader.network.atom.*; -public class OPDSXMLReader extends ATOMXMLReader { +public class OPDSXMLReader extends ATOMXMLReader { public static final String KEY_PRICE = "price"; private DCDate myDCIssued; diff --git a/src/org/geometerplus/fbreader/network/rss/AbstractRSSChannelHandler.java b/src/org/geometerplus/fbreader/network/rss/AbstractRSSChannelHandler.java index 80e6ea2c8..86191430e 100644 --- a/src/org/geometerplus/fbreader/network/rss/AbstractRSSChannelHandler.java +++ b/src/org/geometerplus/fbreader/network/rss/AbstractRSSChannelHandler.java @@ -23,7 +23,7 @@ import org.geometerplus.zlibrary.core.xml.ZLStringMap; import org.geometerplus.fbreader.network.atom.ATOMFeedHandler; -public abstract class AbstractRSSChannelHandler implements ATOMFeedHandler { +public abstract class AbstractRSSChannelHandler implements ATOMFeedHandler { public RSSChannelMetadata createFeed(ZLStringMap attributes) { return new RSSChannelMetadata(attributes); } diff --git a/src/org/geometerplus/fbreader/network/tree/NetworkAuthorTree.java b/src/org/geometerplus/fbreader/network/tree/NetworkAuthorTree.java index af49bb6d2..ee441edba 100644 --- a/src/org/geometerplus/fbreader/network/tree/NetworkAuthorTree.java +++ b/src/org/geometerplus/fbreader/network/tree/NetworkAuthorTree.java @@ -30,7 +30,7 @@ public class NetworkAuthorTree extends NetworkTree { public final NetworkBookItem.AuthorData Author; private int myBooksNumber; - private HashMap mySeriesMap; + private HashMap mySeriesMap; NetworkAuthorTree(NetworkTree parent, NetworkBookItem.AuthorData author) { super(parent); @@ -60,7 +60,7 @@ public class NetworkAuthorTree extends NetworkTree { private void setSeriesIndex(String seriesName, int index) { if (mySeriesMap == null) { - mySeriesMap = new HashMap(); + mySeriesMap = new HashMap(); } mySeriesMap.put(seriesName, Integer.valueOf(index)); } diff --git a/src/org/geometerplus/zlibrary/core/xml/ZLXMLParser.java b/src/org/geometerplus/zlibrary/core/xml/ZLXMLParser.java index 7f1bf46ec..ecec92e1b 100644 --- a/src/org/geometerplus/zlibrary/core/xml/ZLXMLParser.java +++ b/src/org/geometerplus/zlibrary/core/xml/ZLXMLParser.java @@ -224,7 +224,7 @@ final class ZLXMLParser { final ZLMutableString attributeValue = myAttributeValue; final boolean dontCacheAttributeValues = xmlReader.dontCacheAttributeValues(); final ZLMutableString entityName = myEntityName; - final Map strings = new HashMap(); + final Map strings = new HashMap(); final ZLStringMap attributes = new ZLStringMap(); String[] tagStack = new String[10]; int tagStackSize = 0;