Changed cycle detection trigger.

Author: KN4CK3R

DataExchange/SchemaBuilder.cs

@@ -404,16 +404,14 @@ public static bool TryCreateNodeFromSchema(SchemaNode schemaNode, ClassNode pare
 			{
 				var schemaReferenceNode = schemaNode as SchemaReferenceNode;
 
-				try
+				if (referenceNode.PerformCycleCheck && !ClassManager.IsCycleFree(parentNode, classes[schemaReferenceNode.InnerNode], classes.Values))
 				{
-					referenceNode.ChangeInnerNode(classes[schemaReferenceNode.InnerNode]);
-				}
-				catch (ClassCycleException)
-				{
-					logger.Log(LogLevel.Error, $"Skipping node with cycle reference: {node.Name}");
+					logger.Log(LogLevel.Error, $"Skipping node with cycle reference: {schemaReferenceNode.InnerNode.Name}->{node.Name}");
 
 					return false;
 				}
+
+				referenceNode.ChangeInnerNode(classes[schemaReferenceNode.InnerNode]);
 			}
 
 			var vtableNode = node as VTableNode;

Nodes/BaseArrayNode.cs

@@ -10,12 +10,6 @@ public abstract class BaseArrayNode : BaseReferenceNode
 		public int CurrentIndex { get; set; }
 		public int Count { get; set; } = 1;
 
-		public BaseArrayNode(bool performCycleCheck)
-			: base(performCycleCheck)
-		{
-
-		}
-
 		protected int Draw(ViewInfo view, int x, int y, string type, HotSpotType exchange)
 		{
 			Contract.Requires(view != null);
@@ -130,11 +124,6 @@ public override void Update(HotSpot spot)
 	[ContractClassFor(typeof(BaseArrayNode))]
 	internal abstract class BaseArrayNodeContract : BaseArrayNode
 	{
-		public BaseArrayNodeContract(bool performCycleCheck)
-			: base(performCycleCheck)
-		{
-		}
-
 		protected override int DrawChild(ViewInfo view, int x, int y)
 		{
 			Contract.Requires(view != null);

Nodes/BaseReferenceNode.cs

@@ -14,24 +14,24 @@ public abstract class BaseReferenceNode : BaseNode
 		/// <summary>Gets signaled if the inner node was changed.</summary>
 		public event NodeEventHandler InnerNodeChanged;
 
-		/// <summary>Constructor.</summary>
-		/// <param name="performCycleCheck">True to perform class cycle checks when changing the inner node.</param>
-		public BaseReferenceNode(bool performCycleCheck)
-		{
-			this.performCycleCheck = performCycleCheck;
-		}
+		/// <summary>True to perform class cycle checks when changing the inner node.</summary>
+		public abstract bool PerformCycleCheck { get; }
 
 		/// <summary>Changes the inner node.</summary>
+		/// <exception cref="ClassCycleException">Thrown when a class cycle is present.</exception>
 		/// <param name="node">The new node.</param>
 		public void ChangeInnerNode(ClassNode node)
 		{
 			Contract.Requires(node != null);
 
 			if (InnerNode != node)
 			{
-				if (performCycleCheck)
+				if (PerformCycleCheck && ParentNode != null)
 				{
-					PerformCycleCheck(node);
+					if (!ClassManager.IsCycleFree(ParentNode as ClassNode, node))
+					{
+						throw new ClassCycleException();
+					}
 				}
 
 				InnerNode = node;
@@ -41,23 +41,10 @@ public void ChangeInnerNode(ClassNode node)
 				ParentNode?.ChildHasChanged(this);
 			}
 		}
-
-		/// <summary>Performs a class cycle check for the given class.</summary>
-		/// <exception cref="ClassCycleException">Thrown when a class cycle is present.</exception>
-		/// <param name="node">The class to check.</param>
-		public void PerformCycleCheck(ClassNode node)
-		{
-			Contract.Requires(node != null);
-
-			if (!ClassManager.IsCycleFree(ParentNode as ClassNode, node))
-			{
-				throw new ClassCycleException();
-			}
-		}
 	}
 
 
-	/// <summary>Exception for signalling class cycle errors.</summary>
+	/// <summary>Exception for signaling class cycle errors.</summary>
 	public class ClassCycleException : Exception
 	{
 

Nodes/ClassInstanceArrayNode.cs

@@ -9,11 +9,7 @@ public class ClassInstanceArrayNode : BaseArrayNode
 		/// <summary>Size of the node in bytes.</summary>
 		public override int MemorySize => InnerNode.MemorySize * Count;
 
-		public ClassInstanceArrayNode()
-			: base(true)
-		{
-
-		}
+		public override bool PerformCycleCheck => true;
 
 		public override void Intialize()
 		{

Nodes/ClassInstanceNode.cs

@@ -1,4 +1,5 @@
-using ReClassNET.UI;
+using System;
+using ReClassNET.UI;
 using ReClassNET.Util;
 
 namespace ReClassNET.Nodes
@@ -8,11 +9,7 @@ public class ClassInstanceNode : BaseReferenceNode
 		/// <summary>Size of the node in bytes.</summary>
 		public override int MemorySize => InnerNode.MemorySize;
 
-		public ClassInstanceNode()
-			: base(true)
-		{
-
-		}
+		public override bool PerformCycleCheck => true;
 
 		public override void Intialize()
 		{

Nodes/ClassNode.cs

@@ -159,9 +159,10 @@ public override void InsertNode(int index, BaseNode node)
 				return;
 			}
 
-			if (node is BaseReferenceNode)
+			var referenceNode = node as BaseReferenceNode;
+			if (referenceNode != null)
 			{
-				if (!ClassManager.IsCycleFree(this, ((BaseReferenceNode)node).InnerNode))
+				if (referenceNode.PerformCycleCheck && !ClassManager.IsCycleFree(this, referenceNode.InnerNode))
 				{
 					throw new ClassCycleException();
 				}

Nodes/ClassPtrArrayNode.cs

@@ -12,11 +12,7 @@ public class ClassPtrArrayNode : BaseArrayNode
 		/// <summary>Size of the node in bytes.</summary>
 		public override int MemorySize => IntPtr.Size * Count;
 
-		public ClassPtrArrayNode()
-			: base(false)
-		{
-
-		}
+		public override bool PerformCycleCheck => true;
 
 		public override void Intialize()
 		{

Nodes/ClassPtrNode.cs

@@ -12,11 +12,7 @@ public class ClassPtrNode : BaseReferenceNode
 		/// <summary>Size of the node in bytes.</summary>
 		public override int MemorySize => IntPtr.Size;
 
-		public ClassPtrNode()
-			: base(false)
-		{
-
-		}
+		public override bool PerformCycleCheck => false;
 
 		public override void Intialize()
 		{