Don't use ModelCollectionTreeNode for class browser nodes that don't use a IModelCollection.

Author: dgrunwald

src/AddIns/Analysis/UnitTesting/Pad/UnitTestNode.cs

@@ -37,18 +37,20 @@ public UnitTestNode(ITest test)
 			if (test == null)
 				throw new ArgumentNullException("test");
 			this.test = test;
-			test.DisplayNameChanged += test_NameChanged;
-			test.ResultChanged += test_ResultChanged;
-			LazyLoading = true;
 		}
 
-		protected override void DetachEventHandlers()
+		protected override void OnIsVisibleChanged()
 		{
-			// TODO: figure out when we can call this method
-			test.DisplayNameChanged -= test_NameChanged;
-			test.ResultChanged -= test_ResultChanged;
-			
-			base.DetachEventHandlers();
+			base.OnIsVisibleChanged();
+			if (IsVisible) {
+				test.DisplayNameChanged += test_NameChanged;
+				test.ResultChanged += test_ResultChanged;
+				// If the node isn't visible; we don't need to raise the PropertyChanged event for the items shown in the visible
+				// tree node; so we don't need to catch up on missed updates.
+			} else {
+				test.DisplayNameChanged -= test_NameChanged;
+				test.ResultChanged -= test_ResultChanged;
+			}
 		}
 
 		public new ITest Model {

src/AddIns/Debugger/Debugger.AddIn/Pads/ClassBrowserSupport.cs

@@ -18,6 +18,7 @@
 
 using System;
 using System.IO;
+using System.Windows.Controls;
 using Debugger;
 using ICSharpCode.Core.Presentation;
 using ICSharpCode.NRefactory;
@@ -233,12 +234,9 @@ public override object Text {
 			}
 		}
 
-		public override void ShowContextMenu()
+		public override void ShowContextMenu(ContextMenuEventArgs e)
 		{
-			var assemblyModel = this.Model as IAssemblyModel;
-			if (assemblyModel != null) {
-				var ctx = MenuService.ShowContextMenu(null, assemblyModel, "/SharpDevelop/Services/DebuggerService/ModuleContextMenu");
-			}
+			MenuService.ShowContextMenu(null, this.Model, "/SharpDevelop/Services/DebuggerService/ModuleContextMenu");
 		}
 	}
 

src/Libraries/SharpTreeView/ICSharpCode.TreeView/SharpTreeNode.cs

@@ -721,7 +721,7 @@ public void RaisePropertyChanged(string name)
 		/// Gets the underlying model object.
 		/// </summary>
 		/// <remarks>
-		/// This property calls the virtual <see cref="GetModelObject"/> helper method.
+		/// This property calls the virtual <see cref="GetModel()"/> helper method.
 		/// I didn't make the property itself virtual because deriving classes
 		/// may wish to replace it with a more specific return type,
 		/// but C# doesn't support variance in override declarations.
@@ -743,6 +743,10 @@ public virtual void ActivateItem(RoutedEventArgs e)
 		{
 		}
 
+		public virtual void ShowContextMenu(ContextMenuEventArgs e)
+		{
+		}
+		
 		public override string ToString()
 		{
 			// used for keyboard navigation

src/Libraries/SharpTreeView/ICSharpCode.TreeView/SharpTreeViewItem.cs

@@ -116,6 +116,11 @@ protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)
 			}
 		}
 
+		protected override void OnContextMenuOpening(ContextMenuEventArgs e)
+		{
+			Node.ShowContextMenu(e);
+		}
+		
 		#endregion
 
 		#region Drag and Drop

src/Main/Base/Project/Dom/ClassBrowser/AssemblyReferenceTreeNode.cs

@@ -17,15 +17,17 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
+using System.Windows.Controls;
 using ICSharpCode.Core.Presentation;
+using ICSharpCode.TreeView;
 using ICSharpCode.SharpDevelop.Parser;
 
 namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
 {
 	/// <summary>
 	/// Tree node representing one single referenced assembly.
 	/// </summary>
-	public class AssemblyReferenceTreeNode : ModelCollectionTreeNode
+	public class AssemblyReferenceTreeNode : SharpTreeNode
 	{
 		private IAssemblyReferenceModel model;
 
@@ -44,19 +46,6 @@ protected override object GetModel()
 			return model;
 		}
 
-		protected override IModelCollection<object> ModelChildren {
-			get {
-				// TODO Show assemblies referenced by this assembly?
-				return ImmutableModelCollection<object>.Empty;
-			}
-		}
-
-		protected override System.Collections.Generic.IComparer<ICSharpCode.TreeView.SharpTreeNode> NodeComparer {
-			get {
-				return NodeTextComparer;
-			}
-		}
-		
 		public override object Text {
 			get {
 				return model.AssemblyName.ShortName;
@@ -69,12 +58,9 @@ public override object Icon {
 			}
 		}
 
-		public override void ShowContextMenu()
+		public override void ShowContextMenu(ContextMenuEventArgs e)
 		{
-			var assemblyReferenceModel = this.Model as IAssemblyReferenceModel;
-			if (assemblyReferenceModel != null) {
-				var ctx = MenuService.ShowContextMenu(null, assemblyReferenceModel, "/SharpDevelop/Pads/ClassBrowser/AssemblyReferenceContextMenu");
-			}
+			MenuService.ShowContextMenu(null, model, "/SharpDevelop/Pads/ClassBrowser/AssemblyReferenceContextMenu");
 		}
 	}
 }

src/Main/Base/Project/Dom/ClassBrowser/AssemblyReferencesTreeNode.cs

@@ -18,6 +18,7 @@
 
 using System;
 using System.Linq;
+using System.Windows.Controls;
 using ICSharpCode.Core.Presentation;
 using ICSharpCode.SharpDevelop.Dom;
 using ICSharpCode.SharpDevelop.Parser;
@@ -73,12 +74,9 @@ public override object Icon
 			}
 		}
 
-		public override void ShowContextMenu()
+		public override void ShowContextMenu(ContextMenuEventArgs e)
 		{
-			var assemblyReferencesModel = this.Model as IAssemblyReferencesModel;
-			if (assemblyReferencesModel != null) {
-				var ctx = MenuService.ShowContextMenu(null, assemblyReferencesModel, "/SharpDevelop/Pads/ClassBrowser/AssemblyReferencesContextMenu");
-			}
+			MenuService.ShowContextMenu(null, model, "/SharpDevelop/Pads/ClassBrowser/AssemblyReferencesContextMenu");
 		}
 	}
 }

src/Main/Base/Project/Dom/ClassBrowser/AssemblyTreeNode.cs

@@ -18,6 +18,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Windows.Controls;
 using ICSharpCode.Core.Presentation;
 using ICSharpCode.TreeView;
 
@@ -82,12 +83,9 @@ public override object Icon {
 			}
 		}
 
-		public override void ShowContextMenu()
+		public override void ShowContextMenu(ContextMenuEventArgs e)
 		{
-			var assemblyModel = this.Model as IAssemblyModel;
-			if (assemblyModel != null) {
-				var ctx = MenuService.ShowContextMenu(null, assemblyModel, "/SharpDevelop/Pads/ClassBrowser/AssemblyContextMenu");
-			}
+			MenuService.ShowContextMenu(null, model, "/SharpDevelop/Pads/ClassBrowser/AssemblyContextMenu");
 		}
 	}
 }

src/Main/Base/Project/Dom/ClassBrowser/BaseTypesTreeNode.cs

@@ -29,66 +29,53 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
 	/// <summary>
 	/// Represents the "Base types" sub-node of type nodes in ClassBrowser tree.
 	/// </summary>
-	public class BaseTypesTreeNode : ModelCollectionTreeNode
+	public class BaseTypesTreeNode : SharpTreeNode
 	{
-		ITypeDefinitionModel definition;
+		readonly ITypeDefinitionModel definition;
 		string text;
-		bool childrenLoaded;
-		SimpleModelCollection<ITypeDefinitionModel> baseTypes;
 
 		public BaseTypesTreeNode(ITypeDefinitionModel definition)
 		{
 			if (definition == null)
 				throw new ArgumentNullException("definition");
 			this.definition = definition;
-			this.definition.Updated += (sender, e) => UpdateBaseTypes();
 			this.text = SD.ResourceService.GetString("MainWindow.Windows.ClassBrowser.BaseTypes");
-			baseTypes = new SimpleModelCollection<ITypeDefinitionModel>();
-			childrenLoaded = false;
 		}
 
-		protected override IModelCollection<object> ModelChildren {
-			get {
-				if (!childrenLoaded) {
-					UpdateBaseTypes();
-					childrenLoaded = true;
-				}
-				return baseTypes;
+		protected override void OnIsVisibleChanged()
+		{
+			base.OnIsVisibleChanged();
+			if (IsVisible) {
+				definition.Updated += OnDefinitionUpdated;
+			} else {
+				definition.Updated -= OnDefinitionUpdated;
+				LazyLoading = true;
 			}
 		}
-		
-		public override SharpTreeNode FindChildNodeRecursively(Func<SharpTreeNode, bool> predicate)
+
+		void OnDefinitionUpdated(object sender, EventArgs e)
 		{
-			// Don't search children of this node, because they are repeating type nodes from elsewhere
-			return null;
+			// If the list of children was created, update it
+			if (!LazyLoading)
+				LoadChildren();
 		}
 
-		public override bool CanFindChildNodeRecursively {
-			get { return false; }
-		}
-		
-		void UpdateBaseTypes()
+		protected override void LoadChildren()
 		{
-			baseTypes.Clear();
+			Children.Clear();
 			ITypeDefinition currentTypeDef = definition.Resolve();
 			if (currentTypeDef != null) {
 				foreach (var baseType in currentTypeDef.DirectBaseTypes) {
 					ITypeDefinition baseTypeDef = baseType.GetDefinition();
 					if (baseTypeDef != null) {
 						ITypeDefinitionModel baseTypeModel = baseTypeDef.GetModel();
 						if (baseTypeModel != null)
-							baseTypes.Add(baseTypeModel);
+							Children.Add(SD.TreeNodeFactory.CreateTreeNode(baseTypeModel));
 					}
 				}
 			}
 		}
 
-		protected override System.Collections.Generic.IComparer<ICSharpCode.TreeView.SharpTreeNode> NodeComparer {
-			get {
-				return NodeTextComparer;
-			}
-		}
-		
 		public override object Text {
 			get {
 				return text;

src/Main/Base/Project/Dom/ClassBrowser/ClassBrowserTreeView.cs

@@ -43,14 +43,6 @@ public ClassBrowserTreeView()
 			this.Root = root;
 		}
 
-		protected override void OnContextMenuOpening(ContextMenuEventArgs e)
-		{
-			var treeNode = this.SelectedItem as ModelCollectionTreeNode;
-			if (treeNode != null) {
-				treeNode.ShowContextMenu();
-			}
-		}
-		
 		private SharpTreeNode FindAssemblyTreeNode(string fullAssemblyName)
 		{
 			var assemblyTreeNode = this.Root.Children.FirstOrDefault(