From f2aa9fdd84d8351229de51e1b47f76fbe12c3fb3 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 28 Feb 2015 23:19:09 +0100
Subject: [PATCH] Moved DataTemplateExtensions to Templates n.s.

---
 Perspex.Controls/Generators/ItemContainerGenerator.cs      | 1 +
 Perspex.Controls/Generators/TreeItemContainerGenerator.cs  | 1 +
 Perspex.Controls/Generators/TypedItemContainerGenerator.cs | 2 ++
 Perspex.Controls/Perspex.Controls.csproj                   | 2 +-
 Perspex.Controls/Presenters/ContentPresenter.cs            | 1 +
 Perspex.Controls/{ => Templates}/DataTemplateExtensions.cs | 2 +-
 6 files changed, 7 insertions(+), 2 deletions(-)
 rename Perspex.Controls/{ => Templates}/DataTemplateExtensions.cs (98%)

diff --git a/Perspex.Controls/Generators/ItemContainerGenerator.cs b/Perspex.Controls/Generators/ItemContainerGenerator.cs
index 4995facef1..f89c0209e6 100644
--- a/Perspex.Controls/Generators/ItemContainerGenerator.cs
+++ b/Perspex.Controls/Generators/ItemContainerGenerator.cs
@@ -10,6 +10,7 @@ namespace Perspex.Controls.Generators
     using System.Collections;
     using System.Collections.Generic;
     using System.Linq;
+    using Perspex.Controls.Templates;
 
     public class ItemContainerGenerator : IItemContainerGenerator
     {
diff --git a/Perspex.Controls/Generators/TreeItemContainerGenerator.cs b/Perspex.Controls/Generators/TreeItemContainerGenerator.cs
index e8688aa3ba..d5ecd58e83 100644
--- a/Perspex.Controls/Generators/TreeItemContainerGenerator.cs
+++ b/Perspex.Controls/Generators/TreeItemContainerGenerator.cs
@@ -10,6 +10,7 @@ namespace Perspex.Controls.Generators
     using System.Collections;
     using System.Collections.Generic;
     using System.Linq;
+    using Perspex.Controls.Templates;
 
     public class TreeItemContainerGenerator<T> : ItemContainerGenerator, IItemContainerGenerator where T : TreeViewItem, new()
     {
diff --git a/Perspex.Controls/Generators/TypedItemContainerGenerator.cs b/Perspex.Controls/Generators/TypedItemContainerGenerator.cs
index 489e6457ef..5c30333665 100644
--- a/Perspex.Controls/Generators/TypedItemContainerGenerator.cs
+++ b/Perspex.Controls/Generators/TypedItemContainerGenerator.cs
@@ -6,6 +6,8 @@
 
 namespace Perspex.Controls.Generators
 {
+    using Perspex.Controls.Templates;
+
     public class TypedItemContainerGenerator<T> : ItemContainerGenerator where T : ContentControl, new()
     {
         public TypedItemContainerGenerator(ItemsControl owner)
diff --git a/Perspex.Controls/Perspex.Controls.csproj b/Perspex.Controls/Perspex.Controls.csproj
index b7e2445b7d..a09cad280f 100644
--- a/Perspex.Controls/Perspex.Controls.csproj
+++ b/Perspex.Controls/Perspex.Controls.csproj
@@ -60,7 +60,7 @@
     <Compile Include="ControlExtensions.cs" />
     <Compile Include="Controls.cs" />
     <Compile Include="ControlTemplate.cs" />
-    <Compile Include="DataTemplateExtensions.cs" />
+    <Compile Include="Templates\DataTemplateExtensions.cs" />
     <Compile Include="DataTemplate.cs" />
     <Compile Include="Generators\TreeItemContainerGenerator.cs" />
     <Compile Include="Generators\TypedItemContainerGenerator.cs" />
diff --git a/Perspex.Controls/Presenters/ContentPresenter.cs b/Perspex.Controls/Presenters/ContentPresenter.cs
index 9522bfde0b..96e5e1a966 100644
--- a/Perspex.Controls/Presenters/ContentPresenter.cs
+++ b/Perspex.Controls/Presenters/ContentPresenter.cs
@@ -12,6 +12,7 @@ namespace Perspex.Controls.Presenters
     using System.Reactive.Subjects;
     using Perspex.Collections;
     using Perspex.Controls.Primitives;
+    using Perspex.Controls.Templates;
     using Perspex.Media;
 
     public class ContentPresenter : Control, IVisual, ILogical, IPresenter
diff --git a/Perspex.Controls/DataTemplateExtensions.cs b/Perspex.Controls/Templates/DataTemplateExtensions.cs
similarity index 98%
rename from Perspex.Controls/DataTemplateExtensions.cs
rename to Perspex.Controls/Templates/DataTemplateExtensions.cs
index 46de4be280..ac196ce16f 100644
--- a/Perspex.Controls/DataTemplateExtensions.cs
+++ b/Perspex.Controls/Templates/DataTemplateExtensions.cs
@@ -4,7 +4,7 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
-namespace Perspex.Controls
+namespace Perspex.Controls.Templates
 {
     using System.Linq;
     using Perspex.LogicalTree;