# HG changeset patch # User IBBoard # Date 1311450822 0 # Node ID 04f4c2fea356e57cb18907c17475fc31ac94e23c # Parent ff7f1b319b4e17e2c6af5da2d54904ef44d0e560 Re #351: Add extensible requirement handling method * Extract common IRequirementFactory interface * Drop back to just returning IRequirement from factory to simplify generics * Add initial registration of requirement factories diff -r ff7f1b319b4e -r 04f4c2fea356 API/Factories/Requirement/IRequirementFactory.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/API/Factories/Requirement/IRequirementFactory.cs Sat Jul 23 19:53:42 2011 +0000 @@ -0,0 +1,16 @@ +// This file (IRequirementFactory.cs) is a part of the IBBoard.WarFoundry.API project and is copyright 2011 IBBoard +// +// The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license. +using System; +using IBBoard.WarFoundry.API.Objects; +using IBBoard.WarFoundry.API.Objects.Requirement; + +namespace IBBoard.WarFoundry.API.Factories.Requirement +{ + public interface IRequirementFactory + { + IRequirement CreateRequirement(UnitType type, string data, IRaceFactory raceFactory); + string AppliesToID { get; } + } +} + diff -r ff7f1b319b4e -r 04f4c2fea356 API/Factories/Requirement/UnitRequiresAtLeastNUnitsRequirementFactory.cs --- a/API/Factories/Requirement/UnitRequiresAtLeastNUnitsRequirementFactory.cs Sat Jul 16 19:59:04 2011 +0000 +++ b/API/Factories/Requirement/UnitRequiresAtLeastNUnitsRequirementFactory.cs Sat Jul 23 19:53:42 2011 +0000 @@ -7,14 +7,20 @@ namespace IBBoard.WarFoundry.API.Factories.Requirement { - public class UnitRequiresAtLeastNUnitsRequirementFactory + public class UnitRequiresAtLeastNUnitsRequirementFactory : IRequirementFactory { public UnitRequiresAtLeastNUnitsRequirementFactory() { //Do nothing special } - public UnitRequiresAtLeastNUnitsRequirement CreateRequirement(UnitType type, string data, IRaceFactory raceFactory) + public string AppliesToID { + get { + return "RequiresAtLeastNUnits"; + } + } + + public IRequirement CreateRequirement(UnitType type, string data, IRaceFactory raceFactory) { UnitRequiresAtLeastNUnitsRequirement req = new UnitRequiresAtLeastNUnitsRequirement(type); Race race = type.Race; diff -r ff7f1b319b4e -r 04f4c2fea356 API/Factories/Xml/WarFoundryXmlRaceFactory.cs --- a/API/Factories/Xml/WarFoundryXmlRaceFactory.cs Sat Jul 16 19:59:04 2011 +0000 +++ b/API/Factories/Xml/WarFoundryXmlRaceFactory.cs Sat Jul 23 19:53:42 2011 +0000 @@ -401,7 +401,7 @@ if (reqFactory != null) { string data = WarFoundryXmlFactoryUtils.SelectSingleElement(extraData, "race:data").InnerText; - UnitRequiresAtLeastNUnitsRequirement req = reqFactory.CreateRequirement(type, data, this); + IRequirement req = reqFactory.CreateRequirement(type, data, this); type.AddRequirement(req); } } diff -r ff7f1b319b4e -r 04f4c2fea356 API/WarFoundryLoader.cs --- a/API/WarFoundryLoader.cs Sat Jul 16 19:59:04 2011 +0000 +++ b/API/WarFoundryLoader.cs Sat Jul 23 19:53:42 2011 +0000 @@ -1,16 +1,19 @@ // This file (WarFoundryLoader.cs) is a part of the IBBoard.WarFoundry.API project and is copyright 2007, 2008, 2009 IBBoard. // // The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license. - using System; using ICSharpCode.SharpZipLib.Zip; +using System.Collections.Generic; +using IBBoard.WarFoundry.API.Factories.Requirement; +using IBBoard.WarFoundry.API.Objects.Requirement; namespace IBBoard.WarFoundry.API { public class WarFoundryLoader { private static AbstractWarFoundryLoader loader; - + private static Dictionary requirementFactories = new Dictionary(); + /// /// Gets the default used to load WarFoundry data files. /// @@ -29,12 +32,22 @@ public static void SetDefault(AbstractWarFoundryLoader newLoader) { - loader = newLoader; + loader = newLoader; } - + private WarFoundryLoader() { //Hide constructor } + + public static void RegisterRequirementFactory(IRequirementFactory factory) + { + requirementFactories[factory.AppliesToID] = factory; + } + + public static IRequirementFactory GetRequirementFactory(string requirementID) + { + return DictionaryUtils.GetValue(requirementFactories, requirementID); + } } } diff -r ff7f1b319b4e -r 04f4c2fea356 IBBoard.WarFoundry.API.csproj --- a/IBBoard.WarFoundry.API.csproj Sat Jul 16 19:59:04 2011 +0000 +++ b/IBBoard.WarFoundry.API.csproj Sat Jul 23 19:53:42 2011 +0000 @@ -182,6 +182,7 @@ +