diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/XmlTree.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/XmlTree.cs
index c6dfd4c758..9b62e5ea1f 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/XmlTree.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/XmlTree.cs
@@ -11,13 +11,6 @@ using Action = Umbraco.Web._Legacy.Actions.Action;
namespace umbraco.cms.presentation.Trees
{
-
- public enum SerializedTreeType
- {
- JSONTree,
- JsTree
- }
-
///
/// Used for serializing data to XML as the data structure for the JavaScript tree
///
@@ -27,73 +20,13 @@ namespace umbraco.cms.presentation.Trees
public XmlTree()
{
- //set to the XTree provider by default.
- //m_TreeType = SerializedTreeType.XmlTree;
- //m_TreeType = SerializedTreeType.JSONTree;
- m_TreeType = SerializedTreeType.JsTree;
-
Init();
}
-
- ///
- /// Use this constructor to force a tree provider to be used
- ///
- ///
- public XmlTree(SerializedTreeType treeType)
- {
- m_TreeType = treeType;
- Init();
- }
-
+
private void Init()
{
- m_JSSerializer = new JavaScriptSerializer { MaxJsonLength = int.MaxValue };
-
- switch (m_TreeType)
- {
- case SerializedTreeType.JSONTree:
- m_JSSerializer.RegisterConverters(new List()
- {
- new JSONTreeConverter(),
- new JSONTreeNodeConverter()
- });
- break;
- case SerializedTreeType.JsTree:
- m_JSSerializer.RegisterConverters(new List()
- {
- new JsTreeNodeConverter()
- });
- break;
- }
-
-
}
-
- private JavaScriptSerializer m_JSSerializer;
- private SerializedTreeType m_TreeType;
-
- ///
- /// Returns the string representation of the tree structure depending on the SerializedTreeType
- /// specified.
- ///
- ///
- public override string ToString()
- {
- return ToString(m_TreeType);
- }
-
- public string ToString(SerializedTreeType type)
- {
- switch (type)
- {
- case SerializedTreeType.JsTree:
- return m_JSSerializer.Serialize(this.treeCollection);
- case SerializedTreeType.JSONTree:
- return m_JSSerializer.Serialize(this);
- }
- return "";
- }
-
+
public void Add(XmlTreeNode obj)
{
treeCollection.Add(obj);
@@ -532,231 +465,4 @@ namespace umbraco.cms.presentation.Trees
}
- ///
- /// Used to serialize an XmlTree object to JSON for supporting a JSON Tree View control.
- ///
- internal class JSONTreeConverter : JavaScriptConverter
- {
- ///
- /// Not implemented as we never need to Deserialize
- ///
- ///
- ///
- ///
- ///
- public override object Deserialize(IDictionary dictionary, Type type, JavaScriptSerializer serializer)
- {
- throw new NotImplementedException();
- }
-
- ///
- /// Serializes an XmlTree object with the relevant values.
- ///
- ///
- ///
- ///
- public override IDictionary Serialize(object obj, JavaScriptSerializer serializer)
- {
- XmlTree tree = obj as XmlTree;
-
- Dictionary resultSet = new Dictionary();
- Dictionary resultTree = new Dictionary();
-
- if (tree != null)
- {
- //add a count property for the count of total nodes
- resultTree.Add("Count", tree.Count);
-
- List