Revise the base dialog and presenter to abstract out the parameters that vary from dialog to dialog, allowing the presenter to specify those parameters via DialogData struct,

Author: bclothier

Rubberduck.Core/UI/Refactorings/IRefactoringDialogFactory.cs

@@ -14,7 +14,7 @@ TViewModel CreateViewModel<TModel, TViewModel>(TModel model)
             where TViewModel : class, IRefactoringViewModel<TModel>;
         void ReleaseViewModel(IRefactoringViewModel viewModel);
 
-        TDialog CreateDialog<TModel, TView, TViewModel, TDialog>(TModel model, TView view, TViewModel viewmodel)
+        TDialog CreateDialog<TModel, TView, TViewModel, TDialog>(DialogData dialogData, TModel model, TView view, TViewModel viewmodel)
             where TModel : class
             where TView : class, IRefactoringView<TModel>
             where TViewModel : class, IRefactoringViewModel<TModel>

Rubberduck.Core/UI/Refactorings/RefactoringDialogBase.cs

@@ -5,8 +5,8 @@ namespace Rubberduck.UI.Refactorings
 {
     public partial class RefactoringDialogBase : Form
     {
-        protected virtual int MinWidth => 400;
-        protected virtual int MinHeight => 150;
+        protected int MinWidth;
+        protected int MinHeight;
 
         protected RefactoringDialogBase()
         {

Rubberduck.Core/UI/Refactorings/RefactoringDialogBaseGeneric.cs

@@ -2,12 +2,31 @@
 
 namespace Rubberduck.UI.Refactorings
 {
+    public readonly struct DialogData
+    {
+        public string Caption { get; }
+        public int MinimumHeight { get; }
+        public int MinimumWidth { get; }
+
+        public DialogData(string caption, int minimumHeight, int minimumWidth)
+        {
+            Caption = caption;
+            MinimumHeight = minimumHeight;
+            MinimumWidth = minimumWidth;
+        }
+
+        public static DialogData Create(string caption, int minimumHeight, int minimumWidth)
+        {
+            return new DialogData(caption, minimumHeight, minimumWidth);
+        }
+    }
+
     public class RefactoringDialogBase<TModel, TView, TViewModel> : RefactoringDialogBase, IRefactoringDialog<TModel, TView, TViewModel>
         where TModel : class
-        where TView : System.Windows.Controls.UserControl, IRefactoringView<TModel>
+        where TView : class, IRefactoringView<TModel>
         where TViewModel : class, IRefactoringViewModel<TModel>
     {
-        public RefactoringDialogBase(TModel model, TView view, TViewModel viewModel) 
+        public RefactoringDialogBase(DialogData dialogData, TModel model, TView view, TViewModel viewModel) 
         {
             Model = model;
             ViewModel = viewModel;
@@ -16,7 +35,17 @@ public RefactoringDialogBase(TModel model, TView view, TViewModel viewModel)
             View.DataContext = ViewModel;
             ViewModel.OnWindowClosed += ViewModel_OnWindowClosed;
 
-            UserControl = View;
+            MinHeight = dialogData.MinimumHeight;
+            MinWidth = dialogData.MinimumWidth;
+
+            // ReSharper disable once RedundantBaseQualifier
+            // We don't want virtual calls here so we need to explicitly call base.
+            base.Text = dialogData.Caption;
+
+            // Note that user control must be set after dialog data has been consumed to ensure
+            // correct sizing of the dialog
+            System.Diagnostics.Debug.Assert(View is System.Windows.Controls.UserControl);
+            UserControl = View as System.Windows.Controls.UserControl;
         }
 
         public TModel Model { get; }

Rubberduck.Core/UI/Refactorings/RefactoringPresenterBase.cs

@@ -3,20 +3,31 @@
 
 namespace Rubberduck.UI.Refactorings
 {
-    public abstract class RefactoringPresenterBase<TModel, TDialog, TView, TViewModel> : IDisposable, IRefactoringPresenter<TModel, TDialog, TView, TViewModel> 
+    public abstract class RefactoringPresenterBase<TModel> : 
+        RefactoringPresenterGenericBase<
+            TModel,
+            IRefactoringDialog<TModel, IRefactoringView<TModel>, IRefactoringViewModel<TModel>>,
+            IRefactoringView<TModel>,
+            IRefactoringViewModel<TModel>>
+        where TModel : class
+    {
+        protected RefactoringPresenterBase(DialogData dialogData, TModel model, IRefactoringDialogFactory factory):base(dialogData, model, factory) { }
+    }
+
+    public abstract class RefactoringPresenterGenericBase<TModel, TDialog, TView, TViewModel> : IDisposable, IRefactoringPresenter<TModel, TDialog, TView, TViewModel> 
         where TModel : class
         where TView : class, IRefactoringView<TModel>
         where TViewModel : class, IRefactoringViewModel<TModel>
         where TDialog : class, IRefactoringDialog<TModel, TView, TViewModel>
     {
         private readonly IRefactoringDialogFactory _factory;
 
-        protected RefactoringPresenterBase(TModel model, IRefactoringDialogFactory factory)
+        protected RefactoringPresenterGenericBase(DialogData dialogData, TModel model, IRefactoringDialogFactory factory)
         {
             _factory = factory;
             var view = _factory.CreateView<TModel, TView>(model);
             var viewModel = _factory.CreateViewModel<TModel, TViewModel>(model);
-            Dialog = _factory.CreateDialog<TModel, TView, TViewModel, TDialog>(model, view, viewModel);
+            Dialog = _factory.CreateDialog<TModel, TView, TViewModel, TDialog>(dialogData, model, view, viewModel);
         }
 
         public TDialog Dialog { get; }