Update the presenters' implementation to handle the DialogData

bclothier · bclothier · commit 955cf1ce1a07 · 2018-12-29T17:29:56.000-06:00
diff --git a/Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldDialog.cs b/Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldDialog.cs
@@ -1,17 +1,14 @@
 ﻿using Rubberduck.Refactorings.EncapsulateField;
-using Rubberduck.Resources;
 
 namespace Rubberduck.UI.Refactorings.EncapsulateField
 {
     public sealed class EncapsulateFieldDialog : RefactoringDialogBase<EncapsulateFieldModel, EncapsulateFieldView, EncapsulateFieldViewModel>
     {
         private bool _isExpanded;
-        protected override int MinWidth => 667;
-        protected override int MinHeight => _isExpanded ? 560 : 305;
+        private new int MinHeight => _isExpanded ? 560 : 305;
 
-        public EncapsulateFieldDialog(EncapsulateFieldModel model, EncapsulateFieldView view, EncapsulateFieldViewModel viewModel) : base(model, view, viewModel)
+        public EncapsulateFieldDialog(DialogData dialogData, EncapsulateFieldModel model, EncapsulateFieldView view, EncapsulateFieldViewModel viewModel) : base(dialogData, model, view, viewModel)
         {
-            Text = RubberduckUI.EncapsulateField_Caption;
             ViewModel.ExpansionStateChanged += Vm_ExpansionStateChanged;
         }
 
diff --git a/Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldPresenter.cs b/Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldPresenter.cs
@@ -1,12 +1,16 @@
 ﻿using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.EncapsulateField;
+using Rubberduck.Resources;
 
 namespace Rubberduck.UI.Refactorings.EncapsulateField
 {
-    internal class EncapsulateFieldPresenter : RefactoringPresenterBase<EncapsulateFieldModel, IRefactoringDialog<EncapsulateFieldModel, IRefactoringView<EncapsulateFieldModel>, IRefactoringViewModel<EncapsulateFieldModel>>, IRefactoringView<EncapsulateFieldModel>, IRefactoringViewModel<EncapsulateFieldModel>>, IEncapsulateFieldPresenter
+    internal class EncapsulateFieldPresenter : RefactoringPresenterBase<EncapsulateFieldModel>, IEncapsulateFieldPresenter
     {
+        private static readonly DialogData DialogData =
+            DialogData.Create(RubberduckUI.EncapsulateField_Caption, 305, 667);
+
         public EncapsulateFieldPresenter(EncapsulateFieldModel model,
-            IRefactoringDialogFactory dialogFactory) : base(model, dialogFactory) { }
+            IRefactoringDialogFactory dialogFactory) : base(DialogData, model, dialogFactory) { }
 
         public override EncapsulateFieldModel Show()
         {
diff --git a/Rubberduck.Core/UI/Refactorings/ExtractInterface/ExtractInterfacePresenter.cs b/Rubberduck.Core/UI/Refactorings/ExtractInterface/ExtractInterfacePresenter.cs
@@ -1,12 +1,15 @@
 ﻿using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.ExtractInterface;
+using Rubberduck.Resources;
 
 namespace Rubberduck.UI.Refactorings.ExtractInterface
 {
-    internal class ExtractInterfacePresenter : RefactoringPresenterBase<ExtractInterfaceModel, IRefactoringDialog<ExtractInterfaceModel, IRefactoringView<ExtractInterfaceModel>, IRefactoringViewModel<ExtractInterfaceModel>>, IRefactoringView<ExtractInterfaceModel>, IRefactoringViewModel<ExtractInterfaceModel>>, IExtractInterfacePresenter
+    internal class ExtractInterfacePresenter : RefactoringPresenterBase<ExtractInterfaceModel>, IExtractInterfacePresenter
     {
+        private static readonly DialogData DialogData = DialogData.Create(RubberduckUI.ExtractInterface_Caption, 339, 459);
+
         public ExtractInterfacePresenter(ExtractInterfaceModel model,
-            IRefactoringDialogFactory dialogFactory) : base(model, dialogFactory) { }
+            IRefactoringDialogFactory dialogFactory) : base(DialogData, model, dialogFactory) { }
 
         public override ExtractInterfaceModel Show()
         {
diff --git a/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenter.cs b/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenter.cs
@@ -5,12 +5,14 @@
 
 namespace Rubberduck.UI.Refactorings.RemoveParameters
 {
-    public class RemoveParametersPresenter : RefactoringPresenterBase<RemoveParametersModel, IRefactoringDialog<RemoveParametersModel, IRefactoringView<RemoveParametersModel>, IRefactoringViewModel<RemoveParametersModel>>, IRefactoringView<RemoveParametersModel>, IRefactoringViewModel<RemoveParametersModel>>, IRemoveParametersPresenter
+    public class RemoveParametersPresenter : RefactoringPresenterBase<RemoveParametersModel>, IRemoveParametersPresenter
     {
+        private static readonly DialogData DialogData = DialogData.Create(RubberduckUI.RemoveParamsDialog_Caption, 395, 494);
         private readonly IMessageBox _messageBox;
 
         public RemoveParametersPresenter(RemoveParametersModel model,
-            IRefactoringDialogFactory dialogFactory, IMessageBox messageBox) : base(model, dialogFactory)
+            IRefactoringDialogFactory dialogFactory, IMessageBox messageBox) : 
+            base(DialogData,  model, dialogFactory)
         {
             _messageBox = messageBox;
         }
diff --git a/Rubberduck.Core/UI/Refactorings/Rename/RenamePresenter.cs b/Rubberduck.Core/UI/Refactorings/Rename/RenamePresenter.cs
@@ -1,12 +1,16 @@
 ﻿using Rubberduck.Parsing.Symbols;
 using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.Rename;
+using Rubberduck.Resources;
 
 namespace Rubberduck.UI.Refactorings.Rename
 {
-    internal class RenamePresenter : RefactoringPresenterBase<RenameModel, IRefactoringDialog<RenameModel, IRefactoringView<RenameModel>, IRefactoringViewModel<RenameModel>>, IRefactoringView<RenameModel>, IRefactoringViewModel<RenameModel>>, IRenamePresenter
+    internal class RenamePresenter : RefactoringPresenterBase<RenameModel>, IRenamePresenter
     {
-        public RenamePresenter(RenameModel model, IRefactoringDialogFactory dialogFactory) : base(model, dialogFactory) { }
+        private static readonly DialogData DialogData = DialogData.Create(RubberduckUI.RenameDialog_Caption, 164, 684);
+
+        public RenamePresenter(RenameModel model, IRefactoringDialogFactory dialogFactory) : 
+            base(DialogData,  model, dialogFactory) { }
 
         public override RenameModel Show()
         {
diff --git a/Rubberduck.Core/UI/Refactorings/ReorderParameters/ReorderParametersPresenter.cs b/Rubberduck.Core/UI/Refactorings/ReorderParameters/ReorderParametersPresenter.cs
@@ -1,18 +1,19 @@
-﻿using System.Collections.ObjectModel;
-using System.Linq;
-using Rubberduck.Resources;
+﻿using Rubberduck.Resources;
 using Rubberduck.Interaction;
 using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.ReorderParameters;
 
 namespace Rubberduck.UI.Refactorings.ReorderParameters
 {
-    public class ReorderParametersPresenter : RefactoringPresenterBase<ReorderParametersModel, IRefactoringDialog<ReorderParametersModel, IRefactoringView<ReorderParametersModel>, IRefactoringViewModel<ReorderParametersModel>>, IRefactoringView<ReorderParametersModel>, IRefactoringViewModel<ReorderParametersModel>>, IReorderParametersPresenter
+    public class ReorderParametersPresenter : RefactoringPresenterBase<ReorderParametersModel>, IReorderParametersPresenter
     {
+        private static readonly DialogData DialogData =
+            DialogData.Create(RubberduckUI.ReorderParamsDialog_Caption, 395, 494);
         private readonly IMessageBox _messageBox;
 
         public ReorderParametersPresenter(ReorderParametersModel model,
-            IRefactoringDialogFactory dialogFactory, IMessageBox messageBox) : base(model, dialogFactory)
+            IRefactoringDialogFactory dialogFactory, IMessageBox messageBox) : 
+            base(DialogData,  model, dialogFactory)
         {
             _messageBox = messageBox;
         }

Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,14 @@`
`1`	`1`	`using Rubberduck.Refactorings.EncapsulateField;`
`2`		`-using Rubberduck.Resources;`
`3`	`2`
`4`	`3`	`namespace Rubberduck.UI.Refactorings.EncapsulateField`
`5`	`4`	`{`
`6`	`5`	`public sealed class EncapsulateFieldDialog : RefactoringDialogBase<EncapsulateFieldModel, EncapsulateFieldView, EncapsulateFieldViewModel>`
`7`	`6`	`{`
`8`	`7`	`private bool _isExpanded;`
`9`		`- protected override int MinWidth => 667;`
`10`		`- protected override int MinHeight => _isExpanded ? 560 : 305;`
	`8`	`+ private new int MinHeight => _isExpanded ? 560 : 305;`
`11`	`9`
`12`		`- public EncapsulateFieldDialog(EncapsulateFieldModel model, EncapsulateFieldView view, EncapsulateFieldViewModel viewModel) : base(model, view, viewModel)`
	`10`	`+ public EncapsulateFieldDialog(DialogData dialogData, EncapsulateFieldModel model, EncapsulateFieldView view, EncapsulateFieldViewModel viewModel) : base(dialogData, model, view, viewModel)`
`13`	`11`	`{`
`14`		`- Text = RubberduckUI.EncapsulateField_Caption;`
`15`	`12`	`ViewModel.ExpansionStateChanged += Vm_ExpansionStateChanged;`
`16`	`13`	`}`
`17`	`14`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,16 @@`
`1`	`1`	`using Rubberduck.Refactorings;`
`2`	`2`	`using Rubberduck.Refactorings.EncapsulateField;`
	`3`	`+using Rubberduck.Resources;`
`3`	`4`
`4`	`5`	`namespace Rubberduck.UI.Refactorings.EncapsulateField`
`5`	`6`	`{`
`6`		`- internal class EncapsulateFieldPresenter : RefactoringPresenterBase<EncapsulateFieldModel, IRefactoringDialog<EncapsulateFieldModel, IRefactoringView<EncapsulateFieldModel>, IRefactoringViewModel<EncapsulateFieldModel>>, IRefactoringView<EncapsulateFieldModel>, IRefactoringViewModel<EncapsulateFieldModel>>, IEncapsulateFieldPresenter`
	`7`	`+ internal class EncapsulateFieldPresenter : RefactoringPresenterBase<EncapsulateFieldModel>, IEncapsulateFieldPresenter`
`7`	`8`	`{`
	`9`	`+ private static readonly DialogData DialogData =`
	`10`	`+ DialogData.Create(RubberduckUI.EncapsulateField_Caption, 305, 667);`
	`11`	`+`
`8`	`12`	`public EncapsulateFieldPresenter(EncapsulateFieldModel model,`
`9`		`- IRefactoringDialogFactory dialogFactory) : base(model, dialogFactory) { }`
	`13`	`+ IRefactoringDialogFactory dialogFactory) : base(DialogData, model, dialogFactory) { }`
`10`	`14`
`11`	`15`	`public override EncapsulateFieldModel Show()`
`12`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,15 @@`
`1`	`1`	`using Rubberduck.Refactorings;`
`2`	`2`	`using Rubberduck.Refactorings.ExtractInterface;`
	`3`	`+using Rubberduck.Resources;`
`3`	`4`
`4`	`5`	`namespace Rubberduck.UI.Refactorings.ExtractInterface`
`5`	`6`	`{`
`6`		`- internal class ExtractInterfacePresenter : RefactoringPresenterBase<ExtractInterfaceModel, IRefactoringDialog<ExtractInterfaceModel, IRefactoringView<ExtractInterfaceModel>, IRefactoringViewModel<ExtractInterfaceModel>>, IRefactoringView<ExtractInterfaceModel>, IRefactoringViewModel<ExtractInterfaceModel>>, IExtractInterfacePresenter`
	`7`	`+ internal class ExtractInterfacePresenter : RefactoringPresenterBase<ExtractInterfaceModel>, IExtractInterfacePresenter`
`7`	`8`	`{`
	`9`	`+ private static readonly DialogData DialogData = DialogData.Create(RubberduckUI.ExtractInterface_Caption, 339, 459);`
	`10`	`+`
`8`	`11`	`public ExtractInterfacePresenter(ExtractInterfaceModel model,`
`9`		`- IRefactoringDialogFactory dialogFactory) : base(model, dialogFactory) { }`
	`12`	`+ IRefactoringDialogFactory dialogFactory) : base(DialogData, model, dialogFactory) { }`
`10`	`13`
`11`	`14`	`public override ExtractInterfaceModel Show()`
`12`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,14 @@`
`5`	`5`
`6`	`6`	`namespace Rubberduck.UI.Refactorings.RemoveParameters`
`7`	`7`	`{`
`8`		`- public class RemoveParametersPresenter : RefactoringPresenterBase<RemoveParametersModel, IRefactoringDialog<RemoveParametersModel, IRefactoringView<RemoveParametersModel>, IRefactoringViewModel<RemoveParametersModel>>, IRefactoringView<RemoveParametersModel>, IRefactoringViewModel<RemoveParametersModel>>, IRemoveParametersPresenter`
	`8`	`+ public class RemoveParametersPresenter : RefactoringPresenterBase<RemoveParametersModel>, IRemoveParametersPresenter`
`9`	`9`	`{`
	`10`	`+ private static readonly DialogData DialogData = DialogData.Create(RubberduckUI.RemoveParamsDialog_Caption, 395, 494);`
`10`	`11`	`private readonly IMessageBox _messageBox;`
`11`	`12`
`12`	`13`	`public RemoveParametersPresenter(RemoveParametersModel model,`
`13`		`- IRefactoringDialogFactory dialogFactory, IMessageBox messageBox) : base(model, dialogFactory)`
	`14`	`+ IRefactoringDialogFactory dialogFactory, IMessageBox messageBox) :`
	`15`	`+ base(DialogData, model, dialogFactory)`
`14`	`16`	`{`
`15`	`17`	`_messageBox = messageBox;`
`16`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,16 @@`
`1`	`1`	`using Rubberduck.Parsing.Symbols;`
`2`	`2`	`using Rubberduck.Refactorings;`
`3`	`3`	`using Rubberduck.Refactorings.Rename;`
	`4`	`+using Rubberduck.Resources;`
`4`	`5`
`5`	`6`	`namespace Rubberduck.UI.Refactorings.Rename`
`6`	`7`	`{`
`7`		`- internal class RenamePresenter : RefactoringPresenterBase<RenameModel, IRefactoringDialog<RenameModel, IRefactoringView<RenameModel>, IRefactoringViewModel<RenameModel>>, IRefactoringView<RenameModel>, IRefactoringViewModel<RenameModel>>, IRenamePresenter`
	`8`	`+ internal class RenamePresenter : RefactoringPresenterBase<RenameModel>, IRenamePresenter`
`8`	`9`	`{`
`9`		`- public RenamePresenter(RenameModel model, IRefactoringDialogFactory dialogFactory) : base(model, dialogFactory) { }`
	`10`	`+ private static readonly DialogData DialogData = DialogData.Create(RubberduckUI.RenameDialog_Caption, 164, 684);`
	`11`	`+`
	`12`	`+ public RenamePresenter(RenameModel model, IRefactoringDialogFactory dialogFactory) :`
	`13`	`+ base(DialogData, model, dialogFactory) { }`
`10`	`14`
`11`	`15`	`public override RenameModel Show()`
`12`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,19 @@`
`1`		`-using System.Collections.ObjectModel;`
`2`		`-using System.Linq;`
`3`		`-using Rubberduck.Resources;`
	`1`	`+using Rubberduck.Resources;`
`4`	`2`	`using Rubberduck.Interaction;`
`5`	`3`	`using Rubberduck.Refactorings;`
`6`	`4`	`using Rubberduck.Refactorings.ReorderParameters;`
`7`	`5`
`8`	`6`	`namespace Rubberduck.UI.Refactorings.ReorderParameters`
`9`	`7`	`{`
`10`		`- public class ReorderParametersPresenter : RefactoringPresenterBase<ReorderParametersModel, IRefactoringDialog<ReorderParametersModel, IRefactoringView<ReorderParametersModel>, IRefactoringViewModel<ReorderParametersModel>>, IRefactoringView<ReorderParametersModel>, IRefactoringViewModel<ReorderParametersModel>>, IReorderParametersPresenter`
	`8`	`+ public class ReorderParametersPresenter : RefactoringPresenterBase<ReorderParametersModel>, IReorderParametersPresenter`
`11`	`9`	`{`
	`10`	`+ private static readonly DialogData DialogData =`
	`11`	`+ DialogData.Create(RubberduckUI.ReorderParamsDialog_Caption, 395, 494);`
`12`	`12`	`private readonly IMessageBox _messageBox;`
`13`	`13`
`14`	`14`	`public ReorderParametersPresenter(ReorderParametersModel model,`
`15`		`- IRefactoringDialogFactory dialogFactory, IMessageBox messageBox) : base(model, dialogFactory)`
	`15`	`+ IRefactoringDialogFactory dialogFactory, IMessageBox messageBox) :`
	`16`	`+ base(DialogData, model, dialogFactory)`
`16`	`17`	`{`
`17`	`18`	`_messageBox = messageBox;`
`18`	`19`	`}`