Better naming/organization for application/metadata/window validation types

This commit is contained in:
Josh Tynjala
2022-04-26 14:21:07 -07:00
parent 10b8f962cd
commit 1f954d268f
5 changed files with 30 additions and 21 deletions

View File

@@ -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");
}

View File

@@ -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 =
{

View File

@@ -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 =
{

View File

@@ -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 =
{

View File

@@ -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;
};