Author: mes
Date: 2010-10-25 10:01:35 -0700 (Mon, 25 Oct 2010)
New Revision: 22353
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideUtils.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectFirstNeighborsNodeViewTask.java
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/select/AbstractSelectTaskTester.java
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/select/SelectFirstNeighborsNodeViewTaskTest.java
Log:
updated to reflect model-api changes
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideUtils.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideUtils.java
2010-10-25 17:00:05 UTC (rev 22352)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideUtils.java
2010-10-25 17:01:35 UTC (rev 22353)
@@ -46,18 +46,20 @@
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNode;
+import org.cytoscape.model.CyNetwork;
import org.cytoscape.view.model.CyNetworkView;
abstract class HideUtils {
static void setVisibleNodes(Collection<CyNode> nodes, boolean visible,
CyNetworkView view) {
+ final CyNetwork net = view.getModel();
for ( CyNode n : nodes ) {
if ( view != null ) {
view.getNodeView(n).setVisualProperty(NODE_VISIBLE,visible);
- for ( CyNode n2 :
n.getNeighborList(CyEdge.Type.ANY) )
- for ( CyEdge e :
view.getModel().getConnectingEdgeList(n,n2,CyEdge.Type.ANY) )
+ for ( CyNode n2 : net.getNeighborList(n,
CyEdge.Type.ANY) )
+ for ( CyEdge e :
net.getConnectingEdgeList(n,n2,CyEdge.Type.ANY) )
view.getEdgeView( e
).setVisualProperty(EDGE_VISIBLE,visible);
}
}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectFirstNeighborsNodeViewTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectFirstNeighborsNodeViewTask.java
2010-10-25 17:00:05 UTC (rev 22352)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectFirstNeighborsNodeViewTask.java
2010-10-25 17:01:35 UTC (rev 22353)
@@ -34,6 +34,7 @@
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.model.CyNode;
import org.cytoscape.model.CyEdge;
+import org.cytoscape.model.CyNetwork;
import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.TaskMonitor;
import org.cytoscape.session.CyNetworkManager;
@@ -60,8 +61,9 @@
final Set<CyNode> selNodes = new HashSet<CyNode>();
final CyNode node = nodeView.getModel();
+ final CyNetwork net = netView.getModel();
selNodes.add( node );
- selNodes.addAll( node.getNeighborList( CyEdge.Type.ANY ) );
+ selNodes.addAll( net.getNeighborList(node, CyEdge.Type.ANY ) );
SelectUtils.setSelectedNodes( selNodes, true);
netView.updateView();
Modified:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/select/AbstractSelectTaskTester.java
===================================================================
---
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/select/AbstractSelectTaskTester.java
2010-10-25 17:00:05 UTC (rev 22352)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/select/AbstractSelectTaskTester.java
2010-10-25 17:01:35 UTC (rev 22353)
@@ -64,14 +64,16 @@
CyNode e4;
public void setUp() throws Exception {
+ net = mock(CyNetwork.class);
+
CyNetworkView view = mock(CyNetworkView.class);
+ when(view.getModel()).thenReturn(net);
netmgr = mock(CyNetworkManager.class);
when(netmgr.getNetworkView(anyLong())).thenReturn(view);
tm = mock(TaskMonitor.class);
- net = mock(CyNetwork.class);
r1 = mock(CyRow.class);
e1 = mock(CyEdge.class);
Modified:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/select/SelectFirstNeighborsNodeViewTaskTest.java
===================================================================
---
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/select/SelectFirstNeighborsNodeViewTaskTest.java
2010-10-25 17:00:05 UTC (rev 22352)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/select/SelectFirstNeighborsNodeViewTaskTest.java
2010-10-25 17:01:35 UTC (rev 22353)
@@ -69,11 +69,12 @@
// more setup
List<CyNode> nl = new ArrayList<CyNode>();
nl.add(e4);
- when(e3.getNeighborList(CyEdge.Type.ANY)).thenReturn(nl);
+ when(net.getNeighborList(e3,CyEdge.Type.ANY)).thenReturn(nl);
View<CyNode> nv = (View<CyNode>)mock(View.class);
when(nv.getModel()).thenReturn(e3);
CyNetworkView netView = mock(CyNetworkView.class);
+ when(netView.getModel()).thenReturn(net);
// run the task
Task t = new SelectFirstNeighborsNodeViewTask(nv,netView);
--
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.
