From a7c368f2469119e2c449ace28cda55a04adff79f Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Fri, 15 Jan 2010 17:08:44 +1300
Subject: [PATCH] merge .FileFormats and .DataStructures

---
 OpenRA.Server/OpenRA.Server.csproj            |  4 --
 .../OpenRa.DataStructures.csproj              | 65 -------------------
 .../Properties/AssemblyInfo.cs                | 35 ----------
 .../AssetInfo.cs                              |  2 +-
 .../DisposableAction.cs                       |  0
 OpenRa.FileFormats/OpenRa.FileFormats.csproj  | 16 +++--
 .../Tuple.cs                                  |  2 +-
 .../TypeDictionary.cs                         |  2 +-
 .../float2.cs                                 |  0
 .../int2.cs                                   |  0
 OpenRa.Game/Actor.cs                          |  1 +
 OpenRa.Game/Chat.cs                           |  1 +
 OpenRa.Game/OpenRa.Game.csproj                |  4 --
 OpenRa.Game/Traits/Activities/HeliLand.cs     |  6 +-
 OpenRa.Game/Traits/Activities/HeliReturn.cs   |  6 +-
 OpenRa.sln                                    | 20 ------
 RulesConverter/RulesConverter.csproj          |  4 --
 SequenceEditor/SequenceEditor.csproj          |  4 --
 18 files changed, 17 insertions(+), 155 deletions(-)
 delete mode 100644 OpenRa.DataStructures/OpenRa.DataStructures.csproj
 delete mode 100644 OpenRa.DataStructures/Properties/AssemblyInfo.cs
 rename {OpenRa.DataStructures => OpenRa.FileFormats}/AssetInfo.cs (92%)
 rename {OpenRa.DataStructures => OpenRa.FileFormats}/DisposableAction.cs (100%)
 rename {OpenRa.DataStructures => OpenRa.FileFormats}/Tuple.cs (90%)
 rename {OpenRa.DataStructures => OpenRa.FileFormats}/TypeDictionary.cs (94%)
 mode change 100755 => 100644
 rename {OpenRa.DataStructures => OpenRa.FileFormats}/float2.cs (100%)
 rename {OpenRa.DataStructures => OpenRa.FileFormats}/int2.cs (100%)

diff --git a/OpenRA.Server/OpenRA.Server.csproj b/OpenRA.Server/OpenRA.Server.csproj
index 5f486b4d5d..58d23e8a2f 100644
--- a/OpenRA.Server/OpenRA.Server.csproj
+++ b/OpenRA.Server/OpenRA.Server.csproj
@@ -54,10 +54,6 @@
     <Compile Include="ServerOrder.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\OpenRa.DataStructures\OpenRa.DataStructures.csproj">
-      <Project>{2F9E7A23-56C0-4286-9C8E-1060A9B2F073}</Project>
-      <Name>OpenRa.DataStructures</Name>
-    </ProjectReference>
     <ProjectReference Include="..\OpenRa.FileFormats\OpenRa.FileFormats.csproj">
       <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
       <Name>OpenRa.FileFormats</Name>
diff --git a/OpenRa.DataStructures/OpenRa.DataStructures.csproj b/OpenRa.DataStructures/OpenRa.DataStructures.csproj
deleted file mode 100644
index b0d2c9ca21..0000000000
--- a/OpenRa.DataStructures/OpenRa.DataStructures.csproj
+++ /dev/null
@@ -1,65 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{2F9E7A23-56C0-4286-9C8E-1060A9B2F073}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenRa</RootNamespace>
-    <AssemblyName>OpenRa.DataStructures</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="IjwFramework, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Ijw.DirectX\Release\IjwFramework.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssetInfo.cs" />
-    <Compile Include="DisposableAction.cs" />
-    <Compile Include="float2.cs" />
-    <Compile Include="int2.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Tuple.cs" />
-    <Compile Include="TypeDictionary.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/OpenRa.DataStructures/Properties/AssemblyInfo.cs b/OpenRa.DataStructures/Properties/AssemblyInfo.cs
deleted file mode 100644
index cf7fc180e0..0000000000
--- a/OpenRa.DataStructures/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle( "OpenRa.DataStructures" )]
-[assembly: AssemblyDescription( "" )]
-[assembly: AssemblyConfiguration( "" )]
-[assembly: AssemblyCompany( "" )]
-[assembly: AssemblyProduct( "OpenRa.DataStructures" )]
-[assembly: AssemblyCopyright( "Copyright ©  2007" )]
-[assembly: AssemblyTrademark( "" )]
-[assembly: AssemblyCulture( "" )]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible( false )]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid( "fdbd08da-dde2-4eaf-9a8c-4bc63ac5b074" )]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-[assembly: AssemblyVersion( "1.0.0.0" )]
-[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/OpenRa.DataStructures/AssetInfo.cs b/OpenRa.FileFormats/AssetInfo.cs
similarity index 92%
rename from OpenRa.DataStructures/AssetInfo.cs
rename to OpenRa.FileFormats/AssetInfo.cs
index b0e2d46862..e78bdc8727 100644
--- a/OpenRa.DataStructures/AssetInfo.cs
+++ b/OpenRa.FileFormats/AssetInfo.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Security.Cryptography;
 
-namespace OpenRa
+namespace OpenRa.FileFormats
 {
 	public class AssetInfo
 	{
diff --git a/OpenRa.DataStructures/DisposableAction.cs b/OpenRa.FileFormats/DisposableAction.cs
similarity index 100%
rename from OpenRa.DataStructures/DisposableAction.cs
rename to OpenRa.FileFormats/DisposableAction.cs
diff --git a/OpenRa.FileFormats/OpenRa.FileFormats.csproj b/OpenRa.FileFormats/OpenRa.FileFormats.csproj
index 57a2d72322..a41a7b86f3 100644
--- a/OpenRa.FileFormats/OpenRa.FileFormats.csproj
+++ b/OpenRa.FileFormats/OpenRa.FileFormats.csproj
@@ -35,6 +35,10 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="IjwFramework, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Ijw.DirectX\Ijw.Framework\IjwFramework\bin\Release\IjwFramework.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -44,19 +48,23 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AssetInfo.cs" />
     <Compile Include="AudLoader.cs" />
     <Compile Include="Blowfish.cs" />
     <Compile Include="BlowfishKeyProvider.cs" />
+    <Compile Include="DisposableAction.cs" />
     <Compile Include="Dune2ShpReader.cs" />
     <Compile Include="Exts.cs" />
     <Compile Include="FieldLoader.cs" />
     <Compile Include="FileSystem.cs" />
+    <Compile Include="float2.cs" />
     <Compile Include="Folder.cs" />
     <Compile Include="Format2.cs" />
     <Compile Include="Format40.cs" />
     <Compile Include="Format80.cs" />
     <Compile Include="IniFile.cs" />
     <Compile Include="IniWriter.cs" />
+    <Compile Include="int2.cs" />
     <Compile Include="IPaletteRemap.cs" />
     <Compile Include="Map.cs" />
     <Compile Include="MiniYaml.cs" />
@@ -73,14 +81,10 @@
     <Compile Include="TileReference.cs" />
     <Compile Include="TileSet.cs" />
     <Compile Include="TreeReference.cs" />
+    <Compile Include="Tuple.cs" />
+    <Compile Include="TypeDictionary.cs" />
     <Compile Include="Walkability.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenRa.DataStructures\OpenRa.DataStructures.csproj">
-      <Project>{2F9E7A23-56C0-4286-9C8E-1060A9B2F073}</Project>
-      <Name>OpenRa.DataStructures</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/OpenRa.DataStructures/Tuple.cs b/OpenRa.FileFormats/Tuple.cs
similarity index 90%
rename from OpenRa.DataStructures/Tuple.cs
rename to OpenRa.FileFormats/Tuple.cs
index f5260fcfbb..7d5d582808 100644
--- a/OpenRa.DataStructures/Tuple.cs
+++ b/OpenRa.FileFormats/Tuple.cs
@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace OpenRa
+namespace OpenRa.FileFormats
 {
 	public class Tuple<A>
 	{
diff --git a/OpenRa.DataStructures/TypeDictionary.cs b/OpenRa.FileFormats/TypeDictionary.cs
old mode 100755
new mode 100644
similarity index 94%
rename from OpenRa.DataStructures/TypeDictionary.cs
rename to OpenRa.FileFormats/TypeDictionary.cs
index 81fedaf549..aad834d7bf
--- a/OpenRa.DataStructures/TypeDictionary.cs
+++ b/OpenRa.FileFormats/TypeDictionary.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Reflection;
 using IjwFramework.Collections;
 
-namespace OpenRa
+namespace OpenRa.FileFormats
 {
 	public class TypeDictionary
 	{
diff --git a/OpenRa.DataStructures/float2.cs b/OpenRa.FileFormats/float2.cs
similarity index 100%
rename from OpenRa.DataStructures/float2.cs
rename to OpenRa.FileFormats/float2.cs
diff --git a/OpenRa.DataStructures/int2.cs b/OpenRa.FileFormats/int2.cs
similarity index 100%
rename from OpenRa.DataStructures/int2.cs
rename to OpenRa.FileFormats/int2.cs
diff --git a/OpenRa.Game/Actor.cs b/OpenRa.Game/Actor.cs
index cc633692ea..d95d7b2bd2 100755
--- a/OpenRa.Game/Actor.cs
+++ b/OpenRa.Game/Actor.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using OpenRa.Game.GameRules;
 using OpenRa.Game.Traits;
 using OpenRa.Game.Traits.Activities;
+using OpenRa.FileFormats;
 
 namespace OpenRa.Game
 {
diff --git a/OpenRa.Game/Chat.cs b/OpenRa.Game/Chat.cs
index f95b214172..eaafc78f00 100644
--- a/OpenRa.Game/Chat.cs
+++ b/OpenRa.Game/Chat.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Drawing;
+using OpenRa.FileFormats;
 
 namespace OpenRa.Game
 {
diff --git a/OpenRa.Game/OpenRa.Game.csproj b/OpenRa.Game/OpenRa.Game.csproj
index d234352d3b..3de25df83c 100644
--- a/OpenRa.Game/OpenRa.Game.csproj
+++ b/OpenRa.Game/OpenRa.Game.csproj
@@ -286,10 +286,6 @@
     <Compile Include="World.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\OpenRa.DataStructures\OpenRa.DataStructures.csproj">
-      <Project>{2F9E7A23-56C0-4286-9C8E-1060A9B2F073}</Project>
-      <Name>OpenRa.DataStructures</Name>
-    </ProjectReference>
     <ProjectReference Include="..\OpenRa.FileFormats\OpenRa.FileFormats.csproj">
       <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
       <Name>OpenRa.FileFormats</Name>
diff --git a/OpenRa.Game/Traits/Activities/HeliLand.cs b/OpenRa.Game/Traits/Activities/HeliLand.cs
index eea8171415..09bf01915f 100644
--- a/OpenRa.Game/Traits/Activities/HeliLand.cs
+++ b/OpenRa.Game/Traits/Activities/HeliLand.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
+
 namespace OpenRa.Game.Traits.Activities
 {
 	class HeliLand : IActivity
diff --git a/OpenRa.Game/Traits/Activities/HeliReturn.cs b/OpenRa.Game/Traits/Activities/HeliReturn.cs
index 475fb92e04..e8123da2dd 100644
--- a/OpenRa.Game/Traits/Activities/HeliReturn.cs
+++ b/OpenRa.Game/Traits/Activities/HeliReturn.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using OpenRa.Game.GameRules;
+using System.Linq;
 
 namespace OpenRa.Game.Traits.Activities
 {
diff --git a/OpenRa.sln b/OpenRa.sln
index 580ec2fce2..62265d1394 100644
--- a/OpenRa.sln
+++ b/OpenRa.sln
@@ -5,8 +5,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRa.FileFormats", "OpenR
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRa.Game", "OpenRa.Game\OpenRa.Game.csproj", "{0DFB103F-2962-400F-8C6D-E2C28CCBA633}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRa.DataStructures", "OpenRa.DataStructures\OpenRa.DataStructures.csproj", "{2F9E7A23-56C0-4286-9C8E-1060A9B2F073}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PaletteUsage", "PaletteUsage\PaletteUsage.csproj", "{54577061-E2D2-4336-90A2-A9A7106A30CD}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PaletteMatch", "PaletteMatch\PaletteMatch.csproj", "{31411761-224C-4C54-A5FE-280890A70259}"
@@ -69,24 +67,6 @@ Global
 		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|Mixed Platforms.Build.0 = Release|x86
 		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|Win32.ActiveCfg = Release|x86
-		{2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Debug (x86)|Any CPU.ActiveCfg = Debug|x86
-		{2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Debug (x86)|Mixed Platforms.ActiveCfg = Debug|x86
-		{2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Debug (x86)|Mixed Platforms.Build.0 = Debug|x86
-		{2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Debug (x86)|Win32.ActiveCfg = Debug|x86
-		{2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Debug (x86)|Win32.Build.0 = Debug|x86
-		{2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Debug|Win32.ActiveCfg = Debug|x86
-		{2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Release (x86)|Any CPU.ActiveCfg = Release|x86
-		{2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Release (x86)|Mixed Platforms.ActiveCfg = Release|x86
-		{2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Release (x86)|Mixed Platforms.Build.0 = Release|x86
-		{2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Release (x86)|Win32.ActiveCfg = Release|x86
-		{2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Release (x86)|Win32.Build.0 = Release|x86
-		{2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Release|Any CPU.ActiveCfg = Release|x86
-		{2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Release|Mixed Platforms.Build.0 = Release|x86
-		{2F9E7A23-56C0-4286-9C8E-1060A9B2F073}.Release|Win32.ActiveCfg = Release|x86
 		{54577061-E2D2-4336-90A2-A9A7106A30CD}.Debug (x86)|Any CPU.ActiveCfg = Debug|x86
 		{54577061-E2D2-4336-90A2-A9A7106A30CD}.Debug (x86)|Mixed Platforms.ActiveCfg = Debug|x86
 		{54577061-E2D2-4336-90A2-A9A7106A30CD}.Debug (x86)|Mixed Platforms.Build.0 = Debug|x86
diff --git a/RulesConverter/RulesConverter.csproj b/RulesConverter/RulesConverter.csproj
index 4669eb6b9d..6f025e07b0 100644
--- a/RulesConverter/RulesConverter.csproj
+++ b/RulesConverter/RulesConverter.csproj
@@ -55,10 +55,6 @@
     <Compile Include="MiniYamlExts.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\OpenRa.DataStructures\OpenRa.DataStructures.csproj">
-      <Project>{2F9E7A23-56C0-4286-9C8E-1060A9B2F073}</Project>
-      <Name>OpenRa.DataStructures</Name>
-    </ProjectReference>
     <ProjectReference Include="..\OpenRa.FileFormats\OpenRa.FileFormats.csproj">
       <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
       <Name>OpenRa.FileFormats</Name>
diff --git a/SequenceEditor/SequenceEditor.csproj b/SequenceEditor/SequenceEditor.csproj
index 7b4bee80cf..c5d0d8285b 100644
--- a/SequenceEditor/SequenceEditor.csproj
+++ b/SequenceEditor/SequenceEditor.csproj
@@ -103,10 +103,6 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\OpenRa.DataStructures\OpenRa.DataStructures.csproj">
-      <Project>{2F9E7A23-56C0-4286-9C8E-1060A9B2F073}</Project>
-      <Name>OpenRa.DataStructures</Name>
-    </ProjectReference>
     <ProjectReference Include="..\OpenRa.FileFormats\OpenRa.FileFormats.csproj">
       <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
       <Name>OpenRa.FileFormats</Name>