reorg some other files

BenjaminSutas · BenjaminSutas · commit b4e95e85342f · 2023-10-25T11:34:33.000+11:00
diff --git a/OpenLocoTool/DatFileParsing/Typedefs.cs b/OpenLocoTool/DatFileParsing/Typedefs.cs
@@ -9,7 +9,7 @@
 global using Speed32 = System.Int32;
 global using MicroZ = System.Byte;
 global using SoundObjectId = System.Byte;
-global using StringTable = System.Collections.Generic.Dictionary<(int, OpenLocoTool.DatFileParsing.LanguageId), string>;
+global using StringTable = System.Collections.Generic.Dictionary<(int, OpenLocoTool.LanguageId), string>;
 using System.ComponentModel;
 
 namespace OpenLocoTool.DatFileParsing
diff --git a/OpenLocoTool/Data/Constants.cs b/OpenLocoTool/Data/Constants.cs
diff --git a/OpenLocoTool/Data/ImageIds.cs b/OpenLocoTool/Data/ImageIds.cs
@@ -1,4 +1,4 @@
-﻿namespace OpenLocoTool.DataFiles
+﻿namespace OpenLocoTool
 {
 	public static class ImageIds
 	{
diff --git a/OpenLocoTool/Data/LanguageId.cs b/OpenLocoTool/Data/LanguageId.cs
@@ -1,4 +1,4 @@
-﻿namespace OpenLocoTool.DatFileParsing
+﻿namespace OpenLocoTool
 {
 	public enum LanguageId : uint8_t
 	{
diff --git a/OpenLocoTool/Data/OriginalDataFiles.cs b/OpenLocoTool/Data/OriginalDataFiles.cs
@@ -1,4 +1,4 @@
-﻿namespace OpenLocoTool.DataFiles
+﻿namespace OpenLocoTool
 {
 	public static class OriginalDataFiles
 	{
diff --git a/OpenLocoTool/Data/OriginalDataPathIds.cs b/OpenLocoTool/Data/OriginalDataPathIds.cs
@@ -1,4 +1,4 @@
-﻿namespace OpenLocoTool.DataFiles
+﻿namespace OpenLocoTool
 {
 	// these are indexed to the strings in OriginalDateFiles.cs
 	public enum OriginalDataPathIds : uint8_t
diff --git a/OpenLocoTool/Data/OriginalObjectFiles.cs b/OpenLocoTool/Data/OriginalObjectFiles.cs
@@ -1,6 +1,6 @@
 ﻿namespace OpenLocoTool
 {
-	public static class OriginalObjects
+	public static class OriginalObjectFiles
 	{
 		public static readonly HashSet<string> Names = new()
 		{
diff --git a/OpenLocoTool/Data/SawyerEncoding.cs b/OpenLocoTool/Data/SawyerEncoding.cs
@@ -1,4 +1,4 @@
-﻿namespace OpenLocoTool.DatFileParsing
+﻿namespace OpenLocoTool
 {
 	public enum SawyerEncoding : byte
 	{
diff --git a/OpenLocoTool/Objects/CargoObject.cs b/OpenLocoTool/Objects/CargoObject.cs
@@ -1,6 +1,7 @@
 ﻿using System.ComponentModel;
 using OpenLocoTool.DatFileParsing;
 using OpenLocoTool.Headers;
+using OpenLocoTool;
 
 namespace OpenLocoTool.Objects
 {
diff --git a/OpenLocoToolCommon/ReflectionLogger.cs b/OpenLocoToolCommon/ReflectionLogger.cs
@@ -1,7 +1,7 @@
 ﻿using System.Reflection;
 using System.Text;
 
-namespace OpenLocoTool
+namespace OpenLocoToolCommon
 {
 	public static class ReflectionLogger
 	{
diff --git a/OpenLocoToolGui/MainForm.cs b/OpenLocoToolGui/MainForm.cs
@@ -190,12 +190,12 @@ ImageList MakeImageList(MainFormModel model)
 
 		static void AddObjectNode(string key, string text, string objName, TreeView tv)
 		{
-			var imageIndex = OriginalObjects.Names.Contains(objName.Trim()) ? 1 : 0;
+			var imageIndex = OriginalObjectFiles.Names.Contains(objName.Trim()) ? 1 : 0;
 			_ = tv.Nodes.Add(key, text, imageIndex, imageIndex);
 		}
 		static void AddObjectNode(string key, string text, string objName, TreeNode tn)
 		{
-			var imageIndex = OriginalObjects.Names.Contains(objName.Trim()) ? 1 : 0;
+			var imageIndex = OriginalObjectFiles.Names.Contains(objName.Trim()) ? 1 : 0;
 			_ = tn.Nodes.Add(key, text, imageIndex, imageIndex);
 		}
 
@@ -208,7 +208,7 @@ void InitFileTreeView(bool vanillaOnly, string fileFilter)
 				? model.HeaderIndex
 				: model.HeaderIndex.Where(hdr => hdr.Key.Contains(fileFilter, StringComparison.InvariantCultureIgnoreCase));
 
-			filteredFiles = filteredFiles.Where(f => !vanillaOnly || OriginalObjects.Names.Contains(f.Value.Name.Trim()));
+			filteredFiles = filteredFiles.Where(f => !vanillaOnly || OriginalObjectFiles.Names.Contains(f.Value.Name.Trim()));
 
 			tvFileTree.ImageList = MakeImageList(model);
 
@@ -251,7 +251,7 @@ void InitCategoryTreeView(bool vanillaOnly, string fileFilter)
 					? model.HeaderIndex
 					: model.HeaderIndex.Where(hdr => hdr.Key.Contains(fileFilter, StringComparison.InvariantCultureIgnoreCase));
 
-				filteredFiles = filteredFiles.Where(f => !vanillaOnly || OriginalObjects.Names.Contains(f.Value.Name.Trim()));
+				filteredFiles = filteredFiles.Where(f => !vanillaOnly || OriginalObjectFiles.Names.Contains(f.Value.Name.Trim()));
 
 				tvObjType.ImageList = MakeImageList(model);
 
diff --git a/OpenLocoToolGui/MainFormModel.cs b/OpenLocoToolGui/MainFormModel.cs
@@ -8,7 +8,6 @@
 using OpenLocoTool.Objects;
 using OpenLocoToolCommon;
 using OpenLocoTool.Headers;
-using OpenLocoTool.DataFiles;
 
 namespace OpenLocoToolGui
 {
diff --git a/OpenLocoToolTests/ObjectLoadingTests.cs b/OpenLocoToolTests/ObjectLoadingTests.cs
@@ -1,4 +1,5 @@
 using NUnit.Framework;
+using OpenLocoTool;
 using OpenLocoTool.DatFileParsing;
 using OpenLocoTool.Headers;
 using OpenLocoTool.Objects;
@@ -158,11 +159,11 @@ public void LoadCargoObject()
 
 			Assert.Multiple(() =>
 			{
-				Assert.That(obj.Name, Is.EqualTo(0), nameof(obj.Name));
+				Assert.That(obj.Name, Is.EqualTo(string.Empty), nameof(obj.Name));
 				Assert.That(obj.var_02, Is.EqualTo(256), nameof(obj.var_02));
 				Assert.That(obj.var_04, Is.EqualTo(64), nameof(obj.var_04));
-				Assert.That(obj.UnitsAndCargoName, Is.EqualTo(0), nameof(obj.UnitsAndCargoName));
-				Assert.That(obj.UnitNameSingular, Is.EqualTo(0), nameof(obj.UnitNameSingular));
+				Assert.That(obj.UnitsAndCargoName, Is.EqualTo(string.Empty), nameof(obj.UnitsAndCargoName));
+				Assert.That(obj.UnitNameSingular, Is.EqualTo(string.Empty), nameof(obj.UnitNameSingular));
 				Assert.That(obj.UnitInlineSprite, Is.EqualTo(0), nameof(obj.UnitInlineSprite));
 				Assert.That(obj.MatchFlags, Is.EqualTo(4), nameof(obj.MatchFlags));
 				Assert.That(obj.Flags, Is.EqualTo(CargoObjectFlags.Delivering), nameof(obj.Flags));
diff --git a/OpenLocoToolTests/ObjectSavingTests.cs b/OpenLocoToolTests/ObjectSavingTests.cs
@@ -21,7 +21,7 @@ public void WriteLocoStruct()
 			var loaded = ssr.LoadFull(testFile);
 
 			// load data in raw bytes for test
-			ReadOnlySpan<byte> fullData = ssr.LoadBytesFromFile(testFile);
+			ReadOnlySpan<byte> fullData = SawyerStreamReader.LoadBytesFromFile(testFile);
 
 			// make openlocotool useful objects
 			var s5Header = S5Header.Read(fullData[0..S5Header.StructLength]);

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace OpenLocoTool.DataFiles`
	`1`	`+namespace OpenLocoTool`
`2`	`2`	`{`
`3`	`3`	`public static class ImageIds`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace OpenLocoTool.DatFileParsing`
	`1`	`+namespace OpenLocoTool`
`2`	`2`	`{`
`3`	`3`	`public enum LanguageId : uint8_t`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace OpenLocoTool`
`2`	`2`	`{`
`3`		`- public static class OriginalObjects`
	`3`	`+ public static class OriginalObjectFiles`
`4`	`4`	`{`
`5`	`5`	`public static readonly HashSet<string> Names = new()`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System.ComponentModel;`
`2`	`2`	`using OpenLocoTool.DatFileParsing;`
`3`	`3`	`using OpenLocoTool.Headers;`
	`4`	`+using OpenLocoTool;`
`4`	`5`
`5`	`6`	`namespace OpenLocoTool.Objects`
`6`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System.Reflection;`
`2`	`2`	`using System.Text;`
`3`	`3`
`4`		`-namespace OpenLocoTool`
	`4`	`+namespace OpenLocoToolCommon`
`5`	`5`	`{`
`6`	`6`	`public static class ReflectionLogger`
`7`	`7`	`{`