Changed method names.

KN4CK3R · KN4CK3R · commit ccf946220670 · 2019-01-22T10:26:06.000+01:00
diff --git a/ReClass.NET/DataExchange/ReClass/ReClassClipboard.cs b/ReClass.NET/DataExchange/ReClass/ReClassClipboard.cs
@@ -26,7 +26,7 @@ public static void Copy(IEnumerable<BaseNode> nodes, ILogger logger)
 
 			using (var ms = new MemoryStream())
 			{
-				ReClassNetFile.WriteNodes(ms, nodes, logger);
+				ReClassNetFile.SerializeNodesToStream(ms, nodes, logger);
 
 				Clipboard.SetData(ClipboardFormat, ms.ToArray());
 			}
@@ -51,7 +51,7 @@ public static Tuple<List<ClassNode>, List<BaseNode>> Paste(ReClassNetProject tem
 				{
 					using (var ms = new MemoryStream(data))
 					{
-						var result = ReClassNetFile.ReadNodes(ms, templateProject, logger);
+						var result = ReClassNetFile.DeserializeNodesFromStream(ms, templateProject, logger);
 						classes.AddRange(result.Item1);
 						nodes.AddRange(result.Item2);
 					}
diff --git a/ReClass.NET/DataExchange/ReClass/ReClassNetFile.Constants.cs b/ReClass.NET/DataExchange/ReClass/ReClassNetFile.Constants.cs
@@ -12,7 +12,7 @@ public partial class ReClassNetFile
 
 		private const string DataFileName = "Data.xml";
 
-		private const string SerialisationClassName = "__Serialization_Class__";
+		private const string SerializationClassName = "__Serialization_Class__";
 
 		public const string XmlRootElement = "reclass";
 		public const string XmlCustomDataElement = "custom_data";
diff --git a/ReClass.NET/DataExchange/ReClass/ReClassNetFile.Read.cs b/ReClass.NET/DataExchange/ReClass/ReClassNetFile.Read.cs
@@ -250,7 +250,7 @@ private static void TryGetAttributeValue(XElement element, string attribute, out
 			}
 		}
 
-		public static Tuple<List<ClassNode>, List<BaseNode>> ReadNodes(Stream input, ReClassNetProject templateProject, ILogger logger)
+		public static Tuple<List<ClassNode>, List<BaseNode>> DeserializeNodesFromStream(Stream input, ReClassNetProject templateProject, ILogger logger)
 		{
 			Contract.Requires(input != null);
 			Contract.Requires(logger != null);
@@ -267,7 +267,7 @@ public static Tuple<List<ClassNode>, List<BaseNode>> ReadNodes(Stream input, ReC
 
 				var nodes = new List<BaseNode>();
 
-				var serialisationClassNode = project.Classes.FirstOrDefault(c => c.Name == SerialisationClassName);
+				var serialisationClassNode = project.Classes.FirstOrDefault(c => c.Name == SerializationClassName);
 				if (serialisationClassNode != null)
 				{
 					if (templateProject != null)
diff --git a/ReClass.NET/DataExchange/ReClass/ReClassNetFile.Write.cs b/ReClass.NET/DataExchange/ReClass/ReClassNetFile.Write.cs
@@ -1,4 +1,4 @@
-﻿using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.IO;
 using System.IO.Compression;
@@ -138,7 +138,7 @@ private static XElement CreateElementFromNode(BaseNode node, ILogger logger)
 			return element;
 		}
 
-		public static void WriteNodes(Stream output, IEnumerable<BaseNode> nodes, ILogger logger)
+		public static void SerializeNodesToStream(Stream output, IEnumerable<BaseNode> nodes, ILogger logger)
 		{
 			Contract.Requires(output != null);
 			Contract.Requires(nodes != null);
@@ -164,7 +164,7 @@ void RecursiveAddClasses(BaseWrapperNode wrapperNode)
 
 				var serialisationClass = new ClassNode(false)
 				{
-					Name = SerialisationClassName
+					Name = SerializationClassName
 				};
 
 				project.AddClass(serialisationClass);

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public static void Copy(IEnumerable<BaseNode> nodes, ILogger logger)`
`26`	`26`
`27`	`27`	`using (var ms = new MemoryStream())`
`28`	`28`	`{`
`29`		`- ReClassNetFile.WriteNodes(ms, nodes, logger);`
	`29`	`+ ReClassNetFile.SerializeNodesToStream(ms, nodes, logger);`
`30`	`30`
`31`	`31`	`Clipboard.SetData(ClipboardFormat, ms.ToArray());`
`32`	`32`	`}`
`@@ -51,7 +51,7 @@ public static Tuple<List<ClassNode>, List<BaseNode>> Paste(ReClassNetProject tem`
`51`	`51`	`{`
`52`	`52`	`using (var ms = new MemoryStream(data))`
`53`	`53`	`{`
`54`		`- var result = ReClassNetFile.ReadNodes(ms, templateProject, logger);`
	`54`	`+ var result = ReClassNetFile.DeserializeNodesFromStream(ms, templateProject, logger);`
`55`	`55`	`classes.AddRange(result.Item1);`
`56`	`56`	`nodes.AddRange(result.Item2);`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ private static void TryGetAttributeValue(XElement element, string attribute, out`
`250`	`250`	`}`
`251`	`251`	`}`
`252`	`252`
`253`		`- public static Tuple<List<ClassNode>, List<BaseNode>> ReadNodes(Stream input, ReClassNetProject templateProject, ILogger logger)`
	`253`	`+ public static Tuple<List<ClassNode>, List<BaseNode>> DeserializeNodesFromStream(Stream input, ReClassNetProject templateProject, ILogger logger)`
`254`	`254`	`{`
`255`	`255`	`Contract.Requires(input != null);`
`256`	`256`	`Contract.Requires(logger != null);`
`@@ -267,7 +267,7 @@ public static Tuple<List<ClassNode>, List<BaseNode>> ReadNodes(Stream input, ReC`
`267`	`267`
`268`	`268`	`var nodes = new List<BaseNode>();`
`269`	`269`
`270`		`- var serialisationClassNode = project.Classes.FirstOrDefault(c => c.Name == SerialisationClassName);`
	`270`	`+ var serialisationClassNode = project.Classes.FirstOrDefault(c => c.Name == SerializationClassName);`
`271`	`271`	`if (serialisationClassNode != null)`
`272`	`272`	`{`
`273`	`273`	`if (templateProject != null)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System.Collections.Generic;`
	`1`	`+using System.Collections.Generic;`
`2`	`2`	`using System.Diagnostics.Contracts;`
`3`	`3`	`using System.IO;`
`4`	`4`	`using System.IO.Compression;`
`@@ -138,7 +138,7 @@ private static XElement CreateElementFromNode(BaseNode node, ILogger logger)`
`138`	`138`	`return element;`
`139`	`139`	`}`
`140`	`140`
`141`		`- public static void WriteNodes(Stream output, IEnumerable<BaseNode> nodes, ILogger logger)`
	`141`	`+ public static void SerializeNodesToStream(Stream output, IEnumerable<BaseNode> nodes, ILogger logger)`
`142`	`142`	`{`
`143`	`143`	`Contract.Requires(output != null);`
`144`	`144`	`Contract.Requires(nodes != null);`
`@@ -164,7 +164,7 @@ void RecursiveAddClasses(BaseWrapperNode wrapperNode)`
`164`	`164`
`165`	`165`	`var serialisationClass = new ClassNode(false)`
`166`	`166`	`{`
`167`		`- Name = SerialisationClassName`
	`167`	`+ Name = SerializationClassName`
`168`	`168`	`};`
`169`	`169`
`170`	`170`	`project.AddClass(serialisationClass);`