Author: ruschein
Date: 2010-11-19 14:49:16 -0800 (Fri, 19 Nov 2010)
New Revision: 22949
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/networkobjects/DeleteSelectedNodesAndEdgesTask.java
Log:
Reverted some bad ordering logic.
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/networkobjects/DeleteSelectedNodesAndEdgesTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/networkobjects/DeleteSelectedNodesAndEdgesTask.java
2010-11-19 22:43:57 UTC (rev 22948)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/networkobjects/DeleteSelectedNodesAndEdgesTask.java
2010-11-19 22:49:16 UTC (rev 22949)
@@ -77,17 +77,19 @@
final List<CyNode> selectedNodes =
CyTableUtil.getNodesInState(network, "selected", true);
final Set<CyEdge> selectedEdges = new
HashSet<CyEdge>(CyTableUtil.getEdgesInState(network, "selected", true));
+ // Make sure we're not loosing any edges for a possible undo!
+ for (CyNode selectedNode : selectedNodes)
+
selectedEdges.addAll(network.getAdjacentEdgeList(selectedNode,
CyEdge.Type.ANY));
+
+ undoSupport.getUndoableEditSupport().postEdit(
+ new DeleteEdit(network, selectedNodes, selectedEdges,
this, networkViewManager));
+
// Delete the actual nodes and edges:
- for (CyNode selectedNode : selectedNodes) {
-
selectedEdges.addAll(network.getAdjacentEdgeList(selectedNode,
CyEdge.Type.ANY));
+ for (CyNode selectedNode : selectedNodes)
network.removeNode(selectedNode);
- }
for (CyEdge selectedEdge : selectedEdges)
network.removeEdge(selectedEdge);
- undoSupport.getUndoableEditSupport().postEdit(
- new DeleteEdit(network, selectedNodes, selectedEdges,
this, networkViewManager));
-
myView.updateView();
}
}
--
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.
