Add support for CollectionDefinition contents from a ReferenceDef, or by a collection of keys.

Allow more wildcards in DataTransformer.

Author: Lyeeedar

StructuredXmlEditor/Core.xmldef

@@ -196,6 +196,8 @@
 			<String Name="Seperator" Default="," ToolTip="The string to be used when in collapse mode." VisibleIf="Collapse==true" />
 			<Number Name="MinCount" Min="0" ToolTip="The minimum number of child elements this can have." />
 			<Number Name="MaxCount" Min="1" Default="99999999" ToolTip="The maximum number of child elements this can have." />
+			<String Name="Keys" ToolTip="The names of the objects to use in this collection." />
+			<String Name="DefKey" ToolTip="The name of the ReferenceDef to use in this collection." />
 			<Boolean Name="SkipIfDefault" ToolTip="Don't write out this element if it is at the default value." Default="true" />
 			<String Name="VisibleIf" ToolTip="The expression to use to determine whether this element is visible. Leave blank to have always visible." />
 			<Colour Name="TextColour" ToolTip="The colour on the element name in the ui." Default="Collection" HasAlpha="false" />
@@ -216,6 +218,8 @@
 			<String Name="Seperator" Default="," ToolTip="The string to be used when in collapse mode." VisibleIf="Collapse==true" />
 			<Number Name="MinCount" Min="0" ToolTip="The minimum number of child elements this can have." />
 			<Number Name="MaxCount" Min="1" Default="99999999" ToolTip="The maximum number of child elements this can have." />
+			<String Name="Keys" ToolTip="The names of the objects to use in this collection." />
+			<String Name="DefKey" ToolTip="The name of the ReferenceDef to use in this collection." />
 			<Boolean Name="SkipIfDefault" ToolTip="Don't write out this element if it is at the default value." Default="true" />
 			<String Name="VisibleIf" ToolTip="The expression to use to determine whether this element is visible. Leave blank to have always visible." />
 			<Colour Name="TextColour" ToolTip="The colour on the element name in the ui." Default="Collection" HasAlpha="false" />

StructuredXmlEditor/Data/DataTransformer.cs

@@ -201,9 +201,16 @@ public List<XElement> GetElements(XElement el, string path)
 				var nextEls = new List<XElement>();
 				foreach (var currentEl in els)
 				{
-					foreach (var nextEl in currentEl.Elements(part))
+					if (part == "*")
 					{
-						nextEls.Add(nextEl);
+						nextEls.AddRange(currentEl.Elements());
+					}
+					else
+					{
+						foreach (var nextEl in currentEl.Elements(part))
+						{
+							nextEls.Add(nextEl);
+						}
 					}
 				}
 

StructuredXmlEditor/Definition/CollectionDefinition.cs

@@ -6,6 +6,7 @@
 using System.Windows.Data;
 using System.Xml.Linq;
 using StructuredXmlEditor.Data;
+using StructuredXmlEditor.View;
 
 namespace StructuredXmlEditor.Definition
 {
@@ -19,6 +20,8 @@ public class CollectionDefinition : ComplexDataDefinition
 		public List<DataDefinition> AdditionalDefs { get; } = new List<DataDefinition>();
 		public int MinCount { get; set; } = 0;
 		public int MaxCount { get; set; } = int.MaxValue;
+		public List<Tuple<string, string>> DefKeys { get; set; } = new List<Tuple<string, string>>();
+		public string DefKey { get; set; }
 
 		public CollectionDefinition()
 		{
@@ -155,6 +158,27 @@ public override void Parse(XElement definition)
 			MinCount = TryParseInt(definition, "MinCount", 0);
 			MaxCount = TryParseInt(definition, "MaxCount", int.MaxValue);
 
+			DefKey = definition.Attribute("DefKey")?.Value?.ToString();
+			var keyString = definition.Attribute("Keys")?.Value?.ToString();
+			if (!string.IsNullOrWhiteSpace(keyString))
+			{
+				if (!keyString.Contains('('))
+				{
+					DefKeys.AddRange(keyString.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(e => new Tuple<string, string>(e.Trim(), "Type")));
+				}
+				else
+				{
+					var categories = keyString.Split(new char[] { ')' }, StringSplitOptions.RemoveEmptyEntries);
+					foreach (var categoryString in categories)
+					{
+						var split = categoryString.Split('(');
+						var category = split[0].Trim();
+						if (category.StartsWith(",")) category = category.Substring(1);
+						DefKeys.AddRange(split[1].Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(e => new Tuple<string, string>(e.Trim(), category)));
+					}
+				}
+			}
+
 			var currentGroup = "Items";
 
 			var childDefs = definition.Nodes();
@@ -180,7 +204,7 @@ public override void Parse(XElement definition)
 				}
 			}
 
-			if (ChildDefinitions.Count == 0)
+			if (ChildDefinitions.Count == 0 && DefKey == null && DefKeys.Count == 0)
 			{
 				throw new Exception("No child definitions in collection '" + Name + "'!");
 			}
@@ -289,6 +313,46 @@ public override void DoSaveData(XElement parent, DataItem item)
 
 		public override void RecursivelyResolve(Dictionary<string, DataDefinition> local, Dictionary<string, DataDefinition> global, Dictionary<string, Dictionary<string, DataDefinition>> referenceableDefinitions)
 		{
+			if (DefKey != null)
+			{
+				var key = DefKey.ToLower();
+
+				Dictionary<string, DataDefinition> defs = null;
+				if (local.ContainsKey(key)) defs = local;
+				else if (global.ContainsKey(key)) defs = global;
+
+				if (defs != null)
+				{
+					var def = defs[key] as ReferenceDefinition;
+					DefKeys = def.Keys;
+				}
+				else
+				{
+					Message.Show("Failed to find key " + DefKey + "!", "Collection Resolve Failed", "Ok");
+				}
+			}
+
+			foreach (var key in DefKeys)
+			{
+				Dictionary<string, DataDefinition> defs = null;
+				if (local.ContainsKey(key.Item1.ToLower())) defs = local;
+				else if (global.ContainsKey(key.Item1.ToLower())) defs = global;
+
+				if (defs != null)
+				{
+					var childDef = defs[key.Item1.ToLower()];
+					var childWrapperDef = new CollectionChildDefinition();
+					childWrapperDef.WrappedDefinition = childDef;
+
+					ChildDefinitions.Add(childWrapperDef);
+					Keys.Add(new Tuple<CollectionChildDefinition, string>(childWrapperDef, key.Item2));
+				}
+				else if (key.Item1 != "---")
+				{
+					Message.Show("Failed to find key " + key.Item1 + "!", "Collection Resolve Failed", "Ok");
+				}
+			}
+
 			foreach (var def in ChildDefinitions) def.WrappedDefinition.RecursivelyResolve(local, global, referenceableDefinitions);
 			foreach (var def in AdditionalDefs) def.RecursivelyResolve(local, global, referenceableDefinitions);
 		}