Removed more duplicated code.

KN4CK3R · KN4CK3R · commit c4ae5e0fddb1 · 2018-01-16T14:18:32.000+01:00
diff --git a/ReClass.NET/Nodes/BaseTextNode.cs b/ReClass.NET/Nodes/BaseTextNode.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.Diagnostics.Contracts;
+﻿using System.Diagnostics.Contracts;
 using System.Drawing;
 using System.Text;
 using ReClassNET.Memory;
@@ -8,19 +7,19 @@
 
 namespace ReClassNET.Nodes
 {
-	[ContractClass(typeof(BaseTextNodeContract))]
 	public abstract class BaseTextNode : BaseNode
 	{
 		public int Length { get; set; }
 
 		/// <summary>Size of the node in bytes.</summary>
 		public override int MemorySize => Length * CharacterSize;
 
-		/// <summary>Size of one character in bytes.</summary>
-		public abstract int CharacterSize { get; }
-
+		/// <summary>The encoding of the string.</summary>
 		public abstract Encoding Encoding { get; }
 
+		/// <summary>Size of one character in bytes.</summary>
+		private int CharacterSize => Encoding.GetSimpleByteCountPerChar();
+
 		public override void CopyFromNode(BaseNode node)
 		{
 			Length = node.MemorySize / CharacterSize;
@@ -92,18 +91,4 @@ public string ReadValueFromMemory(MemoryBuffer memory)
 			return memory.ReadString(Encoding, Offset, MemorySize);
 		}
 	}
-
-	[ContractClassFor(typeof(BaseTextNode))]
-	internal abstract class BaseTextNodeContract : BaseTextNode
-	{
-		public override int CharacterSize
-		{
-			get
-			{
-				Contract.Ensures(Contract.Result<int>() > 0);
-
-				throw new NotImplementedException();
-			}
-		}
-	}
 }
diff --git a/ReClass.NET/Nodes/UTF16TextNode.cs b/ReClass.NET/Nodes/UTF16TextNode.cs
@@ -1,14 +1,11 @@
 ﻿using System.Drawing;
 using System.Text;
-using ReClassNET.Memory;
 using ReClassNET.UI;
 
 namespace ReClassNET.Nodes
 {
 	public class Utf16TextNode : BaseTextNode
 	{
-		public override int CharacterSize => 2;
-
 		public override Encoding Encoding => Encoding.Unicode;
 
 		public override Size Draw(ViewInfo view, int x, int y)
diff --git a/ReClass.NET/Nodes/UTF32TextNode.cs b/ReClass.NET/Nodes/UTF32TextNode.cs
@@ -1,14 +1,11 @@
 ﻿using System.Drawing;
 using System.Text;
-using ReClassNET.Memory;
 using ReClassNET.UI;
 
 namespace ReClassNET.Nodes
 {
 	public class Utf32TextNode : BaseTextNode
 	{
-		public override int CharacterSize => 4;
-
 		public override Encoding Encoding => Encoding.UTF32;
 
 		public override Size Draw(ViewInfo view, int x, int y)
diff --git a/ReClass.NET/Nodes/UTF8TextNode.cs b/ReClass.NET/Nodes/UTF8TextNode.cs
@@ -1,14 +1,11 @@
 ﻿using System.Drawing;
 using System.Text;
-using ReClassNET.Memory;
 using ReClassNET.UI;
 
 namespace ReClassNET.Nodes
 {
 	public class Utf8TextNode : BaseTextNode
 	{
-		public override int CharacterSize => 1;
-
 		public override Encoding Encoding => Encoding.UTF8;
 
 		public override Size Draw(ViewInfo view, int x, int y)

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,11 @@`
`1`	`1`	`using System.Drawing;`
`2`	`2`	`using System.Text;`
`3`		`-using ReClassNET.Memory;`
`4`	`3`	`using ReClassNET.UI;`
`5`	`4`
`6`	`5`	`namespace ReClassNET.Nodes`
`7`	`6`	`{`
`8`	`7`	`public class Utf16TextNode : BaseTextNode`
`9`	`8`	`{`
`10`		`- public override int CharacterSize => 2;`
`11`		`-`
`12`	`9`	`public override Encoding Encoding => Encoding.Unicode;`
`13`	`10`
`14`	`11`	`public override Size Draw(ViewInfo view, int x, int y)`