NodeRemoved/ConnectionRemoved is now NodeRemoving/ConnectionRemoving and added new NodeRemoving/ConnectionRemoving that's called at the end of removing a node/connection (thanks Zyxil for the suggestion)

LogicalError · LogicalError · commit d4c45d6f67f1 · 2011-10-31T20:25:57.000+01:00
diff --git a/Graph/GraphControl.cs b/Graph/GraphControl.cs
@@ -45,9 +45,11 @@ public GraphControl()
 
 		public event EventHandler<ElementEventArgs>					FocusChanged;
 		public event EventHandler<AcceptNodeEventArgs>				NodeAdded;
-		public event EventHandler<AcceptNodeEventArgs>				NodeRemoved;
+		public event EventHandler<AcceptNodeEventArgs>				NodeRemoving;
+		public event EventHandler<NodeEventArgs>					NodeRemoved;
 		public event EventHandler<AcceptNodeConnectionEventArgs>	ConnectionAdded;
-		public event EventHandler<AcceptNodeConnectionEventArgs>	ConnectionRemoved;
+		public event EventHandler<AcceptNodeConnectionEventArgs>	ConnectionRemoving;
+		public event EventHandler<NodeConnectionEventArgs>			ConnectionRemoved;
 
 
 		#region DragElement
@@ -477,10 +479,10 @@ public void RemoveNode(Node node)
 			if (node == null)
 				return;
 
-			if (NodeRemoved != null)
+			if (NodeRemoving != null)
 			{
 				var eventArgs = new AcceptNodeEventArgs(node);
-				NodeRemoved(this, eventArgs);
+				NodeRemoving(this, eventArgs);
 				if (eventArgs.Cancel)
 					return;
 			}
@@ -490,6 +492,9 @@ public void RemoveNode(Node node)
 			DisconnectAll(node);
 			graphNodes.Remove(node);
 			this.Invalidate();
+
+			if (NodeRemoved != null)
+				NodeRemoved(this, new NodeEventArgs(node));
 		}
 		#endregion
 
@@ -504,10 +509,10 @@ public bool RemoveNodes(IEnumerable<Node> nodes)
 			{
 				if (node == null)
 					continue;
-				if (NodeRemoved != null)
+				if (NodeRemoving != null)
 				{
 					var eventArgs = new AcceptNodeEventArgs(node);
-					NodeRemoved(this, eventArgs);
+					NodeRemoving(this, eventArgs);
 					if (eventArgs.Cancel)
 						continue;
 				}
@@ -518,6 +523,9 @@ public bool RemoveNodes(IEnumerable<Node> nodes)
 				DisconnectAll(node);
 				graphNodes.Remove(node);
 				modified = true;
+
+				if (NodeRemoved != null)
+					NodeRemoved(this, new NodeEventArgs(node));
 			}
 			if (modified)
 				this.Invalidate();
@@ -581,10 +589,10 @@ public bool Disconnect(NodeConnection connection)
 			if (connection == null)
 				return false;
 
-			if (ConnectionRemoved != null)
+			if (ConnectionRemoving != null)
 			{
 				var eventArgs = new AcceptNodeConnectionEventArgs(connection);
-				ConnectionRemoved(this, eventArgs);
+				ConnectionRemoving(this, eventArgs);
 				if (eventArgs.Cancel)
 					return false;
 			}
@@ -603,6 +611,9 @@ public bool Disconnect(NodeConnection connection)
 			connection.From = null;
 			connection.To = null;
 
+			if (ConnectionRemoved != null)
+				ConnectionRemoved(this, new NodeConnectionEventArgs(from, to, connection));
+
 			this.Invalidate();
 			return true;
 		}
diff --git a/Graph/NodeConnection.cs b/Graph/NodeConnection.cs
@@ -32,7 +32,10 @@ namespace Graph
 {
 	public sealed class NodeConnectionEventArgs : EventArgs
 	{
-		public NodeConnectionEventArgs(NodeConnection connection) { Connection = connection; }
+		public NodeConnectionEventArgs(NodeConnection connection) { Connection = connection; From = connection.From; To = connection.To; }
+		public NodeConnectionEventArgs(NodeConnector from, NodeConnector to, NodeConnection connection) { Connection = connection; From = from; To = to; }
+		public NodeConnector From { get; set; }
+		public NodeConnector To { get; set; }
 		public NodeConnection Connection { get; private set; }
 	}
 
diff --git a/GraphExample/ExampleForm.cs b/GraphExample/ExampleForm.cs
@@ -61,7 +61,7 @@ public ExampleForm()
 			graphControl.AddNode(textureNode);
 
 			graphControl.ConnectionAdded += new EventHandler<AcceptNodeConnectionEventArgs>(OnConnectionAdded);
-			graphControl.ConnectionRemoved += new EventHandler<AcceptNodeConnectionEventArgs>(OnConnectionRemoved);
+			graphControl.ConnectionRemoving += new EventHandler<AcceptNodeConnectionEventArgs>(OnConnectionRemoved);
 
 			graphControl.Connect(colorItem, check1Item);
 		}

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,10 @@ namespace Graph`
`32`	`32`	`{`
`33`	`33`	`public sealed class NodeConnectionEventArgs : EventArgs`
`34`	`34`	`{`
`35`		`- public NodeConnectionEventArgs(NodeConnection connection) { Connection = connection; }`
	`35`	`+ public NodeConnectionEventArgs(NodeConnection connection) { Connection = connection; From = connection.From; To = connection.To; }`
	`36`	`+ public NodeConnectionEventArgs(NodeConnector from, NodeConnector to, NodeConnection connection) { Connection = connection; From = from; To = to; }`
	`37`	`+ public NodeConnector From { get; set; }`
	`38`	`+ public NodeConnector To { get; set; }`
`36`	`39`	`public NodeConnection Connection { get; private set; }`
`37`	`40`	`}`
`38`	`41`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public ExampleForm()`
`61`	`61`	`graphControl.AddNode(textureNode);`
`62`	`62`
`63`	`63`	`graphControl.ConnectionAdded += new EventHandler<AcceptNodeConnectionEventArgs>(OnConnectionAdded);`
`64`		`- graphControl.ConnectionRemoved += new EventHandler<AcceptNodeConnectionEventArgs>(OnConnectionRemoved);`
	`64`	`+ graphControl.ConnectionRemoving += new EventHandler<AcceptNodeConnectionEventArgs>(OnConnectionRemoved);`
`65`	`65`
`66`	`66`	`graphControl.Connect(colorItem, check1Item);`
`67`	`67`	`}`