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/Army.cs (modified) (6 diffs)

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