Make refactoring dialog interfaces use "dialog" instead of "view" to match the implementation

Hosch250 · Hosch250 · commit 8f251a206f23 · 2016-05-06T10:40:34.000-05:00
diff --git a/RetailCoder.VBE/Refactorings/EncapsulateField/EncapsulateFieldPresenter.cs b/RetailCoder.VBE/Refactorings/EncapsulateField/EncapsulateFieldPresenter.cs
@@ -12,10 +12,10 @@ public interface IEncapsulateFieldPresenter
 
     public class EncapsulateFieldPresenter : IEncapsulateFieldPresenter
     {
-        private readonly IEncapsulateFieldView _view;
+        private readonly IEncapsulateFieldDialog _view;
         private readonly EncapsulateFieldModel _model;
 
-        public EncapsulateFieldPresenter(IEncapsulateFieldView view, EncapsulateFieldModel model)
+        public EncapsulateFieldPresenter(IEncapsulateFieldDialog view, EncapsulateFieldModel model)
         {
             _view = view;
             _model = model;
diff --git a/RetailCoder.VBE/Refactorings/EncapsulateField/EncapsulateFieldPresenterFactory.cs b/RetailCoder.VBE/Refactorings/EncapsulateField/EncapsulateFieldPresenterFactory.cs
@@ -7,10 +7,10 @@ namespace Rubberduck.Refactorings.EncapsulateField
     public class EncapsulateFieldPresenterFactory : IRefactoringPresenterFactory<EncapsulateFieldPresenter>
     {
         private readonly VBE _vbe;
-        private readonly IEncapsulateFieldView _view;
+        private readonly IEncapsulateFieldDialog _view;
         private readonly RubberduckParserState _parseResult;
 
-        public EncapsulateFieldPresenterFactory(VBE vbe, RubberduckParserState parseResult, IEncapsulateFieldView view)
+        public EncapsulateFieldPresenterFactory(VBE vbe, RubberduckParserState parseResult, IEncapsulateFieldDialog view)
         {
             _vbe = vbe;
             _view = view;
diff --git a/RetailCoder.VBE/Refactorings/EncapsulateField/IEncapsulateFieldDialog.cs b/RetailCoder.VBE/Refactorings/EncapsulateField/IEncapsulateFieldDialog.cs
@@ -3,7 +3,7 @@
 
 namespace Rubberduck.Refactorings.EncapsulateField
 {
-    public interface IEncapsulateFieldView :IDialogView
+    public interface IEncapsulateFieldDialog :IDialogView
     {
         Declaration TargetDeclaration { get; set; }
 
diff --git a/RetailCoder.VBE/Refactorings/ExtractInterface/ExtractInterfacePresenter.cs b/RetailCoder.VBE/Refactorings/ExtractInterface/ExtractInterfacePresenter.cs
@@ -11,10 +11,10 @@ public interface IExtractInterfacePresenter
 
     public class ExtractInterfacePresenter : IExtractInterfacePresenter
     {
-        private readonly IExtractInterfaceView _view;
+        private readonly IExtractInterfaceDialog _view;
         private readonly ExtractInterfaceModel _model;
 
-        public ExtractInterfacePresenter(IExtractInterfaceView view, ExtractInterfaceModel model)
+        public ExtractInterfacePresenter(IExtractInterfaceDialog view, ExtractInterfaceModel model)
         {
             _view = view;
             _model = model;
diff --git a/RetailCoder.VBE/Refactorings/ExtractInterface/ExtractInterfacePresenterFactory.cs b/RetailCoder.VBE/Refactorings/ExtractInterface/ExtractInterfacePresenterFactory.cs
@@ -8,10 +8,10 @@ namespace Rubberduck.Refactorings.ExtractInterface
     public class ExtractInterfacePresenterFactory : IRefactoringPresenterFactory<ExtractInterfacePresenter>
     {
         private readonly VBE _vbe;
-        private readonly IExtractInterfaceView _view;
+        private readonly IExtractInterfaceDialog _view;
         private readonly RubberduckParserState _state;
 
-        public ExtractInterfacePresenterFactory(VBE vbe, RubberduckParserState state, IExtractInterfaceView view)
+        public ExtractInterfacePresenterFactory(VBE vbe, RubberduckParserState state, IExtractInterfaceDialog view)
         {
             _vbe = vbe;
             _view = view;
diff --git a/RetailCoder.VBE/Refactorings/ExtractInterface/IExtractInterfaceDialog.cs b/RetailCoder.VBE/Refactorings/ExtractInterface/IExtractInterfaceDialog.cs
@@ -3,7 +3,7 @@
 
 namespace Rubberduck.Refactorings.ExtractInterface
 {
-    public interface IExtractInterfaceView : IDialogView
+    public interface IExtractInterfaceDialog : IDialogView
     {
         string InterfaceName { get; set; }
         IEnumerable<InterfaceMember> Members { get; set; }
diff --git a/RetailCoder.VBE/Refactorings/RemoveParameters/IRemoveParametersDialog.cs b/RetailCoder.VBE/Refactorings/RemoveParameters/IRemoveParametersDialog.cs
@@ -3,7 +3,7 @@
 
 namespace Rubberduck.Refactorings.RemoveParameters
 {
-    public interface IRemoveParametersView : IDialogView
+    public interface IRemoveParametersDialog : IDialogView
     {
         List<Parameter> Parameters { get; set; }
         void InitializeParameterGrid();
diff --git a/RetailCoder.VBE/Refactorings/RemoveParameters/RemoveParametersPresenter.cs b/RetailCoder.VBE/Refactorings/RemoveParameters/RemoveParametersPresenter.cs
@@ -10,11 +10,11 @@ public interface IRemoveParametersPresenter
 
     public class RemoveParametersPresenter : IRemoveParametersPresenter
     {
-        private readonly IRemoveParametersView _view;
+        private readonly IRemoveParametersDialog _view;
         private readonly RemoveParametersModel _model;
         private readonly IMessageBox _messageBox;
 
-        public RemoveParametersPresenter(IRemoveParametersView view, RemoveParametersModel model, IMessageBox messageBox)
+        public RemoveParametersPresenter(IRemoveParametersDialog view, RemoveParametersModel model, IMessageBox messageBox)
         {
             _view = view;
             _model = model;
diff --git a/RetailCoder.VBE/Refactorings/RemoveParameters/RemoveParametersPresenterFactory.cs b/RetailCoder.VBE/Refactorings/RemoveParameters/RemoveParametersPresenterFactory.cs
@@ -7,11 +7,11 @@ namespace Rubberduck.Refactorings.RemoveParameters
     public class RemoveParametersPresenterFactory : IRefactoringPresenterFactory<RemoveParametersPresenter>
     {
         private readonly VBE _vbe;
-        private readonly IRemoveParametersView _view;
+        private readonly IRemoveParametersDialog _view;
         private readonly RubberduckParserState _parseResult;
         private readonly IMessageBox _messageBox;
 
-        public RemoveParametersPresenterFactory(VBE vbe, IRemoveParametersView view,
+        public RemoveParametersPresenterFactory(VBE vbe, IRemoveParametersDialog view,
             RubberduckParserState parseResult, IMessageBox messageBox)
         {
             _vbe = vbe;
diff --git a/RetailCoder.VBE/Refactorings/Rename/IRenameDialog.cs b/RetailCoder.VBE/Refactorings/Rename/IRenameDialog.cs
@@ -3,7 +3,7 @@
 
 namespace Rubberduck.Refactorings.Rename
 {
-    public interface IRenameView : IDialogView
+    public interface IRenameDialog : IDialogView
     {
         Declaration Target { get; set; }
         string NewName { get; set; }
diff --git a/RetailCoder.VBE/Refactorings/Rename/RenamePresenter.cs b/RetailCoder.VBE/Refactorings/Rename/RenamePresenter.cs
@@ -11,10 +11,10 @@ public interface IRenamePresenter
 
     public class RenamePresenter : IRenamePresenter
     {
-        private readonly IRenameView _view;
+        private readonly IRenameDialog _view;
         private readonly RenameModel _model;
 
-        public RenamePresenter(IRenameView view, RenameModel model)
+        public RenamePresenter(IRenameDialog view, RenameModel model)
         {
             _view = view;
 
diff --git a/RetailCoder.VBE/Refactorings/Rename/RenamePresenterFactory.cs b/RetailCoder.VBE/Refactorings/Rename/RenamePresenterFactory.cs
@@ -9,12 +9,12 @@ namespace Rubberduck.Refactorings.Rename
     public class RenamePresenterFactory : IRefactoringPresenterFactory<RenamePresenter>
     {
         private readonly VBE _vbe;
-        private readonly IRenameView _view;
+        private readonly IRenameDialog _view;
         private readonly RubberduckParserState _parseResult;
         private readonly IMessageBox _messageBox;
         private readonly ICodePaneWrapperFactory _wrapperFactory;
 
-        public RenamePresenterFactory(VBE vbe, IRenameView view, RubberduckParserState parseResult, IMessageBox messageBox, ICodePaneWrapperFactory wrapperFactory)
+        public RenamePresenterFactory(VBE vbe, IRenameDialog view, RubberduckParserState parseResult, IMessageBox messageBox, ICodePaneWrapperFactory wrapperFactory)
         {
             _vbe = vbe;
             _view = view;
diff --git a/RetailCoder.VBE/Refactorings/ReorderParameters/IReorderParametersDialog.cs b/RetailCoder.VBE/Refactorings/ReorderParameters/IReorderParametersDialog.cs
@@ -3,7 +3,7 @@
 
 namespace Rubberduck.Refactorings.ReorderParameters
 {
-    public interface IReorderParametersView : IDialogView
+    public interface IReorderParametersDialog : IDialogView
     {
         List<Parameter> Parameters { get; set; }
         void InitializeParameterGrid();
diff --git a/RetailCoder.VBE/Refactorings/ReorderParameters/ReorderParametersPresenter.cs b/RetailCoder.VBE/Refactorings/ReorderParameters/ReorderParametersPresenter.cs
@@ -10,11 +10,11 @@ public interface IReorderParametersPresenter
 
     public class ReorderParametersPresenter : IReorderParametersPresenter
     {
-        private readonly IReorderParametersView _view;
+        private readonly IReorderParametersDialog _view;
         private readonly ReorderParametersModel _model;
         private readonly IMessageBox _messageBox;
 
-        public ReorderParametersPresenter(IReorderParametersView view, ReorderParametersModel model, IMessageBox messageBox)
+        public ReorderParametersPresenter(IReorderParametersDialog view, ReorderParametersModel model, IMessageBox messageBox)
         {
             _view = view;
             _model = model;
diff --git a/RetailCoder.VBE/Refactorings/ReorderParameters/ReorderParametersPresenterFactory.cs b/RetailCoder.VBE/Refactorings/ReorderParameters/ReorderParametersPresenterFactory.cs
@@ -7,11 +7,11 @@ namespace Rubberduck.Refactorings.ReorderParameters
     public class ReorderParametersPresenterFactory : IRefactoringPresenterFactory<IReorderParametersPresenter>
     {
         private readonly VBE _vbe;
-        private readonly IReorderParametersView _view;
+        private readonly IReorderParametersDialog _view;
         private readonly RubberduckParserState _parseResult;
         private readonly IMessageBox _messageBox;
 
-        public ReorderParametersPresenterFactory(VBE vbe, IReorderParametersView view,
+        public ReorderParametersPresenterFactory(VBE vbe, IReorderParametersDialog view,
             RubberduckParserState parseResult, IMessageBox messageBox)
         {
             _vbe = vbe;
diff --git a/RetailCoder.VBE/Root/RubberduckModule.cs b/RetailCoder.VBE/Root/RubberduckModule.cs
@@ -15,20 +15,17 @@
 using Rubberduck.Navigation.CodeExplorer;
 using Rubberduck.Parsing;
 using Rubberduck.Parsing.VBA;
-using Rubberduck.Refactorings.Rename;
 using Rubberduck.Settings;
 using Rubberduck.SmartIndenter;
 using Rubberduck.SourceControl;
 using Rubberduck.UI;
 using Rubberduck.UI.CodeExplorer;
-using Rubberduck.UI.CodeExplorer.Commands;
 using Rubberduck.UI.CodeInspections;
 using Rubberduck.UI.Command;
 using Rubberduck.UI.Command.MenuItems;
 using Rubberduck.UI.Command.MenuItems.ParentMenus;
 using Rubberduck.UI.Command.Refactorings;
 using Rubberduck.UI.Controls;
-using Rubberduck.UI.Refactorings;
 using Rubberduck.UI.SourceControl;
 using Rubberduck.UI.ToDoItems;
 using Rubberduck.UI.UnitTesting;
@@ -84,8 +81,6 @@ public override void Load()
 
             BindCommandsToMenuItems();
             BindCommandsToCodeExplorer();
-
-            Bind<IRenameView>().To<RenameDialog>().WhenInjectedInto<CodeExplorer_RenameCommand>();
             
             Rebind<IIndenter>().To<Indenter>().InSingletonScope();
             Rebind<IIndenterSettings>().To<IndenterSettings>();
diff --git a/RetailCoder.VBE/Rubberduck.csproj b/RetailCoder.VBE/Rubberduck.csproj
@@ -458,26 +458,26 @@
     <Compile Include="Refactorings\EncapsulateField\EncapsulateFieldPresenter.cs" />
     <Compile Include="Refactorings\EncapsulateField\EncapsulateFieldPresenterFactory.cs" />
     <Compile Include="Refactorings\EncapsulateField\EncapsulateFieldRefactoring.cs" />
-    <Compile Include="Refactorings\EncapsulateField\IEncapsulateFieldView.cs" />
+    <Compile Include="Refactorings\EncapsulateField\IEncapsulateFieldDialog.cs" />
     <Compile Include="Refactorings\ExtractInterface\ExtractInterfaceRefactoring.cs" />
     <Compile Include="Refactorings\ExtractInterface\ExtractInterfaceModel.cs" />
     <Compile Include="Refactorings\ExtractInterface\ExtractInterfacePresenter.cs" />
     <Compile Include="Refactorings\ExtractInterface\ExtractInterfacePresenterFactory.cs" />
-    <Compile Include="Refactorings\ExtractInterface\IExtractInterfaceView.cs" />
+    <Compile Include="Refactorings\ExtractInterface\IExtractInterfaceDialog.cs" />
     <Compile Include="Refactorings\ExtractInterface\InterfaceMember.cs" />
     <Compile Include="Refactorings\ImplementInterface\ImplementInterfaceRefactoring.cs" />
     <Compile Include="Refactorings\ImplementInterface\Parameter.cs" />
     <Compile Include="Refactorings\IntroduceField\IntroduceFieldRefactoring.cs" />
     <Compile Include="Refactorings\IntroduceParameter\IntroduceParameterRefactoring.cs" />
     <Compile Include="Refactorings\MoveCloserToUsage\MoveCloserToUsageRefactoring.cs" />
-    <Compile Include="Refactorings\RemoveParameters\IRemoveParametersView.cs" />
+    <Compile Include="Refactorings\RemoveParameters\IRemoveParametersDialog.cs" />
     <Compile Include="Refactorings\RemoveParameters\Parameter.cs" />
     <Compile Include="Refactorings\RemoveParameters\RemoveParametersModel.cs" />
     <Compile Include="Refactorings\RemoveParameters\RemoveParametersPresenter.cs" />
     <Compile Include="Refactorings\RemoveParameters\RemoveParametersPresenterFactory.cs" />
     <Compile Include="Refactorings\RemoveParameters\RemoveParametersRefactoring.cs" />
     <Compile Include="Refactorings\Rename\RenameModel.cs" />
-    <Compile Include="Refactorings\ReorderParameters\IReorderParametersView.cs" />
+    <Compile Include="Refactorings\ReorderParameters\IReorderParametersDialog.cs" />
     <Compile Include="Refactorings\ReorderParameters\ReorderParametersModel.cs" />
     <Compile Include="Refactorings\ReorderParameters\ReorderParametersPresenter.cs" />
     <Compile Include="Refactorings\ReorderParameters\ReorderParametersPresenterFactory.cs" />
@@ -791,7 +791,7 @@
     <Compile Include="UI\FileBrowserDialogFactory.cs" />
     <Compile Include="UI\SourceControl\IControlView.cs" />
     <Compile Include="UI\SourceControl\IControlViewModel.cs" />
-    <Compile Include="Refactorings\Rename\IRenameView.cs" />
+    <Compile Include="Refactorings\Rename\IRenameDialog.cs" />
     <Compile Include="UI\Refactorings\RenameDialog.cs">
       <SubType>Form</SubType>
     </Compile>
diff --git a/RetailCoder.VBE/UI/CodeExplorer/Commands/CodeExplorer_RenameCommand.cs b/RetailCoder.VBE/UI/CodeExplorer/Commands/CodeExplorer_RenameCommand.cs
@@ -14,9 +14,9 @@ public class CodeExplorer_RenameCommand : CommandBase, IDisposable
         private readonly VBE _vbe;
         private readonly RubberduckParserState _state;
         private readonly ICodePaneWrapperFactory _wrapperFactory;
-        private readonly IRenameView _view;
+        private readonly IRenameDialog _view;
 
-        public CodeExplorer_RenameCommand(VBE vbe, RubberduckParserState state, ICodePaneWrapperFactory wrapperFactory, IRenameView view)
+        public CodeExplorer_RenameCommand(VBE vbe, RubberduckParserState state, ICodePaneWrapperFactory wrapperFactory, IRenameDialog view)
         {
             _vbe = vbe;
             _state = state;
diff --git a/RetailCoder.VBE/UI/Refactorings/EncapsulateFieldDialog.cs b/RetailCoder.VBE/UI/Refactorings/EncapsulateFieldDialog.cs
@@ -7,7 +7,7 @@
 
 namespace Rubberduck.UI.Refactorings
 {
-    public partial class EncapsulateFieldDialog : Form, IEncapsulateFieldView
+    public partial class EncapsulateFieldDialog : Form, IEncapsulateFieldDialog
     {
         public string NewPropertyName
         {
diff --git a/RetailCoder.VBE/UI/Refactorings/ExtractInterfaceDialog.cs b/RetailCoder.VBE/UI/Refactorings/ExtractInterfaceDialog.cs
@@ -8,7 +8,7 @@
 
 namespace Rubberduck.UI.Refactorings
 {
-    public partial class ExtractInterfaceDialog : Form, IExtractInterfaceView
+    public partial class ExtractInterfaceDialog : Form, IExtractInterfaceDialog
     {
         public string InterfaceName
         {
diff --git a/RetailCoder.VBE/UI/Refactorings/RemoveParametersDialog.cs b/RetailCoder.VBE/UI/Refactorings/RemoveParametersDialog.cs
@@ -7,7 +7,7 @@
 
 namespace Rubberduck.UI.Refactorings
 {
-    public partial class RemoveParametersDialog : Form, IRemoveParametersView
+    public partial class RemoveParametersDialog : Form, IRemoveParametersDialog
     {
         public List<Parameter> Parameters { get; set; }
         private Parameter _selectedItem;
diff --git a/RetailCoder.VBE/UI/Refactorings/RenameDialog.cs b/RetailCoder.VBE/UI/Refactorings/RenameDialog.cs
@@ -7,7 +7,7 @@
 
 namespace Rubberduck.UI.Refactorings
 {
-    public partial class RenameDialog : Form, IRenameView
+    public partial class RenameDialog : Form, IRenameDialog
     {
         public RenameDialog()
         {
diff --git a/RetailCoder.VBE/UI/Refactorings/ReorderParametersDialog.cs b/RetailCoder.VBE/UI/Refactorings/ReorderParametersDialog.cs
@@ -7,7 +7,7 @@
 
 namespace Rubberduck.UI.Refactorings
 {
-    public partial class ReorderParametersDialog : Form, IReorderParametersView
+    public partial class ReorderParametersDialog : Form, IReorderParametersDialog
     {
         public List<Parameter> Parameters { get; set; }
         private Parameter _selectedItem;
diff --git a/RubberduckTests/CodeExplorer/CodeExplorerTests.cs b/RubberduckTests/CodeExplorer/CodeExplorerTests.cs
@@ -215,7 +215,7 @@ Sub Bar()
             var configLoader = new Mock<ConfigurationLoader>(null, null);
             configLoader.Setup(c => c.LoadConfiguration()).Returns(GetDefaultUnitTestConfig());
 
-            var view = new Mock<IRenameView>();
+            var view = new Mock<IRenameDialog>();
             view.Setup(r => r.ShowDialog()).Returns(DialogResult.OK);
             view.Setup(r => r.Target);
             view.SetupGet(r => r.NewName).Returns("Fizz");
diff --git a/RubberduckTests/Refactoring/EncapsulateFieldTests.cs b/RubberduckTests/Refactoring/EncapsulateFieldTests.cs
diff --git a/RubberduckTests/Refactoring/RemoveParametersTests.cs b/RubberduckTests/Refactoring/RemoveParametersTests.cs
diff --git a/RubberduckTests/Refactoring/RenameTests.cs b/RubberduckTests/Refactoring/RenameTests.cs
diff --git a/RubberduckTests/Refactoring/ReorderParametersTests.cs b/RubberduckTests/Refactoring/ReorderParametersTests.cs

Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,10 @@ public interface IEncapsulateFieldPresenter`
`12`	`12`
`13`	`13`	`public class EncapsulateFieldPresenter : IEncapsulateFieldPresenter`
`14`	`14`	`{`
`15`		`- private readonly IEncapsulateFieldView _view;`
	`15`	`+ private readonly IEncapsulateFieldDialog _view;`
`16`	`16`	`private readonly EncapsulateFieldModel _model;`
`17`	`17`
`18`		`- public EncapsulateFieldPresenter(IEncapsulateFieldView view, EncapsulateFieldModel model)`
	`18`	`+ public EncapsulateFieldPresenter(IEncapsulateFieldDialog view, EncapsulateFieldModel model)`
`19`	`19`	`{`
`20`	`20`	`_view = view;`
`21`	`21`	`_model = model;`
Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,10 @@ namespace Rubberduck.Refactorings.EncapsulateField`
`7`	`7`	`public class EncapsulateFieldPresenterFactory : IRefactoringPresenterFactory<EncapsulateFieldPresenter>`
`8`	`8`	`{`
`9`	`9`	`private readonly VBE _vbe;`
`10`		`- private readonly IEncapsulateFieldView _view;`
	`10`	`+ private readonly IEncapsulateFieldDialog _view;`
`11`	`11`	`private readonly RubberduckParserState _parseResult;`
`12`	`12`
`13`		`- public EncapsulateFieldPresenterFactory(VBE vbe, RubberduckParserState parseResult, IEncapsulateFieldView view)`
	`13`	`+ public EncapsulateFieldPresenterFactory(VBE vbe, RubberduckParserState parseResult, IEncapsulateFieldDialog view)`
`14`	`14`	`{`
`15`	`15`	`_vbe = vbe;`
`16`	`16`	`_view = view;`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace Rubberduck.Refactorings.EncapsulateField`
`5`	`5`	`{`
`6`		`- public interface IEncapsulateFieldView :IDialogView`
	`6`	`+ public interface IEncapsulateFieldDialog :IDialogView`
`7`	`7`	`{`
`8`	`8`	`Declaration TargetDeclaration { get; set; }`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,10 @@ public interface IExtractInterfacePresenter`
`11`	`11`
`12`	`12`	`public class ExtractInterfacePresenter : IExtractInterfacePresenter`
`13`	`13`	`{`
`14`		`- private readonly IExtractInterfaceView _view;`
	`14`	`+ private readonly IExtractInterfaceDialog _view;`
`15`	`15`	`private readonly ExtractInterfaceModel _model;`
`16`	`16`
`17`		`- public ExtractInterfacePresenter(IExtractInterfaceView view, ExtractInterfaceModel model)`
	`17`	`+ public ExtractInterfacePresenter(IExtractInterfaceDialog view, ExtractInterfaceModel model)`
`18`	`18`	`{`
`19`	`19`	`_view = view;`
`20`	`20`	`_model = model;`
Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,10 @@ namespace Rubberduck.Refactorings.ExtractInterface`
`8`	`8`	`public class ExtractInterfacePresenterFactory : IRefactoringPresenterFactory<ExtractInterfacePresenter>`
`9`	`9`	`{`
`10`	`10`	`private readonly VBE _vbe;`
`11`		`- private readonly IExtractInterfaceView _view;`
	`11`	`+ private readonly IExtractInterfaceDialog _view;`
`12`	`12`	`private readonly RubberduckParserState _state;`
`13`	`13`
`14`		`- public ExtractInterfacePresenterFactory(VBE vbe, RubberduckParserState state, IExtractInterfaceView view)`
	`14`	`+ public ExtractInterfacePresenterFactory(VBE vbe, RubberduckParserState state, IExtractInterfaceDialog view)`
`15`	`15`	`{`
`16`	`16`	`_vbe = vbe;`
`17`	`17`	`_view = view;`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace Rubberduck.Refactorings.ExtractInterface`
`5`	`5`	`{`
`6`		`- public interface IExtractInterfaceView : IDialogView`
	`6`	`+ public interface IExtractInterfaceDialog : IDialogView`
`7`	`7`	`{`
`8`	`8`	`string InterfaceName { get; set; }`
`9`	`9`	`IEnumerable<InterfaceMember> Members { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace Rubberduck.Refactorings.RemoveParameters`
`5`	`5`	`{`
`6`		`- public interface IRemoveParametersView : IDialogView`
	`6`	`+ public interface IRemoveParametersDialog : IDialogView`
`7`	`7`	`{`
`8`	`8`	`List<Parameter> Parameters { get; set; }`
`9`	`9`	`void InitializeParameterGrid();`
Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,11 @@ public interface IRemoveParametersPresenter`
`10`	`10`
`11`	`11`	`public class RemoveParametersPresenter : IRemoveParametersPresenter`
`12`	`12`	`{`
`13`		`- private readonly IRemoveParametersView _view;`
	`13`	`+ private readonly IRemoveParametersDialog _view;`
`14`	`14`	`private readonly RemoveParametersModel _model;`
`15`	`15`	`private readonly IMessageBox _messageBox;`
`16`	`16`
`17`		`- public RemoveParametersPresenter(IRemoveParametersView view, RemoveParametersModel model, IMessageBox messageBox)`
	`17`	`+ public RemoveParametersPresenter(IRemoveParametersDialog view, RemoveParametersModel model, IMessageBox messageBox)`
`18`	`18`	`{`
`19`	`19`	`_view = view;`
`20`	`20`	`_model = model;`
Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,11 @@ namespace Rubberduck.Refactorings.RemoveParameters`
`7`	`7`	`public class RemoveParametersPresenterFactory : IRefactoringPresenterFactory<RemoveParametersPresenter>`
`8`	`8`	`{`
`9`	`9`	`private readonly VBE _vbe;`
`10`		`- private readonly IRemoveParametersView _view;`
	`10`	`+ private readonly IRemoveParametersDialog _view;`
`11`	`11`	`private readonly RubberduckParserState _parseResult;`
`12`	`12`	`private readonly IMessageBox _messageBox;`
`13`	`13`
`14`		`- public RemoveParametersPresenterFactory(VBE vbe, IRemoveParametersView view,`
	`14`	`+ public RemoveParametersPresenterFactory(VBE vbe, IRemoveParametersDialog view,`
`15`	`15`	`RubberduckParserState parseResult, IMessageBox messageBox)`
`16`	`16`	`{`
`17`	`17`	`_vbe = vbe;`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace Rubberduck.Refactorings.Rename`
`5`	`5`	`{`
`6`		`- public interface IRenameView : IDialogView`
	`6`	`+ public interface IRenameDialog : IDialogView`
`7`	`7`	`{`
`8`	`8`	`Declaration Target { get; set; }`
`9`	`9`	`string NewName { get; set; }`