From 41cb6b68b6cc42d0998ff912cf48d55ed6e2f3e8 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 7 Nov 2015 13:03:17 +0100
Subject: [PATCH] Moved ControlLocator out of Data namespace.

---
 src/Markup/Perspex.Markup/{Data => }/ControlLocator.cs         | 2 +-
 src/Markup/Perspex.Markup/Perspex.Markup.csproj                | 2 +-
 .../Perspex.Markup.UnitTests/{Data => }/ControlLocatorTests.cs | 3 +--
 tests/Perspex.Markup.UnitTests/Perspex.Markup.UnitTests.csproj | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)
 rename src/Markup/Perspex.Markup/{Data => }/ControlLocator.cs (98%)
 rename tests/Perspex.Markup.UnitTests/{Data => }/ControlLocatorTests.cs (98%)

diff --git a/src/Markup/Perspex.Markup/Data/ControlLocator.cs b/src/Markup/Perspex.Markup/ControlLocator.cs
similarity index 98%
rename from src/Markup/Perspex.Markup/Data/ControlLocator.cs
rename to src/Markup/Perspex.Markup/ControlLocator.cs
index 082741ae06..36330d89c5 100644
--- a/src/Markup/Perspex.Markup/Data/ControlLocator.cs
+++ b/src/Markup/Perspex.Markup/ControlLocator.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Reactive.Linq;
 using Perspex.Controls;
 
-namespace Perspex.Markup.Data
+namespace Perspex.Markup
 {
     /// <summary>
     /// Locates controls relative to other controls.
diff --git a/src/Markup/Perspex.Markup/Perspex.Markup.csproj b/src/Markup/Perspex.Markup/Perspex.Markup.csproj
index 02ee1b1113..0fc06f2499 100644
--- a/src/Markup/Perspex.Markup/Perspex.Markup.csproj
+++ b/src/Markup/Perspex.Markup/Perspex.Markup.csproj
@@ -42,7 +42,7 @@
     <Compile Include="Data\ExpressionNodeBuilder.cs" />
     <Compile Include="Data\ExpressionParseException.cs" />
     <Compile Include="Data\ExpressionSubject.cs" />
-    <Compile Include="Data\ControlLocator.cs" />
+    <Compile Include="ControlLocator.cs" />
     <Compile Include="Data\Plugins\PerspexPropertyAccessorPlugin.cs" />
     <Compile Include="Data\Plugins\InpcPropertyAccessorPlugin.cs" />
     <Compile Include="Data\Plugins\IPropertyAccessor.cs" />
diff --git a/tests/Perspex.Markup.UnitTests/Data/ControlLocatorTests.cs b/tests/Perspex.Markup.UnitTests/ControlLocatorTests.cs
similarity index 98%
rename from tests/Perspex.Markup.UnitTests/Data/ControlLocatorTests.cs
rename to tests/Perspex.Markup.UnitTests/ControlLocatorTests.cs
index 9e14ce832b..14286479c2 100644
--- a/tests/Perspex.Markup.UnitTests/Data/ControlLocatorTests.cs
+++ b/tests/Perspex.Markup.UnitTests/ControlLocatorTests.cs
@@ -5,10 +5,9 @@ using System;
 using System.Collections.Generic;
 using System.Reactive.Linq;
 using Perspex.Controls;
-using Perspex.Markup.Data;
 using Xunit;
 
-namespace Perspex.Markup.UnitTests.Data
+namespace Perspex.Markup.UnitTests
 {
     public class ControlLocatorTests
     {
diff --git a/tests/Perspex.Markup.UnitTests/Perspex.Markup.UnitTests.csproj b/tests/Perspex.Markup.UnitTests/Perspex.Markup.UnitTests.csproj
index 8c453f9435..1bc9e09112 100644
--- a/tests/Perspex.Markup.UnitTests/Perspex.Markup.UnitTests.csproj
+++ b/tests/Perspex.Markup.UnitTests/Perspex.Markup.UnitTests.csproj
@@ -77,7 +77,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Data\ControlLocatorTests.cs" />
+    <Compile Include="ControlLocatorTests.cs" />
     <Compile Include="Data\ExpressionNodeBuilderTests.cs" />
     <Compile Include="Data\ExpressionNodeBuilderTests_Errors.cs" />
     <Compile Include="Data\ExpressionObserverTests_Indexer.cs" />