refactoring: all the UrlInfo classes were moved to a separate directory

src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java

@@ -39,6 +39,7 @@ import org.geometerplus.zlibrary.ui.android.R;
 
 import org.geometerplus.fbreader.network.*;
 import org.geometerplus.fbreader.network.opds.OPDSCustomLink;
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoWithDate;
 
 import org.geometerplus.android.util.UIUtil;
 

src/org/geometerplus/android/fbreader/network/BookDownloader.java

@@ -26,8 +26,7 @@ import android.app.Activity;
 import android.net.Uri;
 import android.content.Intent;
 
-import org.geometerplus.fbreader.network.BookUrlInfo;
-
+import org.geometerplus.fbreader.network.urlInfo.BookUrlInfo;
 
 public class BookDownloader extends Activity {
 

src/org/geometerplus/android/fbreader/network/BookDownloaderService.java

@@ -40,8 +40,8 @@ import org.geometerplus.zlibrary.ui.android.R;
 import org.geometerplus.zlibrary.core.resources.ZLResource;
 import org.geometerplus.zlibrary.core.network.*;
 
-import org.geometerplus.fbreader.network.UrlInfo;
-import org.geometerplus.fbreader.network.BookUrlInfo;
+import org.geometerplus.fbreader.network.urlInfo.UrlInfo;
+import org.geometerplus.fbreader.network.urlInfo.BookUrlInfo;
 
 import org.geometerplus.android.fbreader.FBReader;
 

src/org/geometerplus/android/fbreader/network/NetworkBookActions.java

@@ -42,6 +42,7 @@ import org.geometerplus.android.util.UIUtil;
 import org.geometerplus.android.fbreader.FBReader;
 
 import org.geometerplus.fbreader.network.*;
+import org.geometerplus.fbreader.network.urlInfo.*;
 import org.geometerplus.fbreader.network.tree.NetworkBookTree;
 import org.geometerplus.fbreader.network.tree.NetworkAuthorTree;
 import org.geometerplus.fbreader.network.tree.NetworkSeriesTree;

src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java

@@ -35,12 +35,12 @@ import org.geometerplus.android.util.UIUtil;
 import org.geometerplus.android.util.PackageUtil;
 
 import org.geometerplus.fbreader.network.*;
+import org.geometerplus.fbreader.network.authentication.*;
 import org.geometerplus.fbreader.network.tree.NetworkTreeFactory;
 import org.geometerplus.fbreader.network.tree.NetworkCatalogTree;
 import org.geometerplus.fbreader.network.tree.NetworkCatalogRootTree;
 import org.geometerplus.fbreader.network.opds.BasketItem;
-import org.geometerplus.fbreader.network.authentication.*;
-
+import org.geometerplus.fbreader.network.urlInfo.UrlInfo;
 
 class NetworkCatalogActions extends NetworkTreeActions {
 	public static final int OPEN_CATALOG_ITEM_ID = 0;

src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java

@@ -41,6 +41,7 @@ import org.geometerplus.android.util.UIUtil;
 
 import org.geometerplus.fbreader.network.*;
 import org.geometerplus.fbreader.network.opds.OPDSCustomLink;
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoWithDate;
 
 public class NetworkLibraryActivity extends NetworkBaseActivity {
 	static final String ADD_CATALOG = "android.fbreader.action.ADD_CATALOG";

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.UrlInfoWithDate;
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoWithDate;
 
 import org.geometerplus.android.util.SQLiteUtil;
 

src/org/geometerplus/fbreader/network/AbstractNetworkLink.java

@@ -24,6 +24,8 @@ import java.util.*;
 import org.geometerplus.zlibrary.core.util.ZLMiscUtil;
 import org.geometerplus.zlibrary.core.options.ZLStringListOption;
 
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoWithDate;
+
 public abstract class AbstractNetworkLink implements INetworkLink, Basket {
 	protected String mySiteName;
 	protected String myTitle;

src/org/geometerplus/fbreader/network/ICustomNetworkLink.java

@@ -19,9 +19,11 @@
 
 package org.geometerplus.fbreader.network;
 
+import java.util.HashMap;
+
 import org.geometerplus.zlibrary.core.network.ZLNetworkException;
 
-import java.util.HashMap;
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoWithDate;
 
 public interface ICustomNetworkLink extends INetworkLink {
 	public static final int INVALID_ID = -1;

src/org/geometerplus/fbreader/network/INetworkLink.java

@@ -24,7 +24,7 @@ import java.util.*;
 import org.geometerplus.zlibrary.core.network.ZLNetworkRequest;
 
 import org.geometerplus.fbreader.network.authentication.NetworkAuthenticationManager;
-
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoWithDate;
 
 public interface INetworkLink {
 	String URL_MAIN = "main";

src/org/geometerplus/fbreader/network/NetworkBookItem.java

@@ -22,6 +22,7 @@ package org.geometerplus.fbreader.network;
 import java.util.*;
 import java.io.File;
 
+import org.geometerplus.fbreader.network.urlInfo.*;
 import org.geometerplus.fbreader.network.authentication.NetworkAuthenticationManager;
 
 public final class NetworkBookItem extends NetworkItem {

src/org/geometerplus/fbreader/network/NetworkCatalogItem.java

@@ -25,6 +25,7 @@ import org.geometerplus.zlibrary.core.util.ZLBoolean3;
 import org.geometerplus.zlibrary.core.network.ZLNetworkException;
 
 import org.geometerplus.fbreader.network.authentication.NetworkAuthenticationManager;
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoCollection;
 
 public abstract class NetworkCatalogItem extends NetworkItem {
 	// bit mask for flags parameter

src/org/geometerplus/fbreader/network/NetworkDatabase.java

@@ -21,6 +21,8 @@ package org.geometerplus.fbreader.network;
 
 import java.util.Map;
 
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoWithDate;
+
 public abstract class NetworkDatabase {
 	private static NetworkDatabase ourInstance;
 

src/org/geometerplus/fbreader/network/NetworkItem.java

@@ -21,6 +21,9 @@ package org.geometerplus.fbreader.network;
 
 import java.util.*;
 
+import org.geometerplus.fbreader.network.urlInfo.UrlInfo;
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoCollection;
+
 public abstract class NetworkItem {
 	public final INetworkLink Link;
 	public final String Title;

src/org/geometerplus/fbreader/network/NetworkLibrary.java

@@ -33,6 +33,7 @@ import org.geometerplus.fbreader.tree.FBTree;
 import org.geometerplus.fbreader.network.tree.*;
 import org.geometerplus.fbreader.network.opds.OPDSCustomLink;
 import org.geometerplus.fbreader.network.opds.OPDSLinkReader;
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoWithDate;
 
 public class NetworkLibrary {
 	private static NetworkLibrary ourInstance;

src/org/geometerplus/fbreader/network/NetworkURLCatalogItem.java

@@ -23,6 +23,9 @@ import org.geometerplus.zlibrary.core.network.ZLNetworkException;
 import org.geometerplus.zlibrary.core.network.ZLNetworkManager;
 import org.geometerplus.zlibrary.core.network.ZLNetworkRequest;
 
+import org.geometerplus.fbreader.network.urlInfo.UrlInfo;
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoCollection;
+
 public abstract class NetworkURLCatalogItem extends NetworkCatalogItem {
 	/**
 	 * Creates new NetworkURLCatalogItem instance with <code>Accessibility.ALWAYS</code> accessibility and <code>FLAGS_DEFAULT</code> flags.

src/org/geometerplus/fbreader/network/TopUpItem.java

@@ -19,10 +19,10 @@
 
 package org.geometerplus.fbreader.network;
 
-import java.util.Map;
-
 import org.geometerplus.zlibrary.core.resources.ZLResource;
 
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoCollection;
+
 public class TopUpItem extends NetworkItem {
 	public TopUpItem(INetworkLink link, UrlInfoCollection urls) {
 		super(

src/org/geometerplus/fbreader/network/authentication/NetworkAuthenticationManager.java

@@ -25,9 +25,8 @@ import org.geometerplus.zlibrary.core.options.ZLStringOption;
 import org.geometerplus.zlibrary.core.network.ZLNetworkException;
 
 import org.geometerplus.fbreader.network.*;
-
 import org.geometerplus.fbreader.network.authentication.litres.LitResAuthenticationManager;
-
+import org.geometerplus.fbreader.network.urlInfo.BookUrlInfo;
 
 public abstract class NetworkAuthenticationManager {
 	private static final HashMap<String, NetworkAuthenticationManager> ourManagers = new HashMap<String, NetworkAuthenticationManager>();

src/org/geometerplus/fbreader/network/authentication/litres/LitResAuthenticationManager.java

@@ -29,6 +29,7 @@ import org.geometerplus.zlibrary.core.network.ZLNetworkRequest;
 
 import org.geometerplus.fbreader.network.*;
 import org.geometerplus.fbreader.network.authentication.*;
+import org.geometerplus.fbreader.network.urlInfo.*;
 
 public class LitResAuthenticationManager extends NetworkAuthenticationManager {
 	private boolean mySidChecked;

src/org/geometerplus/fbreader/network/authentication/litres/LitResBookshelfItem.java

@@ -25,6 +25,7 @@ import org.geometerplus.zlibrary.core.resources.ZLResource;
 import org.geometerplus.zlibrary.core.network.ZLNetworkException;
 
 import org.geometerplus.fbreader.network.*;
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoCollection;
 
 abstract class SortedCatalogItem extends NetworkCatalogItem {
 	private final List<NetworkItem> myChildren = new LinkedList<NetworkItem>();

src/org/geometerplus/fbreader/network/authentication/litres/LitResRecommendationsItem.java

@@ -23,6 +23,7 @@ import org.geometerplus.zlibrary.core.util.ZLNetworkUtil;
 
 import org.geometerplus.fbreader.network.*;
 import org.geometerplus.fbreader.network.opds.OPDSCatalogItem;
+import org.geometerplus.fbreader.network.urlInfo.*;
 
 public class LitResRecommendationsItem extends OPDSCatalogItem {
 	public LitResRecommendationsItem(INetworkLink link, String title, String summary, UrlInfoCollection urls, Accessibility accessibility) {

src/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java

@@ -26,7 +26,7 @@ import org.geometerplus.zlibrary.core.xml.*;
 
 import org.geometerplus.fbreader.network.*;
 import org.geometerplus.fbreader.network.opds.HtmlToString;
-
+import org.geometerplus.fbreader.network.urlInfo.*;
 
 class LitResXMLReader extends LitResAuthenticationXMLReader {
 	public final INetworkLink Link;

src/org/geometerplus/fbreader/network/opds/BasketItem.java

@@ -21,8 +21,8 @@ package org.geometerplus.fbreader.network.opds;
 
 import org.geometerplus.zlibrary.core.util.ZLNetworkUtil;
 
-import org.geometerplus.fbreader.network.UrlInfo;
-import org.geometerplus.fbreader.network.UrlInfoCollection;
+import org.geometerplus.fbreader.network.urlInfo.UrlInfo;
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoCollection;
 
 public class BasketItem extends OPDSCatalogItem {
 	BasketItem(OPDSNetworkLink link, String title, String summary, UrlInfoCollection urls, Accessibility accessibility) {

src/org/geometerplus/fbreader/network/opds/NetworkOPDSFeedReader.java

@@ -28,6 +28,7 @@ import org.geometerplus.fbreader.network.*;
 import org.geometerplus.fbreader.network.atom.*;
 import org.geometerplus.fbreader.network.authentication.litres.LitResBookshelfItem;
 import org.geometerplus.fbreader.network.authentication.litres.LitResRecommendationsItem;
+import org.geometerplus.fbreader.network.urlInfo.*;
 
 class NetworkOPDSFeedReader implements OPDSFeedReader, OPDSConstants, MimeTypes {
 	private final String myBaseURL;

src/org/geometerplus/fbreader/network/opds/OPDSCatalogItem.java

@@ -25,6 +25,7 @@ import org.geometerplus.zlibrary.core.network.ZLNetworkException;
 import org.geometerplus.zlibrary.core.network.ZLNetworkRequest;
 
 import org.geometerplus.fbreader.network.*;
+import org.geometerplus.fbreader.network.urlInfo.*;
 
 public class OPDSCatalogItem extends NetworkURLCatalogItem {
 	static class State extends NetworkOperationData {

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.UrlInfoWithDate;
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoWithDate;
 
 public class OPDSCustomLink extends OPDSNetworkLink implements ICustomNetworkLink {
 	private int myId;

src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java

@@ -27,14 +27,12 @@ import org.geometerplus.zlibrary.core.filesystem.ZLResourceFile;
 import org.geometerplus.zlibrary.core.util.ZLNetworkUtil;
 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.UrlInfoWithDate;
+import org.geometerplus.fbreader.network.*;
 import org.geometerplus.fbreader.network.atom.ATOMLink;
 import org.geometerplus.fbreader.network.atom.ATOMUpdated;
 import org.geometerplus.fbreader.network.authentication.NetworkAuthenticationManager;
 import org.geometerplus.fbreader.network.authentication.litres.LitResAuthenticationManager;
+import org.geometerplus.fbreader.network.urlInfo.UrlInfoWithDate;
 
 class OPDSLinkXMLReader extends OPDSXMLReader implements OPDSConstants, MimeTypes {
 	private static class LinkReader implements OPDSFeedReader {

src/org/geometerplus/fbreader/network/opds/OPDSNetworkLink.java

@@ -32,9 +32,10 @@ import org.geometerplus.zlibrary.core.network.ZLNetworkRequest;
 
 import org.geometerplus.fbreader.network.*;
 import org.geometerplus.fbreader.network.authentication.NetworkAuthenticationManager;
+import org.geometerplus.fbreader.network.urlInfo.*;
 
 public class OPDSNetworkLink extends AbstractNetworkLink {
-	private TreeMap<RelationAlias, String> myRelationAliases;
+	private TreeMap<RelationAlias,String> myRelationAliases;
 
 	private TreeMap<String,NetworkCatalogItem.Accessibility> myUrlConditions;
 	private final LinkedList<URLRewritingRule> myUrlRewritingRules = new LinkedList<URLRewritingRule>();

src/org/geometerplus/fbreader/network/urlInfo/BookBuyUrlInfo.java

@@ -17,7 +17,7 @@
  * 02110-1301, USA.
  */
 
-package org.geometerplus.fbreader.network;
+package org.geometerplus.fbreader.network.urlInfo;
 
 public class BookBuyUrlInfo extends BookUrlInfo {
 	public final String Price;

src/org/geometerplus/fbreader/network/urlInfo/BookUrlInfo.java

@@ -17,7 +17,7 @@
  * 02110-1301, USA.
  */
 
-package org.geometerplus.fbreader.network;
+package org.geometerplus.fbreader.network.urlInfo;
 
 import java.io.File;
 import java.net.URI;

src/org/geometerplus/fbreader/network/urlInfo/DecoratedBookUrlInfo.java

@@ -17,7 +17,7 @@
  * 02110-1301, USA.
  */
 
-package org.geometerplus.fbreader.network;
+package org.geometerplus.fbreader.network.urlInfo;
 
 public class DecoratedBookUrlInfo extends BookUrlInfo {
 	private final String myCleanUrl;

src/org/geometerplus/fbreader/network/urlInfo/UrlInfo.java

@@ -17,7 +17,7 @@
  * 02110-1301, USA.
  */
 
-package org.geometerplus.fbreader.network;
+package org.geometerplus.fbreader.network.urlInfo;
 
 import java.io.Serializable;
 

src/org/geometerplus/fbreader/network/urlInfo/UrlInfoCollection.java

@@ -17,7 +17,7 @@
  * 02110-1301, USA.
  */
 
-package org.geometerplus.fbreader.network;
+package org.geometerplus.fbreader.network.urlInfo;
 
 import java.util.*;
 

src/org/geometerplus/fbreader/network/urlInfo/UrlInfoWithDate.java

@@ -17,7 +17,7 @@
  * 02110-1301, USA.
  */
 
-package org.geometerplus.fbreader.network;
+package org.geometerplus.fbreader.network.urlInfo;
 
 import java.util.Date;
 import java.io.Serializable;