Changeset 454:def5d333c5e8 in IBBoard.WarFoundry.API

Timestamp:

01/31/12 14:58:09 (4 months ago)

Author:

IBBoard <dev@…>

Branch:

default

Message:

Re #379: Fix validation of requirements to check for unit

• Remove custom messages for overrides to reduce verbosity
• Add missing multiplication signs for readability

Location:

API/Objects/Requirement

Files:

• RequiresNUnitsForMUnitsRequirement.cs (modified) (2 diffs)
• UnitRequiresAtLeastNUnitsRequirement.cs (modified) (1 diff)
• UnitRequiresNoMoreThanNOfUnitTypeRequirement.cs (modified) (1 diff)

API/Objects/Requirement/RequiresNUnitsForMUnitsRequirement.cs

@@ -67 +67 @@
                 {
                     string unitTypeList = GetUnitTypeList(limit);
-                    failures.Add(String.Format("{0} {1} for every {2} {3} (would have {4} for {5})", limit.Count, unitTypeList, limit.AllowsCount, allowedType.Name, limitedTypeCount, allowedTypeCount));
+                    failures.Add(String.Format("{0} × {1} for every {2} × {3} (would have {4} for {5})", limit.Count, unitTypeList, limit.AllowsCount, allowedType.Name, limitedTypeCount, allowedTypeCount));
                 }
             }
@@ -191 +191 @@
                 {
                     string unitTypeList = GetUnitTypeList(limit);
-                    failures.Add(String.Format("{0} {1} for every {2} {3} (have {4} for {5})", limit.Count, unitTypeList, limit.AllowsCount, allowedType.Name, limitedTypeCount, allowedTypeCount));
+                    failures.Add(String.Format("{0} × {1} for every {2} × {3} (have {4} for {5})", limit.Count, unitTypeList, limit.AllowsCount, allowedType.Name, limitedTypeCount, allowedTypeCount));
                 }
             }

API/Objects/Requirement/UnitRequiresAtLeastNUnitsRequirement.cs

@@ -39 +39 @@
             return IsApplicable(toArmy) ? base.ValidatesArmy(toArmy) : Validation.NotApplicable;
         }
-
-        protected override string ValidationFailedMessage
-        {
-            get
-            {
-                return "Army contains " + requirementOnType.Name + " and so must contain: {0}.";
-            }
-        }
-
-        protected override string AllowsAddingFailedMessage
-        {
-            get
-            {
-                return "Army would contain " + requirementOnType.Name + " and so must contain: {0}.";
-            }
-        }
     }
 }

API/Objects/Requirement/UnitRequiresNoMoreThanNOfUnitTypeRequirement.cs

@@ -51 +51 @@
             return requirementOnType.Equals(toObject) || (toObject is Unit && requirementOnType.Equals(((Unit)toObject).UnitType));
         }
-
-        protected override string ValidationFailedMessage
-        {
-            get
-            {
-                return "Army contains " + requirementOnType.Name + " and so cannot contain more than: {0}.";
-            }
-        }
-
-        protected override string AllowsAddingFailedMessage
-        {
-            get
-            {
-                return "Army would contain " + requirementOnType.Name + " and so cannot contain more than: {0}.";
-            }
-        }
     }
 }