DynamoDS
diff --git a/‎src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
Copy file name to clipboard
+3-2Lines changed: 3 additions & 2 deletions b/‎src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
Copy file name to clipboard
+3-2Lines changed: 3 additions & 2 deletions
diff --git a/‎src/DynamoCoreWpf/ViewModels/Core/HomeWorkspaceViewModel.cs
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions b/‎src/DynamoCoreWpf/ViewModels/Core/HomeWorkspaceViewModel.cs
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/ViewModels/Core/NodeViewModel.cs
Copy file name to clipboard
+15-1Lines changed: 15 additions & 1 deletion b/‎src/DynamoCoreWpf/ViewModels/Core/NodeViewModel.cs
Copy file name to clipboard
+15-1Lines changed: 15 additions & 1 deletion
diff --git a/‎src/DynamoCoreWpf/ViewModels/Core/WorkspaceViewModel.cs
Copy file name to clipboard
+31-41Lines changed: 31 additions & 41 deletions b/‎src/DynamoCoreWpf/ViewModels/Core/WorkspaceViewModel.cs
Copy file name to clipboard
+31-41Lines changed: 31 additions & 41 deletions
diff --git a/‎src/DynamoCoreWpf/ViewModels/Preview/InfoBubbleViewModel.cs
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions b/‎src/DynamoCoreWpf/ViewModels/Preview/InfoBubbleViewModel.cs
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/ViewModels/RunSettingsViewModel.cs
Copy file name to clipboard
+12-3Lines changed: 12 additions & 3 deletions b/‎src/DynamoCoreWpf/ViewModels/RunSettingsViewModel.cs
Copy file name to clipboard
+12-3Lines changed: 12 additions & 3 deletions
@@ -415,6 +415,7 @@ public bool ShowDebugASTs
 
         public IWatchHandler WatchHandler { get; private set; }
 
+        [Obsolete("This Property will be obsoleted in Dynamo 3.0.")]
         public SearchViewModel SearchViewModel { get; private set; }
 
         public PackageManagerClientViewModel PackageManagerClientViewModel { get; private set; }
@@ -535,7 +536,7 @@ protected DynamoViewModel(StartConfiguration startConfiguration)
             this.WatchHandler = startConfiguration.WatchHandler;
             var pmExtension = model.GetPackageManagerExtension();
             this.PackageManagerClientViewModel = new PackageManagerClientViewModel(this, pmExtension.PackageManagerClient);
-            this.SearchViewModel = new SearchViewModel(this);
+            this.SearchViewModel = null;
 
             // Start page should not show up during test mode.
             this.ShowStartPage = !DynamoModel.IsTestMode;
@@ -2290,7 +2291,7 @@ public void ImportLibrary(object parameter)
                                 string.Format(detailedMessage, file));
                         }
                     }
-                    SearchViewModel.SearchAndUpdateResults();
+                    CurrentSpaceViewModel.InCanvasSearchViewModel.SearchAndUpdateResults();
                 }
                 catch(LibraryLoadFailedException ex)
                 {
 
@@ -222,6 +222,9 @@ private bool CanStopPeriodicTimer(object parameter)
             return true;
         }
 
+        /// <summary>
+        /// Object dispose function
+        /// </summary>
         public override void Dispose()
         {
             base.Dispose();
@@ -230,6 +233,7 @@ public override void Dispose()
             hwm.EvaluationCompleted -= hwm_EvaluationCompleted;
             hwm.SetNodeDeltaState -= hwm_SetNodeDeltaState;
             RunSettingsViewModel.PropertyChanged -= RunSettingsViewModel_PropertyChanged;
+            RunSettingsViewModel.Dispose();
             RunSettingsViewModel = null;
             DynamoViewModel.Model.ShutdownStarted -= Model_ShutdownStarted;
         }
 
@@ -590,7 +590,10 @@ public NodeViewModel(WorkspaceViewModel workspaceViewModel, NodeModel logic)
             ++NoteViewModel.StaticZIndex;
         }
 
-        public virtual void Dispose()
+        /// <summary>
+        /// Dispose function
+        /// </summary>
+        public override void Dispose()
         {
             this.NodeModel.PropertyChanged -= logic_PropertyChanged;
 
@@ -601,7 +604,18 @@ public virtual void Dispose()
                 DynamoViewModel.EngineController.AstBuilt -= EngineController_AstBuilt;
             }
 
+            foreach (var p in InPorts)
+            {
+                p.Dispose();
+            }
+
+            foreach (var p in OutPorts)
+            {
+                p.Dispose();
+            }
+            ErrorBubble.Dispose();
             DynamoSelection.Instance.Selection.CollectionChanged -= SelectionOnCollectionChanged;
+            base.Dispose();
         }
 
         public NodeViewModel(WorkspaceViewModel workspaceViewModel, NodeModel logic, Size preferredSize)
 
@@ -251,29 +251,19 @@ public bool IsCursorForced
             set { isCursorForced = value; RaisePropertyChanged("IsCursorForced"); }
         }
 
-        private CompositeCollection _workspaceElements = new CompositeCollection();
         [JsonIgnore]
-        public CompositeCollection WorkspaceElements { get { return _workspaceElements; } }
-        
-        ObservableCollection<ConnectorViewModel> _connectors = new ObservableCollection<ConnectorViewModel>();
+        public CompositeCollection WorkspaceElements { get; } = new CompositeCollection();
         [JsonIgnore]
-        public ObservableCollection<ConnectorViewModel> Connectors { get { return _connectors; } }
+        public ObservableCollection<ConnectorViewModel> Connectors { get; } = new ObservableCollection<ConnectorViewModel>();
 
-        ObservableCollection<NodeViewModel> _nodes = new ObservableCollection<NodeViewModel>();
         [JsonProperty("NodeViews")]
-        public ObservableCollection<NodeViewModel> Nodes { get { return _nodes; } }
-
+        public ObservableCollection<NodeViewModel> Nodes { get; } = new ObservableCollection<NodeViewModel>();
         // Do not serialize notes, they will be converted to annotations during serialization
-        ObservableCollection<NoteViewModel> _notes = new ObservableCollection<NoteViewModel>();
         [JsonIgnore]
-        public ObservableCollection<NoteViewModel> Notes { get { return _notes; } }
-
-        ObservableCollection<InfoBubbleViewModel> _errors = new ObservableCollection<InfoBubbleViewModel>();
+        public ObservableCollection<NoteViewModel> Notes { get; } = new ObservableCollection<NoteViewModel>();
         [JsonIgnore]
-        public ObservableCollection<InfoBubbleViewModel> Errors { get { return _errors; } }
-
-        ObservableCollection<AnnotationViewModel> _annotations = new ObservableCollection<AnnotationViewModel>();
-        public ObservableCollection<AnnotationViewModel> Annotations { get { return _annotations; } }
+        public ObservableCollection<InfoBubbleViewModel> Errors { get; } = new ObservableCollection<InfoBubbleViewModel>();
+        public ObservableCollection<AnnotationViewModel> Annotations { get; } = new ObservableCollection<AnnotationViewModel>();
 
         [JsonIgnore]
         public string Name
@@ -419,19 +409,19 @@ public WorkspaceViewModel(WorkspaceModel model, DynamoViewModel dynamoViewModel)
             stateMachine = new StateMachine(this);
 
             var nodesColl = new CollectionContainer { Collection = Nodes };
-            _workspaceElements.Add(nodesColl);
+            WorkspaceElements.Add(nodesColl);
 
             var connColl = new CollectionContainer { Collection = Connectors };
-            _workspaceElements.Add(connColl);
+            WorkspaceElements.Add(connColl);
 
             var notesColl = new CollectionContainer { Collection = Notes };
-            _workspaceElements.Add(notesColl);
+            WorkspaceElements.Add(notesColl);
 
             var errorsColl = new CollectionContainer { Collection = Errors };
-            _workspaceElements.Add(errorsColl);
+            WorkspaceElements.Add(errorsColl);
 
             var annotationsColl = new CollectionContainer {Collection = Annotations};
-            _workspaceElements.Add(annotationsColl);
+            WorkspaceElements.Add(annotationsColl);
 
             //respond to collection changes on the model by creating new view models
             //currently, view models are added for notes and nodes
@@ -513,7 +503,7 @@ public override void Dispose()
             Nodes.Clear();
             Notes.Clear();
             Connectors.Clear();
-            
+            InCanvasSearchViewModel.Dispose();
         }
 
         internal void ZoomInInternal()
@@ -621,66 +611,66 @@ void CopyPasteChanged(object sender, EventArgs e)
         void Connectors_ConnectorAdded(ConnectorModel c)
         {
             var viewModel = new ConnectorViewModel(this, c);
-            if (_connectors.All(x => x.ConnectorModel != c))
-                _connectors.Add(viewModel);
+            if (Connectors.All(x => x.ConnectorModel != c))
+                Connectors.Add(viewModel);
         }
 
         void Connectors_ConnectorDeleted(ConnectorModel c)
         {
-            var connector = _connectors.FirstOrDefault(x => x.ConnectorModel == c);
+            var connector = Connectors.FirstOrDefault(x => x.ConnectorModel == c);
             if (connector != null)
             {
-                _connectors.Remove(connector);
+                Connectors.Remove(connector);
                 connector.Dispose();
             }
         }
 
         private void Model_NoteAdded(NoteModel note)
         {
             var viewModel = new NoteViewModel(this, note);
-            _notes.Add(viewModel);
+            Notes.Add(viewModel);
         }
 
         private void Model_NoteRemoved(NoteModel note)
         {
-            var matchingNoteViewModel = _notes.First(x => x.Model == note);
-            _notes.Remove(matchingNoteViewModel);
+            var matchingNoteViewModel = Notes.First(x => x.Model == note);
+            Notes.Remove(matchingNoteViewModel);
             matchingNoteViewModel.Dispose();
         }
 
         private void Model_NotesCleared()
         {
-            foreach (var noteViewModel in _notes)
+            foreach (var noteViewModel in Notes)
             {
                 noteViewModel.Dispose();
             }
-            _notes.Clear();
+            Notes.Clear();
         }
 
         private void Model_AnnotationAdded(AnnotationModel annotation)
         {
             var viewModel = new AnnotationViewModel(this, annotation);
-            _annotations.Add(viewModel);
+            Annotations.Add(viewModel);
         }
 
         private void Model_AnnotationRemoved(AnnotationModel annotation)
         {
-            _annotations.Remove(_annotations.First(x => x.AnnotationModel == annotation));
+            Annotations.Remove(Annotations.First(x => x.AnnotationModel == annotation));
         }
 
         private void Model_AnnotationsCleared()
         {
-            _annotations.Clear();
+            Annotations.Clear();
         }
 
         void Model_NodesCleared()
         {
-            foreach(var nodeViewModel in _nodes)
+            foreach(var nodeViewModel in Nodes)
             {
                 this.unsubscribeNodeEvents(nodeViewModel);
                 nodeViewModel.Dispose();
             }
-            _nodes.Clear();
+            Nodes.Clear();
             Errors.Clear();
 
             PostNodeChangeActions();
@@ -694,9 +684,9 @@ private void unsubscribeNodeEvents(NodeViewModel nodeViewModel)
 
         void Model_NodeRemoved(NodeModel node)
         {
-            NodeViewModel nodeViewModel = _nodes.First(x => x.NodeLogic == node);
+            NodeViewModel nodeViewModel = Nodes.First(x => x.NodeLogic == node);
             Errors.Remove(nodeViewModel.ErrorBubble);
-            _nodes.Remove(nodeViewModel);
+            Nodes.Remove(nodeViewModel);
             //unsub the events we attached below in NodeAdded.
             this.unsubscribeNodeEvents(nodeViewModel);
             nodeViewModel.Dispose();
@@ -709,7 +699,7 @@ void Model_NodeAdded(NodeModel node)
             var nodeViewModel = new NodeViewModel(this, node);
             nodeViewModel.SnapInputEvent += nodeViewModel_SnapInputEvent;
             nodeViewModel.NodeLogic.Modified += OnNodeModified;
-            _nodes.Add(nodeViewModel);
+            Nodes.Add(nodeViewModel);
             Errors.Add(nodeViewModel.ErrorBubble);
             nodeViewModel.UpdateBubbleContent();
 
@@ -1222,8 +1212,8 @@ internal void FitViewInternal()
             else
             {   
                 // no selection, fitview all nodes and notes
-                var nodes = _nodes.Select(x => x.NodeModel);
-                var notes = _notes.Select(x => x.Model);
+                var nodes = Nodes.Select(x => x.NodeModel);
+                var notes = Notes.Select(x => x.Model);
                 var models = nodes.Concat<ModelBase>(notes);
 
                 if (!models.Any()) return;
 
@@ -133,6 +133,10 @@ public void OnRequestAction(InfoBubbleEventArgs e)
 
         #region Public Methods
 
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="dynamoViewModel"></param>
         public InfoBubbleViewModel(DynamoViewModel dynamoViewModel)
         {
             this.DynamoViewModel = dynamoViewModel;
 
@@ -81,12 +81,12 @@ public RunTypeItem(RunType runType)
     /// notifications as those notifications are raised when the value is set on the
     /// model.
     /// </summary>
-    public class RunSettingsViewModel : NotificationObject
+    public class RunSettingsViewModel : ViewModelBase
     {
         #region private members
 
         private bool debug = false;
-        private readonly HomeWorkspaceViewModel workspaceViewModel;
+        private HomeWorkspaceViewModel workspaceViewModel;
         private readonly DynamoViewModel dynamoViewModel;
         private RunTypeItem selectedRunTypeItem;
         private SynchronizationContext context;
@@ -215,7 +215,7 @@ public Visibility RunButtonVisibility
 
         #endregion
 
-        #region constructors
+        #region constructors and dispose function
 
         public RunSettingsViewModel(RunSettings settings, HomeWorkspaceViewModel workspaceViewModel, DynamoViewModel dynamoViewModel)
         {
@@ -236,6 +236,15 @@ public RunSettingsViewModel(RunSettings settings, HomeWorkspaceViewModel workspa
             ToggleRunTypeEnabled(RunType.Periodic, false);
         }
 
+        /// <summary>
+        /// When switching workspace, this need to be called in HomeworkspaceViewModel dispose function
+        /// </summary>
+        public override void Dispose()
+        {
+            base.Dispose();
+            this.workspaceViewModel = null;
+        }
+
         #endregion
 
         #region private and internal methods
Original file line number	Diff line number	Diff line change
`@@ -415,6 +415,7 @@ public bool ShowDebugASTs`
`415`	`415`
`416`	`416`	`public IWatchHandler WatchHandler { get; private set; }`
`417`	`417`
	`418`	`+ [Obsolete("This Property will be obsoleted in Dynamo 3.0.")]`
`418`	`419`	`public SearchViewModel SearchViewModel { get; private set; }`
`419`	`420`
`420`	`421`	`public PackageManagerClientViewModel PackageManagerClientViewModel { get; private set; }`
`@@ -535,7 +536,7 @@ protected DynamoViewModel(StartConfiguration startConfiguration)`
`535`	`536`	`this.WatchHandler = startConfiguration.WatchHandler;`
`536`	`537`	`var pmExtension = model.GetPackageManagerExtension();`
`537`	`538`	`this.PackageManagerClientViewModel = new PackageManagerClientViewModel(this, pmExtension.PackageManagerClient);`
`538`		`- this.SearchViewModel = new SearchViewModel(this);`
	`539`	`+ this.SearchViewModel = null;`
`539`	`540`
`540`	`541`	`// Start page should not show up during test mode.`
`541`	`542`	`this.ShowStartPage = !DynamoModel.IsTestMode;`
`@@ -2290,7 +2291,7 @@ public void ImportLibrary(object parameter)`
`2290`	`2291`	`string.Format(detailedMessage, file));`
`2291`	`2292`	`}`
`2292`	`2293`	`}`
`2293`		`- SearchViewModel.SearchAndUpdateResults();`
	`2294`	`+ CurrentSpaceViewModel.InCanvasSearchViewModel.SearchAndUpdateResults();`
`2294`	`2295`	`}`
`2295`	`2296`	`catch(LibraryLoadFailedException ex)`
`2296`	`2297`	`{`
Original file line number	Diff line number	Diff line change
`@@ -222,6 +222,9 @@ private bool CanStopPeriodicTimer(object parameter)`
`222`	`222`	`return true;`
`223`	`223`	`}`
`224`	`224`
	`225`	`+ /// <summary>`
	`226`	`+ /// Object dispose function`
	`227`	`+ /// </summary>`
`225`	`228`	`public override void Dispose()`
`226`	`229`	`{`
`227`	`230`	`base.Dispose();`
`@@ -230,6 +233,7 @@ public override void Dispose()`
`230`	`233`	`hwm.EvaluationCompleted -= hwm_EvaluationCompleted;`
`231`	`234`	`hwm.SetNodeDeltaState -= hwm_SetNodeDeltaState;`
`232`	`235`	`RunSettingsViewModel.PropertyChanged -= RunSettingsViewModel_PropertyChanged;`
	`236`	`+ RunSettingsViewModel.Dispose();`
`233`	`237`	`RunSettingsViewModel = null;`
`234`	`238`	`DynamoViewModel.Model.ShutdownStarted -= Model_ShutdownStarted;`
`235`	`239`	`}`
Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,10 @@ public void OnRequestAction(InfoBubbleEventArgs e)`
`133`	`133`
`134`	`134`	`#region Public Methods`
`135`	`135`
	`136`	`+ /// <summary>`
	`137`	`+ /// Constructor`
	`138`	`+ /// </summary>`
	`139`	`+ /// <param name="dynamoViewModel"></param>`
`136`	`140`	`public InfoBubbleViewModel(DynamoViewModel dynamoViewModel)`
`137`	`141`	`{`
`138`	`142`	`this.DynamoViewModel = dynamoViewModel;`