From ccb77dee12600cf77a87844cc424e139660b7623 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Mon, 23 Aug 2010 17:47:46 +1200
Subject: [PATCH] rename ChoosePaletteOnSelect

---
 OpenRA.Game/Selection.cs                                  | 1 +
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj                      | 4 ++--
 ...ChoosePaletteOnSelect.cs => ChooseBuildTabOnSelect.cs} | 8 ++++----
 mods/cnc/system.yaml                                      | 2 +-
 mods/ra/system.yaml                                       | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)
 rename OpenRA.Mods.RA/World/{ChoosePaletteOnSelect.cs => ChooseBuildTabOnSelect.cs} (81%)
 mode change 100755 => 100644

diff --git a/OpenRA.Game/Selection.cs b/OpenRA.Game/Selection.cs
index 1a38a1a56c..cc861ca6bf 100644
--- a/OpenRA.Game/Selection.cs
+++ b/OpenRA.Game/Selection.cs
@@ -29,6 +29,7 @@ namespace OpenRA
 		{
 			return actors.AsEnumerable().Contains(a);
 		}
+
 		public void Combine(World world, IEnumerable<Actor> newSelection, bool isCombine, bool isClick)
 		{
 			var oldSelection = actors.AsEnumerable();
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index c6ffac11f1..46f79ccbfa 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -226,7 +226,7 @@
     <Compile Include="Cloak.cs" />
     <Compile Include="Modifiers\FrozenUnderFog.cs" />
     <Compile Include="Modifiers\HiddenUnderFog.cs" />
-    <Compile Include="World\ChoosePaletteOnSelect.cs" />
+    <Compile Include="World\ChooseBuildTabOnSelect.cs" />
     <Compile Include="Transforms.cs" />
     <Compile Include="Activities\Transform.cs" />
     <Compile Include="ActorLostNotification.cs" />
diff --git a/OpenRA.Mods.RA/World/ChoosePaletteOnSelect.cs b/OpenRA.Mods.RA/World/ChooseBuildTabOnSelect.cs
old mode 100755
new mode 100644
similarity index 81%
rename from OpenRA.Mods.RA/World/ChoosePaletteOnSelect.cs
rename to OpenRA.Mods.RA/World/ChooseBuildTabOnSelect.cs
index 11528e8e6d..7cf76682bb
--- a/OpenRA.Mods.RA/World/ChoosePaletteOnSelect.cs
+++ b/OpenRA.Mods.RA/World/ChooseBuildTabOnSelect.cs
@@ -14,16 +14,16 @@ using OpenRA.Widgets;
 
 namespace OpenRA.Mods.RA.Widgets
 {
-	class ChoosePaletteOnSelectInfo : ITraitInfo
+	class ChooseBuildTabOnSelectInfo : ITraitInfo
 	{
-		public object Create( ActorInitializer init ) { return new ChoosePaletteOnSelect( init ); }
+		public object Create( ActorInitializer init ) { return new ChooseBuildTabOnSelect( init ); }
 	}
 
-	class ChoosePaletteOnSelect : INotifySelection
+	class ChooseBuildTabOnSelect : INotifySelection
 	{
 		readonly World world;
 
-		public ChoosePaletteOnSelect( ActorInitializer init )
+		public ChooseBuildTabOnSelect( ActorInitializer init )
 		{
 			world = init.world;
 		}
diff --git a/mods/cnc/system.yaml b/mods/cnc/system.yaml
index 8618348e24..8ac9394485 100644
--- a/mods/cnc/system.yaml
+++ b/mods/cnc/system.yaml
@@ -98,7 +98,7 @@ World:
 	Country@nod:
 		Name: Nod
 		Race: nod
-	ChoosePaletteOnSelect:
+	ChooseBuildTabOnSelect:
 	BibLayer:
 	ResourceLayer:
 	ResourceType@green-tib:
diff --git a/mods/ra/system.yaml b/mods/ra/system.yaml
index bed6dd6ae7..e719d01869 100644
--- a/mods/ra/system.yaml
+++ b/mods/ra/system.yaml
@@ -94,7 +94,7 @@ World:
 	LightPaletteRotator:
 	BuildingInfluence:
 	UnitInfluence:
-	ChoosePaletteOnSelect:
+	ChooseBuildTabOnSelect:
 	BridgeLayer:
 		Bridges: bridge1, bridge2, br1, br2, br3
 	CrateDrop: