Skip to content

Commit bf17684

Browse files
committed
Make the unnecessary abstract member concrete to make it less confusing to use with the model
1 parent f650d46 commit bf17684

File tree

5 files changed

+5
-25
lines changed

5 files changed

+5
-25
lines changed

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,7 @@ namespace Rubberduck.UI.Refactorings.ExtractInterface
88
internal class ExtractInterfacePresenter : RefactoringPresenterBase<ExtractInterfaceModel, ExtractInterfaceDialog, ExtractInterfaceView, ExtractInterfaceViewModel>, IExtractInterfacePresenter
99
{
1010
public ExtractInterfacePresenter(ExtractInterfaceModel model,
11-
IRefactoringDialogFactory dialogFactory) : base(model, dialogFactory)
12-
{
13-
ViewModel = dialogFactory.CreateViewModel<ExtractInterfaceModel, ExtractInterfaceViewModel>(model);
14-
}
15-
16-
public override ExtractInterfaceViewModel ViewModel { get; }
11+
IRefactoringDialogFactory dialogFactory) : base(model, dialogFactory) { }
1712

1813
public override ExtractInterfaceModel Show()
1914
{

Rubberduck.Core/UI/Refactorings/RefactoringPresenterBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ protected RefactoringPresenterBase(TModel model, IRefactoringDialogFactory facto
1919
Dialog = _factory.CreateDialog<TModel, TView, TViewModel, TDialog>(model, view, viewModel);
2020
}
2121

22-
public TModel Model => Dialog.Model;
2322
public TDialog Dialog { get; }
24-
public abstract TViewModel ViewModel { get; }
23+
public TModel Model => Dialog.Model;
24+
public TViewModel ViewModel => Dialog.ViewModel;
2525
public virtual RefactoringDialogResult DialogResult { get; protected set; }
2626

2727
public virtual TModel Show()

Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenter.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,9 @@ internal class RemoveParametersPresenter : RefactoringPresenterBase<RemoveParame
1313
public RemoveParametersPresenter(RemoveParametersModel model,
1414
IRefactoringDialogFactory dialogFactory, IMessageBox messageBox) : base(model, dialogFactory)
1515
{
16-
ViewModel = dialogFactory.CreateViewModel<RemoveParametersModel, RemoveParametersViewModel>(model);
1716
_messageBox = messageBox;
1817
}
1918

20-
public override RemoveParametersViewModel ViewModel { get; }
21-
2219
public override RemoveParametersModel Show()
2320
{
2421
if (Model.TargetDeclaration == null)

Rubberduck.Core/UI/Refactorings/Rename/RenamePresenter.cs

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,7 @@ namespace Rubberduck.UI.Refactorings.Rename
66
{
77
internal class RenamePresenter : RefactoringPresenterBase<RenameModel, IRefactoringDialog<RenameModel, IRefactoringView<RenameModel>, IRefactoringViewModel<RenameModel>>, IRefactoringView<RenameModel>, IRefactoringViewModel<RenameModel>>, IRenamePresenter
88
{
9-
private readonly RenameViewModel _viewModel;
10-
11-
public RenamePresenter(RenameModel model, IRefactoringDialogFactory dialogFactory) : base(model, dialogFactory)
12-
{
13-
_viewModel = dialogFactory.CreateViewModel<RenameModel, RenameViewModel>(model);
14-
}
15-
16-
public override IRefactoringViewModel<RenameModel> ViewModel => _viewModel;
9+
public RenamePresenter(RenameModel model, IRefactoringDialogFactory dialogFactory) : base(model, dialogFactory) { }
1710

1811
public override RenameModel Show()
1912
{
@@ -28,16 +21,14 @@ public RenameModel Show(Declaration target)
2821
}
2922

3023
Model.Target = target;
31-
_viewModel.Target = target;
3224

3325
var model = Show();
3426

3527
if (DialogResult != RefactoringDialogResult.Execute)
3628
{
3729
return null;
3830
}
39-
40-
//Model.NewName = _viewModel.NewName;
31+
4132
return model;
4233
}
4334
}

Rubberduck.Core/UI/Refactorings/ReorderParameters/ReorderParametersPresenter.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,9 @@ internal class ReorderParametersPresenter : RefactoringPresenterBase<ReorderPara
1414
public ReorderParametersPresenter(ReorderParametersModel model,
1515
IRefactoringDialogFactory dialogFactory, IMessageBox messageBox) : base(model, dialogFactory)
1616
{
17-
ViewModel = dialogFactory.CreateViewModel<ReorderParametersModel, ReorderParametersViewModel>(model);
1817
_messageBox = messageBox;
1918
}
2019

21-
public override ReorderParametersViewModel ViewModel { get; }
22-
2320
public override ReorderParametersModel Show()
2421
{
2522
if (Model.TargetDeclaration == null) { return null; }

0 commit comments

Comments
 (0)