diff --git a/src/org/geometerplus/android/fbreader/network/ItemsLoadingHandler.java b/src/org/geometerplus/android/fbreader/network/ItemsLoadingHandler.java index 75e28c3d9..d048538de 100644 --- a/src/org/geometerplus/android/fbreader/network/ItemsLoadingHandler.java +++ b/src/org/geometerplus/android/fbreader/network/ItemsLoadingHandler.java @@ -29,7 +29,7 @@ import android.os.Message; import android.os.Handler; import org.geometerplus.fbreader.network.INetworkLink; -import org.geometerplus.fbreader.network.NetworkLibraryItem; +import org.geometerplus.fbreader.network.NetworkItem; abstract class ItemsLoadingHandler extends Handler { @@ -37,20 +37,20 @@ abstract class ItemsLoadingHandler extends Handler { private static final int WHAT_UPDATE_ITEMS = 0; private static final int WHAT_FINISHED = 1; - private final LinkedList myItems = new LinkedList(); - private final HashMap> myUncommitedItems = new HashMap>(); + private final LinkedList myItems = new LinkedList(); + private final HashMap> myUncommitedItems = new HashMap>(); private final Object myItemsMonitor = new Object(); private volatile boolean myFinishProcessed; private final Object myFinishMonitor = new Object(); - public final void addItem(INetworkLink link, NetworkLibraryItem item) { + public final void addItem(INetworkLink link, NetworkItem item) { synchronized (myItemsMonitor) { myItems.add(item); - LinkedList uncommited = myUncommitedItems.get(link); + LinkedList uncommited = myUncommitedItems.get(link); if (uncommited == null) { - uncommited = new LinkedList(); + uncommited = new LinkedList(); myUncommitedItems.put(link, uncommited); } uncommited.add(item); @@ -59,7 +59,7 @@ abstract class ItemsLoadingHandler extends Handler { public final void commitItems(INetworkLink link) { synchronized (myItemsMonitor) { - LinkedList uncommited = myUncommitedItems.get(link); + LinkedList uncommited = myUncommitedItems.get(link); if (uncommited != null) { uncommited.clear(); } @@ -98,9 +98,9 @@ abstract class ItemsLoadingHandler extends Handler { } private final void doProcessFinish(String errorMessage, boolean interrupted) { - HashSet uncommitedItems = new HashSet(); + HashSet uncommitedItems = new HashSet(); synchronized (myUncommitedItems) { - for (LinkedList items: myUncommitedItems.values()) { + for (LinkedList items: myUncommitedItems.values()) { uncommitedItems.addAll(items); } } @@ -124,9 +124,9 @@ abstract class ItemsLoadingHandler extends Handler { // callbacks - public abstract void onUpdateItems(List items); + public abstract void onUpdateItems(List items); public abstract void afterUpdateItems(); - public abstract void onFinish(String errorMessage, boolean interrupted, Set uncommitedItems); + public abstract void onFinish(String errorMessage, boolean interrupted, Set uncommitedItems); @Override diff --git a/src/org/geometerplus/android/fbreader/network/ItemsLoadingRunnable.java b/src/org/geometerplus/android/fbreader/network/ItemsLoadingRunnable.java index ffa82bab1..4c3f4ec9b 100644 --- a/src/org/geometerplus/android/fbreader/network/ItemsLoadingRunnable.java +++ b/src/org/geometerplus/android/fbreader/network/ItemsLoadingRunnable.java @@ -26,7 +26,7 @@ import org.geometerplus.zlibrary.core.network.ZLNetworkException; import org.geometerplus.fbreader.network.INetworkLink; import org.geometerplus.fbreader.network.NetworkOperationData; -import org.geometerplus.fbreader.network.NetworkLibraryItem; +import org.geometerplus.fbreader.network.NetworkItem; abstract class ItemsLoadingRunnable implements Runnable { private final ItemsLoadingHandler myHandler; @@ -99,7 +99,7 @@ abstract class ItemsLoadingRunnable implements Runnable { doLoading(new NetworkOperationData.OnNewItemListener() { private long myUpdateTime; private int myItemsNumber; - public void onNewItem(INetworkLink link, NetworkLibraryItem item) { + public void onNewItem(INetworkLink link, NetworkItem item) { myHandler.addItem(link, item); ++myItemsNumber; final long now = System.currentTimeMillis(); diff --git a/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java b/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java index 09200ffe4..5343b6642 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java @@ -295,8 +295,8 @@ class NetworkCatalogActions extends NetworkTreeActions { } @Override - public void onUpdateItems(List items) { - for (NetworkLibraryItem item: items) { + public void onUpdateItems(List items) { + for (NetworkItem item: items) { myTree.ChildrenItems.add(item); NetworkTreeFactory.createNetworkTree(myTree, item); } @@ -311,7 +311,7 @@ class NetworkCatalogActions extends NetworkTreeActions { @Override public void onFinish(String errorMessage, boolean interrupted, - Set uncommitedItems) { + Set uncommitedItems) { if (interrupted && (!myTree.Item.supportsResumeLoading() || errorMessage != null)) { myTree.ChildrenItems.clear(); diff --git a/src/org/geometerplus/android/fbreader/network/NetworkSearchActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkSearchActivity.java index a7bbc74c1..a88cdc60d 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkSearchActivity.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkSearchActivity.java @@ -62,9 +62,9 @@ public class NetworkSearchActivity extends Activity { } @Override - public void onUpdateItems(List items) { + public void onUpdateItems(List items) { SearchResult result = myTree.getSearchResult(); - for (NetworkLibraryItem item: items) { + for (NetworkItem item: items) { if (item instanceof NetworkBookItem) { result.addBook((NetworkBookItem)item); } @@ -81,7 +81,7 @@ public class NetworkSearchActivity extends Activity { @Override public void onFinish(String errorMessage, boolean interrupted, - Set uncommitedItems) { + Set uncommitedItems) { if (interrupted) { myTree.setSearchResult(null); } else { diff --git a/src/org/geometerplus/android/fbreader/network/NetworkView.java b/src/org/geometerplus/android/fbreader/network/NetworkView.java index 1247c7c7a..77994cd7b 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkView.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkView.java @@ -88,7 +88,7 @@ class NetworkView { } /* - * NetworkLibraryItem's actions + * NetworkItem's actions */ public RefillAccountActions getTopUpActions() { diff --git a/src/org/geometerplus/fbreader/network/NetworkBookItem.java b/src/org/geometerplus/fbreader/network/NetworkBookItem.java index 6e8da3cbb..0381e2306 100644 --- a/src/org/geometerplus/fbreader/network/NetworkBookItem.java +++ b/src/org/geometerplus/fbreader/network/NetworkBookItem.java @@ -25,7 +25,7 @@ import java.io.File; import org.geometerplus.fbreader.network.authentication.NetworkAuthenticationManager; -public final class NetworkBookItem extends NetworkLibraryItem { +public final class NetworkBookItem extends NetworkItem { public static class AuthorData implements Comparable { public final String DisplayName; @@ -80,7 +80,7 @@ public final class NetworkBookItem extends NetworkLibraryItem { private final LinkedList myReferences; /** - * Creates new NetworkLibraryItem instance. + * Creates new NetworkItem instance. * * @param link corresponding NetworkLink object. Must be not null. * @param id string that uniquely identifies this book item. Must be not null. diff --git a/src/org/geometerplus/fbreader/network/NetworkBookItemComparator.java b/src/org/geometerplus/fbreader/network/NetworkBookItemComparator.java index db8981e73..faf44f04b 100644 --- a/src/org/geometerplus/fbreader/network/NetworkBookItemComparator.java +++ b/src/org/geometerplus/fbreader/network/NetworkBookItemComparator.java @@ -22,8 +22,8 @@ package org.geometerplus.fbreader.network; import java.util.Comparator; import java.util.LinkedList; -public final class NetworkBookItemComparator implements Comparator { - public int compare(NetworkLibraryItem item0, NetworkLibraryItem item1) { +public final class NetworkBookItemComparator implements Comparator { + public int compare(NetworkItem item0, NetworkItem item1) { final boolean item0isABook = item0 instanceof NetworkBookItem; final boolean item1isABook = item1 instanceof NetworkBookItem; diff --git a/src/org/geometerplus/fbreader/network/NetworkCatalogItem.java b/src/org/geometerplus/fbreader/network/NetworkCatalogItem.java index 34e6c1ad5..bd10505e3 100644 --- a/src/org/geometerplus/fbreader/network/NetworkCatalogItem.java +++ b/src/org/geometerplus/fbreader/network/NetworkCatalogItem.java @@ -28,7 +28,7 @@ import org.geometerplus.zlibrary.core.network.ZLNetworkRequest; import org.geometerplus.fbreader.network.authentication.NetworkAuthenticationManager; -public abstract class NetworkCatalogItem extends NetworkLibraryItem { +public abstract class NetworkCatalogItem extends NetworkItem { // catalog types: public static enum CatalogType { diff --git a/src/org/geometerplus/fbreader/network/NetworkLibraryItem.java b/src/org/geometerplus/fbreader/network/NetworkItem.java similarity index 88% rename from src/org/geometerplus/fbreader/network/NetworkLibraryItem.java rename to src/org/geometerplus/fbreader/network/NetworkItem.java index 42e0dc9b1..1970da833 100644 --- a/src/org/geometerplus/fbreader/network/NetworkLibraryItem.java +++ b/src/org/geometerplus/fbreader/network/NetworkItem.java @@ -19,7 +19,7 @@ package org.geometerplus.fbreader.network; -public abstract class NetworkLibraryItem { +public abstract class NetworkItem { public final INetworkLink Link; public final String Title; public final String Summary; @@ -28,14 +28,14 @@ public abstract class NetworkLibraryItem { //public org.geometerplus.fbreader.network.atom.ATOMEntry dbgEntry; /** - * Creates new NetworkLibraryItem instance. + * Creates new NetworkItem instance. * * @param link corresponding NetworkLink object. Must be not null. * @param title title of this library item. Must be not null. * @param summary description of this library item. Can be null. * @param cover cover url. Can be null. */ - protected NetworkLibraryItem(INetworkLink link, String title, String summary, String cover) { + protected NetworkItem(INetworkLink link, String title, String summary, String cover) { Link = link; Title = title; Summary = summary; diff --git a/src/org/geometerplus/fbreader/network/NetworkLibrary.java b/src/org/geometerplus/fbreader/network/NetworkLibrary.java index eed8369dd..8a0f18373 100644 --- a/src/org/geometerplus/fbreader/network/NetworkLibrary.java +++ b/src/org/geometerplus/fbreader/network/NetworkLibrary.java @@ -429,7 +429,7 @@ public class NetworkLibrary { LinkedList dataList = new LinkedList(); final NetworkOperationData.OnNewItemListener synchronizedListener = new NetworkOperationData.OnNewItemListener() { - public synchronized void onNewItem(INetworkLink link, NetworkLibraryItem item) { + public synchronized void onNewItem(INetworkLink link, NetworkItem item) { listener.onNewItem(link, item); } public synchronized boolean confirmInterrupt() { diff --git a/src/org/geometerplus/fbreader/network/NetworkOperationData.java b/src/org/geometerplus/fbreader/network/NetworkOperationData.java index 256336808..70adad9da 100644 --- a/src/org/geometerplus/fbreader/network/NetworkOperationData.java +++ b/src/org/geometerplus/fbreader/network/NetworkOperationData.java @@ -25,7 +25,7 @@ import org.geometerplus.zlibrary.core.network.ZLNetworkRequest; public class NetworkOperationData { public interface OnNewItemListener { - void onNewItem(INetworkLink link, NetworkLibraryItem item); + void onNewItem(INetworkLink link, NetworkItem item); void commitItems(INetworkLink link); diff --git a/src/org/geometerplus/fbreader/network/NetworkTree.java b/src/org/geometerplus/fbreader/network/NetworkTree.java index 9fd176885..a6f3c5aa0 100644 --- a/src/org/geometerplus/fbreader/network/NetworkTree.java +++ b/src/org/geometerplus/fbreader/network/NetworkTree.java @@ -77,7 +77,7 @@ public abstract class NetworkTree extends FBTree { super(parent, position); } - public static ZLImage createCover(NetworkLibraryItem item) { + public static ZLImage createCover(NetworkItem item) { if (item.Cover == null) { return null; } @@ -121,7 +121,7 @@ public abstract class NetworkTree extends FBTree { } - public abstract NetworkLibraryItem getHoldedItem(); + public abstract NetworkItem getHoldedItem(); private Key myKey; /** @@ -146,13 +146,13 @@ public abstract class NetworkTree extends FBTree { */ protected abstract String getStringId(); - public void removeItems(Set items) { + public void removeItems(Set items) { if (items.isEmpty() || subTrees().isEmpty()) { return; } final LinkedList treesList = new LinkedList(); for (FBTree tree: subTrees()) { - final NetworkLibraryItem treeItem = ((NetworkTree)tree).getHoldedItem(); + final NetworkItem treeItem = ((NetworkTree)tree).getHoldedItem(); if (treeItem != null && items.contains(treeItem)) { treesList.add(tree); items.remove(treeItem); diff --git a/src/org/geometerplus/fbreader/network/TopUpItem.java b/src/org/geometerplus/fbreader/network/TopUpItem.java index 8b0dcf83f..b19978d45 100644 --- a/src/org/geometerplus/fbreader/network/TopUpItem.java +++ b/src/org/geometerplus/fbreader/network/TopUpItem.java @@ -21,7 +21,7 @@ package org.geometerplus.fbreader.network; import org.geometerplus.zlibrary.core.resources.ZLResource; -public class TopUpItem extends NetworkLibraryItem { +public class TopUpItem extends NetworkItem { public TopUpItem(INetworkLink link, String cover) { super( link, diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResAuthenticationManager.java b/src/org/geometerplus/fbreader/network/authentication/litres/LitResAuthenticationManager.java index 5d54c2efe..d340b3372 100644 --- a/src/org/geometerplus/fbreader/network/authentication/litres/LitResAuthenticationManager.java +++ b/src/org/geometerplus/fbreader/network/authentication/litres/LitResAuthenticationManager.java @@ -39,7 +39,7 @@ public class LitResAuthenticationManager extends NetworkAuthenticationManager { private String myInitializedDataSid; private String myAccount; - private final HashMap myPurchasedBooks = new HashMap(); + private final HashMap myPurchasedBooks = new HashMap(); public LitResAuthenticationManager(INetworkLink link, String sslCertificate) { super(link, sslCertificate); @@ -352,7 +352,7 @@ public class LitResAuthenticationManager extends NetworkAuthenticationManager { return new LitResNetworkRequest( LitResUtil.url(Link, query), SSLCertificate, - new LitResXMLReader(Link, new LinkedList()) + new LitResXMLReader(Link, new LinkedList()) ); } @@ -363,7 +363,7 @@ public class LitResAuthenticationManager extends NetworkAuthenticationManager { private void loadPurchasedBooksOnSuccess(LitResNetworkRequest purchasedBooksRequest) { LitResXMLReader reader = (LitResXMLReader)purchasedBooksRequest.Reader; myPurchasedBooks.clear(); - for (NetworkLibraryItem item: reader.Books) { + for (NetworkItem item: reader.Books) { if (item instanceof NetworkBookItem) { NetworkBookItem book = (NetworkBookItem)item; myPurchasedBooks.put(book.Id, book); diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResBookshelfItem.java b/src/org/geometerplus/fbreader/network/authentication/litres/LitResBookshelfItem.java index 682b72c00..935c20481 100644 --- a/src/org/geometerplus/fbreader/network/authentication/litres/LitResBookshelfItem.java +++ b/src/org/geometerplus/fbreader/network/authentication/litres/LitResBookshelfItem.java @@ -27,16 +27,16 @@ import org.geometerplus.zlibrary.core.network.ZLNetworkException; import org.geometerplus.fbreader.network.*; abstract class SortedCatalogItem extends NetworkCatalogItem { - private final List myChildren = new LinkedList(); + private final List myChildren = new LinkedList(); - private SortedCatalogItem(NetworkCatalogItem parent, ZLResource resource, List children) { + private SortedCatalogItem(NetworkCatalogItem parent, ZLResource resource, List children) { super(parent.Link, resource.getValue(), resource.getResource("summary").getValue(), "", parent.URLByType); - for (NetworkLibraryItem child : children) { + for (NetworkItem child : children) { if (accepts(child)) { myChildren.add(child); } } - final Comparator comparator = getComparator(); + final Comparator comparator = getComparator(); if (comparator != null) { Collections.sort(myChildren, comparator); } @@ -46,12 +46,12 @@ abstract class SortedCatalogItem extends NetworkCatalogItem { return myChildren.isEmpty(); } - protected abstract Comparator getComparator(); - protected boolean accepts(NetworkLibraryItem item) { + protected abstract Comparator getComparator(); + protected boolean accepts(NetworkItem item) { return item instanceof NetworkBookItem; } - public SortedCatalogItem(NetworkCatalogItem parent, String resourceKey, List children) { + public SortedCatalogItem(NetworkCatalogItem parent, String resourceKey, List children) { this(parent, ZLResource.resource("networkView").getResource(resourceKey), children); } @@ -61,7 +61,7 @@ abstract class SortedCatalogItem extends NetworkCatalogItem { @Override public void loadChildren(NetworkOperationData.OnNewItemListener listener) throws ZLNetworkException { - for (NetworkLibraryItem child : myChildren) { + for (NetworkItem child : myChildren) { listener.onNewItem(Link, child); } listener.commitItems(Link); @@ -69,25 +69,25 @@ abstract class SortedCatalogItem extends NetworkCatalogItem { } class ByAuthorCatalogItem extends SortedCatalogItem { - ByAuthorCatalogItem(NetworkCatalogItem parent, List children) { + ByAuthorCatalogItem(NetworkCatalogItem parent, List children) { super(parent, "byAuthor", children); } @Override - protected Comparator getComparator() { + protected Comparator getComparator() { return new NetworkBookItemComparator(); } } class ByTitleCatalogItem extends SortedCatalogItem { - ByTitleCatalogItem(NetworkCatalogItem parent, List children) { + ByTitleCatalogItem(NetworkCatalogItem parent, List children) { super(parent, "byTitle", children); } @Override - protected Comparator getComparator() { - return new Comparator() { - public int compare(NetworkLibraryItem item0, NetworkLibraryItem item1) { + protected Comparator getComparator() { + return new Comparator() { + public int compare(NetworkItem item0, NetworkItem item1) { return item0.Title.compareTo(item1.Title); } }; @@ -95,14 +95,14 @@ class ByTitleCatalogItem extends SortedCatalogItem { } class ByDateCatalogItem extends SortedCatalogItem { - ByDateCatalogItem(NetworkCatalogItem parent, List children) { + ByDateCatalogItem(NetworkCatalogItem parent, List children) { super(parent, "byDate", children); } @Override - protected Comparator getComparator() { - return new Comparator() { - public int compare(NetworkLibraryItem item0, NetworkLibraryItem item1) { + protected Comparator getComparator() { + return new Comparator() { + public int compare(NetworkItem item0, NetworkItem item1) { return 0; } }; @@ -110,14 +110,14 @@ class ByDateCatalogItem extends SortedCatalogItem { } class BySeriesCatalogItem extends SortedCatalogItem { - BySeriesCatalogItem(NetworkCatalogItem parent, List children) { + BySeriesCatalogItem(NetworkCatalogItem parent, List children) { super(parent, "bySeries", children); } @Override - protected Comparator getComparator() { - return new Comparator() { - public int compare(NetworkLibraryItem item0, NetworkLibraryItem item1) { + protected Comparator getComparator() { + return new Comparator() { + public int compare(NetworkItem item0, NetworkItem item1) { final NetworkBookItem book0 = (NetworkBookItem)item0; final NetworkBookItem book1 = (NetworkBookItem)item1; int diff = book0.SeriesTitle.compareTo(book1.SeriesTitle); @@ -130,7 +130,7 @@ class BySeriesCatalogItem extends SortedCatalogItem { } @Override - protected boolean accepts(NetworkLibraryItem item) { + protected boolean accepts(NetworkItem item) { return item instanceof NetworkBookItem && ((NetworkBookItem)item).SeriesTitle != null; @@ -166,11 +166,11 @@ public class LitResBookshelfItem extends NetworkCatalogItem { } finally { myForceReload = true; // TODO: implement asynchronous loading - ArrayList children = - new ArrayList(mgr.purchasedBooks()); + ArrayList children = + new ArrayList(mgr.purchasedBooks()); if (children.size() <= 5) { Collections.sort(children, new NetworkBookItemComparator()); - for (NetworkLibraryItem item : children) { + for (NetworkItem item : children) { listener.onNewItem(Link, item); } } else { diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java b/src/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java index 580b026d5..1662c31b3 100644 --- a/src/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java +++ b/src/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java @@ -31,7 +31,7 @@ import org.geometerplus.fbreader.network.opds.HtmlToString; class LitResXMLReader extends LitResAuthenticationXMLReader { public final INetworkLink Link; - public final List Books; + public final List Books; private int myIndex; @@ -55,7 +55,7 @@ class LitResXMLReader extends LitResAuthenticationXMLReader { private HashMap myURLByType = new HashMap(); // TODO: remove private LinkedList myReferences = new LinkedList(); - public LitResXMLReader(INetworkLink link, List books) { + public LitResXMLReader(INetworkLink link, List books) { super(link.getSiteName()); Link = link; Books = books; diff --git a/src/org/geometerplus/fbreader/network/opds/NetworkOPDSFeedReader.java b/src/org/geometerplus/fbreader/network/opds/NetworkOPDSFeedReader.java index b9437ca59..809a449fe 100644 --- a/src/org/geometerplus/fbreader/network/opds/NetworkOPDSFeedReader.java +++ b/src/org/geometerplus/fbreader/network/opds/NetworkOPDSFeedReader.java @@ -42,7 +42,7 @@ class NetworkOPDSFeedReader implements OPDSFeedReader, OPDSConstants, MimeTypes private int myItemsToLoad = -1; /** - * Creates new OPDSFeedReader instance that can be used to get NetworkLibraryItem objects from OPDS feeds. + * Creates new OPDSFeedReader instance that can be used to get NetworkItem objects from OPDS feeds. * * @param baseURL string that contains URL of the OPDS feed, that will be read using this instance of the reader * @param result network results buffer. Must be created using OPDSNetworkLink corresponding to the OPDS feed, @@ -203,7 +203,7 @@ class NetworkOPDSFeedReader implements OPDSFeedReader, OPDSConstants, MimeTypes } } - NetworkLibraryItem item; + NetworkItem item; if (hasBookLink) { item = readBookItem(entry); } else { @@ -218,7 +218,7 @@ class NetworkOPDSFeedReader implements OPDSFeedReader, OPDSConstants, MimeTypes private static final String AuthorPrefix = "author:"; private static final String AuthorsPrefix = "authors:"; - private NetworkLibraryItem readBookItem(OPDSEntry entry) { + private NetworkItem readBookItem(OPDSEntry entry) { final OPDSNetworkLink opdsNetworkLink = (OPDSNetworkLink)myData.Link; /*final String date; if (entry.DCIssued != null) { @@ -368,7 +368,7 @@ class NetworkOPDSFeedReader implements OPDSFeedReader, OPDSConstants, MimeTypes } } - private NetworkLibraryItem readCatalogItem(OPDSEntry entry) { + private NetworkItem readCatalogItem(OPDSEntry entry) { final OPDSNetworkLink opdsLink = (OPDSNetworkLink)myData.Link; String coverURL = null; String url = null; diff --git a/src/org/geometerplus/fbreader/network/tree/AddCustomCatalogItemTree.java b/src/org/geometerplus/fbreader/network/tree/AddCustomCatalogItemTree.java index 99d7bd670..8d6d3097d 100644 --- a/src/org/geometerplus/fbreader/network/tree/AddCustomCatalogItemTree.java +++ b/src/org/geometerplus/fbreader/network/tree/AddCustomCatalogItemTree.java @@ -21,7 +21,7 @@ package org.geometerplus.fbreader.network.tree; import org.geometerplus.zlibrary.core.resources.ZLResource; -import org.geometerplus.fbreader.network.NetworkLibraryItem; +import org.geometerplus.fbreader.network.NetworkItem; import org.geometerplus.fbreader.network.NetworkTree; public class AddCustomCatalogItemTree extends NetworkTree { @@ -40,7 +40,7 @@ public class AddCustomCatalogItemTree extends NetworkTree { } @Override - public NetworkLibraryItem getHoldedItem() { + public NetworkItem getHoldedItem() { return null; } diff --git a/src/org/geometerplus/fbreader/network/tree/NetworkAuthorTree.java b/src/org/geometerplus/fbreader/network/tree/NetworkAuthorTree.java index e16690223..b7c1ae976 100644 --- a/src/org/geometerplus/fbreader/network/tree/NetworkAuthorTree.java +++ b/src/org/geometerplus/fbreader/network/tree/NetworkAuthorTree.java @@ -120,7 +120,7 @@ public class NetworkAuthorTree extends NetworkTree { } @Override - public NetworkLibraryItem getHoldedItem() { + public NetworkItem getHoldedItem() { return null; } diff --git a/src/org/geometerplus/fbreader/network/tree/NetworkBookTree.java b/src/org/geometerplus/fbreader/network/tree/NetworkBookTree.java index c765fcb4c..5b3586547 100644 --- a/src/org/geometerplus/fbreader/network/tree/NetworkBookTree.java +++ b/src/org/geometerplus/fbreader/network/tree/NetworkBookTree.java @@ -69,7 +69,7 @@ public class NetworkBookTree extends NetworkTree { } @Override - public NetworkLibraryItem getHoldedItem() { + public NetworkItem getHoldedItem() { return Book; } diff --git a/src/org/geometerplus/fbreader/network/tree/NetworkCatalogTree.java b/src/org/geometerplus/fbreader/network/tree/NetworkCatalogTree.java index 0c9ba1121..097e391e1 100644 --- a/src/org/geometerplus/fbreader/network/tree/NetworkCatalogTree.java +++ b/src/org/geometerplus/fbreader/network/tree/NetworkCatalogTree.java @@ -29,7 +29,7 @@ import org.geometerplus.fbreader.network.*; public class NetworkCatalogTree extends NetworkTree { public final NetworkCatalogItem Item; - public final ArrayList ChildrenItems = new ArrayList(); + public final ArrayList ChildrenItems = new ArrayList(); private long myLoadedTime = -1; @@ -86,7 +86,7 @@ public class NetworkCatalogTree extends NetworkTree { int nodeCount = 0; for (int i = 0; i < ChildrenItems.size(); ++i) { - NetworkLibraryItem currentItem = ChildrenItems.get(i); + NetworkItem currentItem = ChildrenItems.get(i); if (!(currentItem instanceof NetworkCatalogItem)) { continue; } @@ -158,12 +158,12 @@ public class NetworkCatalogTree extends NetworkTree { } @Override - public NetworkLibraryItem getHoldedItem() { + public NetworkItem getHoldedItem() { return Item; } @Override - public void removeItems(Set items) { + public void removeItems(Set items) { ChildrenItems.removeAll(items); super.removeItems(items); } diff --git a/src/org/geometerplus/fbreader/network/tree/NetworkSeriesTree.java b/src/org/geometerplus/fbreader/network/tree/NetworkSeriesTree.java index 8c4bb848f..3a9af37d0 100644 --- a/src/org/geometerplus/fbreader/network/tree/NetworkSeriesTree.java +++ b/src/org/geometerplus/fbreader/network/tree/NetworkSeriesTree.java @@ -87,12 +87,12 @@ public class NetworkSeriesTree extends NetworkTree { } @Override - public NetworkLibraryItem getHoldedItem() { + public NetworkItem getHoldedItem() { return null; } @Override - public void removeItems(Set items) { + public void removeItems(Set items) { super.removeItems(items); if (subTrees().isEmpty()) { removeSelf(); diff --git a/src/org/geometerplus/fbreader/network/tree/NetworkTreeFactory.java b/src/org/geometerplus/fbreader/network/tree/NetworkTreeFactory.java index a06104d8e..a61903512 100644 --- a/src/org/geometerplus/fbreader/network/tree/NetworkTreeFactory.java +++ b/src/org/geometerplus/fbreader/network/tree/NetworkTreeFactory.java @@ -25,11 +25,11 @@ import org.geometerplus.fbreader.network.*; public class NetworkTreeFactory { - public static NetworkTree createNetworkTree(NetworkCatalogTree parent, NetworkLibraryItem item) { + public static NetworkTree createNetworkTree(NetworkCatalogTree parent, NetworkItem item) { return createNetworkTree(parent, item, -1); } - public static NetworkTree createNetworkTree(NetworkCatalogTree parent, NetworkLibraryItem item, int position) { + public static NetworkTree createNetworkTree(NetworkCatalogTree parent, NetworkItem item, int position) { final int subtreesSize = parent.subTrees().size(); if (position == -1) { position = subtreesSize; diff --git a/src/org/geometerplus/fbreader/network/tree/RootTree.java b/src/org/geometerplus/fbreader/network/tree/RootTree.java index b7b93506f..09a4a6a69 100644 --- a/src/org/geometerplus/fbreader/network/tree/RootTree.java +++ b/src/org/geometerplus/fbreader/network/tree/RootTree.java @@ -19,7 +19,7 @@ package org.geometerplus.fbreader.network.tree; -import org.geometerplus.fbreader.network.NetworkLibraryItem; +import org.geometerplus.fbreader.network.NetworkItem; import org.geometerplus.fbreader.network.NetworkTree; public final class RootTree extends NetworkTree { @@ -29,7 +29,7 @@ public final class RootTree extends NetworkTree { } @Override - public NetworkLibraryItem getHoldedItem() { + public NetworkItem getHoldedItem() { return null; } diff --git a/src/org/geometerplus/fbreader/network/tree/SearchItemTree.java b/src/org/geometerplus/fbreader/network/tree/SearchItemTree.java index 7d7adff0e..183aa41ef 100644 --- a/src/org/geometerplus/fbreader/network/tree/SearchItemTree.java +++ b/src/org/geometerplus/fbreader/network/tree/SearchItemTree.java @@ -90,7 +90,7 @@ public class SearchItemTree extends NetworkTree { } @Override - public NetworkLibraryItem getHoldedItem() { + public NetworkItem getHoldedItem() { return null; }