Added CreateInstanceFromType.

KN4CK3R · KN4CK3R · commit e556581d052c · 2019-01-05T23:13:00.000+01:00
diff --git a/ReClass.NET/DataExchange/ReClass/ReClass2007File.cs b/ReClass.NET/DataExchange/ReClass/ReClass2007File.cs
@@ -136,7 +136,7 @@ private IEnumerable<BaseNode> ReadNodeRows(IEnumerable<DataRow> rows, ClassNode
 					continue;
 				}
 
-				var node = Activator.CreateInstance(nodeType) as BaseNode;
+				var node = BaseNode.CreateInstanceFromType(nodeType);
 				if (node == null)
 				{
 					logger.Log(LogLevel.Error, $"Could not create node of type: {nodeType}");
diff --git a/ReClass.NET/DataExchange/ReClass/ReClassFile.cs b/ReClass.NET/DataExchange/ReClass/ReClassFile.cs
@@ -155,7 +155,7 @@ private IEnumerable<BaseNode> ReadNodeElements(IEnumerable<XElement> elements, C
 					continue;
 				}
 
-				var node = Activator.CreateInstance(nodeType) as BaseNode;
+				var node = BaseNode.CreateInstanceFromType(nodeType);
 				if (node == null)
 				{
 					logger.Log(LogLevel.Error, $"Could not create node of type: {nodeType}");
diff --git a/ReClass.NET/DataExchange/ReClass/ReClassNetFile.Read.cs b/ReClass.NET/DataExchange/ReClass/ReClassNetFile.Read.cs
@@ -122,7 +122,7 @@ private IEnumerable<BaseNode> ReadNodeElements(IEnumerable<XElement> elements, C
 					continue;
 				}
 
-				var node = Activator.CreateInstance(nodeType) as BaseNode;
+				var node = BaseNode.CreateInstanceFromType(nodeType);
 				if (node == null)
 				{
 					logger.Log(LogLevel.Error, $"Could not create node of type: {nodeType}");
diff --git a/ReClass.NET/DataExchange/ReClass/ReClassQtFile.cs b/ReClass.NET/DataExchange/ReClass/ReClassQtFile.cs
@@ -135,7 +135,7 @@ private IEnumerable<BaseNode> ReadNodeElements(IEnumerable<XElement> elements, C
 					continue;
 				}
 
-				var node = Activator.CreateInstance(nodeType) as BaseNode;
+				var node = BaseNode.CreateInstanceFromType(nodeType);
 				if (node == null)
 				{
 					logger.Log(LogLevel.Error, $"Could not create node of type: {nodeType}");
diff --git a/ReClass.NET/Nodes/BaseContainerNode.cs b/ReClass.NET/Nodes/BaseContainerNode.cs
@@ -124,7 +124,8 @@ public virtual bool ReplaceChildNode(int index, Type nodeType, ref List<BaseNode
 
 			var oldNode = nodes[index];
 
-			if (!(Activator.CreateInstance(nodeType) is BaseNode node))
+			var node = CreateInstanceFromType(nodeType);
+			if (node == null)
 			{
 				return false;
 			}
diff --git a/ReClass.NET/Nodes/BaseNode.cs b/ReClass.NET/Nodes/BaseNode.cs
@@ -63,6 +63,11 @@ private void ObjectInvariants()
 			Contract.Invariant(levelsOpen != null);
 		}
 
+		public static BaseNode CreateInstanceFromType(Type nodeType)
+		{
+			return Activator.CreateInstance(nodeType) as BaseNode;
+		}
+
 		/// <summary>Constructor which sets a unique <see cref="Name"/>.</summary>
 		protected BaseNode()
 		{
diff --git a/ReClass.NET/UI/NodeTypesBuilder.cs b/ReClass.NET/UI/NodeTypesBuilder.cs
@@ -147,7 +147,7 @@ private static void GetNodeInfoFromType(Type nodeType, out string label, out Ima
 		{
 			Contract.Requires(nodeType != null);
 
-			var node = Activator.CreateInstance(nodeType) as BaseNode;
+			var node = BaseNode.CreateInstanceFromType(nodeType);
 			if (node == null)
 			{
 				throw new InvalidOperationException($"'{nodeType}' is not a valid node type.");

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ private IEnumerable<BaseNode> ReadNodeRows(IEnumerable<DataRow> rows, ClassNode`
`136`	`136`	`continue;`
`137`	`137`	`}`
`138`	`138`
`139`		`- var node = Activator.CreateInstance(nodeType) as BaseNode;`
	`139`	`+ var node = BaseNode.CreateInstanceFromType(nodeType);`
`140`	`140`	`if (node == null)`
`141`	`141`	`{`
`142`	`142`	`logger.Log(LogLevel.Error, $"Could not create node of type: {nodeType}");`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ private IEnumerable<BaseNode> ReadNodeElements(IEnumerable<XElement> elements, C`
`155`	`155`	`continue;`
`156`	`156`	`}`
`157`	`157`
`158`		`- var node = Activator.CreateInstance(nodeType) as BaseNode;`
	`158`	`+ var node = BaseNode.CreateInstanceFromType(nodeType);`
`159`	`159`	`if (node == null)`
`160`	`160`	`{`
`161`	`161`	`logger.Log(LogLevel.Error, $"Could not create node of type: {nodeType}");`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ private IEnumerable<BaseNode> ReadNodeElements(IEnumerable<XElement> elements, C`
`122`	`122`	`continue;`
`123`	`123`	`}`
`124`	`124`
`125`		`- var node = Activator.CreateInstance(nodeType) as BaseNode;`
	`125`	`+ var node = BaseNode.CreateInstanceFromType(nodeType);`
`126`	`126`	`if (node == null)`
`127`	`127`	`{`
`128`	`128`	`logger.Log(LogLevel.Error, $"Could not create node of type: {nodeType}");`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ private IEnumerable<BaseNode> ReadNodeElements(IEnumerable<XElement> elements, C`
`135`	`135`	`continue;`
`136`	`136`	`}`
`137`	`137`
`138`		`- var node = Activator.CreateInstance(nodeType) as BaseNode;`
	`138`	`+ var node = BaseNode.CreateInstanceFromType(nodeType);`
`139`	`139`	`if (node == null)`
`140`	`140`	`{`
`141`	`141`	`logger.Log(LogLevel.Error, $"Could not create node of type: {nodeType}");`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,8 @@ public virtual bool ReplaceChildNode(int index, Type nodeType, ref List<BaseNode`
`124`	`124`
`125`	`125`	`var oldNode = nodes[index];`
`126`	`126`
`127`		`- if (!(Activator.CreateInstance(nodeType) is BaseNode node))`
	`127`	`+ var node = CreateInstanceFromType(nodeType);`
	`128`	`+ if (node == null)`
`128`	`129`	`{`
`129`	`130`	`return false;`
`130`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,11 @@ private void ObjectInvariants()`
`63`	`63`	`Contract.Invariant(levelsOpen != null);`
`64`	`64`	`}`
`65`	`65`
	`66`	`+ public static BaseNode CreateInstanceFromType(Type nodeType)`
	`67`	`+ {`
	`68`	`+ return Activator.CreateInstance(nodeType) as BaseNode;`
	`69`	`+ }`
	`70`	`+`
`66`	`71`	`/// <summary>Constructor which sets a unique <see cref="Name"/>.</summary>`
`67`	`72`	`protected BaseNode()`
`68`	`73`	`{`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ private static void GetNodeInfoFromType(Type nodeType, out string label, out Ima`
`147`	`147`	`{`
`148`	`148`	`Contract.Requires(nodeType != null);`
`149`	`149`
`150`		`- var node = Activator.CreateInstance(nodeType) as BaseNode;`
	`150`	`+ var node = BaseNode.CreateInstanceFromType(nodeType);`
`151`	`151`	`if (node == null)`
`152`	`152`	`{`
`153`	`153`	`throw new InvalidOperationException($"'{nodeType}' is not a valid node type.");`