Author: kono
Date: 2010-08-09 17:20:47 -0700 (Mon, 09 Aug 2010)
New Revision: 21275
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedNodesTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedTask.java
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/UnHideAllEdgesTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/UnHideAllNodesTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/UnHideAllTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectFirstNeighborsNodeViewTask.java
Log:
Method name changed from getSource() to getModel() for consistency.
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTask.java
2010-08-10 00:20:10 UTC (rev 21274)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTask.java
2010-08-10 00:20:47 UTC (rev 21275)
@@ -55,7 +55,7 @@
}
public void run(TaskMonitor e) {
- final CyNetwork curr = view.getSource();
+ final CyNetwork curr = view.getModel();
final List<CyEdge> selectedEdges =
CyDataTableUtil.getEdgesInState(curr,"selected",true);
HideUtils.setVisibleEdges( selectedEdges, false, view );
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedNodesTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedNodesTask.java
2010-08-10 00:20:10 UTC (rev 21274)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedNodesTask.java
2010-08-10 00:20:47 UTC (rev 21275)
@@ -55,7 +55,7 @@
}
public void run(TaskMonitor e) {
- final CyNetwork curr = view.getSource();
+ final CyNetwork curr = view.getModel();
final List<CyNode> selectedNodes =
CyDataTableUtil.getNodesInState(curr,"selected",true);
HideUtils.setVisibleNodes( selectedNodes, false, view );
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedTask.java
2010-08-10 00:20:10 UTC (rev 21274)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedTask.java
2010-08-10 00:20:47 UTC (rev 21275)
@@ -56,7 +56,7 @@
}
public void run(TaskMonitor e) {
- final CyNetwork curr = view.getSource();
+ final CyNetwork curr = view.getModel();
final List<CyNode> selectedNodes =
CyDataTableUtil.getNodesInState(curr,"selected",true);
final List<CyEdge> selectedEdges =
CyDataTableUtil.getEdgesInState(curr,"selected",true);
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-08-10 00:20:10 UTC (rev 21274)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideUtils.java
2010-08-10 00:20:47 UTC (rev 21275)
@@ -57,7 +57,7 @@
view.getNodeView(n).setVisualProperty(NODE_VISIBLE,visible);
for ( CyNode n2 :
n.getNeighborList(CyEdge.Type.ANY) )
- for ( CyEdge e :
view.getSource().getConnectingEdgeList(n,n2,CyEdge.Type.ANY) )
+ for ( CyEdge e :
view.getModel().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/hide/UnHideAllEdgesTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/UnHideAllEdgesTask.java
2010-08-10 00:20:10 UTC (rev 21274)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/UnHideAllEdgesTask.java
2010-08-10 00:20:47 UTC (rev 21275)
@@ -51,7 +51,7 @@
}
public void run(TaskMonitor e) {
- final CyNetwork curr = view.getSource();
+ final CyNetwork curr = view.getModel();
HideUtils.setVisibleEdges( curr.getEdgeList(), true, view );
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/UnHideAllNodesTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/UnHideAllNodesTask.java
2010-08-10 00:20:10 UTC (rev 21274)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/UnHideAllNodesTask.java
2010-08-10 00:20:47 UTC (rev 21275)
@@ -54,7 +54,7 @@
}
public void run(TaskMonitor e) {
- final CyNetwork curr = view.getSource();
+ final CyNetwork curr = view.getModel();
HideUtils.setVisibleNodes( curr.getNodeList(), true, view );
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/UnHideAllTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/UnHideAllTask.java
2010-08-10 00:20:10 UTC (rev 21274)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/UnHideAllTask.java
2010-08-10 00:20:47 UTC (rev 21275)
@@ -52,7 +52,7 @@
}
public void run(TaskMonitor e) {
- final CyNetwork curr = view.getSource();
+ final CyNetwork curr = view.getModel();
HideUtils.setVisibleNodes( curr.getNodeList(), true, view );
HideUtils.setVisibleEdges( curr.getEdgeList(), true, view );
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-08-10 00:20:10 UTC (rev 21274)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/select/SelectFirstNeighborsNodeViewTask.java
2010-08-10 00:20:47 UTC (rev 21275)
@@ -65,7 +65,7 @@
throw new Exception("network view is null");
final Set<CyNode> selNodes = new HashSet<CyNode>();
- final CyNode node = nodeView.getSource();
+ final CyNode node = nodeView.getModel();
selNodes.add( node );
selNodes.addAll( node.getNeighborList( CyEdge.Type.ANY ) );
--
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.
