Author: scooter
Date: 2012-07-20 11:29:57 -0700 (Fri, 20 Jul 2012)
New Revision: 29947
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/group/GroupNodesTaskFactoryImpl.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/group/UnGroupNodesTaskFactoryImpl.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/select/SelectAllTaskFactoryImpl.java
core3/impl/trunk/linkout-impl/src/main/java/org/cytoscape/linkout/internal/LinkOut.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
core3/impl/trunk/webservice-psicquic-client-impl/src/main/java/org/cytoscape/webservice/psicquic/CyActivator.java
core3/impl/trunk/webservice-psicquic-client-impl/src/main/java/org/cytoscape/webservice/psicquic/task/ExpandNodeContextMenuFactory.java
Log:
First round of fixes related to UI review.
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2012-07-20 18:25:02 UTC (rev 29946)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2012-07-20 18:29:57 UTC (rev 29947)
@@ -408,11 +408,21 @@
selectAllTaskFactoryProps.setProperty(ENABLE_FOR,"network");
selectAllTaskFactoryProps.setProperty(TITLE,"Select all nodes
and edges");
selectAllTaskFactoryProps.setProperty(MENU_GRAVITY,"5.0");
+ selectAllTaskFactoryProps.setProperty(PREFERRED_ACTION, "NEW");
selectAllTaskFactoryProps.setProperty(COMMAND,"select-all-nodes-and-edges");
selectAllTaskFactoryProps.setProperty(COMMAND_NAMESPACE,"network");
registerService(bc,selectAllTaskFactory,NetworkTaskFactory.class,
selectAllTaskFactoryProps);
registerService(bc,selectAllTaskFactory,SelectAllTaskFactory.class,
selectAllTaskFactoryProps);
+ Properties selectAllViewTaskFactoryProps = new Properties();
+ selectAllViewTaskFactoryProps.setProperty(PREFERRED_MENU,
NETWORK_SELECT_MENU);
+
selectAllViewTaskFactoryProps.setProperty(ENABLE_FOR,"networkAndView");
+ selectAllViewTaskFactoryProps.setProperty(TITLE,"All nodes and
edges");
+ selectAllViewTaskFactoryProps.setProperty(MENU_GRAVITY,"1.1");
+ selectAllViewTaskFactoryProps.setProperty(PREFERRED_ACTION,
"NEW");
+ selectAllViewTaskFactoryProps.setProperty(IN_MENU_BAR,"false");
+
registerService(bc,selectAllTaskFactory,NetworkViewTaskFactory.class,
selectAllViewTaskFactoryProps);
+
Properties selectAllEdgesTaskFactoryProps = new Properties();
selectAllEdgesTaskFactoryProps.setProperty(PREFERRED_MENU,"Select.Edges");
selectAllEdgesTaskFactoryProps.setProperty(ACCELERATOR,"cmd alt
a");
@@ -471,6 +481,7 @@
selectFirstNeighborsTaskFactoryProps.setProperty(COMMAND_NAMESPACE,"network");
registerService(bc,selectFirstNeighborsTaskFactory,NetworkTaskFactory.class,
selectFirstNeighborsTaskFactoryProps);
registerService(bc,selectFirstNeighborsTaskFactory,SelectFirstNeighborsTaskFactory.class,
selectFirstNeighborsTaskFactoryProps);
+
Properties selectFirstNeighborsTaskFactoryInEdgeProps = new
Properties();
selectFirstNeighborsTaskFactoryInEdgeProps.setProperty(ENABLE_FOR,"network");
selectFirstNeighborsTaskFactoryInEdgeProps.setProperty(PREFERRED_MENU,"Select.Nodes.First
Neighbors of Selected Nodes");
@@ -481,6 +492,7 @@
selectFirstNeighborsTaskFactoryInEdgeProps.setProperty(COMMAND_NAMESPACE,"network");
registerService(bc,selectFirstNeighborsTaskFactoryInEdge,NetworkTaskFactory.class,
selectFirstNeighborsTaskFactoryInEdgeProps);
registerService(bc,selectFirstNeighborsTaskFactoryInEdge,SelectFirstNeighborsTaskFactory.class,
selectFirstNeighborsTaskFactoryInEdgeProps);
+
Properties selectFirstNeighborsTaskFactoryOutEdgeProps = new
Properties();
selectFirstNeighborsTaskFactoryOutEdgeProps.setProperty(ENABLE_FOR,"network");
selectFirstNeighborsTaskFactoryOutEdgeProps.setProperty(PREFERRED_MENU,"Select.Nodes.First
Neighbors of Selected Nodes");
@@ -940,6 +952,19 @@
registerService(bc,groupNodesTaskFactory,NetworkViewTaskFactory.class,
groupNodesTaskFactoryProps);
registerService(bc,groupNodesTaskFactory,GroupNodesTaskFactory.class,
groupNodesTaskFactoryProps);
+ // Add Group Selected Nodes to the nodes context also
+ Properties groupNodeViewTaskFactoryProps = new Properties();
+
groupNodeViewTaskFactoryProps.setProperty(PREFERRED_MENU,NODE_GROUP_MENU);
+ groupNodeViewTaskFactoryProps.setProperty(MENU_GRAVITY, "0.0");
+ groupNodeViewTaskFactoryProps.setProperty(TITLE,"Group Selected
Nodes");
+ groupNodeViewTaskFactoryProps.setProperty(TOOLTIP,"Group
Selected Nodes Together");
+ groupNodeViewTaskFactoryProps.setProperty(IN_TOOL_BAR,"false");
+ groupNodeViewTaskFactoryProps.setProperty(IN_MENU_BAR,"false");
+ groupNodeViewTaskFactoryProps.setProperty(PREFERRED_ACTION,
"NEW");
+ groupNodeViewTaskFactoryProps.setProperty(COMMAND,
"group-selected-nodes");
+ groupNodeViewTaskFactoryProps.setProperty(COMMAND_NAMESPACE,
"network-view");
+
registerService(bc,groupNodesTaskFactory,NodeViewTaskFactory.class,
groupNodeViewTaskFactoryProps);
+
UnGroupNodesTaskFactoryImpl unGroupTaskFactory =
new UnGroupNodesTaskFactoryImpl(cyGroupManager);
Properties unGroupNodesTaskFactoryProps = new Properties();
@@ -954,6 +979,21 @@
registerService(bc,unGroupTaskFactory,NetworkViewTaskFactory.class,
unGroupNodesTaskFactoryProps);
registerService(bc,unGroupTaskFactory,UnGroupTaskFactory.class,
unGroupNodesTaskFactoryProps);
+ // Add Ungroup Selected Nodes to the nodes context also
+ Properties unGroupNodeViewTaskFactoryProps = new Properties();
+
unGroupNodeViewTaskFactoryProps.setProperty(PREFERRED_MENU,NODE_GROUP_MENU);
+ unGroupNodeViewTaskFactoryProps.setProperty(MENU_GRAVITY,
"1.0");
+
unGroupNodeViewTaskFactoryProps.setProperty(INSERT_SEPARATOR_AFTER, "true");
+ unGroupNodeViewTaskFactoryProps.setProperty(TITLE,"Ungroup
Selected Nodes");
+ unGroupNodeViewTaskFactoryProps.setProperty(TOOLTIP,"Ungroup
Selected Nodes");
+
unGroupNodeViewTaskFactoryProps.setProperty(IN_TOOL_BAR,"false");
+
unGroupNodeViewTaskFactoryProps.setProperty(IN_MENU_BAR,"false");
+ unGroupNodeViewTaskFactoryProps.setProperty(PREFERRED_ACTION,
"NEW");
+ unGroupNodeViewTaskFactoryProps.setProperty(COMMAND,
"ungroup-selected-nodes");
+ unGroupNodeViewTaskFactoryProps.setProperty(COMMAND_NAMESPACE,
"network-view");
+
registerService(bc,unGroupTaskFactory,NodeViewTaskFactory.class,
unGroupNodeViewTaskFactoryProps);
+
registerService(bc,unGroupTaskFactory,UnGroupNodesTaskFactory.class,
unGroupNodeViewTaskFactoryProps);
+
GroupNodeContextTaskFactoryImpl collapseGroupTaskFactory =
new GroupNodeContextTaskFactoryImpl(cyGroupManager,
true);
Properties collapseGroupTaskFactoryProps = new Properties();
@@ -961,6 +1001,7 @@
collapseGroupTaskFactoryProps.setProperty(TITLE,"Collapse
Group");
collapseGroupTaskFactoryProps.setProperty(TOOLTIP,"Collapse
Grouped Nodes");
collapseGroupTaskFactoryProps.setProperty(PREFERRED_ACTION,
"NEW");
+ collapseGroupTaskFactoryProps.setProperty(MENU_GRAVITY, "2.0");
collapseGroupTaskFactoryProps.setProperty(COMMAND,
"collapse-grouped-nodes");
collapseGroupTaskFactoryProps.setProperty(COMMAND_NAMESPACE,
"network-view"); // TODO right namespace?
registerService(bc,collapseGroupTaskFactory,NodeViewTaskFactory.class,
collapseGroupTaskFactoryProps);
@@ -973,23 +1014,16 @@
expandGroupTaskFactoryProps.setProperty(TITLE,"Expand Group");
expandGroupTaskFactoryProps.setProperty(TOOLTIP,"Expand Group");
expandGroupTaskFactoryProps.setProperty(PREFERRED_ACTION,
"NEW");
+ expandGroupTaskFactoryProps.setProperty(MENU_GRAVITY, "3.0");
expandGroupTaskFactoryProps.setProperty(COMMAND,
"expand-group");
expandGroupTaskFactoryProps.setProperty(COMMAND_NAMESPACE,
"network-view"); // TODO right namespace
registerService(bc,expandGroupTaskFactory,NodeViewTaskFactory.class,
expandGroupTaskFactoryProps);
registerService(bc,expandGroupTaskFactory,ExpandGroupTaskFactory.class,
expandGroupTaskFactoryProps);
- UnGroupNodesTaskFactoryImpl unGroupNodesTaskFactory =
- new UnGroupNodesTaskFactoryImpl(cyGroupManager);
- Properties unGroupTaskFactoryProps = new Properties();
-
unGroupTaskFactoryProps.setProperty(PREFERRED_MENU,NODE_GROUP_MENU);
- unGroupTaskFactoryProps.setProperty(TITLE,"Ungroup Nodes");
- unGroupTaskFactoryProps.setProperty(TOOLTIP,"Ungroup Nodes");
- unGroupTaskFactoryProps.setProperty(PREFERRED_ACTION, "NEW");
- unGroupTaskFactoryProps.setProperty(COMMAND, "ungroup");
- unGroupTaskFactoryProps.setProperty(COMMAND_NAMESPACE,
"network-view"); // TODO right namespace
-
registerService(bc,unGroupNodesTaskFactory,NodeViewTaskFactory.class,
unGroupTaskFactoryProps);
-
registerService(bc,unGroupNodesTaskFactory,UnGroupNodesTaskFactory.class,
unGroupTaskFactoryProps);
-
+ // TODO: add to group...
+
+ // TODO: remove from group...
+
MapTableToNetworkTablesTaskFactoryImpl mapNetworkToTables = new
MapTableToNetworkTablesTaskFactoryImpl(cyNetworkManagerServiceRef,
tunableSetterServiceRef, updateAddedNetworkAttributes);
Properties mapNetworkToTablesProps = new Properties();
registerService(bc, mapNetworkToTables,
MapTableToNetworkTablesTaskFactory.class, mapNetworkToTablesProps);
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/group/GroupNodesTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/group/GroupNodesTaskFactoryImpl.java
2012-07-20 18:25:02 UTC (rev 29946)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/group/GroupNodesTaskFactoryImpl.java
2012-07-20 18:29:57 UTC (rev 29947)
@@ -29,14 +29,22 @@
*/
package org.cytoscape.task.internal.group;
+import java.util.List;
+
import org.cytoscape.group.CyGroupFactory;
import org.cytoscape.group.CyGroupManager;
+import org.cytoscape.model.CyNetwork;
+import org.cytoscape.model.CyNode;
+import org.cytoscape.model.CyTableUtil;
import org.cytoscape.task.AbstractNetworkViewTaskFactory;
+import org.cytoscape.task.NodeViewTaskFactory;
import org.cytoscape.task.edit.GroupNodesTaskFactory;
import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.View;
import org.cytoscape.work.TaskIterator;
-public class GroupNodesTaskFactoryImpl extends AbstractNetworkViewTaskFactory
implements GroupNodesTaskFactory{
+public class GroupNodesTaskFactoryImpl extends AbstractNetworkViewTaskFactory
+ implements NodeViewTaskFactory,
GroupNodesTaskFactory {
private CyGroupManager mgr;
private CyGroupFactory groupFactory;
@@ -49,4 +57,33 @@
public TaskIterator createTaskIterator(CyNetworkView view) {
return new TaskIterator(new GroupNodesTask(view, mgr,
groupFactory));
}
+
+ public TaskIterator createTaskIterator(View<CyNode> nodeView,
CyNetworkView view) {
+ return new TaskIterator(new GroupNodesTask(view, mgr,
groupFactory));
+ }
+
+ public boolean isReady(CyNetworkView netView) {
+ if (netView == null)
+ return false;
+
+ // Get all of the selected nodes
+ CyNetwork net = netView.getModel();
+ final List<CyNode> selNodes = CyTableUtil.getNodesInState(net,
CyNetwork.SELECTED, true);
+ if (selNodes.size() > 1)
+ return true;
+ return false;
+ }
+
+ public boolean isReady(View<CyNode> nodeView, CyNetworkView netView) {
+ if (nodeView == null || netView == null) {
+ return false;
+ }
+
+ // Get all of the selected nodes
+ CyNetwork net = netView.getModel();
+ final List<CyNode> selNodes = CyTableUtil.getNodesInState(net,
CyNetwork.SELECTED, true);
+ if (selNodes.size() > 1)
+ return true;
+ return false;
+ }
}
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/group/UnGroupNodesTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/group/UnGroupNodesTaskFactoryImpl.java
2012-07-20 18:25:02 UTC (rev 29946)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/group/UnGroupNodesTaskFactoryImpl.java
2012-07-20 18:29:57 UTC (rev 29947)
@@ -47,7 +47,8 @@
import org.cytoscape.view.model.View;
import org.cytoscape.work.TaskIterator;
-public class UnGroupNodesTaskFactoryImpl implements NodeViewTaskFactory,
NetworkViewTaskFactory, UnGroupTaskFactory, UnGroupNodesTaskFactory {
+public class UnGroupNodesTaskFactoryImpl implements NetworkViewTaskFactory,
+ UnGroupTaskFactory,
UnGroupNodesTaskFactory {
private CyGroupManager mgr;
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/select/SelectAllTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/select/SelectAllTaskFactoryImpl.java
2012-07-20 18:25:02 UTC (rev 29946)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/select/SelectAllTaskFactoryImpl.java
2012-07-20 18:29:57 UTC (rev 29947)
@@ -33,13 +33,15 @@
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.task.AbstractNetworkTaskFactory;
+import org.cytoscape.task.NetworkViewTaskFactory;
import org.cytoscape.task.select.SelectAllTaskFactory;
+import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.undo.UndoSupport;
-public class SelectAllTaskFactoryImpl extends AbstractNetworkTaskFactory
implements SelectAllTaskFactory{
+public class SelectAllTaskFactoryImpl extends AbstractNetworkTaskFactory
implements SelectAllTaskFactory, NetworkViewTaskFactory {
private final UndoSupport undoSupport;
private final CyNetworkViewManager networkViewManager;
private final CyEventHelper eventHelper;
@@ -57,4 +59,10 @@
return new TaskIterator(new SelectAllTask(undoSupport, network,
networkViewManager,
eventHelper));
}
+
+ public TaskIterator createTaskIterator(CyNetworkView view) {
+ return createTaskIterator(view.getModel());
+ }
+
+ public boolean isReady(CyNetworkView view) { return
isReady(view.getModel()); }
}
Modified:
core3/impl/trunk/linkout-impl/src/main/java/org/cytoscape/linkout/internal/LinkOut.java
===================================================================
---
core3/impl/trunk/linkout-impl/src/main/java/org/cytoscape/linkout/internal/LinkOut.java
2012-07-20 18:25:02 UTC (rev 29946)
+++
core3/impl/trunk/linkout-impl/src/main/java/org/cytoscape/linkout/internal/LinkOut.java
2012-07-20 18:29:57 UTC (rev 29947)
@@ -135,7 +135,11 @@
addStaticNodeLinks();
addStaticEdgeLinks();
- addDynamicLinks();
+ // This has been disabled until we can figure out the right way
to
+ // construct these menus and add them to the existing Linkout
menu.
+ // The current approach is not used (as far as we know) and adds
+ // significant confusion in the UI
+ // addDynamicLinks();
}
/**
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
2012-07-20 18:25:02 UTC (rev 29946)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
2012-07-20 18:29:57 UTC (rev 29947)
@@ -171,7 +171,11 @@
BendFactory bf = getService(bc, BendFactory.class);
final Properties clearBendProp = new Properties();
- clearBendProp.put(ServiceProperties.PREFERRED_MENU, "Clear
Bend");
+ clearBendProp.put(ServiceProperties.PREFERRED_MENU,
+ ServiceProperties.EDGE_EDIT_MENU);
+ clearBendProp.put(ServiceProperties.TITLE, "Clear Edge Bends");
+ clearBendProp.put(ServiceProperties.MENU_GRAVITY, "5.0");
+ clearBendProp.put(ServiceProperties.INSERT_SEPARATOR_BEFORE,
"true");
final ClearBendTaskFactory clearBendTaskFactory = new
ClearBendTaskFactory(vmmServiceRef, bf);
registerService(bc, clearBendTaskFactory,
EdgeViewTaskFactory.class, clearBendProp);
Modified:
core3/impl/trunk/webservice-psicquic-client-impl/src/main/java/org/cytoscape/webservice/psicquic/CyActivator.java
===================================================================
---
core3/impl/trunk/webservice-psicquic-client-impl/src/main/java/org/cytoscape/webservice/psicquic/CyActivator.java
2012-07-20 18:25:02 UTC (rev 29946)
+++
core3/impl/trunk/webservice-psicquic-client-impl/src/main/java/org/cytoscape/webservice/psicquic/CyActivator.java
2012-07-20 18:29:57 UTC (rev 29947)
@@ -7,6 +7,7 @@
import org.cytoscape.model.CyNetworkFactory;
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.service.util.AbstractCyActivator;
+import org.cytoscape.task.NodeViewTaskFactory;
import org.cytoscape.task.create.CreateNetworkViewTaskFactory;
import org.cytoscape.util.swing.OpenBrowser;
import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
@@ -53,7 +54,9 @@
final Properties nodeProp = new Properties();
nodeProp.setProperty("preferredTaskManager", "menu");
nodeProp.setProperty(PREFERRED_MENU, NODE_EDIT_MENU);
+ nodeProp.setProperty(INSERT_SEPARATOR_BEFORE, "true");
nodeProp.setProperty(MENU_GRAVITY, "10.0");
- registerService(bc, expandNodeContextMenuFactory,
CyNodeViewContextMenuFactory.class, nodeProp);
+ nodeProp.setProperty(TITLE, "Extend Network");
+ registerService(bc, expandNodeContextMenuFactory,
NodeViewTaskFactory.class, nodeProp);
}
}
Modified:
core3/impl/trunk/webservice-psicquic-client-impl/src/main/java/org/cytoscape/webservice/psicquic/task/ExpandNodeContextMenuFactory.java
===================================================================
---
core3/impl/trunk/webservice-psicquic-client-impl/src/main/java/org/cytoscape/webservice/psicquic/task/ExpandNodeContextMenuFactory.java
2012-07-20 18:25:02 UTC (rev 29946)
+++
core3/impl/trunk/webservice-psicquic-client-impl/src/main/java/org/cytoscape/webservice/psicquic/task/ExpandNodeContextMenuFactory.java
2012-07-20 18:29:57 UTC (rev 29947)
@@ -4,15 +4,10 @@
import java.awt.event.ActionListener;
import java.util.Map;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import javax.swing.SwingUtilities;
-
-import org.cytoscape.application.swing.CyMenuItem;
-import org.cytoscape.application.swing.CyNodeViewContextMenuFactory;
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
+import org.cytoscape.task.AbstractNodeViewTaskFactory;
import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.View;
@@ -24,10 +19,8 @@
import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.TaskManager;
-public class ExpandNodeContextMenuFactory implements
CyNodeViewContextMenuFactory {
+public class ExpandNodeContextMenuFactory extends AbstractNodeViewTaskFactory {
- private static final String ROOT_MENU_LABEL = "Expand Node by Database
Search";
-
private final CyEventHelper eh;
private final VisualMappingManager vmm;
private final RegistryManager manager;
@@ -48,45 +41,14 @@
this.builder = builder;
}
- @Override
- public CyMenuItem createMenuItem(final CyNetworkView netView, final
View<CyNode> nodeView) {
-
- final JMenu rootJMenu = new JMenu(ROOT_MENU_LABEL);
- final CyMenuItem rootMenu = new CyMenuItem(rootJMenu, 5.0f);
-
- final JMenuItem primaryMenu = new JMenuItem("Send unique ID as
query");
-
- primaryMenu.addActionListener(new ActionListener() {
-
- @Override
- public void actionPerformed(ActionEvent arg0) {
- SwingUtilities.invokeLater(new Runnable() {
-
- @Override
- public void run() {
- expand(netView, nodeView);
- }
- });
-
- }
- });
- rootJMenu.add(primaryMenu);
-
- return rootMenu;
- }
-
- private final void expand(CyNetworkView netView, View<CyNode> nodeView)
{
-
- // Create query
- String name =
netView.getModel().getDefaultNodeTable().getRow(nodeView.getModel().getSUID())
- .get(CyNetwork.NAME, String.class);
- taskManager.execute(createTaskIterator(name, netView,
nodeView));
- }
-
- private TaskIterator createTaskIterator(final String query,
CyNetworkView netView, final View<CyNode> nodeView) {
+ public TaskIterator createTaskIterator(View<CyNode> nodeView,
CyNetworkView netView) {
if (manager == null)
throw new NullPointerException("RegistryManager is
null");
+ // Create query
+ String query = netView.getModel().getDefaultNodeTable()
+ .getRow(nodeView.getModel().getSUID())
+ .get(CyNetwork.NAME,
String.class);
if (query == null)
throw new NullPointerException("Query object is null.");
else {
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
