Clean up ExtractInterface objects

Author: bclothier

Rubberduck.Core/UI/Refactorings/ExtractInterface/ExtractInterfaceDialog.cs

@@ -3,12 +3,12 @@
 
 namespace Rubberduck.UI.Refactorings
 {
-    internal sealed class ExtractInterfaceDialog : RefactoringDialogBase<ExtractInterfaceModel, ExtractInterfaceView, ExtractInterfaceViewModel>
+    public sealed class ExtractInterfaceDialog : RefactoringDialogBase<ExtractInterfaceModel, ExtractInterfaceView, ExtractInterfaceViewModel>
     {
         protected override int MinHeight => 339;
         protected override int MinWidth => 459;
 
-        private ExtractInterfaceDialog(ExtractInterfaceModel model, ExtractInterfaceView view, ExtractInterfaceViewModel viewModel) : base(model, view, viewModel)
+        public ExtractInterfaceDialog(ExtractInterfaceModel model, ExtractInterfaceView view, ExtractInterfaceViewModel viewModel) : base(model, view, viewModel)
         {
             Text = RubberduckUI.ExtractInterface_Caption;
         }

Rubberduck.Core/UI/Refactorings/ExtractInterface/ExtractInterfacePresenter.cs

@@ -1,11 +1,9 @@
-using System.Linq;
-using Rubberduck.Parsing.Symbols;
-using Rubberduck.Refactorings;
+using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.ExtractInterface;
 
 namespace Rubberduck.UI.Refactorings.ExtractInterface
 {
-    internal class ExtractInterfacePresenter : RefactoringPresenterBase<ExtractInterfaceModel, ExtractInterfaceDialog, ExtractInterfaceView, ExtractInterfaceViewModel>, IExtractInterfacePresenter
+    internal class ExtractInterfacePresenter : RefactoringPresenterBase<ExtractInterfaceModel, IRefactoringDialog<ExtractInterfaceModel, IRefactoringView<ExtractInterfaceModel>, IRefactoringViewModel<ExtractInterfaceModel>>, IRefactoringView<ExtractInterfaceModel>, IRefactoringViewModel<ExtractInterfaceModel>>, IExtractInterfacePresenter
     {
         public ExtractInterfacePresenter(ExtractInterfaceModel model,
             IRefactoringDialogFactory dialogFactory) : base(model, dialogFactory) { }
@@ -17,23 +15,8 @@ public override ExtractInterfaceModel Show()
                 return null;
             }
 
-            ViewModel.ComponentNames = Model.State.DeclarationFinder
-                .UserDeclarations(DeclarationType.Module)
-                .Where(moduleDeclaration => moduleDeclaration.ProjectId == Model.TargetDeclaration.ProjectId)
-                .Select(module => module.ComponentName)
-                .ToList();
-            ViewModel.InterfaceName = Model.InterfaceName;
-            ViewModel.Members = Model.Members.Select(m => m.ToViewModel()).ToList();
-
-            Show();
-            if (DialogResult != RefactoringDialogResult.Execute)
-            {
-                return null;
-            }
-
-            Model.InterfaceName = ViewModel.InterfaceName;
-            Model.Members = ViewModel.Members.Where(m => m.IsSelected).Select(vm => vm.ToModel()).ToList();
-            return Model;
+            var model = base.Show();
+            return DialogResult != RefactoringDialogResult.Execute ? null : model;
         }
     }
 }

Rubberduck.Core/UI/Refactorings/ExtractInterface/ExtractInterfaceViewModel.cs

@@ -3,18 +3,32 @@
 using System.Linq;
 using NLog;
 using Rubberduck.Parsing.Grammar;
+using Rubberduck.Parsing.Symbols;
 using Rubberduck.Refactorings.ExtractInterface;
 using Rubberduck.UI.Command;
 using Rubberduck.UI.Refactorings.ExtractInterface;
 
 namespace Rubberduck.UI.Refactorings
 {
-    internal class ExtractInterfaceViewModel : RefactoringViewModelBase<ExtractInterfaceModel>
+    public class ExtractInterfaceViewModel : RefactoringViewModelBase<ExtractInterfaceModel>
     {
         public ExtractInterfaceViewModel(ExtractInterfaceModel model) : base(model)
         {
             SelectAllCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), _ => ToggleSelection(true));
             DeselectAllCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), _ => ToggleSelection(false));
+
+            ComponentNames = Model.State.DeclarationFinder
+                .UserDeclarations(DeclarationType.Module)
+                .Where(moduleDeclaration => moduleDeclaration.ProjectId == Model.TargetDeclaration.ProjectId)
+                .Select(module => module.ComponentName)
+                .ToList();
+            _members = Model.Members.Select(m => m.ToViewModel()).ToList();
+            UpdateModelMembers();
+        }
+
+        private void UpdateModelMembers()
+        {
+            Model.Members = _members.Where(m => m.IsSelected).Select(vm => vm.ToModel()).ToList();
         }
 
         private List<InterfaceMemberViewModel> _members;
@@ -24,19 +38,19 @@ public List<InterfaceMemberViewModel> Members
             set
             {
                 _members = value;
+                UpdateModelMembers();
                 OnPropertyChanged();
             }
         }
 
         public List<string> ComponentNames { get; set; }
 
-        private string _interfaceName;
         public string InterfaceName
         {
-            get => _interfaceName;
+            get => Model.InterfaceName;
             set
             {
-                _interfaceName = value;
+                Model.InterfaceName = value;
                 OnPropertyChanged();
                 OnPropertyChanged(nameof(IsValidInterfaceName));
             }
@@ -62,6 +76,7 @@ private void ToggleSelection(bool value)
             {
                 item.IsSelected = value;
             }
+            UpdateModelMembers();
         }
 
         public CommandBase SelectAllCommand { get; }

Rubberduck.Core/UI/Refactorings/ExtractInterface/InterfaceMemberViewModel.cs

@@ -2,7 +2,7 @@
 
 namespace Rubberduck.UI.Refactorings.ExtractInterface
 {
-    internal class InterfaceMemberViewModel : ViewModelBase 
+    public class InterfaceMemberViewModel : ViewModelBase 
     {
         public InterfaceMemberViewModel(InterfaceMember model)
         {