From a72c3e46bf33be1123ebc0115076669512381f1c Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 18 Feb 2016 23:07:10 +0100
Subject: [PATCH] Moved ILogical to Perspex.LogicalTree.

---
 src/Perspex.Controls/Control.cs                             | 1 +
 src/Perspex.Controls/IControl.cs                            | 1 +
 src/Perspex.Controls/ISetLogicalParent.cs                   | 2 ++
 src/Perspex.Controls/ItemsControl.cs                        | 1 +
 src/Perspex.Controls/Mixins/ContentControlMixin.cs          | 1 +
 src/Perspex.Controls/Panel.cs                               | 1 +
 src/Perspex.Controls/Presenters/ContentPresenter.cs         | 1 +
 src/Perspex.Diagnostics/ViewModels/LogicalTreeNode.cs       | 1 +
 src/Perspex.Styling/{ => LogicalTree}/ILogical.cs           | 2 +-
 src/Perspex.Styling/Perspex.Styling.csproj                  | 2 +-
 src/Perspex.Styling/Styling/Selectors.cs                    | 1 +
 tests/Perspex.Controls.UnitTests/DecoratorTests.cs          | 1 +
 tests/Perspex.Styling.UnitTests/SelectorTests_Child.cs      | 1 +
 tests/Perspex.Styling.UnitTests/SelectorTests_Descendent.cs | 1 +
 14 files changed, 15 insertions(+), 2 deletions(-)
 rename src/Perspex.Styling/{ => LogicalTree}/ILogical.cs (96%)

diff --git a/src/Perspex.Controls/Control.cs b/src/Perspex.Controls/Control.cs
index 8a70ba201f..badec4b788 100644
--- a/src/Perspex.Controls/Control.cs
+++ b/src/Perspex.Controls/Control.cs
@@ -14,6 +14,7 @@ using Perspex.Controls.Templates;
 using Perspex.Data;
 using Perspex.Input;
 using Perspex.Interactivity;
+using Perspex.LogicalTree;
 using Perspex.Styling;
 
 namespace Perspex.Controls
diff --git a/src/Perspex.Controls/IControl.cs b/src/Perspex.Controls/IControl.cs
index a76fda9c01..7baa03fb9b 100644
--- a/src/Perspex.Controls/IControl.cs
+++ b/src/Perspex.Controls/IControl.cs
@@ -5,6 +5,7 @@ using System;
 using Perspex.Controls.Templates;
 using Perspex.Input;
 using Perspex.Layout;
+using Perspex.LogicalTree;
 using Perspex.Styling;
 
 namespace Perspex.Controls
diff --git a/src/Perspex.Controls/ISetLogicalParent.cs b/src/Perspex.Controls/ISetLogicalParent.cs
index 8ead31b4c6..9b8e0a00f2 100644
--- a/src/Perspex.Controls/ISetLogicalParent.cs
+++ b/src/Perspex.Controls/ISetLogicalParent.cs
@@ -1,6 +1,8 @@
 // Copyright (c) The Perspex Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using Perspex.LogicalTree;
+
 namespace Perspex.Controls
 {
     /// <summary>
diff --git a/src/Perspex.Controls/ItemsControl.cs b/src/Perspex.Controls/ItemsControl.cs
index 76d2133dc2..27028cba4b 100644
--- a/src/Perspex.Controls/ItemsControl.cs
+++ b/src/Perspex.Controls/ItemsControl.cs
@@ -12,6 +12,7 @@ using Perspex.Controls.Presenters;
 using Perspex.Controls.Primitives;
 using Perspex.Controls.Templates;
 using Perspex.Controls.Utils;
+using Perspex.LogicalTree;
 using Perspex.Metadata;
 
 namespace Perspex.Controls
diff --git a/src/Perspex.Controls/Mixins/ContentControlMixin.cs b/src/Perspex.Controls/Mixins/ContentControlMixin.cs
index a935fafc00..b1fc17624b 100644
--- a/src/Perspex.Controls/Mixins/ContentControlMixin.cs
+++ b/src/Perspex.Controls/Mixins/ContentControlMixin.cs
@@ -8,6 +8,7 @@ using Perspex.Collections;
 using Perspex.Controls.Presenters;
 using Perspex.Controls.Primitives;
 using Perspex.Interactivity;
+using Perspex.LogicalTree;
 using Perspex.Styling;
 
 namespace Perspex.Controls.Mixins
diff --git a/src/Perspex.Controls/Panel.cs b/src/Perspex.Controls/Panel.cs
index fc80cc1656..ec87c5ba18 100644
--- a/src/Perspex.Controls/Panel.cs
+++ b/src/Perspex.Controls/Panel.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
+using Perspex.LogicalTree;
 using Perspex.Media;
 using Perspex.Metadata;
 
diff --git a/src/Perspex.Controls/Presenters/ContentPresenter.cs b/src/Perspex.Controls/Presenters/ContentPresenter.cs
index 23cd87d5dd..246db77c46 100644
--- a/src/Perspex.Controls/Presenters/ContentPresenter.cs
+++ b/src/Perspex.Controls/Presenters/ContentPresenter.cs
@@ -3,6 +3,7 @@
 
 using Perspex.Controls.Primitives;
 using Perspex.Controls.Templates;
+using Perspex.LogicalTree;
 
 namespace Perspex.Controls.Presenters
 {
diff --git a/src/Perspex.Diagnostics/ViewModels/LogicalTreeNode.cs b/src/Perspex.Diagnostics/ViewModels/LogicalTreeNode.cs
index bef186b246..e71163292e 100644
--- a/src/Perspex.Diagnostics/ViewModels/LogicalTreeNode.cs
+++ b/src/Perspex.Diagnostics/ViewModels/LogicalTreeNode.cs
@@ -3,6 +3,7 @@
 
 using System;
 using Perspex.Controls;
+using Perspex.LogicalTree;
 using ReactiveUI;
 
 namespace Perspex.Diagnostics.ViewModels
diff --git a/src/Perspex.Styling/ILogical.cs b/src/Perspex.Styling/LogicalTree/ILogical.cs
similarity index 96%
rename from src/Perspex.Styling/ILogical.cs
rename to src/Perspex.Styling/LogicalTree/ILogical.cs
index b1f5ded5b6..2d3faa2020 100644
--- a/src/Perspex.Styling/ILogical.cs
+++ b/src/Perspex.Styling/LogicalTree/ILogical.cs
@@ -3,7 +3,7 @@
 
 using Perspex.Collections;
 
-namespace Perspex
+namespace Perspex.LogicalTree
 {
     /// <summary>
     /// Represents a node in the logical tree.
diff --git a/src/Perspex.Styling/Perspex.Styling.csproj b/src/Perspex.Styling/Perspex.Styling.csproj
index 92edaa3db6..39ed053d7b 100644
--- a/src/Perspex.Styling/Perspex.Styling.csproj
+++ b/src/Perspex.Styling/Perspex.Styling.csproj
@@ -43,7 +43,7 @@
     <Compile Include="..\Shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="ILogical.cs" />
+    <Compile Include="LogicalTree\ILogical.cs" />
     <Compile Include="LogicalTree\LogicalExtensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Styling\ActivatedSubject.cs" />
diff --git a/src/Perspex.Styling/Styling/Selectors.cs b/src/Perspex.Styling/Styling/Selectors.cs
index 3c88cac0a6..14d9d0d4be 100644
--- a/src/Perspex.Styling/Styling/Selectors.cs
+++ b/src/Perspex.Styling/Styling/Selectors.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using System.Reactive;
 using System.Reactive.Linq;
 using System.Reflection;
+using Perspex.LogicalTree;
 
 namespace Perspex.Styling
 {
diff --git a/tests/Perspex.Controls.UnitTests/DecoratorTests.cs b/tests/Perspex.Controls.UnitTests/DecoratorTests.cs
index 84be13c397..da102c5cf1 100644
--- a/tests/Perspex.Controls.UnitTests/DecoratorTests.cs
+++ b/tests/Perspex.Controls.UnitTests/DecoratorTests.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Specialized;
 using System.Linq;
+using Perspex.LogicalTree;
 using Xunit;
 
 namespace Perspex.Controls.UnitTests
diff --git a/tests/Perspex.Styling.UnitTests/SelectorTests_Child.cs b/tests/Perspex.Styling.UnitTests/SelectorTests_Child.cs
index 427a806376..3d58006145 100644
--- a/tests/Perspex.Styling.UnitTests/SelectorTests_Child.cs
+++ b/tests/Perspex.Styling.UnitTests/SelectorTests_Child.cs
@@ -9,6 +9,7 @@ using System.Reactive.Linq;
 using Perspex.Collections;
 using Perspex.Controls;
 using Perspex.Data;
+using Perspex.LogicalTree;
 using Xunit;
 
 namespace Perspex.Styling.UnitTests
diff --git a/tests/Perspex.Styling.UnitTests/SelectorTests_Descendent.cs b/tests/Perspex.Styling.UnitTests/SelectorTests_Descendent.cs
index fab2f15a97..7e1bd429d1 100644
--- a/tests/Perspex.Styling.UnitTests/SelectorTests_Descendent.cs
+++ b/tests/Perspex.Styling.UnitTests/SelectorTests_Descendent.cs
@@ -9,6 +9,7 @@ using System.Threading.Tasks;
 using Perspex.Collections;
 using Perspex.Controls;
 using Perspex.Data;
+using Perspex.LogicalTree;
 using Xunit;
 
 namespace Perspex.Styling.UnitTests