# HG changeset patch # User IBBoard # Date 1250328831 0 # Node ID c4d9b1ec75edcdbecf9687782b9bf770548b52c5 # Parent 7653fab9d70ea764f9744d44e202f7c7350786fd Re #124: Remove "factory factory" * Replace calls to factory factory with direct invocation of "get factory" methods in GTK# UI diff -r 7653fab9d70e -r c4d9b1ec75ed FrmMainWindow.cs --- a/FrmMainWindow.cs Tue Jul 14 18:33:52 2009 +0000 +++ b/FrmMainWindow.cs Sat Aug 15 09:33:51 2009 +0000 @@ -129,21 +129,10 @@ FailedUnitRequirementMethod = new FailedUnitRequirementDelegate(OnFailedUnitRequirement); UnitNameChangedMethod = new StringValChangedDelegate(OnUnitNameChanged); - //FIXME: Temporary hack to add paths and factories + //FIXME: Temporary hack to add paths and factories before we get preferences and plugins WarFoundryLoader.GetDefault().AddLoadDirectory(new DirectoryInfo(Constants.ExecutablePath + Constants.DirectoryString + "data")); - IWarFoundryFactory factory = WarFoundryFactoryFactory.GetFactoryFactory().GetFactory(typeof(WarFoundryXmlFactory)); - - if (factory!=null && factory is WarFoundryXmlFactory) - { - WarFoundryLoader.GetDefault().RegisterFactory((WarFoundryXmlFactory)factory); - } - - factory = WarFoundryFactoryFactory.GetFactoryFactory().GetFactory(typeof(RollcallFactory)); - - if (factory!=null && factory is RollcallFactory) - { - WarFoundryLoader.GetDefault().RegisterNonNativeFactory((INonNativeWarFoundryFactory)factory); - } + WarFoundryLoader.GetDefault().RegisterFactory(WarFoundryXmlFactory.GetFactory()); + WarFoundryLoader.GetDefault().RegisterNonNativeFactory(RollcallFactory.GetFactory()); logger.Debug("Initialising complete - seeing if we can load default army or system"); diff -r 7653fab9d70e -r c4d9b1ec75ed gtk-gui/objects.xml --- a/gtk-gui/objects.xml Tue Jul 14 18:33:52 2009 +0000 +++ b/gtk-gui/objects.xml Sat Aug 15 09:33:51 2009 +0000 @@ -1,2 +1,6 @@ + + + + \ No newline at end of file