Rewire the refactoring

Author: Hosch250

RetailCoder.VBE/Refactorings/ReorderParameters/IReorderParametersDialog.cs

@@ -1,5 +1,8 @@
-using System.Windows.Forms;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Windows.Forms;
 using Rubberduck.UI;
+using Rubberduck.UI.Refactorings.ReorderParameters;
 
 namespace Rubberduck.Refactorings.ReorderParameters
 {
@@ -10,11 +13,11 @@ public interface IReorderParametersPresenter
 
     public class ReorderParametersPresenter : IReorderParametersPresenter
     {
-        private readonly IReorderParametersDialog _view;
+        private readonly ReorderParametersDialog _view;
         private readonly ReorderParametersModel _model;
         private readonly IMessageBox _messageBox;
 
-        public ReorderParametersPresenter(IReorderParametersDialog view, ReorderParametersModel model, IMessageBox messageBox)
+        public ReorderParametersPresenter(ReorderParametersDialog view, ReorderParametersModel model, IMessageBox messageBox)
         {
             _view = view;
             _model = model;
@@ -32,15 +35,15 @@ public ReorderParametersModel Show()
                 return null;
             }
 
-            _view.Parameters = _model.Parameters;
-            _view.InitializeParameterGrid();
+            _view.ViewModel.Parameters = new ObservableCollection<Parameter>(_model.Parameters);
 
-            if (_view.ShowDialog() != DialogResult.OK)
+            _view.ShowDialog();
+            if (_view.DialogResult != DialogResult.OK)
             {
                 return null;
             }
 
-            _model.Parameters = _view.Parameters;
+            _model.Parameters = _view.ViewModel.Parameters.ToList();
             return _model;
         }
     }

RetailCoder.VBE/Refactorings/ReorderParameters/ReorderParametersPresenter.cs

@@ -1,17 +1,18 @@
 using Rubberduck.Parsing.VBA;
 using Rubberduck.UI;
+using Rubberduck.UI.Refactorings.ReorderParameters;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.Refactorings.ReorderParameters
 {
     public class ReorderParametersPresenterFactory : IRefactoringPresenterFactory<IReorderParametersPresenter>
     {
         private readonly IVBE _vbe;
-        private readonly IReorderParametersDialog _view;
+        private readonly ReorderParametersDialog _view;
         private readonly RubberduckParserState _state;
         private readonly IMessageBox _messageBox;
 
-        public ReorderParametersPresenterFactory(IVBE vbe, IReorderParametersDialog view,
+        public ReorderParametersPresenterFactory(IVBE vbe, ReorderParametersDialog view,
             RubberduckParserState state, IMessageBox messageBox)
         {
             _vbe = vbe;

RetailCoder.VBE/Refactorings/ReorderParameters/ReorderParametersPresenterFactory.cs

@@ -590,7 +590,6 @@
     <Compile Include="Refactorings\RemoveParameters\RemoveParametersPresenterFactory.cs" />
     <Compile Include="Refactorings\RemoveParameters\RemoveParametersRefactoring.cs" />
     <Compile Include="Refactorings\Rename\RenameModel.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" />

RetailCoder.VBE/Rubberduck.csproj

@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
+using System.Linq;
 using System.Runtime.InteropServices;
 using Rubberduck.Common;
 using Rubberduck.Parsing.Symbols;
@@ -73,13 +71,9 @@ protected override void ExecuteImpl(object parameter)
 
                 using (var view = new ReorderParametersDialog(new ReorderParametersViewModel(_state)))
                 {
-                    /*var factory = new ReorderParametersPresenterFactory(Vbe, view, _state, _msgbox);
+                    var factory = new ReorderParametersPresenterFactory(Vbe, view, _state, _msgbox);
                     var refactoring = new ReorderParametersRefactoring(Vbe, factory, _msgbox);
-                    refactoring.Refactor(selection);*/
-                    view.ViewModel.Parameters =
-                        new ObservableCollection<Parameter>(_state.AllUserDeclarations.Where(s => s.DeclarationType == DeclarationType.Parameter)
-                                .Select((s, i) => new Parameter((ParameterDeclaration)s, i)).ToList());
-                    view.ShowDialog();
+                    refactoring.Refactor(selection);
                 }
             }
         }