From 23a5ac439b37365b2da069323845f394f28c893d Mon Sep 17 00:00:00 2001
From: Per Ploug <ploug@umbraco.dk>
Date: Wed, 26 Aug 2015 12:18:42 +0200
Subject: [PATCH] Removes the old type trees and sets the right order on the
 new

---
 src/Umbraco.Web/Trees/ContentTypeTreeController.cs        | 2 +-
 src/Umbraco.Web/Trees/MediaTypeTreeController.cs          | 2 +-
 src/Umbraco.Web/Trees/MemberTypeTreeController.cs         | 2 +-
 .../umbraco.presentation/umbraco/Trees/loadMediaTypes.cs  | 2 +-
 .../umbraco.presentation/umbraco/Trees/loadMemberTypes.cs | 8 ++++----
 .../umbraco.presentation/umbraco/Trees/loadNodeTypes.cs   | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
index 975f3fcc8b..333eceb40f 100644
--- a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
@@ -16,7 +16,7 @@ using Umbraco.Core.Services;
 namespace Umbraco.Web.Trees
 {
     [UmbracoTreeAuthorize(Constants.Trees.DataTypes)]
-    [Tree(Constants.Applications.Settings, Constants.Trees.DocumentTypes, "Document Types")]
+    [Tree(Constants.Applications.Settings, Constants.Trees.DocumentTypes, "Document Types", sortOrder: 6)]
     [Umbraco.Web.Mvc.PluginController("UmbracoTrees")]
     [CoreTree]
     public class ContentTypeTreeController : TreeController
diff --git a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
index 93270ef7bd..0623fc6426 100644
--- a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
@@ -16,7 +16,7 @@ using Umbraco.Core.Services;
 namespace Umbraco.Web.Trees
 {
     [UmbracoTreeAuthorize(Constants.Trees.DataTypes)]
-    [Tree(Constants.Applications.Settings, Constants.Trees.MediaTypes, "Media Types")]
+    [Tree(Constants.Applications.Settings, Constants.Trees.MediaTypes, "Media Types", sortOrder:5)]
     [Umbraco.Web.Mvc.PluginController("UmbracoTrees")]
     [CoreTree]
     public class MediaTypeTreeController : TreeController
diff --git a/src/Umbraco.Web/Trees/MemberTypeTreeController.cs b/src/Umbraco.Web/Trees/MemberTypeTreeController.cs
index e3876f11a8..1c814f4dea 100644
--- a/src/Umbraco.Web/Trees/MemberTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/MemberTypeTreeController.cs
@@ -13,7 +13,7 @@ using Umbraco.Web.WebApi.Filters;
 namespace Umbraco.Web.Trees
 {
     [UmbracoTreeAuthorize(Constants.Trees.DataTypes)]
-    [Tree(Constants.Applications.Members, Constants.Trees.MemberTypes, "Member Types")]
+    [Tree(Constants.Applications.Members, Constants.Trees.MemberTypes, "Member Types", sortOrder:2  )]
     [Umbraco.Web.Mvc.PluginController("UmbracoTrees")]
     [CoreTree]
     public class MemberTypeTreeController : TreeController
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMediaTypes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMediaTypes.cs
index f3493ef8e3..2d097f44f5 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMediaTypes.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMediaTypes.cs
@@ -12,7 +12,7 @@ using Umbraco.Web.umbraco.presentation.umbraco.Trees;
 
 namespace umbraco
 {
-    [Tree(Constants.Applications.Settings, "mediaTypes", "Media Types", sortOrder: 5)]
+    [Obsolete("This class is no longer used and will be removed from the codebase in future versions")]
     public class loadMediaTypes : BaseTree
     {
         public loadMediaTypes(string application) : base(application) { }
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberTypes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberTypes.cs
index 762a2112a4..667a65ed8d 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberTypes.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberTypes.cs
@@ -30,10 +30,10 @@ using Umbraco.Core;
 
 namespace umbraco
 {
-	/// <summary>
-	/// Handles loading of the member types into the application tree
-	/// </summary>
-    [Tree(Constants.Applications.Members, "memberType", "Member Types", sortOrder: 2)]
+    /// <summary>
+    /// Handles loading of the member types into the application tree
+    /// </summary>
+    [Obsolete("This class is no longer used and will be removed from the codebase in future versions")]
     public class loadMemberTypes : BaseTree
 	{
         public loadMemberTypes(string application) : base(application) { }
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadNodeTypes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadNodeTypes.cs
index 8df83291fe..c2940a8a5d 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadNodeTypes.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadNodeTypes.cs
@@ -14,7 +14,7 @@ using Umbraco.Web.umbraco.presentation.umbraco.Trees;
 
 namespace umbraco
 {
-    [Tree(Constants.Applications.Settings, "nodeTypes", "Document Types", sortOrder: 6)]
+    [Obsolete("This class is no longer used and will be removed from the codebase in future versions")]
     public class loadNodeTypes : BaseTree
     {