Added BaseClassWrapperNode.

KN4CK3R · KN4CK3R · commit 67ac5c8e70ef · 2019-02-19T15:33:00.000+01:00
diff --git a/ReClass.NET/DataExchange/ReClass/ReClassNetFile.Read.cs b/ReClass.NET/DataExchange/ReClass/ReClassNetFile.Read.cs
@@ -178,7 +178,7 @@ ClassNode GetClassNodeFromElementReference()
 				{
 					BaseNode innerNode = null;
 
-					if (node is ClassInstanceNode)
+					if (node is BaseClassWrapperNode)
 					{
 						innerNode = GetClassNodeFromElementReference();
 						if (innerNode == null)
diff --git a/ReClass.NET/DataExchange/ReClass/ReClassNetFile.Write.cs b/ReClass.NET/DataExchange/ReClass/ReClassNetFile.Write.cs
@@ -65,33 +65,45 @@ private static XElement CreateElementFromNode(BaseNode node, ILogger logger)
 			Contract.Requires(node != null);
 			Contract.Requires(logger != null);
 
-			var converter = CustomNodeSerializer.GetWriteConverter(node);
-			if (converter != null)
+			XElement CreateElement()
 			{
-				return converter.CreateElementFromNode(node, logger, CreateElementFromNode);
+				var converter = CustomNodeSerializer.GetWriteConverter(node);
+				if (converter != null)
+				{
+					return converter.CreateElementFromNode(node, logger, CreateElementFromNode);
+				}
+
+				if (!buildInTypeToStringMap.TryGetValue(node.GetType(), out var typeString))
+				{
+					logger.Log(LogLevel.Error, $"Skipping node with unknown type: {node.Name}");
+					logger.Log(LogLevel.Warning, node.GetType().ToString());
+
+					return null;
+				}
+
+				return new XElement(
+					XmlNodeElement,
+					new XAttribute(XmlTypeAttribute, typeString)
+				);
 			}
 
-			if (!buildInTypeToStringMap.TryGetValue(node.GetType(), out var typeString))
+			var element = CreateElement();
+			if (element == null)
 			{
-				logger.Log(LogLevel.Error, $"Skipping node with unknown type: {node.Name}");
-				logger.Log(LogLevel.Warning, node.GetType().ToString());
+				logger.Log(LogLevel.Error, "Could not create element.");
 
 				return null;
 			}
 
-			var element = new XElement(
-				XmlNodeElement,
-				new XAttribute(XmlNameAttribute, node.Name ?? string.Empty),
-				new XAttribute(XmlCommentAttribute, node.Comment ?? string.Empty),
-				new XAttribute(XmlHiddenAttribute, node.IsHidden.ToString()),
-				new XAttribute(XmlTypeAttribute, typeString)
-			);
+			element.SetAttributeValue(XmlNameAttribute, node.Name ?? string.Empty);
+			element.SetAttributeValue(XmlCommentAttribute, node.Comment ?? string.Empty);
+			element.SetAttributeValue(XmlHiddenAttribute, node.IsHidden.ToString());
 
 			if (node is BaseWrapperNode wrapperNode)
 			{
-				if (node is ClassInstanceNode classInstanceNode)
+				if (node is BaseClassWrapperNode classWrapperNode)
 				{
-					element.SetAttributeValue(XmlReferenceAttribute, ((ClassNode)classInstanceNode.InnerNode).Uuid.ToBase64String());
+					element.SetAttributeValue(XmlReferenceAttribute, ((ClassNode)classWrapperNode.InnerNode).Uuid.ToBase64String());
 				}
 				else if (wrapperNode.InnerNode != null)
 				{
diff --git a/ReClass.NET/Nodes/BaseClassWrapperNode.cs b/ReClass.NET/Nodes/BaseClassWrapperNode.cs
@@ -0,0 +1,16 @@
+﻿namespace ReClassNET.Nodes
+{
+	public abstract class BaseClassWrapperNode : BaseWrapperNode
+	{
+		public override void Initialize()
+		{
+			InnerNode = ClassNode.Create();
+			InnerNode.Initialize();
+		}
+
+		public override bool CanChangeInnerNodeTo(BaseNode node)
+		{
+			return node is ClassNode;
+		}
+	}
+}
diff --git a/ReClass.NET/Nodes/ClassInstanceNode.cs b/ReClass.NET/Nodes/ClassInstanceNode.cs
@@ -5,7 +5,7 @@
 
 namespace ReClassNET.Nodes
 {
-	public class ClassInstanceNode : BaseWrapperNode
+	public class ClassInstanceNode : BaseClassWrapperNode
 	{
 		public override int MemorySize => InnerNode.MemorySize;
 
@@ -17,17 +17,6 @@ public override void GetUserInterfaceInfo(out string name, out Image icon)
 			icon = Properties.Resources.B16x16_Button_Class_Instance;
 		}
 
-		public override void Initialize()
-		{
-			InnerNode = ClassNode.Create();
-			InnerNode.Initialize();
-		}
-
-		public override bool CanChangeInnerNodeTo(BaseNode node)
-		{
-			return node is ClassNode;
-		}
-
 		public override Size Draw(ViewInfo view, int x, int y)
 		{
 			if (IsHidden && !IsWrapped)
diff --git a/ReClass.NET/ReClass.NET.csproj b/ReClass.NET/ReClass.NET.csproj
@@ -248,6 +248,7 @@
     <Compile Include="Native\NativeMethods.Unix.cs" />
     <Compile Include="Native\NativeMethods.Windows.cs" />
     <Compile Include="Nodes\ArrayNode.cs" />
+    <Compile Include="Nodes\BaseClassWrapperNode.cs" />
     <Compile Include="Nodes\BaseFunctionNode.cs" />
     <Compile Include="Nodes\BaseWrapperArrayNode.cs" />
     <Compile Include="Nodes\BaseWrapperNode.cs" />

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ ClassNode GetClassNodeFromElementReference()`
`178`	`178`	`{`
`179`	`179`	`BaseNode innerNode = null;`
`180`	`180`
`181`		`- if (node is ClassInstanceNode)`
	`181`	`+ if (node is BaseClassWrapperNode)`
`182`	`182`	`{`
`183`	`183`	`innerNode = GetClassNodeFromElementReference();`
`184`	`184`	`if (innerNode == null)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace ReClassNET.Nodes`
`7`	`7`	`{`
`8`		`- public class ClassInstanceNode : BaseWrapperNode`
	`8`	`+ public class ClassInstanceNode : BaseClassWrapperNode`
`9`	`9`	`{`
`10`	`10`	`public override int MemorySize => InnerNode.MemorySize;`
`11`	`11`
`@@ -17,17 +17,6 @@ public override void GetUserInterfaceInfo(out string name, out Image icon)`
`17`	`17`	`icon = Properties.Resources.B16x16_Button_Class_Instance;`
`18`	`18`	`}`
`19`	`19`
`20`		`- public override void Initialize()`
`21`		`- {`
`22`		`- InnerNode = ClassNode.Create();`
`23`		`- InnerNode.Initialize();`
`24`		`- }`
`25`		`-`
`26`		`- public override bool CanChangeInnerNodeTo(BaseNode node)`
`27`		`- {`
`28`		`- return node is ClassNode;`
`29`		`- }`
`30`		`-`
`31`	`20`	`public override Size Draw(ViewInfo view, int x, int y)`
`32`	`21`	`{`
`33`	`22`	`if (IsHidden && !IsWrapped)`