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/Objects/ArmyCategory.cs (modified) (3 diffs)

@@ -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);
             }
         }