From 40099d9d22932589c7c147ff415a23dd2fcab0fd Mon Sep 17 00:00:00 2001
From: "agrath@gmail.com" <unknown@kiln.example.com>
Date: Sat, 21 May 2011 14:55:10 -1200
Subject: [PATCH] Made DynamicNode and DynamicMedia share an intermediary base
 class (that inherits from DynamicObject) rather than both inheriting from
 DynamicObject directly Want to share some functionality between them

---
 .../RazorDynamicNode/DynamicBase.cs                  | 12 ++++++++++++
 .../RazorDynamicNode/DynamicMedia.cs                 |  2 +-
 .../RazorDynamicNode/DynamicNode.cs                  |  6 +++---
 .../umbraco.MacroEngines.csproj                      |  1 +
 4 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicBase.cs

diff --git a/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicBase.cs b/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicBase.cs
new file mode 100644
index 0000000000..d00a54af60
--- /dev/null
+++ b/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicBase.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Dynamic;
+
+namespace umbraco.MacroEngines
+{
+    public class DynamicBase : DynamicObject
+    {
+    }
+}
diff --git a/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicMedia.cs b/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicMedia.cs
index 651215aeda..6efee66421 100644
--- a/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicMedia.cs
+++ b/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicMedia.cs
@@ -8,7 +8,7 @@ using umbraco.cms.businesslogic.property;
 
 namespace umbraco.MacroEngines
 {
-    public class DynamicMedia : DynamicObject
+    public class DynamicMedia : DynamicBase
     {
         private Dictionary<string, string> _propertyCache;
         private Media _media;
diff --git a/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicNode.cs b/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicNode.cs
index 126067c1f2..f7c59164e5 100644
--- a/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicNode.cs
+++ b/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicNode.cs
@@ -19,7 +19,7 @@ using System.Xml.Linq;
 
 namespace umbraco.MacroEngines
 {
-    public class DynamicNode : DynamicObject
+    public class DynamicNode : DynamicBase
     {
         #region consts
         // these are private readonlys as const can't be Guids
@@ -329,12 +329,12 @@ namespace umbraco.MacroEngines
             List<string> list = new List<string>();
             if (node != null)
             {
-                
+
                 //find the doctype node, so we can walk it's parent's tree- not the working.parent content tree
                 CMSNode working = ContentType.GetByAlias(node.NodeTypeAlias);
                 while (working != null)
                 {
-                    if((working as ContentType) != null)
+                    if ((working as ContentType) != null)
                     {
                         list.Add((working as ContentType).Alias);
                     }
diff --git a/umbraco.MacroEngines.Juno/umbraco.MacroEngines.csproj b/umbraco.MacroEngines.Juno/umbraco.MacroEngines.csproj
index 90e88e6453..554bb86067 100644
--- a/umbraco.MacroEngines.Juno/umbraco.MacroEngines.csproj
+++ b/umbraco.MacroEngines.Juno/umbraco.MacroEngines.csproj
@@ -61,6 +61,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="RazorCore\BaseContext.cs" />
+    <Compile Include="RazorDynamicNode\DynamicBase.cs" />
     <Compile Include="RazorDynamicNode\DynamicMediaList.cs" />
     <Compile Include="RazorDynamicNode\DynamicNodeList.cs" />
     <Compile Include="RazorDynamicNode\RazorLibraryCore.cs" />