Timestamp:

06/27/09 14:39:04 (14 months ago)

Author:

ibboard

Message:

Re #90: Stop new units showing up twice

• Hand all of unit adding/removing down to category
• Refactor out OnFailedRequirement method in Army
• Make Army listen to and propogate FailedRequirement events from Units
• Add OnUnitAdded/Removed method to ArmyCategory that takes list of failures
• Remove direct reference to Army from Unit and go via ArmyCategory instead

Files:

• IBBoard.WarFoundry.API/trunk/api/Commands/CreateAndAddUnitCommand.cs (modified) (4 diffs)

@@ -13 +13 @@
     {
         private UnitType addedUnitType;
-        private Army army;
+        private ArmyCategory armyCat;
         private Unit addedUnit;
         
-        public CreateAndAddUnitCommand(UnitType toAdd, Army armyTo)
+        public CreateAndAddUnitCommand(UnitType toAdd, ArmyCategory armyCatTo)
         {
             addedUnitType = toAdd;
-            army = armyTo;
+            armyCat = armyCatTo;
         }
 
         [Obsolete("Use two parameter constructor instead")]
-        public CreateAndAddUnitCommand(UnitType toAdd, ArmyCategory catTo, Army armyTo) : this(toAdd, armyTo)
+        public CreateAndAddUnitCommand(UnitType toAdd, ArmyCategory catTo, Army armyTo) : this(toAdd, catTo)
         {
         }
@@ -34 +34 @@
         public override bool CanExecute()
         {
-            return (addedUnitType!=null && army!=null);
+            return (addedUnitType!=null && armyCat!=null);
         }
 
@@ -49 +49 @@
         public override bool Execute()
         {
-            addedUnit = new Unit(addedUnitType, army);
+            addedUnit = new Unit(addedUnitType, armyCat);
             this.Redo();
             return true;
@@ -56 +56 @@
         public override void Redo()
         {
-            army.AddUnit(addedUnit);
+            armyCat.AddUnit(addedUnit);
         }
 
         public override void Undo()
         {
-            army.RemoveUnit(addedUnit);
+            armyCat.RemoveUnit(addedUnit);
         }