From fec2823537e88bf79be32ca1d0be1348b63c03a5 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 22 Aug 2017 00:34:17 +0200
Subject: [PATCH] StyleResources -> ResourceDictionary.

And move it to the `Avalonia.Controls` namespace.
---
 .../StyleResources.cs => Controls/ResourceDictionary.cs}  | 6 +++---
 src/Avalonia.Styling/Styling/Style.cs                     | 7 ++++---
 tests/Avalonia.Styling.UnitTests/ResourceTests.cs         | 8 ++++----
 3 files changed, 11 insertions(+), 10 deletions(-)
 rename src/Avalonia.Styling/{Styling/StyleResources.cs => Controls/ResourceDictionary.cs} (95%)

diff --git a/src/Avalonia.Styling/Styling/StyleResources.cs b/src/Avalonia.Styling/Controls/ResourceDictionary.cs
similarity index 95%
rename from src/Avalonia.Styling/Styling/StyleResources.cs
rename to src/Avalonia.Styling/Controls/ResourceDictionary.cs
index e447c6adfd..96f523c83e 100644
--- a/src/Avalonia.Styling/Styling/StyleResources.cs
+++ b/src/Avalonia.Styling/Controls/ResourceDictionary.cs
@@ -2,12 +2,12 @@
 using System.Collections;
 using System.Collections.Generic;
 
-namespace Avalonia.Styling
+namespace Avalonia.Controls
 {
     /// <summary>
-    /// Holds resources for a <see cref="Style"/>.
+    /// An indexed dictionary of resources.
     /// </summary>
-    public class StyleResources : IDictionary<string, object>, IDictionary
+    public class ResourceDictionary : IDictionary<string, object>, IDictionary
     {
         private Dictionary<string, object> _inner = new Dictionary<string, object>();
 
diff --git a/src/Avalonia.Styling/Styling/Style.cs b/src/Avalonia.Styling/Styling/Style.cs
index 3dfd9118af..d7df465722 100644
--- a/src/Avalonia.Styling/Styling/Style.cs
+++ b/src/Avalonia.Styling/Styling/Style.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reactive.Linq;
+using Avalonia.Controls;
 using Avalonia.Metadata;
 
 namespace Avalonia.Styling
@@ -16,7 +17,7 @@ namespace Avalonia.Styling
         private static Dictionary<IStyleable, List<IDisposable>> _applied =
             new Dictionary<IStyleable, List<IDisposable>>();
 
-        private StyleResources _resources;
+        private ResourceDictionary _resources;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Style"/> class.
@@ -37,13 +38,13 @@ namespace Avalonia.Styling
         /// <summary>
         /// Gets or sets a dictionary of style resources.
         /// </summary>
-        public StyleResources Resources
+        public ResourceDictionary Resources
         {
             get
             {
                 if (_resources == null)
                 {
-                    _resources = new StyleResources();
+                    _resources = new ResourceDictionary();
                 }
 
                 return _resources;
diff --git a/tests/Avalonia.Styling.UnitTests/ResourceTests.cs b/tests/Avalonia.Styling.UnitTests/ResourceTests.cs
index a2535e0fb5..1efd043f6a 100644
--- a/tests/Avalonia.Styling.UnitTests/ResourceTests.cs
+++ b/tests/Avalonia.Styling.UnitTests/ResourceTests.cs
@@ -20,7 +20,7 @@ namespace Avalonia.Styling.UnitTests
                 {
                     new Style
                     {
-                        Resources = new StyleResources
+                        Resources = new ResourceDictionary
                         {
                             { "Foo", "foo resource" },
                             { "Bar", "overridden" },
@@ -33,14 +33,14 @@ namespace Avalonia.Styling.UnitTests
                     {
                         new Style
                         {
-                            Resources = new StyleResources
+                            Resources = new ResourceDictionary
                             {
                                 { "Bar", "again overridden" },
                             }
                         },
                         new Style
                         {
-                            Resources = new StyleResources
+                            Resources = new ResourceDictionary
                             {
                                 { "Bar", "bar resource" },
                             }
@@ -64,7 +64,7 @@ namespace Avalonia.Styling.UnitTests
                     {
                         new Style
                         {
-                            Resources = new StyleResources
+                            Resources = new ResourceDictionary
                             {
                                 { "Foo", "foo" },
                             }