From c6483f03809f7480485564ffa557bb30e2f266fb Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 17 Jan 2013 09:16:45 -0100
Subject: [PATCH] Revert e4bb9041cf54 as it was a breaking change

---
 src/Umbraco.Core/Dynamics/DynamicXml.cs       | 12 ----
 .../Dynamics/DynamicXmlConverter.cs           | 59 -------------------
 src/Umbraco.Core/Umbraco.Core.csproj          |  1 -
 .../PublishedContent/DynamicXmlTests.cs       | 57 ------------------
 4 files changed, 129 deletions(-)
 delete mode 100644 src/Umbraco.Core/Dynamics/DynamicXmlConverter.cs

diff --git a/src/Umbraco.Core/Dynamics/DynamicXml.cs b/src/Umbraco.Core/Dynamics/DynamicXml.cs
index 0a1ed5ed3b..1c9bfdd5b5 100644
--- a/src/Umbraco.Core/Dynamics/DynamicXml.cs
+++ b/src/Umbraco.Core/Dynamics/DynamicXml.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Linq;
 using System.Dynamic;
 using System.Reflection;
@@ -12,7 +11,6 @@ using System.Web;
 
 namespace Umbraco.Core.Dynamics
 {
-    [TypeConverter(typeof(DynamicXmlConverter))]
     public class DynamicXml : DynamicObject, IEnumerable<DynamicXml>, IEnumerable<XElement>
     {
         public XElement BaseElement { get; set; }
@@ -215,16 +213,6 @@ namespace Umbraco.Core.Dynamics
             }
             return root;
         }
-
-        /// <summary>
-        /// Return the string version of Xml
-        /// </summary>
-        /// <returns></returns>
-        public override string ToString()
-        {
-            return ToXml();
-        }
-
         public IHtmlString ToHtml()
         {
             return new HtmlString(this.ToXml());
diff --git a/src/Umbraco.Core/Dynamics/DynamicXmlConverter.cs b/src/Umbraco.Core/Dynamics/DynamicXmlConverter.cs
deleted file mode 100644
index 45ac9290c0..0000000000
--- a/src/Umbraco.Core/Dynamics/DynamicXmlConverter.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Globalization;
-using System.Linq;
-using System.Xml;
-using System.Xml.Linq;
-
-namespace Umbraco.Core.Dynamics
-{
-    /// <summary>
-    /// A custom type converter for DynamicXml
-    /// </summary>
-    public class DynamicXmlConverter : TypeConverter
-    {
-        public override bool CanConvertTo(ITypeDescriptorContext context, Type sourceType)
-        {
-            var convertableTypes = new[] { typeof(string), typeof(XElement), typeof(XmlElement), typeof(XmlDocument) };
-
-            return convertableTypes.Any(x => TypeHelper.IsTypeAssignableFrom(x, sourceType))
-                   || base.CanConvertFrom(context, sourceType);
-        }
-
-        public override object ConvertTo(
-            ITypeDescriptorContext context,
-            CultureInfo culture,
-            object value,
-            Type destinationType)
-        {
-            var dxml = value as DynamicXml;
-            if (dxml == null)
-                return null;
-            //string
-            if (TypeHelper.IsTypeAssignableFrom<string>(destinationType))
-            {
-                return value.ToString();
-            }
-            //XElement
-            if (TypeHelper.IsTypeAssignableFrom<XElement>(destinationType))
-            {
-                return dxml.BaseElement;
-            }
-            //XmlElement
-            if (TypeHelper.IsTypeAssignableFrom<XmlElement>(destinationType))
-            {
-                var xDoc = new XmlDocument();
-                xDoc.LoadXml(dxml.ToString());
-                return xDoc.DocumentElement;
-            }
-            //XmlDocument
-            if (TypeHelper.IsTypeAssignableFrom<XmlDocument>(destinationType))
-            {
-                var xDoc = new XmlDocument();
-                xDoc.LoadXml(dxml.ToString());
-                return xDoc;
-            }
-            return base.ConvertTo(context, culture, value, destinationType);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 4ebdac20df..672bed94a7 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -66,7 +66,6 @@
     <Compile Include="Dictionary\CultureDictionaryFactoryResolver.cs" />
     <Compile Include="Dictionary\ICultureDictionaryFactory.cs" />
     <Compile Include="Dynamics\DynamicInstanceHelper.cs" />
-    <Compile Include="Dynamics\DynamicXmlConverter.cs" />
     <Compile Include="Enum.cs" />
     <Compile Include="HashCodeCombiner.cs" />
     <Compile Include="IO\FileSystemWrapper.cs" />
diff --git a/src/Umbraco.Tests/PublishedContent/DynamicXmlTests.cs b/src/Umbraco.Tests/PublishedContent/DynamicXmlTests.cs
index 1e5b169319..295ca8d0bb 100644
--- a/src/Umbraco.Tests/PublishedContent/DynamicXmlTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/DynamicXmlTests.cs
@@ -1,69 +1,12 @@
 using System;
 using System.Diagnostics;
-using System.Xml;
-using System.Xml.Linq;
 using Microsoft.CSharp.RuntimeBinder;
 using NUnit.Framework;
 using Umbraco.Core.Dynamics;
 using System.Linq;
-using Umbraco.Tests.PartialTrust;
-using Umbraco.Core;
 
 namespace Umbraco.Tests.PublishedContent
 {
-    [TestFixture]
-    public class DynamicXmlConverterTests : AbstractPartialTrustFixture<DynamicXmlConverterTests>
-    {
-        [Test]
-        public void Convert_To_String()
-        {
-            var xml = "<DAMP fullMedia=\"\"><mediaItem><Image id=\"1057\" version=\"d58d5c16-153e-4896-892f-a722e45a69af\" parentID=\"-1\" level=\"1\" writerID=\"0\" nodeType=\"1032\" template=\"0\" sortOrder=\"1\" createDate=\"2012-11-05T16:55:29\" updateDate=\"2012-11-05T16:55:44\" nodeName=\"test12\" urlName=\"test12\" writerName=\"admin\" nodeTypeAlias=\"Image\" path=\"-1,1057\"><umbracoFile>/media/54/tulips.jpg</umbracoFile><umbracoWidth>1024</umbracoWidth><umbracoHeight>768</umbracoHeight><umbracoBytes>620888</umbracoBytes><umbracoExtension>jpg</umbracoExtension><newsCrops><crops date=\"2012-11-05T16:55:34\"><crop name=\"thumbCrop\" x=\"154\" y=\"1\" x2=\"922\" y2=\"768\" url=\"/media/54/tulips_thumbCrop.jpg\" /></crops></newsCrops></Image></mediaItem><mediaItem><Image id=\"1055\" version=\"4df1f08a-3552-45f2-b4bf-fa980c762f4a\" parentID=\"-1\" level=\"1\" writerID=\"0\" nodeType=\"1032\" template=\"0\" sortOrder=\"1\" createDate=\"2012-11-05T16:29:58\" updateDate=\"2012-11-05T16:30:27\" nodeName=\"Test\" urlName=\"test\" writerName=\"admin\" nodeTypeAlias=\"Image\" path=\"-1,1055\"><umbracoFile>/media/41/hydrangeas.jpg</umbracoFile><umbracoWidth>1024</umbracoWidth><umbracoHeight>768</umbracoHeight><umbracoBytes>595284</umbracoBytes><umbracoExtension>jpg</umbracoExtension><newsCrops><crops date=\"2012-11-05T16:30:18\"><crop name=\"thumbCrop\" x=\"133\" y=\"0\" x2=\"902\" y2=\"768\" url=\"/media/41/hydrangeas_thumbCrop.jpg\" /></crops></newsCrops></Image></mediaItem></DAMP>";
-            var dXml = new DynamicXml(xml);
-            var result = dXml.TryConvertTo<string>();
-            Assert.IsTrue(result.Success);
-            Assert.AreEqual(xml, result.Result);
-        }
-
-        [Test]
-        public void Convert_To_XElement()
-        {
-            var xml = "<DAMP fullMedia=\"\"><mediaItem><Image id=\"1057\" version=\"d58d5c16-153e-4896-892f-a722e45a69af\" parentID=\"-1\" level=\"1\" writerID=\"0\" nodeType=\"1032\" template=\"0\" sortOrder=\"1\" createDate=\"2012-11-05T16:55:29\" updateDate=\"2012-11-05T16:55:44\" nodeName=\"test12\" urlName=\"test12\" writerName=\"admin\" nodeTypeAlias=\"Image\" path=\"-1,1057\"><umbracoFile>/media/54/tulips.jpg</umbracoFile><umbracoWidth>1024</umbracoWidth><umbracoHeight>768</umbracoHeight><umbracoBytes>620888</umbracoBytes><umbracoExtension>jpg</umbracoExtension><newsCrops><crops date=\"2012-11-05T16:55:34\"><crop name=\"thumbCrop\" x=\"154\" y=\"1\" x2=\"922\" y2=\"768\" url=\"/media/54/tulips_thumbCrop.jpg\" /></crops></newsCrops></Image></mediaItem><mediaItem><Image id=\"1055\" version=\"4df1f08a-3552-45f2-b4bf-fa980c762f4a\" parentID=\"-1\" level=\"1\" writerID=\"0\" nodeType=\"1032\" template=\"0\" sortOrder=\"1\" createDate=\"2012-11-05T16:29:58\" updateDate=\"2012-11-05T16:30:27\" nodeName=\"Test\" urlName=\"test\" writerName=\"admin\" nodeTypeAlias=\"Image\" path=\"-1,1055\"><umbracoFile>/media/41/hydrangeas.jpg</umbracoFile><umbracoWidth>1024</umbracoWidth><umbracoHeight>768</umbracoHeight><umbracoBytes>595284</umbracoBytes><umbracoExtension>jpg</umbracoExtension><newsCrops><crops date=\"2012-11-05T16:30:18\"><crop name=\"thumbCrop\" x=\"133\" y=\"0\" x2=\"902\" y2=\"768\" url=\"/media/41/hydrangeas_thumbCrop.jpg\" /></crops></newsCrops></Image></mediaItem></DAMP>";
-            var dXml = new DynamicXml(xml);
-            var result = dXml.TryConvertTo<XElement>();
-            Assert.IsTrue(result.Success);
-            Assert.AreEqual(xml, result.Result.ToString(SaveOptions.DisableFormatting));
-        }
-
-        [Test]
-        public void Convert_To_XmlElement()
-        {
-            var xml = "<DAMP fullMedia=\"\"><mediaItem><Image id=\"1057\" version=\"d58d5c16-153e-4896-892f-a722e45a69af\" parentID=\"-1\" level=\"1\" writerID=\"0\" nodeType=\"1032\" template=\"0\" sortOrder=\"1\" createDate=\"2012-11-05T16:55:29\" updateDate=\"2012-11-05T16:55:44\" nodeName=\"test12\" urlName=\"test12\" writerName=\"admin\" nodeTypeAlias=\"Image\" path=\"-1,1057\"><umbracoFile>/media/54/tulips.jpg</umbracoFile><umbracoWidth>1024</umbracoWidth><umbracoHeight>768</umbracoHeight><umbracoBytes>620888</umbracoBytes><umbracoExtension>jpg</umbracoExtension><newsCrops><crops date=\"2012-11-05T16:55:34\"><crop name=\"thumbCrop\" x=\"154\" y=\"1\" x2=\"922\" y2=\"768\" url=\"/media/54/tulips_thumbCrop.jpg\" /></crops></newsCrops></Image></mediaItem><mediaItem><Image id=\"1055\" version=\"4df1f08a-3552-45f2-b4bf-fa980c762f4a\" parentID=\"-1\" level=\"1\" writerID=\"0\" nodeType=\"1032\" template=\"0\" sortOrder=\"1\" createDate=\"2012-11-05T16:29:58\" updateDate=\"2012-11-05T16:30:27\" nodeName=\"Test\" urlName=\"test\" writerName=\"admin\" nodeTypeAlias=\"Image\" path=\"-1,1055\"><umbracoFile>/media/41/hydrangeas.jpg</umbracoFile><umbracoWidth>1024</umbracoWidth><umbracoHeight>768</umbracoHeight><umbracoBytes>595284</umbracoBytes><umbracoExtension>jpg</umbracoExtension><newsCrops><crops date=\"2012-11-05T16:30:18\"><crop name=\"thumbCrop\" x=\"133\" y=\"0\" x2=\"902\" y2=\"768\" url=\"/media/41/hydrangeas_thumbCrop.jpg\" /></crops></newsCrops></Image></mediaItem></DAMP>";
-            var dXml = new DynamicXml(xml);
-            var result = dXml.TryConvertTo<XmlElement>();
-            Assert.IsTrue(result.Success);
-            Assert.AreEqual(xml, result.Result.OuterXml);
-        }
-
-        [Test]
-        public void Convert_To_XmlDocument()
-        {
-            var xml = "<DAMP fullMedia=\"\"><mediaItem><Image id=\"1057\" version=\"d58d5c16-153e-4896-892f-a722e45a69af\" parentID=\"-1\" level=\"1\" writerID=\"0\" nodeType=\"1032\" template=\"0\" sortOrder=\"1\" createDate=\"2012-11-05T16:55:29\" updateDate=\"2012-11-05T16:55:44\" nodeName=\"test12\" urlName=\"test12\" writerName=\"admin\" nodeTypeAlias=\"Image\" path=\"-1,1057\"><umbracoFile>/media/54/tulips.jpg</umbracoFile><umbracoWidth>1024</umbracoWidth><umbracoHeight>768</umbracoHeight><umbracoBytes>620888</umbracoBytes><umbracoExtension>jpg</umbracoExtension><newsCrops><crops date=\"2012-11-05T16:55:34\"><crop name=\"thumbCrop\" x=\"154\" y=\"1\" x2=\"922\" y2=\"768\" url=\"/media/54/tulips_thumbCrop.jpg\" /></crops></newsCrops></Image></mediaItem><mediaItem><Image id=\"1055\" version=\"4df1f08a-3552-45f2-b4bf-fa980c762f4a\" parentID=\"-1\" level=\"1\" writerID=\"0\" nodeType=\"1032\" template=\"0\" sortOrder=\"1\" createDate=\"2012-11-05T16:29:58\" updateDate=\"2012-11-05T16:30:27\" nodeName=\"Test\" urlName=\"test\" writerName=\"admin\" nodeTypeAlias=\"Image\" path=\"-1,1055\"><umbracoFile>/media/41/hydrangeas.jpg</umbracoFile><umbracoWidth>1024</umbracoWidth><umbracoHeight>768</umbracoHeight><umbracoBytes>595284</umbracoBytes><umbracoExtension>jpg</umbracoExtension><newsCrops><crops date=\"2012-11-05T16:30:18\"><crop name=\"thumbCrop\" x=\"133\" y=\"0\" x2=\"902\" y2=\"768\" url=\"/media/41/hydrangeas_thumbCrop.jpg\" /></crops></newsCrops></Image></mediaItem></DAMP>";
-            var dXml = new DynamicXml(xml);
-            var result = dXml.TryConvertTo<XmlDocument>();
-            Assert.IsTrue(result.Success);
-            Assert.AreEqual(xml, result.Result.InnerXml);
-        }
-
-        public override void TestSetup()
-        {
-
-        }
-
-        public override void TestTearDown()
-        {
-        }
-    }
-
     [TestFixture]
     public class DynamicXmlTests
     {