#13 Fixing child deletion

Author: EJBQ

src/ca/mcgill/cs/stg/jetuml/framework/GraphModificationListener.java

@@ -47,14 +47,14 @@ public GraphModificationListener(UndoManager pUndo)
 	public void nodeAdded(Graph pGraph, Node pNode)
 	{
 		AddDeleteNodeCommand ac = new AddDeleteNodeCommand(pGraph, pNode, true);
-		if(pNode.getParent() != null)
-		{
-			aUndoManager.startTracking();
-			childAttached(pGraph, pNode.getParent().getChildren().indexOf(pNode), pNode.getParent(), pNode);
-			aUndoManager.add(ac);
-			aUndoManager.endTracking();
-			return;
-		}
+//		if(pNode.getParent() != null)
+//		{
+//			aUndoManager.startTracking();
+//			childAttached(pGraph, pNode.getParent().getChildren().indexOf(pNode), pNode.getParent(), pNode);
+//			aUndoManager.add(ac);
+//			aUndoManager.endTracking();
+//			return;
+//		}
 		aUndoManager.add(ac);
 	}
 
@@ -66,14 +66,14 @@ public void nodeAdded(Graph pGraph, Node pNode)
 	public void nodeRemoved(Graph pGraph, Node pNode)
 	{
 		AddDeleteNodeCommand dc = new AddDeleteNodeCommand(pGraph, pNode, false);
-		if(pNode.getParent() != null)
-		{
-			aUndoManager.startTracking();
-			childDetached(pGraph, pNode.getParent().getChildren().indexOf(pNode), pNode.getParent(), pNode);
-			aUndoManager.add(dc);
-			aUndoManager.endTracking();
-			return;
-		}
+//		if(pNode.getParent() != null)
+//		{
+//			aUndoManager.startTracking();
+//			childDetached(pGraph, pNode.getParent().getChildren().indexOf(pNode), pNode.getParent(), pNode);
+//			aUndoManager.add(dc);
+//			aUndoManager.endTracking();
+//			return;
+//		}
 		aUndoManager.add(dc);
 	}
 

src/ca/mcgill/cs/stg/jetuml/graph/Graph.java

@@ -46,7 +46,7 @@ public abstract class Graph
 	private transient ArrayList<Edge> aEdgesToBeRemoved;
 	private transient boolean aNeedsLayout;
 	private transient Rectangle2D aMinBounds;
-	private GraphModificationListener aModListener;
+	protected GraphModificationListener aModListener;
 
 	/**
      * Constructs a graph with no nodes or edges.
@@ -126,8 +126,6 @@ public boolean add(Node pNode, Point2D pPoint)
 		boolean accepted = false;
 		/* A variable commented out during testing. @JoelChev */
 		//boolean insideANode = false;
-		aModListener.startCompoundListening();
-		aModListener.nodeAdded(this, pNode);
 		for(int i = aNodes.size() - 1; i >= 0 && !accepted; i--)
 		{
 			Node parent = aNodes.get(i);
@@ -144,7 +142,7 @@ public boolean add(Node pNode, Point2D pPoint)
 //			System.out.println("FALSE!");
 //			return false;
 //		}
-		aModListener.endCompoundListening();
+		aModListener.nodeAdded(this, pNode);
 		aNodes.add(pNode);
 		aNeedsLayout = true;
 		return true;
@@ -239,7 +237,6 @@ public void removeNode(Node pNode)
 		}
 		aModListener.startCompoundListening();
 		aNodesToBeRemoved.add(pNode);
-		aModListener.nodeRemoved(this, pNode);
 		// notify nodes of removals
 		for(int i = 0; i < aNodes.size(); i++)
 		{
@@ -263,6 +260,7 @@ public void removeNode(Node pNode)
 		{
 			removeNode(childNode);
 		}
+		aModListener.nodeRemoved(this, pNode);
 		aModListener.endCompoundListening();
 		aNeedsLayout = true;
 	}