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

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

Browse source
This commit is contained in:
Nikolay Pultsin 2011-04-15 23:32:27 +01:00
parent aa82cf5ddc
commit 5c2775b46e
34 changed files with 48 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
View file

@ -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;

3
src/org/geometerplus/android/fbreader/network/BookDownloader.java
View file

@ -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 {

4
src/org/geometerplus/android/fbreader/network/BookDownloaderService.java
View file

@ -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;

1
src/org/geometerplus/android/fbreader/network/NetworkBookActions.java
View file

@ -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;

4
src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java
View file

@ -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;

1
src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java
View file

@ -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";

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

@ -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;

2
src/org/geometerplus/fbreader/network/AbstractNetworkLink.java
View file

@ -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;

4
src/org/geometerplus/fbreader/network/ICustomNetworkLink.java
View file

@ -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;

2
src/org/geometerplus/fbreader/network/INetworkLink.java
View file

@ -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";

1
src/org/geometerplus/fbreader/network/NetworkBookItem.java
View file

@ -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 {

1
src/org/geometerplus/fbreader/network/NetworkCatalogItem.java
View file

@ -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

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

@ -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;

3
src/org/geometerplus/fbreader/network/NetworkItem.java
View file

@ -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;

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

@ -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;

3
src/org/geometerplus/fbreader/network/NetworkURLCatalogItem.java
View file

@ -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.

4
src/org/geometerplus/fbreader/network/TopUpItem.java
View file

@ -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(

3
src/org/geometerplus/fbreader/network/authentication/NetworkAuthenticationManager.java
View file

@ -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>();

1
src/org/geometerplus/fbreader/network/authentication/litres/LitResAuthenticationManager.java
View file

@ -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;

1
src/org/geometerplus/fbreader/network/authentication/litres/LitResBookshelfItem.java
View file

@ -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>();

1
src/org/geometerplus/fbreader/network/authentication/litres/LitResRecommendationsItem.java
View file

@ -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) {

2
src/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java
View file

@ -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;

4
src/org/geometerplus/fbreader/network/opds/BasketItem.java
View file

@ -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) {

1
src/org/geometerplus/fbreader/network/opds/NetworkOPDSFeedReader.java
View file

@ -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;

1
src/org/geometerplus/fbreader/network/opds/OPDSCatalogItem.java
View file

@ -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 {

2
src/org/geometerplus/fbreader/network/opds/OPDSCustomLink.java
View file

@ -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;

6
src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java
View file

@ -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 {

3
src/org/geometerplus/fbreader/network/opds/OPDSNetworkLink.java
View file

@ -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>();

2
src/org/geometerplus/fbreader/network/BookBuyUrlInfo.java → src/org/geometerplus/fbreader/network/urlInfo/BookBuyUrlInfo.java
View file

@ -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;

2
src/org/geometerplus/fbreader/network/BookUrlInfo.java → src/org/geometerplus/fbreader/network/urlInfo/BookUrlInfo.java
View file

@ -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;

2
src/org/geometerplus/fbreader/network/DecoratedBookUrlInfo.java → src/org/geometerplus/fbreader/network/urlInfo/DecoratedBookUrlInfo.java
View file

@ -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;

2
src/org/geometerplus/fbreader/network/UrlInfo.java → src/org/geometerplus/fbreader/network/urlInfo/UrlInfo.java
View file

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

2
src/org/geometerplus/fbreader/network/UrlInfoCollection.java → src/org/geometerplus/fbreader/network/urlInfo/UrlInfoCollection.java
View file

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

2
src/org/geometerplus/fbreader/network/UrlInfoWithDate.java → src/org/geometerplus/fbreader/network/urlInfo/UrlInfoWithDate.java
View file

@ -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;