Extracted more event handlers.

Author: KN4CK3R

ReClass.NET/Forms/MainForm.Designer.cs

@@ -866,5 +866,58 @@ private void showCodeOfClassToolStripMenuItem2_Click(object sender, EventArgs e)
 
 			LinkedWindowFeatures.ShowCodeGeneratorForm(classNode.Yield(), CurrentProject.TypeMapping);
 		}
+
+		private void enableHierarchyViewToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			var isChecked = enableHierarchyViewToolStripMenuItem.Checked;
+
+			enableHierarchyViewToolStripMenuItem.Checked = !isChecked;
+
+			expandAllClassesToolStripMenuItem.Enabled = collapseAllClassesToolStripMenuItem.Enabled = isChecked;
+
+			classesView.EnableClassHierarchyView = isChecked;
+		}
+
+		private void autoExpandHierarchyViewToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			var isChecked = autoExpandHierarchyViewToolStripMenuItem.Checked;
+
+			autoExpandHierarchyViewToolStripMenuItem.Checked = !isChecked;
+
+			classesView.AutoExpandClassNodes = isChecked;
+		}
+
+		private void expandAllClassesToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			classesView.ExpandAllClassNodes();
+		}
+
+		private void collapseAllClassesToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			classesView.CollapseAllClassNodes();
+		}
+
+		private void removeUnusedClassesToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			CurrentProject.RemoveUnusedClasses();
+		}
+
+		private void deleteClassToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			var classNode = classesView.SelectedClass;
+			if (classNode == null)
+			{
+				return;
+			}
+
+			try
+			{
+				CurrentProject.Remove(classNode);
+			}
+			catch (ClassReferencedException ex)
+			{
+				Program.Logger.Log(ex);
+			}
+		}
 	}
 }

ReClass.NET/Forms/MainForm.cs

@@ -113,10 +113,11 @@ public int Compare(object x, object y)
 
 		private readonly TreeNode root;
 
-		private ReClassNetProject project;
-
 		private ClassNode selectedClass;
 
+		private bool autoExpandClassNodes;
+		private bool enableClassHierarchyView;
+
 		public delegate void SelectionChangedEvent(object sender, ClassNode node);
 		public event SelectionChangedEvent SelectionChanged;
 
@@ -141,10 +142,41 @@ public ClassNode SelectedClass
 		}
 
 		[DefaultValue(false)]
-		public bool AutoExpandClassNodes { get; set; }
+		public bool AutoExpandClassNodes
+		{
+			get => autoExpandClassNodes;
+			set
+			{
+				if (autoExpandClassNodes != value)
+				{
+					autoExpandClassNodes = value;
+
+					if (autoExpandClassNodes)
+					{
+						ExpandAllClassNodes();
+					}
+				}
+			}
+		}
 
 		[DefaultValue(false)]
-		public bool EnableClassHierarchyView { get; set; }
+		public bool EnableClassHierarchyView
+		{
+			get => enableClassHierarchyView;
+			set
+			{
+				if (enableClassHierarchyView != value)
+				{
+					enableClassHierarchyView = value;
+
+					var classes = root.Nodes.Cast<ClassTreeNode>().Select(t => t.ClassNode).ToList();
+
+					root.Nodes.Clear();
+
+					AddClasses(classes);
+				}
+			}
+		}
 
 		public ContextMenuStrip ProjectTreeNodeContextMenuStrip { get; set; }
 
@@ -220,26 +252,6 @@ private void classesTreeView_MouseUp(object sender, MouseEventArgs e)
 			}
 		}
 
-		private void removeUnusedClassesToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			//project.RemoveUnusedClasses();
-		}
-
-		private void deleteClassToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			/*if (classesTreeView.SelectedNode is ClassTreeNode treeNode)
-			{
-				try
-				{
-					project.Remove(treeNode.ClassNode);
-				}
-				catch (ClassReferencedException ex)
-				{
-					Program.Logger.Log(ex);
-				}
-			}*/
-		}
-
 		private void renameClassToolStripMenuItem_Click(object sender, EventArgs e)
 		{
 			/*var treeNode = classesTreeView.SelectedNode;
@@ -264,52 +276,21 @@ private void classesTreeView_AfterLabelEdit(object sender, NodeLabelEditEventArg
 			}
 		}
 
-		private void enableHierarchyViewToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			/*enableHierarchyViewToolStripMenuItem.Checked = !enableHierarchyViewToolStripMenuItem.Checked;
-
-			expandAllClassesToolStripMenuItem.Enabled =
-				collapseAllClassesToolStripMenuItem.Enabled = enableHierarchyViewToolStripMenuItem.Checked;
-
-			EnableClassHierarchyView = enableHierarchyViewToolStripMenuItem.Checked;
-
-			var classes = root.Nodes.Cast<ClassTreeNode>().Select(t => t.ClassNode).ToList();
-
-			classesTreeView.BeginUpdate();
-
-			root.Nodes.Clear();
-
-			classes.ForEach(AddClassInternal);
-
-			classesTreeView.Sort();
-
-			classesTreeView.EndUpdate();*/
-		}
-
-		private void autoExpandHierarchyViewToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			/*autoExpandHierarchyViewToolStripMenuItem.Checked = !autoExpandHierarchyViewToolStripMenuItem.Checked;
-
-			AutoExpandClassNodes = autoExpandHierarchyViewToolStripMenuItem.Checked;
-
-			if (AutoExpandClassNodes)
-			{
-				root.ExpandAll();
-			}*/
-		}
+		#endregion
 
-		private void expandAllClassesToolStripMenuItem_Click(object sender, EventArgs e)
+		public void ExpandAllClassNodes()
 		{
-			//root.ExpandAll();
+			root.ExpandAll();
 		}
 
-		private void collapseAllClassesToolStripMenuItem_Click(object sender, EventArgs e)
+		public void CollapseAllClassNodes()
 		{
-			//root.Nodes.Cast<TreeNode>().ForEach(n => n.Collapse());
+			foreach (var tn in root.Nodes.Cast<TreeNode>())
+			{
+				tn.Collapse();
+			}
 		}
 
-		#endregion
-
 		public void Clear()
 		{
 			root.Nodes.Clear();
@@ -340,6 +321,19 @@ public void AddClasses(IEnumerable<ClassNode> nodes)
 			classesTreeView.EndUpdate();
 		}
 
+		/// <summary>
+		/// Adds a new <see cref="ClassTreeNode"/> to the tree.
+		/// </summary>
+		/// <param name="node">The class to add.</param>
+		private void AddClassInternal(ClassNode node)
+		{
+			Contract.Requires(node != null);
+
+			root.Nodes.Add(new ClassTreeNode(node, this));
+
+			root.Expand();
+		}
+
 		/// <summary>Removes the class from the view.</summary>
 		/// <param name="node">The class to remove.</param>
 		public void RemoveClass(ClassNode node)
@@ -362,19 +356,6 @@ public void RemoveClass(ClassNode node)
 			}
 		}
 
-		/// <summary>
-		/// Adds a new <see cref="ClassTreeNode"/> to the tree.
-		/// </summary>
-		/// <param name="node">The class to add.</param>
-		private void AddClassInternal(ClassNode node)
-		{
-			Contract.Requires(node != null);
-
-			root.Nodes.Add(new ClassTreeNode(node, this));
-
-			root.Expand();
-		}
-
 		/// <summary>Searches for the <see cref="ClassTreeNode"/> which represents the class.</summary>
 		/// <param name="node">The class to search.</param>
 		/// <returns>The found class tree node.</returns>