Author: paperwing
Date: 2012-03-16 13:31:56 -0700 (Fri, 16 Mar 2012)
New Revision: 28564

Modified:
   
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/input/NetworkChangeInputHandler.java
Log:
fixes #809 Bug was fixed by deleting edges before nodes. Also, selected node 
and edge data are removed from the CyTable when they are removed.

Modified: 
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/input/NetworkChangeInputHandler.java
===================================================================
--- 
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/input/NetworkChangeInputHandler.java
  2012-03-16 18:45:31 UTC (rev 28563)
+++ 
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/input/NetworkChangeInputHandler.java
  2012-03-16 20:31:56 UTC (rev 28564)
@@ -10,6 +10,7 @@
 import org.cytoscape.paperwing.internal.data.GraphicsData;
 import org.cytoscape.paperwing.internal.geometric.Vector3;
 import org.cytoscape.paperwing.internal.tools.GeometryToolkit;
+import org.cytoscape.paperwing.internal.tools.NetworkToolkit;
 import org.cytoscape.paperwing.internal.tools.RenderToolkit;
 import org.cytoscape.paperwing.internal.tools.SimpleCamera;
 import org.cytoscape.view.model.CyNetworkView;
@@ -142,9 +143,13 @@
                                }
                        }
                        
+                       // Remove the node and edge entries from the CyTable
+                       NetworkToolkit.deselectEdges(selectedEdgeIndices, 
networkView);
+                       NetworkToolkit.deselectNodes(selectedNodeIndices, 
networkView);
+                       
+                       networkView.getModel().removeEdges(edgesToBeRemoved);
                        networkView.getModel().removeNodes(nodesToBeRemoved);
-                       networkView.getModel().removeEdges(edgesToBeRemoved);
-                       
+
                        selectedNodeIndices.clear();
                        selectedEdgeIndices.clear();
                        

-- 
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.

Reply via email to