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

renaming: NetworkLibraryItem -> NetworkItem

Browse source
This commit is contained in:
Nikolay Pultsin 2011-03-06 13:19:08 +00:00
parent 5dad452668
commit 247e6937ad
25 changed files with 85 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/org/geometerplus/android/fbreader/network/ItemsLoadingHandler.java
View file

@ -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<NetworkLibraryItem> myItems = new LinkedList<NetworkLibraryItem>();
private final HashMap<INetworkLink, LinkedList<NetworkLibraryItem>> myUncommitedItems = new HashMap<INetworkLink, LinkedList<NetworkLibraryItem>>();
private final LinkedList<NetworkItem> myItems = new LinkedList<NetworkItem>();
private final HashMap<INetworkLink, LinkedList<NetworkItem>> myUncommitedItems = new HashMap<INetworkLink, LinkedList<NetworkItem>>();
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<NetworkLibraryItem> uncommited = myUncommitedItems.get(link);
LinkedList<NetworkItem> uncommited = myUncommitedItems.get(link);
if (uncommited == null) {
uncommited = new LinkedList<NetworkLibraryItem>();
uncommited = new LinkedList<NetworkItem>();
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<NetworkLibraryItem> uncommited = myUncommitedItems.get(link);
LinkedList<NetworkItem> 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<NetworkLibraryItem> uncommitedItems = new HashSet<NetworkLibraryItem>();
HashSet<NetworkItem> uncommitedItems = new HashSet<NetworkItem>();
synchronized (myUncommitedItems) {
for (LinkedList<NetworkLibraryItem> items: myUncommitedItems.values()) {
for (LinkedList<NetworkItem> items: myUncommitedItems.values()) {
uncommitedItems.addAll(items);
}
}
@ -124,9 +124,9 @@ abstract class ItemsLoadingHandler extends Handler {
// callbacks
public abstract void onUpdateItems(List<NetworkLibraryItem> items);
public abstract void onUpdateItems(List<NetworkItem> items);
public abstract void afterUpdateItems();
public abstract void onFinish(String errorMessage, boolean interrupted, Set<NetworkLibraryItem> uncommitedItems);
public abstract void onFinish(String errorMessage, boolean interrupted, Set<NetworkItem> uncommitedItems);
@Override

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

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

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

@ -295,8 +295,8 @@ class NetworkCatalogActions extends NetworkTreeActions {
}
@Override
public void onUpdateItems(List<NetworkLibraryItem> items) {
for (NetworkLibraryItem item: items) {
public void onUpdateItems(List<NetworkItem> 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<NetworkLibraryItem> uncommitedItems) {
Set<NetworkItem> uncommitedItems) {
if (interrupted &&
(!myTree.Item.supportsResumeLoading() || errorMessage != null)) {
myTree.ChildrenItems.clear();

6
src/org/geometerplus/android/fbreader/network/NetworkSearchActivity.java
View file

@ -62,9 +62,9 @@ public class NetworkSearchActivity extends Activity {
}
@Override
public void onUpdateItems(List<NetworkLibraryItem> items) {
public void onUpdateItems(List<NetworkItem> 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<NetworkLibraryItem> uncommitedItems) {
Set<NetworkItem> uncommitedItems) {
if (interrupted) {
myTree.setSearchResult(null);
} else {

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

@ -88,7 +88,7 @@ class NetworkView {
}
/*
* NetworkLibraryItem's actions
* NetworkItem's actions
*/
public RefillAccountActions getTopUpActions() {

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

@ -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<AuthorData> {
public final String DisplayName;
@ -80,7 +80,7 @@ public final class NetworkBookItem extends NetworkLibraryItem {
private final LinkedList<BookReference> myReferences;
/**
* Creates new NetworkLibraryItem instance.
* Creates new NetworkItem instance.
*
* @param link corresponding NetworkLink object. Must be not <code>null</code>.
* @param id string that uniquely identifies this book item. Must be not <code>null</code>.

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

@ -22,8 +22,8 @@ package org.geometerplus.fbreader.network;
import java.util.Comparator;
import java.util.LinkedList;
public final class NetworkBookItemComparator implements Comparator<NetworkLibraryItem> {
public int compare(NetworkLibraryItem item0, NetworkLibraryItem item1) {
public final class NetworkBookItemComparator implements Comparator<NetworkItem> {
public int compare(NetworkItem item0, NetworkItem item1) {
final boolean item0isABook = item0 instanceof NetworkBookItem;
final boolean item1isABook = item1 instanceof NetworkBookItem;

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

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

6
src/org/geometerplus/fbreader/network/NetworkLibraryItem.java → src/org/geometerplus/fbreader/network/NetworkItem.java
View file

@ -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 <code>null</code>.
* @param title title of this library item. Must be not <code>null</code>.
* @param summary description of this library item. Can be <code>null</code>.
* @param cover cover url. Can be <code>null</code>.
*/
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;

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

@ -429,7 +429,7 @@ public class NetworkLibrary {
LinkedList<NetworkOperationData> dataList = new LinkedList<NetworkOperationData>();
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() {

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

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

8
src/org/geometerplus/fbreader/network/NetworkTree.java
View file

@ -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<NetworkLibraryItem> items) {
public void removeItems(Set<NetworkItem> items) {
if (items.isEmpty() || subTrees().isEmpty()) {
return;
}
final LinkedList<FBTree> treesList = new LinkedList<FBTree>();
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);

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

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

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

@ -39,7 +39,7 @@ public class LitResAuthenticationManager extends NetworkAuthenticationManager {
private String myInitializedDataSid;
private String myAccount;
private final HashMap<String, NetworkLibraryItem> myPurchasedBooks = new HashMap<String, NetworkLibraryItem>();
private final HashMap<String, NetworkItem> myPurchasedBooks = new HashMap<String, NetworkItem>();
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<NetworkLibraryItem>())
new LitResXMLReader(Link, new LinkedList<NetworkItem>())
);
}
@ -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);

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

@ -27,16 +27,16 @@ import org.geometerplus.zlibrary.core.network.ZLNetworkException;
import org.geometerplus.fbreader.network.*;
abstract class SortedCatalogItem extends NetworkCatalogItem {
private final List<NetworkLibraryItem> myChildren = new LinkedList<NetworkLibraryItem>();
private final List<NetworkItem> myChildren = new LinkedList<NetworkItem>();
private SortedCatalogItem(NetworkCatalogItem parent, ZLResource resource, List<NetworkLibraryItem> children) {
private SortedCatalogItem(NetworkCatalogItem parent, ZLResource resource, List<NetworkItem> 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<NetworkLibraryItem> comparator = getComparator();
final Comparator<NetworkItem> comparator = getComparator();
if (comparator != null) {
Collections.sort(myChildren, comparator);
}
@ -46,12 +46,12 @@ abstract class SortedCatalogItem extends NetworkCatalogItem {
return myChildren.isEmpty();
}
protected abstract Comparator<NetworkLibraryItem> getComparator();
protected boolean accepts(NetworkLibraryItem item) {
protected abstract Comparator<NetworkItem> getComparator();
protected boolean accepts(NetworkItem item) {
return item instanceof NetworkBookItem;
}
public SortedCatalogItem(NetworkCatalogItem parent, String resourceKey, List<NetworkLibraryItem> children) {
public SortedCatalogItem(NetworkCatalogItem parent, String resourceKey, List<NetworkItem> 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<NetworkLibraryItem> children) {
ByAuthorCatalogItem(NetworkCatalogItem parent, List<NetworkItem> children) {
super(parent, "byAuthor", children);
}
@Override
protected Comparator<NetworkLibraryItem> getComparator() {
protected Comparator<NetworkItem> getComparator() {
return new NetworkBookItemComparator();
}
}
class ByTitleCatalogItem extends SortedCatalogItem {
ByTitleCatalogItem(NetworkCatalogItem parent, List<NetworkLibraryItem> children) {
ByTitleCatalogItem(NetworkCatalogItem parent, List<NetworkItem> children) {
super(parent, "byTitle", children);
}
@Override
protected Comparator<NetworkLibraryItem> getComparator() {
return new Comparator<NetworkLibraryItem>() {
public int compare(NetworkLibraryItem item0, NetworkLibraryItem item1) {
protected Comparator<NetworkItem> getComparator() {
return new Comparator<NetworkItem>() {
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<NetworkLibraryItem> children) {
ByDateCatalogItem(NetworkCatalogItem parent, List<NetworkItem> children) {
super(parent, "byDate", children);
}
@Override
protected Comparator<NetworkLibraryItem> getComparator() {
return new Comparator<NetworkLibraryItem>() {
public int compare(NetworkLibraryItem item0, NetworkLibraryItem item1) {
protected Comparator<NetworkItem> getComparator() {
return new Comparator<NetworkItem>() {
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<NetworkLibraryItem> children) {
BySeriesCatalogItem(NetworkCatalogItem parent, List<NetworkItem> children) {
super(parent, "bySeries", children);
}
@Override
protected Comparator<NetworkLibraryItem> getComparator() {
return new Comparator<NetworkLibraryItem>() {
public int compare(NetworkLibraryItem item0, NetworkLibraryItem item1) {
protected Comparator<NetworkItem> getComparator() {
return new Comparator<NetworkItem>() {
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<NetworkLibraryItem> children =
new ArrayList<NetworkLibraryItem>(mgr.purchasedBooks());
ArrayList<NetworkItem> children =
new ArrayList<NetworkItem>(mgr.purchasedBooks());
if (children.size() <= 5) {
Collections.sort(children, new NetworkBookItemComparator());
for (NetworkLibraryItem item : children) {
for (NetworkItem item : children) {
listener.onNewItem(Link, item);
}
} else {

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

@ -31,7 +31,7 @@ import org.geometerplus.fbreader.network.opds.HtmlToString;
class LitResXMLReader extends LitResAuthenticationXMLReader {
public final INetworkLink Link;
public final List<NetworkLibraryItem> Books;
public final List<NetworkItem> Books;
private int myIndex;
@ -55,7 +55,7 @@ class LitResXMLReader extends LitResAuthenticationXMLReader {
private HashMap<Integer, String> myURLByType = new HashMap<Integer, String>(); // TODO: remove
private LinkedList<BookReference> myReferences = new LinkedList<BookReference>();
public LitResXMLReader(INetworkLink link, List<NetworkLibraryItem> books) {
public LitResXMLReader(INetworkLink link, List<NetworkItem> books) {
super(link.getSiteName());
Link = link;
Books = books;

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

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

4
src/org/geometerplus/fbreader/network/tree/AddCustomCatalogItemTree.java
View file

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

2
src/org/geometerplus/fbreader/network/tree/NetworkAuthorTree.java
View file

@ -120,7 +120,7 @@ public class NetworkAuthorTree extends NetworkTree {
}
@Override
public NetworkLibraryItem getHoldedItem() {
public NetworkItem getHoldedItem() {
return null;
}

2
src/org/geometerplus/fbreader/network/tree/NetworkBookTree.java
View file

@ -69,7 +69,7 @@ public class NetworkBookTree extends NetworkTree {
}
@Override
public NetworkLibraryItem getHoldedItem() {
public NetworkItem getHoldedItem() {
return Book;
}

8
src/org/geometerplus/fbreader/network/tree/NetworkCatalogTree.java
View file

@ -29,7 +29,7 @@ import org.geometerplus.fbreader.network.*;
public class NetworkCatalogTree extends NetworkTree {
public final NetworkCatalogItem Item;
public final ArrayList<NetworkLibraryItem> ChildrenItems = new ArrayList<NetworkLibraryItem>();
public final ArrayList<NetworkItem> ChildrenItems = new ArrayList<NetworkItem>();
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<NetworkLibraryItem> items) {
public void removeItems(Set<NetworkItem> items) {
ChildrenItems.removeAll(items);
super.removeItems(items);
}

4
src/org/geometerplus/fbreader/network/tree/NetworkSeriesTree.java
View file

@ -87,12 +87,12 @@ public class NetworkSeriesTree extends NetworkTree {
}
@Override
public NetworkLibraryItem getHoldedItem() {
public NetworkItem getHoldedItem() {
return null;
}
@Override
public void removeItems(Set<NetworkLibraryItem> items) {
public void removeItems(Set<NetworkItem> items) {
super.removeItems(items);
if (subTrees().isEmpty()) {
removeSelf();

4
src/org/geometerplus/fbreader/network/tree/NetworkTreeFactory.java
View file

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

4
src/org/geometerplus/fbreader/network/tree/RootTree.java
View file

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

2
src/org/geometerplus/fbreader/network/tree/SearchItemTree.java
View file

@ -90,7 +90,7 @@ public class SearchItemTree extends NetworkTree {
}
@Override
public NetworkLibraryItem getHoldedItem() {
public NetworkItem getHoldedItem() {
return null;
}