From 809b716d0dbb75e484d17e6f4a969a6c7db70438 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Sat, 31 Dec 2011 11:02:38 +1300
Subject: [PATCH] tidy silly Enum.GetValues type nonsense

---
 OpenRA.FileFormats/Exts.cs                     | 1 +
 OpenRA.Mods.RA/GivesBounty.cs                  | 4 ++--
 OpenRA.Mods.RA/Widgets/Logic/DiplomacyLogic.cs | 2 +-
 OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs   | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/OpenRA.FileFormats/Exts.cs b/OpenRA.FileFormats/Exts.cs
index af4321cb39..9d4216a5ea 100755
--- a/OpenRA.FileFormats/Exts.cs
+++ b/OpenRA.FileFormats/Exts.cs
@@ -208,5 +208,6 @@ namespace OpenRA
 	public static class Enum<T>
 	{
 		public static T Parse(string s) { return (T)Enum.Parse(typeof(T), s); }
+		public static T[] GetValues() { return (T[])Enum.GetValues(typeof(T)); }
 	}
 }
diff --git a/OpenRA.Mods.RA/GivesBounty.cs b/OpenRA.Mods.RA/GivesBounty.cs
index 4a986360cd..4cdc46e3a3 100644
--- a/OpenRA.Mods.RA/GivesBounty.cs
+++ b/OpenRA.Mods.RA/GivesBounty.cs
@@ -9,9 +9,9 @@
 #endregion
 
 using System.Linq;
-using OpenRA.Traits;
-using OpenRA.Mods.RA.Effects;
 using OpenRA.Mods.RA.Buildings;
+using OpenRA.Mods.RA.Effects;
+using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
 {
diff --git a/OpenRA.Mods.RA/Widgets/Logic/DiplomacyLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/DiplomacyLogic.cs
index f4a838cda8..7b317ce6db 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/DiplomacyLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/DiplomacyLogic.cs
@@ -122,7 +122,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 
 		void ShowDropDown(Player p, DropDownButtonWidget dropdown)
 		{
-			var stances = Enum.GetValues(typeof(Stance)).OfType<Stance>();
+			var stances = Enum<Stance>.GetValues();
 			Func<Stance, ScrollItemWidget, ScrollItemWidget> setupItem = (s, template) =>
 			{
 				var item = ScrollItemWidget.Setup(template,
diff --git a/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs b/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs
index efb183becc..d0f36d99c8 100644
--- a/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs
+++ b/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs
@@ -132,7 +132,7 @@ namespace OpenRA.Mods.RA.Widgets
 			if (actor.First == null)
 				return true;
 
-			var stances = (UnitStance[])Enum.GetValues(typeof(UnitStance));
+			var stances = Enum<UnitStance>.GetValues();
 
 			var nextStance = stances.Concat(stances).SkipWhile(s => s != actor.Second.predictedStance).Skip(1).First();