Improved type checks.

KN4CK3R · KN4CK3R · commit a55ebc4368bb · 2019-01-18T15:06:40.000+01:00
diff --git a/ReClass.NET/Nodes/BaseContainerNode.cs b/ReClass.NET/Nodes/BaseContainerNode.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using ReClassNET.Extensions;
@@ -18,6 +18,13 @@ private void ObjectInvariants()
 		/// <summary>The child nodes of the node.</summary>
 		public IEnumerable<BaseNode> Nodes => nodes;
 
+		/// <summary>
+		/// Should be called before adding a child to test if the container can handle the node type.
+		/// </summary>
+		/// <param name="node">The new child node.</param>
+		/// <returns>True if the container can handle the child node or false otherwise.</returns>
+		public abstract bool CanHandleChildNode(BaseNode node);
+
 		/// <summary>Calculates the offset of every child node.</summary>
 		public void UpdateOffsets()
 		{
diff --git a/ReClass.NET/Nodes/BaseWrapperArrayNode.cs b/ReClass.NET/Nodes/BaseWrapperArrayNode.cs
@@ -16,9 +16,15 @@ public abstract class BaseWrapperArrayNode : BaseWrapperNode
 
 		public override bool CanChangeInnerNodeTo(BaseNode node)
 		{
-			// A null node (aka void) is not allowed for instances.
+			switch (node)
+			{
+				case null:
+				case ClassNode _:
+				case VMethodNode _:
+					return false;
+			}
 
-			return node != null;
+			return true;
 		}
 
 		protected Size Draw(ViewInfo view, int x, int y, string type)
diff --git a/ReClass.NET/Nodes/ClassNode.cs b/ReClass.NET/Nodes/ClassNode.cs
@@ -79,6 +79,19 @@ public override void GetUserInterfaceInfo(out string name, out Image icon)
 			throw new InvalidOperationException($"The '{nameof(ClassNode)}' node should not be accessible from the ui.");
 		}
 
+		public override bool CanHandleChildNode(BaseNode node)
+		{
+			switch (node)
+			{
+				case null:
+				case ClassNode _:
+				case VMethodNode _:
+					return false;
+			}
+
+			return true;
+		}
+
 		public override void Intialize()
 		{
 			AddBytes(IntPtr.Size);
diff --git a/ReClass.NET/Nodes/PointerNode.cs b/ReClass.NET/Nodes/PointerNode.cs
@@ -26,6 +26,13 @@ public override void GetUserInterfaceInfo(out string name, out Image icon)
 
 		public override bool CanChangeInnerNodeTo(BaseNode node)
 		{
+			switch (node)
+			{
+				case ClassNode _:
+				case VMethodNode _:
+					return false;
+			}
+
 			return true;
 		}
 
diff --git a/ReClass.NET/Nodes/VTableNode.cs b/ReClass.NET/Nodes/VTableNode.cs
@@ -19,6 +19,11 @@ public override void GetUserInterfaceInfo(out string name, out Image icon)
 			icon = Properties.Resources.B16x16_Button_VTable;
 		}
 
+		public override bool CanHandleChildNode(BaseNode node)
+		{
+			return node is VMethodNode;
+		}
+
 		public override void Intialize()
 		{
 			AddBytes(10 * IntPtr.Size);

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,13 @@ public override void GetUserInterfaceInfo(out string name, out Image icon)`
`26`	`26`
`27`	`27`	`public override bool CanChangeInnerNodeTo(BaseNode node)`
`28`	`28`	`{`
	`29`	`+ switch (node)`
	`30`	`+ {`
	`31`	`+ case ClassNode _:`
	`32`	`+ case VMethodNode _:`
	`33`	`+ return false;`
	`34`	`+ }`
	`35`	`+`
`29`	`36`	`return true;`
`30`	`37`	`}`
`31`	`38`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,11 @@ public override void GetUserInterfaceInfo(out string name, out Image icon)`
`19`	`19`	`icon = Properties.Resources.B16x16_Button_VTable;`
`20`	`20`	`}`
`21`	`21`
	`22`	`+ public override bool CanHandleChildNode(BaseNode node)`
	`23`	`+ {`
	`24`	`+ return node is VMethodNode;`
	`25`	`+ }`
	`26`	`+`
`22`	`27`	`public override void Intialize()`
`23`	`28`	`{`
`24`	`29`	`AddBytes(10 * IntPtr.Size);`