1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-04 10:19:33 +02:00

cleanup: no NetworkTree constructor with level parameter

This commit is contained in:
Nikolay Pultsin 2011-03-01 16:24:49 +00:00
parent 85df6a5e84
commit 8001a37cec
11 changed files with 18 additions and 30 deletions

View file

@ -29,8 +29,8 @@ import org.geometerplus.fbreader.network.NetworkTree;
import org.geometerplus.android.fbreader.tree.ZLAndroidTree; import org.geometerplus.android.fbreader.tree.ZLAndroidTree;
public class AddCustomCatalogItemTree extends NetworkTree implements ZLAndroidTree { public class AddCustomCatalogItemTree extends NetworkTree implements ZLAndroidTree {
public AddCustomCatalogItemTree() { public AddCustomCatalogItemTree(NetworkTree parent) {
super(1); super(parent);
} }
@Override @Override

View file

@ -99,7 +99,7 @@ public class NetworkBookInfoActivity extends Activity implements NetworkView.Eve
@Override @Override
public void onCreateContextMenu(ContextMenu menu, View view, ContextMenu.ContextMenuInfo menuInfo) { public void onCreateContextMenu(ContextMenu menu, View view, ContextMenu.ContextMenuInfo menuInfo) {
new RefillAccountActions().buildContextMenu(this, menu, new RefillAccountTree(myBook.Link)); new RefillAccountActions().buildContextMenu(this, menu, myBook.Link);
} }
@Override @Override

View file

@ -103,7 +103,7 @@ public class NetworkLibraryActivity extends NetworkBaseActivity {
private void prepareView() { private void prepareView() {
if (myTree == null) { if (myTree == null) {
myTree = NetworkLibrary.Instance().getTree(); myTree = NetworkLibrary.Instance().getRootTree();
setListAdapter(new LibraryAdapter()); setListAdapter(new LibraryAdapter());
getListView().invalidateViews(); getListView().invalidateViews();
} }

View file

@ -69,6 +69,10 @@ class NetworkView {
myActions.add(new AddCustomCatalogItemActions()); myActions.add(new AddCustomCatalogItemActions());
myActions.trimToSize(); myActions.trimToSize();
final NetworkTree root = library.getRootTree();
mySearchItem = new SearchItemTree(root);
myAddCustomCatalogItem = new AddCustomCatalogItemTree(root);
myInitialized = true; myInitialized = true;
} }
@ -313,8 +317,8 @@ class NetworkView {
* Special view items item * Special view items item
*/ */
private final SearchItemTree mySearchItem = new SearchItemTree(); private SearchItemTree mySearchItem;
private final AddCustomCatalogItemTree myAddCustomCatalogItem = new AddCustomCatalogItemTree(); private AddCustomCatalogItemTree myAddCustomCatalogItem;
public SearchItemTree getSearchItemTree() { public SearchItemTree getSearchItemTree() {
return mySearchItem; return mySearchItem;

View file

@ -41,9 +41,12 @@ class RefillAccountActions extends NetworkTreeActions {
@Override @Override
public void buildContextMenu(Activity activity, ContextMenu menu, NetworkTree tree) { public void buildContextMenu(Activity activity, ContextMenu menu, NetworkTree tree) {
buildContextMenu(activity, menu, ((RefillAccountTree)tree).Link);
}
public void buildContextMenu(Activity activity, ContextMenu menu, INetworkLink link) {
menu.setHeaderTitle(getTitleValue("refillTitle")); menu.setHeaderTitle(getTitleValue("refillTitle"));
final INetworkLink link = ((RefillAccountTree)tree).Link;
if (Util.isSmsAccountRefillingSupported(activity, link)) { if (Util.isSmsAccountRefillingSupported(activity, link)) {
addMenuItem(menu, REFILL_VIA_SMS_ITEM_ID, "refillViaSms"); addMenuItem(menu, REFILL_VIA_SMS_ITEM_ID, "refillViaSms");
} }

View file

@ -36,15 +36,10 @@ class RefillAccountTree extends NetworkTree implements ZLAndroidTree {
public final INetworkLink Link; public final INetworkLink Link;
public RefillAccountTree(NetworkCatalogTree parentTree) { public RefillAccountTree(NetworkCatalogTree parentTree) {
super(parentTree.Level + 1); super(parentTree);
Link = parentTree.Item.Link; Link = parentTree.Item.Link;
} }
public RefillAccountTree(INetworkLink link) {
super(1);
Link = link;
}
@Override @Override
public String getName() { public String getName() {
return ZLResource.resource("networkView").getResource("refillTitle").getValue(); return ZLResource.resource("networkView").getResource("refillTitle").getValue();

View file

@ -34,11 +34,10 @@ import org.geometerplus.zlibrary.ui.android.R;
import org.geometerplus.android.fbreader.tree.ZLAndroidTree; import org.geometerplus.android.fbreader.tree.ZLAndroidTree;
public class SearchItemTree extends NetworkTree implements ZLAndroidTree { public class SearchItemTree extends NetworkTree implements ZLAndroidTree {
private SearchResult myResult; private SearchResult myResult;
public SearchItemTree() { public SearchItemTree(NetworkTree parent) {
super(1); super(parent);
} }
@Override @Override

View file

@ -413,11 +413,10 @@ public class NetworkLibrary {
} }
} }
public NetworkTree getTree() { public NetworkTree getRootTree() {
return myRootTree; return myRootTree;
} }
public void simpleSearch(String pattern, final NetworkOperationData.OnNewItemListener listener) throws ZLNetworkException { public void simpleSearch(String pattern, final NetworkOperationData.OnNewItemListener listener) throws ZLNetworkException {
LinkedList<ZLNetworkRequest> requestList = new LinkedList<ZLNetworkRequest>(); LinkedList<ZLNetworkRequest> requestList = new LinkedList<ZLNetworkRequest>();
LinkedList<NetworkOperationData> dataList = new LinkedList<NetworkOperationData>(); LinkedList<NetworkOperationData> dataList = new LinkedList<NetworkOperationData>();

View file

@ -94,10 +94,6 @@ public abstract class NetworkTree extends FBTree {
} }
} }
protected NetworkTree(int level) {
super(level);
}
protected NetworkTree() { protected NetworkTree() {
super(); super();
} }

View file

@ -29,10 +29,6 @@ public abstract class FBTree extends ZLTree<FBTree> implements Comparable<FBTree
private ZLImage myCover; private ZLImage myCover;
private boolean myCoverRequested; private boolean myCoverRequested;
protected FBTree(int level) {
super(level);
}
protected FBTree() { protected FBTree() {
super(); super();
} }

View file

@ -27,10 +27,6 @@ public abstract class ZLTree<T extends ZLTree<T>> implements Iterable<T> {
public final int Level; public final int Level;
private ArrayList<T> mySubTrees; private ArrayList<T> mySubTrees;
protected ZLTree(int level) {
this(level, null, 0);
}
protected ZLTree() { protected ZLTree() {
this(null); this(null);
} }