From 1f954d268fd964558e8d8d88d094ce38317805d3 Mon Sep 17 00:00:00 2001
From: Josh Tynjala <joshtynjala@bowlerhat.dev>
Date: Tue, 26 Apr 2022 14:21:07 -0700
Subject: [PATCH] Better naming/organization for application/metadata/window
 validation types

---
 src/lime/tools/ProjectXMLParser.hx                | 13 ++++++++-----
 .../ApplicationDataType.hx}                       |  7 ++++---
 .../MetaDataType.hx}                              |  7 ++++---
 .../WindowDataType.hx}                            |  9 +++++----
 tools/CommandLineTools.hx                         | 15 +++++++++------
 5 files changed, 30 insertions(+), 21 deletions(-)
 rename src/lime/tools/{ApplicationDataDefaults.hx => _types/ApplicationDataType.hx} (63%)
 rename src/lime/tools/{MetaDataDefaults.hx => _types/MetaDataType.hx} (71%)
 rename src/lime/tools/{WindowDataDefaults.hx => _types/WindowDataType.hx} (88%)

diff --git a/src/lime/tools/ProjectXMLParser.hx b/src/lime/tools/ProjectXMLParser.hx
index 576592d4a..cafeb9457 100644
--- a/src/lime/tools/ProjectXMLParser.hx
+++ b/src/lime/tools/ProjectXMLParser.hx
@@ -7,6 +7,9 @@ import lime.tools.Asset;
 import lime.tools.AssetType;
 import lime.tools.Dependency;
 import lime.tools.HXProject;
+import lime.tools._types.ApplicationDataType;
+import lime.tools._types.MetaDataType;
+import lime.tools._types.WindowDataType;
 #if lime
 import lime.utils.AssetManifest;
 #end
@@ -439,11 +442,11 @@ class ProjectXMLParser extends HXProject
 						name = "packageName";
 					}
 
-					if (Reflect.hasField(ApplicationDataDefaults.fields, name))
+					if (Reflect.hasField(ApplicationDataType.fields, name))
 					{
 						Reflect.setField(app, name, value);
 					}
-					else if (Reflect.hasField(MetaDataDefaults.fields, name))
+					else if (Reflect.hasField(MetaDataType.fields, name))
 					{
 						Reflect.setField(meta, name, value);
 					}
@@ -856,7 +859,7 @@ class ProjectXMLParser extends HXProject
 						name = "packageName";
 					}
 
-					if (Reflect.hasField(MetaDataDefaults.fields, name))
+					if (Reflect.hasField(MetaDataType.fields, name))
 					{
 						Reflect.setField(meta, name, value);
 					}
@@ -2006,11 +2009,11 @@ class ProjectXMLParser extends HXProject
 					Reflect.setField(windows[id], "colorDepth", Std.parseInt(value));
 
 				default:
-					if (Reflect.hasField(WindowDataDefaults.fields, name))
+					if (Reflect.hasField(WindowDataType.fields, name))
 					{
 						Reflect.setField(windows[id], name, value == "true");
 					}
-					else if (Reflect.hasField(WindowDataDefaults.fields, formatAttributeName(name)))
+					else if (Reflect.hasField(WindowDataType.fields, formatAttributeName(name)))
 					{
 						Reflect.setField(windows[id], formatAttributeName(name), value == "true");
 					}
diff --git a/src/lime/tools/ApplicationDataDefaults.hx b/src/lime/tools/_types/ApplicationDataType.hx
similarity index 63%
rename from src/lime/tools/ApplicationDataDefaults.hx
rename to src/lime/tools/_types/ApplicationDataType.hx
index 50559844b..5f6123cb3 100644
--- a/src/lime/tools/ApplicationDataDefaults.hx
+++ b/src/lime/tools/_types/ApplicationDataType.hx
@@ -1,7 +1,8 @@
-package lime.tools;
+package lime.tools._types;
 
-@:dox(hide)
-class ApplicationDataDefaults
+import lime.tools.ApplicationData;
+
+class ApplicationDataType
 {
 	public static var fields:ApplicationData =
 		{
diff --git a/src/lime/tools/MetaDataDefaults.hx b/src/lime/tools/_types/MetaDataType.hx
similarity index 71%
rename from src/lime/tools/MetaDataDefaults.hx
rename to src/lime/tools/_types/MetaDataType.hx
index 250b1f265..d96214039 100644
--- a/src/lime/tools/MetaDataDefaults.hx
+++ b/src/lime/tools/_types/MetaDataType.hx
@@ -1,7 +1,8 @@
-package lime.tools;
+package lime.tools._types;
 
-@:dox(hide)
-class MetaDataDefaults
+import lime.tools.MetaData;
+
+class MetaDataType
 {
 	public static var fields:MetaData =
 		{
diff --git a/src/lime/tools/WindowDataDefaults.hx b/src/lime/tools/_types/WindowDataType.hx
similarity index 88%
rename from src/lime/tools/WindowDataDefaults.hx
rename to src/lime/tools/_types/WindowDataType.hx
index 965c4d8a1..7745382e4 100644
--- a/src/lime/tools/WindowDataDefaults.hx
+++ b/src/lime/tools/_types/WindowDataType.hx
@@ -1,7 +1,8 @@
-package lime.tools;
+package lime.tools._types;
 
-@:dox(hide)
-class WindowDataDefaults
+import lime.tools.WindowData;
+
+class WindowDataType
 {
 	public static var fields:WindowData =
 		{
@@ -35,4 +36,4 @@ class WindowDataDefaults
 			maximized: false,
 			hidden: false
 		}
-}
+}
\ No newline at end of file
diff --git a/tools/CommandLineTools.hx b/tools/CommandLineTools.hx
index 955c4907a..cf897ad80 100644
--- a/tools/CommandLineTools.hx
+++ b/tools/CommandLineTools.hx
@@ -10,6 +10,9 @@ import hxp.*;
 import lime.system.CFFI;
 import lime.tools.HXProject;
 import lime.tools.*;
+import lime.tools._types.ApplicationDataType;
+import lime.tools._types.MetaDataType;
+import lime.tools._types.WindowDataType;
 import sys.io.File;
 import sys.io.Process;
 import sys.FileSystem;
@@ -1860,9 +1863,9 @@ class CommandLineTools
 					var fieldValue = Reflect.field(project, field);
 					var typeValue:Dynamic = switch (field)
 					{
-						case "app": ApplicationDataDefaults.fields;
-						case "meta": MetaDataDefaults.fields;
-						case "window": WindowDataDefaults.fields;
+						case "app": ApplicationDataType.fields;
+						case "meta": MetaDataType.fields;
+						case "window": WindowDataType.fields;
 						default: fieldValue;
 					};
 
@@ -2130,9 +2133,9 @@ class CommandLineTools
 						var fieldReference = Reflect.field(overrides, fieldName);
 						var typeValue:Dynamic = switch (fieldName)
 						{
-							case "app": ApplicationDataDefaults.fields;
-							case "meta": MetaDataDefaults.fields;
-							case "window": WindowDataDefaults.fields;
+							case "app": ApplicationDataType.fields;
+							case "meta": MetaDataType.fields;
+							case "window": WindowDataType.fields;
 							default: fieldReference;
 						};