Introduce NodeBuilder.GetSortIndex()

This method is used to get the sorting group of a node. It makes it easier
for add-ins to set node ordering.

2 files changed, 4 insertions, 15 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ClassNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ClassNodeBuilder.cs
index fba7a52efa..086f4a09a8 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ClassNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ClassNodeBuilder.cs
@@ -127,14 +127,6 @@ namespace MonoDevelop.Ide.Gui.Pads.ClassPad
 			// info from the db, so we always return true here. After all 99% of classes will have members
 			return true;
 		}
-
-		public override int CompareObjects (ITreeNavigator thisNode, ITreeNavigator otherNode)
-		{
-			if (thisNode.DataItem is ClassData)
-				return DefaultSort;
-			else
-				return 1;
-		}
 	}
 
 	public class ClassNodeCommandHandler : NodeCommandHandler
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/CombineNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/CombineNodeBuilder.cs
index f2f7c8d72a..a53acf34d4 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/CombineNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/CombineNodeBuilder.cs
@@ -82,15 +82,12 @@ namespace MonoDevelop.Ide.Gui.Pads.ClassPad
 		{
 			return ((SolutionFolder) dataObject).Items.Count > 0;
 		}
-		
-		public override int CompareObjects (ITreeNavigator thisNode, ITreeNavigator otherNode)
+
+		public override int GetSortIndex (ITreeNavigator node)
 		{
-			if (otherNode.DataItem is SolutionFolder)
-				return DefaultSort;
-			else
-				return -1;
+			return -100;
 		}
-
+		
 		public override void OnNodeAdded (object dataObject)
 		{
 			SolutionFolder combine = (SolutionFolder) dataObject;