#524 - Fix reordering/deletion of construction orders

Author: ekolis

FrEee.Core.Domain/Objects/GameState/Game.cs

@@ -789,7 +789,12 @@ public void EnableAbilityCache()
 		}
 		else if (typeof(T).IsAssignableTo(typeof(IOrder)))
 		{
-			list = Galaxy?.SpaceObjects?.OfType<IOrderable>().SelectMany(q => q.Orders);
+			IEnumerable<IOrderable> orderables =
+			[
+				..Galaxy?.SpaceObjects?.OfType<IOrderable>(),
+				..Galaxy?.ConstructionQueues
+			];
+			list = orderables.SelectMany(q => q.Orders);
 		}
 		else if (typeof(T).IsAssignableTo(typeof(IDesign)))
 		{

FrEee.Plugins.Default.Commands/Orders/OrderCommand.cs

@@ -27,14 +27,8 @@ protected OrderCommand(IOrderable target, IOrder order)
 	[DoNotSerialize]
 	public virtual IOrder Order
 	{
-		get
-		{
-			return order.Value;
-		}
-		set
-		{
-			order = value.ReferViaGalaxy();
-		}
+		get => order.Value;
+		set => order = value.ReferViaGalaxy();
 	}
 
 	private GameReference<IOrder> order { get; set; }

FrEee.Plugins.Default.Processes/Construction/ConstructionQueue.cs

@@ -444,11 +444,14 @@ public bool IsObsoleteMemory(Empire emp)
 
 	public void RearrangeOrder(IOrder order, int delta)
 	{
-		if (order is not null && order is not IConstructionOrder)
+		if (order is null)
+		{
+			throw new NullReferenceException("Can't rearrange a null order in a construction queue's orders.");
+		}
+		if (order is not IConstructionOrder o)
 		{
-			throw new Exception("Can't rearrange a " + order.GetType() + " in a construction queue's orders.");
+			throw new ArgumentException("Can't rearrange a " + order.GetType() + " in a construction queue's orders.");
 		}
-		var o = (IConstructionOrder)order;
 		var newpos = Orders.IndexOf(o) + delta;
 		if (newpos < 0)
 		{

FrEee.UI.WinForms/Forms/ConstructionQueueForm.cs

@@ -58,11 +58,13 @@ public IEnumerable<IConstructionOrder> SelectedOrders
 		{
 			foreach (ListViewItem item in lstQueue.SelectedItems)
 			{
-				if (item.Tag is IConstructionOrder)
-					yield return (IConstructionOrder)item.Tag;
-				else if (item.Tag is IEnumerable<IConstructionOrder>)
+				if (item.Tag is IConstructionOrder order)
 				{
-					foreach (var o in (IEnumerable<IConstructionOrder>)item.Tag)
+					yield return order;
+				}
+				else if (item.Tag is IEnumerable<IConstructionOrder> orders)
+				{
+					foreach (var o in orders)
 						yield return o;
 				}
 			}