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

Location:

IBBoard.WarFoundry.API/trunk/api

Files:

• Commands/CreateAndAddUnitCommand.cs (modified) (4 diffs)
• Objects/Army.cs (modified) (6 diffs)
• Objects/ArmyCategory.cs (modified) (3 diffs)
• Objects/Unit.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);
         }
 

@@ -70 +70 @@
                         cat.UnitAdded+=new ObjectAddDelegate(Army_UnitAdded);
                         cat.UnitRemoved+=new ObjectRemoveDelegate(Army_UnitRemoved);
+                        cat.FailedRequirement+=new FailedUnitRequirementDelegate(Army_FailedRequirement);
                     }
                 }
@@ -102 +103 @@
         protected void OnUnitAdded(Unit unit, List<FailedUnitRequirement> failedReqs)
         {
-            if (UnitAdded!=null)
+            if (UnitAdded != null)
             {
                 UnitAdded(unit);
             }
 
-            if (FailedRequirement!=null && failedReqs!=null && failedReqs.Count > 0)
-            {
-                FailedRequirement(failedReqs);
-            }
+            OnFailedRequirement(failedReqs);
         }
 
@@ -125 +123 @@
             }
 
-            if (FailedRequirement!=null && failedReqs!=null && failedReqs.Count > 0)
+            OnFailedRequirement(failedReqs);
+        }
+
+        protected void OnFailedRequirement(List<FailedUnitRequirement> failedReqs)
+        {
+            if (FailedRequirement != null && failedReqs != null && failedReqs.Count > 0)
             {
                 FailedRequirement(failedReqs);
@@ -161 +164 @@
         public void AddUnit(Unit unit)
         {
-            unit.Army = this;
             ArmyCategory armyCat = GetCategory(unit.UnitType.MainCategory);
             armyCat.AddUnit(unit);
@@ -168 +170 @@
         public void RemoveUnit(Unit unit)
         {
-            List<FailedUnitRequirement> failedReqs = CanRemoveUnit(unit);
-            unit.Army = null;
             unit.Category.RemoveUnit(unit);
-            OnUnitRemoved(unit, failedReqs);
         }
 
@@ -255 +254 @@
         }
 
-        private void Army_UnitAdded(object val)
+        private void Army_UnitAdded(WarFoundryObject val)
         {
             OnUnitAdded((Unit)val);
         }
 
-        private void Army_UnitRemoved(object val)
+        private void Army_UnitRemoved(WarFoundryObject val)
         {
             OnUnitRemoved((Unit)val);
+        }
+
+        private void Army_FailedRequirement(List<FailedUnitRequirement> val)
+        {
+            OnFailedRequirement(val);
         }
     }

@@ -23 +23 @@
         public event ObjectAddDelegate UnitAdded;
         public event ObjectRemoveDelegate UnitRemoved;
+        public event FailedUnitRequirementDelegate FailedRequirement;
 
         public ArmyCategory(Army army, Category cat) : base()
@@ -75 +76 @@
             unitTypes[unit.UnitType.ID] = (int)unitTypeCount + 1;
             TotalPoints+= unit.PointsValue;
-            OnUnitAdded(unit);
+            OnUnitAdded(unit, failedReqs);
         }
 
         internal void RemoveUnit(Unit unit)
         {
+            List<FailedUnitRequirement> failedReqs = ParentArmy.CanRemoveUnit(unit);
             units.Remove(unit);
             unitTypes[unit.UnitType.ID] = ((int)unitTypes[unit.UnitType.ID])-1;
             TotalPoints-= unit.PointsValue;
             unit.PointsValueChanged-= PointsValueChangedMethod;
-            OnUnitRemoved(unit);
+            OnUnitRemoved(unit, failedReqs);
         }
 
@@ -126 +128 @@
         }
 
-        private void OnUnitAdded(Unit unit)
+        protected void OnUnitAdded(Unit unit)
         {
-            if (UnitAdded!=null)
+            OnUnitAdded(unit, null);
+        }
+
+        protected void OnUnitAdded(Unit unit, List<FailedUnitRequirement> failedReqs)
+        {
+            if (UnitAdded != null)
             {
                 UnitAdded(unit);
             }
+
+            if (FailedRequirement != null && failedReqs != null && failedReqs.Count > 0)
+            {
+                FailedRequirement(failedReqs);
+            }
         }
 
-        private void OnUnitRemoved(Unit unit)
+        protected void OnUnitRemoved(Unit unit)
         {
-            if (UnitRemoved!=null)
+            OnUnitRemoved(unit, null);
+        }
+
+        protected void OnUnitRemoved(Unit unit, List<FailedUnitRequirement> failedReqs)
+        {
+            if (UnitRemoved != null)
             {
                 UnitRemoved(unit);
+            }
+
+            if (FailedRequirement != null && failedReqs != null && failedReqs.Count > 0)
+            {
+                FailedRequirement(failedReqs);
             }
         }

@@ -18 +18 @@
         private UnitType type;
         private int size;
-        private Army army;
         private Unit parentUnit;
         private double points;
@@ -28 +27 @@
         public event DoubleValChangedDelegate UnitEquipmentAmountChanged;
 
-        public Unit(UnitType unitType, Army parentArmy) : this(unitType, unitType.MinSize, parentArmy){}
-
-        public Unit(UnitType unitType, int startSize, Army parentArmy)
-        {
-            Army = parentArmy;
+        public Unit(UnitType unitType, ArmyCategory parentArmyCat) : this(unitType, unitType.MinSize, parentArmyCat) { }
+
+        public Unit(UnitType unitType, int startSize, ArmyCategory parentArmyCat)
+        {
+            Category = parentArmyCat;
             type = unitType;
             Size = startSize;
@@ -144 +143 @@
         public Army Army
         {
-            get { return army; }
-            set 
-            {
-                army = value;
-
-                if (army == null)
-                {
-                    Category = null;
-                }
-            }
+            get { return (Category == null ? null : Category.ParentArmy); }
         }
 
@@ -163 +153 @@
         public ArmyCategory Category
         {
-            get 
-            { 
-                if (cat==null)
-                {
-                    if (Army!=null)
-                    {
-                        return Army.GetCategory(UnitType.MainCategory);
-                    }
-                    else
-                    {
-                        return null;
-                    }
-                }
-                else
-                {
-                    return cat; 
-                }
+            get
+            {
+                return cat;
             }
             set { cat = value; }