Use folder structure namespaces

src/DotTiled.Tests/Assert/AssertData.cs

@@ -1,3 +1,5 @@
+using DotTiled.Model.Layers;
+
 namespace DotTiled.Tests;
 
 public static partial class DotTiledAssert

src/DotTiled.Tests/Assert/AssertImage.cs

@@ -1,3 +1,5 @@
+using DotTiled.Model.Tilesets;
+
 namespace DotTiled.Tests;
 
 public static partial class DotTiledAssert

src/DotTiled.Tests/Assert/AssertLayer.cs

@@ -1,3 +1,5 @@
+using DotTiled.Model.Layers;
+
 namespace DotTiled.Tests;
 
 public static partial class DotTiledAssert

src/DotTiled.Tests/Assert/AssertMap.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Numerics;
+using DotTiled.Model;
 
 namespace DotTiled.Tests;
 

src/DotTiled.Tests/Assert/AssertObject.cs

@@ -1,20 +1,22 @@
+using DotTiled.Model.Layers.Objects;
+
 namespace DotTiled.Tests;
 
 public static partial class DotTiledAssert
 {
-  internal static void AssertObject(Object expected, Object actual)
+  internal static void AssertObject(Model.Layers.Objects.Object expected, Model.Layers.Objects.Object actual)
   {
     // Attributes
-    AssertEqual(expected.ID, actual.ID, nameof(Object.ID));
-    AssertEqual(expected.Name, actual.Name, nameof(Object.Name));
-    AssertEqual(expected.Type, actual.Type, nameof(Object.Type));
-    AssertEqual(expected.X, actual.X, nameof(Object.X));
-    AssertEqual(expected.Y, actual.Y, nameof(Object.Y));
-    AssertEqual(expected.Width, actual.Width, nameof(Object.Width));
-    AssertEqual(expected.Height, actual.Height, nameof(Object.Height));
-    AssertEqual(expected.Rotation, actual.Rotation, nameof(Object.Rotation));
-    AssertEqual(expected.Visible, actual.Visible, nameof(Object.Visible));
-    AssertEqual(expected.Template, actual.Template, nameof(Object.Template));
+    AssertEqual(expected.ID, actual.ID, nameof(Model.Layers.Objects.Object.ID));
+    AssertEqual(expected.Name, actual.Name, nameof(Model.Layers.Objects.Object.Name));
+    AssertEqual(expected.Type, actual.Type, nameof(Model.Layers.Objects.Object.Type));
+    AssertEqual(expected.X, actual.X, nameof(Model.Layers.Objects.Object.X));
+    AssertEqual(expected.Y, actual.Y, nameof(Model.Layers.Objects.Object.Y));
+    AssertEqual(expected.Width, actual.Width, nameof(Model.Layers.Objects.Object.Width));
+    AssertEqual(expected.Height, actual.Height, nameof(Model.Layers.Objects.Object.Height));
+    AssertEqual(expected.Rotation, actual.Rotation, nameof(Model.Layers.Objects.Object.Rotation));
+    AssertEqual(expected.Visible, actual.Visible, nameof(Model.Layers.Objects.Object.Visible));
+    AssertEqual(expected.Template, actual.Template, nameof(Model.Layers.Objects.Object.Template));
 
     AssertProperties(expected.Properties, actual.Properties);
 

src/DotTiled.Tests/Assert/AssertProperties.cs

@@ -1,3 +1,5 @@
+using DotTiled.Model.Properties;
+
 namespace DotTiled.Tests;
 
 public static partial class DotTiledAssert

src/DotTiled.Tests/Assert/AssertTileset.cs

@@ -1,3 +1,6 @@
+using DotTiled.Model.Layers;
+using DotTiled.Model.Tilesets;
+
 namespace DotTiled.Tests;
 
 public static partial class DotTiledAssert

src/DotTiled.Tests/Serialization/TestData.cs

@@ -1,4 +1,6 @@
 using System.Xml;
+using DotTiled.Model.Properties;
+using DotTiled.Model.Properties.CustomTypes;
 
 namespace DotTiled.Tests;
 

src/DotTiled.Tests/Serialization/TestData/Map/default-map/default-map.cs

@@ -1,3 +1,6 @@
+using DotTiled.Model;
+using DotTiled.Model.Layers;
+
 namespace DotTiled.Tests;
 
 public partial class TestData

src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-multi/map-external-tileset-multi.cs

@@ -1,4 +1,8 @@
 using System.Globalization;
+using DotTiled.Model;
+using DotTiled.Model.Layers;
+using DotTiled.Model.Properties;
+using DotTiled.Model.Tilesets;
 
 namespace DotTiled.Tests;
 

src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-wangset/map-external-tileset-wangset.cs

@@ -1,4 +1,7 @@
 using System.Globalization;
+using DotTiled.Model;
+using DotTiled.Model.Layers;
+using DotTiled.Model.Tilesets;
 
 namespace DotTiled.Tests;
 

src/DotTiled.Tests/Serialization/TestData/Map/map-with-common-props/map-with-common-props.cs

@@ -1,4 +1,7 @@
 using System.Globalization;
+using DotTiled.Model;
+using DotTiled.Model.Layers;
+using DotTiled.Model.Properties;
 
 namespace DotTiled.Tests;
 

src/DotTiled.Tests/Serialization/TestData/Map/map-with-custom-type-props/map-with-custom-type-props.cs

@@ -1,4 +1,8 @@
 using System.Globalization;
+using DotTiled.Model;
+using DotTiled.Model.Layers;
+using DotTiled.Model.Properties;
+using DotTiled.Model.Properties.CustomTypes;
 
 namespace DotTiled.Tests;
 

src/DotTiled.Tests/Serialization/TestData/Map/map-with-embedded-tileset/map-with-embedded-tileset.cs

@@ -1,4 +1,7 @@
 using System.Globalization;
+using DotTiled.Model;
+using DotTiled.Model.Layers;
+using DotTiled.Model.Tilesets;
 
 namespace DotTiled.Tests;
 

src/DotTiled.Tests/Serialization/TestData/Map/map-with-external-tileset/map-with-external-tileset.cs

@@ -1,4 +1,7 @@
 using System.Globalization;
+using DotTiled.Model;
+using DotTiled.Model.Layers;
+using DotTiled.Model.Tilesets;
 
 namespace DotTiled.Tests;
 

src/DotTiled.Tests/Serialization/TestData/Map/map-with-flippingflags/map-with-flippingflags.cs

@@ -1,4 +1,7 @@
 using System.Globalization;
+using DotTiled.Model;
+using DotTiled.Model.Layers;
+using DotTiled.Model.Tilesets;
 
 namespace DotTiled.Tests;
 

src/DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/map-with-many-layers.cs

@@ -1,4 +1,9 @@
 using System.Numerics;
+using DotTiled.Model;
+using DotTiled.Model.Layers;
+using DotTiled.Model.Layers.Objects;
+using DotTiled.Model.Properties;
+using DotTiled.Model.Tilesets;
 
 namespace DotTiled.Tests;
 

src/DotTiled.Tests/Serialization/Tmj/TmjMapReaderTests.cs

@@ -1,3 +1,8 @@
+using DotTiled.Model;
+using DotTiled.Model.Properties.CustomTypes;
+using DotTiled.Model.Tilesets;
+using DotTiled.Serialization.Tmj;
+
 namespace DotTiled.Tests;
 
 public partial class TmjMapReaderTests

src/DotTiled.Tests/Serialization/Tmx/TmxMapReaderTests.cs

@@ -1,4 +1,8 @@
 using System.Xml;
+using DotTiled.Model;
+using DotTiled.Model.Properties.CustomTypes;
+using DotTiled.Model.Tilesets;
+using DotTiled.Serialization.Tmx;
 
 namespace DotTiled.Tests;