# HG changeset patch # User IBBoard # Date 1275764266 0 # Node ID a3c1bf57fd3fea49c23a7cd88ec0a27517006c52 # Parent 6fe0cb1bf74f5df3d74238de86e29342f7aaec85 Re #279: Create composite limit * Ignore XPath and go for all child nodes, since we want to warn in future if an unsupported limit is ignored * Make the "any" option in the limit choice group a singular instead of 0+ to ensure we get a choice when we use the group diff -r 6fe0cb1bf74f -r a3c1bf57fd3f api/Factories/Xml/WarFoundryXmlLimitParser.cs --- a/api/Factories/Xml/WarFoundryXmlLimitParser.cs Sat Jun 05 15:36:04 2010 +0000 +++ b/api/Factories/Xml/WarFoundryXmlLimitParser.cs Sat Jun 05 18:57:46 2010 +0000 @@ -50,7 +50,7 @@ break; case "compositeMinLimit": ICollection minSubLimits = GetSubLimits(limitElem); - limit = new CompositeMaximumLimit(minSubLimits); + limit = new CompositeMinimumLimit(minSubLimits); break; default: //TODO: Warn of missing handler for when we've extended the limit list @@ -86,8 +86,7 @@ private XmlNodeList GetSubLimitElements(XmlElement limitElem) { - //"core:percentageLimit | core:sizeConstrainedLimit | core:absoluteLimit | core:unitSizeLimit | core:compositeMaxLimit | core:compositeMinLimit" - return WarFoundryXmlFactoryUtils.SelectNodes(limitElem, "core:absolueLimit"); + return limitElem.ChildNodes; } } } diff -r 6fe0cb1bf74f -r a3c1bf57fd3f schemas/warfoundry-core.xsd --- a/schemas/warfoundry-core.xsd Sat Jun 05 15:36:04 2010 +0000 +++ b/schemas/warfoundry-core.xsd Sat Jun 05 18:57:46 2010 +0000 @@ -71,7 +71,7 @@ - +