refactoring : remove obsolete code and fix a memory leak

Author: NeVeSpl

sources/RevitDBExplorer/Command.cs

@@ -29,7 +29,11 @@ public Result Execute(ExternalCommandData commandData, ref string message, Eleme
             if (numberOfWindowsInMemory > 3)
             {
 #if DEBUG
-                //throw new Exception("There is probably a memory leak.");
+                GC.Collect();
+                if (numberOfWindowsInMemory > 4)
+                {
+                    //throw new Exception("There is probably a memory leak.");
+                }
 #endif
             }
 

sources/RevitDBExplorer/MainWindow.xaml

@@ -6,8 +6,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
         xmlns:componentQueryEditor="clr-namespace:RevitDBExplorer.UIComponents.QueryEditor"
         xmlns:componentQueryVisualization="clr-namespace:RevitDBExplorer.UIComponents.QueryVisualization"
-        xmlns:componentBusyIndicator="clr-namespace:RevitDBExplorer.UIComponents.BusyIndicator" 
-        xmlns:componentBreadcrumbs="clr-namespace:RevitDBExplorer.UIComponents.Breadcrumbs"    
+        xmlns:componentBusyIndicator="clr-namespace:RevitDBExplorer.UIComponents.BusyIndicator"    
         xmlns:componentWorkspaces="clr-namespace:RevitDBExplorer.UIComponents.Workspaces"    
         xmlns:converters="clr-namespace:RevitDBExplorer.WPF.Converters" 
         xmlns:ext="clr-namespace:RevitDBExplorer.WPF.MarkupExtensions"    
@@ -235,7 +234,7 @@
                 </Grid.ColumnDefinitions>
 
                 <Grid Grid.Column="0" ClipToBounds="False" Visibility="Collapsed">
-                    <componentBreadcrumbs:BreadcrumbsView DataContext="{Binding Breadcrumbs}" Margin="7 0 0 0"/>
+                    
                 </Grid>
 
                 <StackPanel Orientation="Horizontal" Grid.Column="1" Background="{DynamicResource StatusBar.Background}">

sources/RevitDBExplorer/MainWindow.xaml.cs

@@ -17,7 +17,6 @@
 using RevitDBExplorer.Domain.RevitDatabaseScripting;
 using RevitDBExplorer.Domain.Selectors;
 using RevitDBExplorer.Properties;
-using RevitDBExplorer.UIComponents.Breadcrumbs;
 using RevitDBExplorer.UIComponents.List;
 using RevitDBExplorer.UIComponents.List.ViewModels;
 using RevitDBExplorer.UIComponents.QueryEditor;
@@ -36,7 +35,6 @@ internal partial class MainWindow : Window, IAmWindowOpener, INotifyPropertyChan
         private readonly QueryEditorViewModel queryEditorVM;
         private readonly QueryVisualizationVM queryVisualizationVM;
         private readonly WorkspacesViewModel workspacesVM;        
-        private readonly BreadcrumbsVM breadcrumbsVM;
         private readonly DispatcherTimer isRevitBusyDispatcher;
         private readonly IRDV3DController rdvController;        
         private bool isRevitBusy;
@@ -49,8 +47,7 @@ internal partial class MainWindow : Window, IAmWindowOpener, INotifyPropertyChan
 
         public QueryEditorViewModel QueryEditor => queryEditorVM;
         public QueryVisualizationVM QueryVisualization => queryVisualizationVM;
-        public WorkspacesViewModel Workspaces => workspacesVM;           
-        public BreadcrumbsVM Breadcrumbs => breadcrumbsVM;                         
+        public WorkspacesViewModel Workspaces => workspacesVM;                                  
         public bool IsRevitBusy
         {
             get
@@ -144,7 +141,6 @@ public MainWindow()
             queryEditorVM = new QueryEditorViewModel(TryQueryDatabase, GenerateScriptForQueryAndOpenRDS);
             queryVisualizationVM = new QueryVisualizationVM();
             workspacesVM = new WorkspacesViewModel(this, queryEditorVM, OpenRDSWithGivenScript);            
-            breadcrumbsVM = new BreadcrumbsVM();
 
             rdvController = RevitDatabaseVisualizationFactory.CreateController();
 
@@ -216,6 +212,7 @@ private void Workspaces_SelectedItemChanged(SelectedItemChangedEventArgs obj)
         }       
         void IAmWindowOpener.Open(SourceOfObjects sourceOfObjects)
         {
+            SaveUserSettings();
             var window = new MainWindow(sourceOfObjects);
             window.Owner = this;
             window.Show(); 
@@ -300,6 +297,7 @@ private void Window_Closed(object sender, EventArgs e)
             Dispatcher.UnhandledException -= Dispatcher_UnhandledException;           
             isRevitBusyDispatcher.Tick -= IsRevitBusyDispatcher_Tick;
             Workspaces.SelectedItemChanged -= Workspaces_SelectedItemChanged;
+            Workspaces.Unbind();
         }
         private void Window_Closing(object sender, EventArgs e)
         {

sources/RevitDBExplorer/UIComponents/Breadcrumbs/BreadcrumbsVM.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using System.Collections.ObjectModel;
 using System.Windows;
 using RevitDBExplorer.Domain.DataModel;

sources/RevitDBExplorer/UIComponents/Breadcrumbs/BreadcrumbsView.xaml

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
+using System.Threading.Tasks;
 using System.Windows;
 using RevitDBExplorer.Domain;
 using RevitDBExplorer.Domain.DataModel;
@@ -75,6 +76,10 @@ public IEnumerable<object> GetSelectedItems()
         {
             return Workspaces.First().GetSelectedItems();
         }
+        public void Unbind()
+        {
+            Workspaces.First().Unbind();
+        }
 
 
         private WorkspaceViewModel CreateNewWorkspace()
@@ -175,7 +180,7 @@ public WorkspaceViewModel(IAmWindowOpener windowOpener, IAmQueryExecutor queryEx
             List.SelectedItemChanged += List_SelectedItemChanged;
             ExplorerTree.ScriptWasGenerated += OpenRDSWithGivenScript;
             UtilityTree.ScriptWasGenerated += OpenRDSWithGivenScript;
-            Title = "Workspace";
+            Title = "";
         }
 
 
@@ -187,7 +192,7 @@ private async void Tree_SelectedItemChanged(TreeSelectedItemChangedEventArgs eve
 
                 if (eventArgs.Sender == ExplorerTree)
                 {
-                    UtilityTree.RemoveSelection();
+                    UtilityTree?.RemoveSelection();
                 }
                 if (eventArgs.Sender == UtilityTree)
                 {
@@ -201,7 +206,7 @@ private async void Tree_SelectedItemChanged(TreeSelectedItemChangedEventArgs eve
             if (eventArgs.NewOne is SnoopableObjectTreeItem snoopableObjectTreeItem)
             {
                 chosenView = RightView.List;
-                await List.PopulateListView(snoopableObjectTreeItem);               
+                List.PopulateListView(snoopableObjectTreeItem).Forget();               
             }
 
             if (eventArgs.NewOne is UtilityGroupTreeItem utilityGroupTreeItem)
@@ -260,10 +265,18 @@ public IEnumerable<object> GetSelectedItems()
             {
                 yield return ExplorerTree.SelectedItem;
             }
-            if (UtilityTree.SelectedItem != null)
+            if (UtilityTree?.SelectedItem != null)
             {
                 yield return UtilityTree.SelectedItem;
             }
         }
+        public void Unbind()
+        {
+            ExplorerTree.SelectedItemChanged -= Tree_SelectedItemChanged;
+            UtilityTree.SelectedItemChanged -= Tree_SelectedItemChanged;
+            List.SelectedItemChanged -= List_SelectedItemChanged;
+            ExplorerTree.ScriptWasGenerated -= OpenRDSWithGivenScript;
+            UtilityTree.ScriptWasGenerated -= OpenRDSWithGivenScript;
+        }
     }
 }