diff api/Commands/AbstractSetUnitEquipmentAmountCommand.cs @ 298:483b491d18f4

Fixes #337: Merge API v0.1.1 changes into v0.2 * Merge translation-related changes from v0.1.1 branch
author IBBoard <dev@ibboard.co.uk>
date Mon, 17 Jan 2011 20:02:41 +0000
parents 65553d2c8612
children
line wrap: on
line diff
--- a/api/Commands/AbstractSetUnitEquipmentAmountCommand.cs	Fri Jan 07 03:35:50 2011 +0000
+++ b/api/Commands/AbstractSetUnitEquipmentAmountCommand.cs	Mon Jan 17 20:02:41 2011 +0000
@@ -19,9 +19,7 @@
 		private UnitEquipmentItem equip;
 		private double oldAmount;
 		private bool oldAmountWasRatio;
-		private string description;
-		private string undoDescription;
-		
+
 		public AbstractSetUnitEquipmentAmountCommand(Unit unit, UnitEquipmentItem item)
 		{
 			this.unit = unit;
@@ -32,19 +30,14 @@
 
 		public override bool CanExecute()
 		{
-			return (unit!=null && equip!=null);
+			return (unit != null && equip != null);
 		}
 
 		public override string Description
 		{
 			get
 			{
-				if (description == null)
-				{
-					description = Translation.GetTranslation("setEquipmentAmountCommandDescription", "set {0} amount for {1} to {2}", equip.Name, unit.Name, GetNewAmountString());
-				}
-				
-				return description;
+				return Translation.GetTranslation("setEquipmentAmountCommandDescription", "set {0} amount for {1} to {2}", equip.Name, unit.Name, GetNewAmountString());
 			}
 		}
 
@@ -60,12 +53,7 @@
 		{
 			get
 			{
-				if (undoDescription == null)
-				{
-					undoDescription = Translation.GetTranslation("setEquipmentAmountCommandUndoDescription", "set {0} amount for {1} to {2}", equip.Name, unit.Name, GetOldAmountString());
-				}
-				
-				return undoDescription;
+				return Translation.GetTranslation("setEquipmentAmountCommandUndoDescription", "set {0} amount for {1} to {2}", equip.Name, unit.Name, GetOldAmountString());
 			}
 		}
 
@@ -79,23 +67,23 @@
 		{
 			return oldAmountWasRatio ? GetRatioAmountString(oldAmount, UnitEquipmentRatioSelection.CalculateNumberTaken(Unit, EquipItem, oldAmount)) : GetNumberAmountString((int)oldAmount);
 		}
-		
+
 		protected string GetNumberAmountString(int number)
 		{
-			return Translation.GetTranslation ("equipmentAmountNumber", "{0}", number);
+			return Translation.GetTranslation("equipmentAmountNumber", "{0}", number);
 		}
 
-		protected string GetRatioAmountString (double amount, int number)
+		protected string GetRatioAmountString(double amount, int number)
 		{
 			string amountString;
 			
 			if (amount == 100)
 			{
-				amountString = Translation.GetTranslation ("equipmentAmountAll", "all ({1})", amount, number);
+				amountString = Translation.GetTranslation("equipmentAmountAll", "all ({1})", amount, number);
 			}
 			else
 			{
-				amountString = Translation.GetTranslation ("equipmentAmountPercentage", "{0}% ({1})", amount, number);
+				amountString = Translation.GetTranslation("equipmentAmountPercentage", "{0}% ({1})", amount, number);
 			}
 			
 			return amountString;
@@ -107,7 +95,7 @@
 			return true;
 		}
 
-		public override void Undo ()
+		public override void Undo()
 		{
 			if (oldAmountWasRatio)
 			{
@@ -119,7 +107,6 @@
 			}
 		}
 
-
 		public UnitEquipmentItem EquipItem
 		{
 			get { return equip; }