Skip to content

Commit cad4f22

Browse files
Hosch250Hosch250
committed
Redo interface
1 parent ebeae31 commit cad4f22

10 files changed

+42
-74
lines changed

‎RetailCoder.VBE/Refactorings/Rename/RenamePresenter.cs

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,32 @@
1-
using System;
1+
using System.Windows.Forms;
22
using Rubberduck.Parsing.Symbols;
33

44
namespace Rubberduck.Refactorings.Rename
55
{
66
public class RenamePresenter
77
{
88
private readonly IRenameView _view;
9-
private RenameModel _model;
9+
private readonly RenameModel _model;
1010

1111
public RenamePresenter(IRenameView view, RenameModel model)
1212
{
1313
_view = view;
14-
_view.OkButtonClicked += OnViewOkButtonClicked;
15-
_view.CancelButtonClicked += OnViewCancelButtonClicked;
1614

1715
_model = model;
1816
}
1917

2018
public RenameModel Show()
2119
{
22-
if (_model.Target != null)
20+
if (_model.Target == null) { return null; }
21+
22+
_view.Target = _model.Target;
23+
24+
if (_view.ShowDialog() != DialogResult.OK)
2325
{
24-
_view.Target = _model.Target;
25-
_view.ShowDialog();
26+
return null;
2627
}
2728

29+
_model.NewName = _view.NewName;
2830
return _model;
2931
}
3032

@@ -33,19 +35,14 @@ public RenameModel Show(Declaration target)
3335
_model.PromptIfTargetImplementsInterface(ref target);
3436
_model.Target = target;
3537
_view.Target = target;
36-
_view.ShowDialog();
37-
return _model;
38-
}
3938

40-
private void OnViewOkButtonClicked(object sender, EventArgs e)
41-
{
42-
_model.NewName = _view.NewName;
43-
}
39+
if (_view.ShowDialog() != DialogResult.OK)
40+
{
41+
return null;
42+
}
4443

45-
private void OnViewCancelButtonClicked(object sender, EventArgs e)
46-
{
47-
_model = null;
48-
_view.Hide();
44+
_model.NewName = _view.NewName;
45+
return _model;
4946
}
5047
}
5148
}

‎RetailCoder.VBE/UI/IDialogView.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@ namespace Rubberduck.UI
55
{
66
public interface IDialogView : IDisposable
77
{
8-
event EventHandler CancelButtonClicked;
9-
void OnCancelButtonClicked();
10-
11-
event EventHandler OkButtonClicked;
12-
void OnOkButtonClicked();
13-
148
DialogResult ShowDialog();
159
}
1610
}

‎RetailCoder.VBE/UI/Refactorings/ExtractMethodDialog.Designer.cs

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎RetailCoder.VBE/UI/Refactorings/ExtractMethodDialog.cs

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,6 @@ private void InitializeParameterGrid()
7575

7676
private void RegisterViewEvents()
7777
{
78-
OkButton.Click += OkButtonOnClick;
79-
CancelButton.Click += CancelButton_Click;
80-
8178
SetReturnValueCheck.CheckedChanged += SetReturnValueCheck_CheckedChanged;
8279
MethodNameBox.TextChanged += MethodNameBox_TextChanged;
8380
MethodAccessibilityCombo.SelectedIndexChanged += MethodAccessibilityCombo_SelectedIndexChanged;
@@ -156,29 +153,17 @@ private void OnViewEvent(EventHandler target, EventArgs args = null)
156153
}
157154

158155
public event EventHandler CancelButtonClicked;
159-
160-
public void OnCancelButtonClicked()
156+
public void OnCancelButtonClicked(object sender, EventArgs e)
161157
{
162158
OnViewEvent(CancelButtonClicked);
163159
}
164160

165-
private void CancelButton_Click(object sender, EventArgs e)
166-
{
167-
OnCancelButtonClicked();
168-
}
169-
170161
public event EventHandler OkButtonClicked;
171-
172-
public void OnOkButtonClicked()
162+
public void OnOkButtonClicked(object sender, EventArgs e)
173163
{
174164
OnViewEvent(OkButtonClicked);
175165
}
176166

177-
private void OkButtonOnClick(object sender, EventArgs e)
178-
{
179-
OnOkButtonClicked();
180-
}
181-
182167
private string _preview;
183168
public string Preview
184169
{

‎RetailCoder.VBE/UI/Refactorings/RemoveParametersDialog.Designer.cs

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎RetailCoder.VBE/UI/Refactorings/RemoveParametersDialog.cs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,19 +60,18 @@ public void InitializeParameterGrid()
6060
MethodParametersGrid.Columns.Add(column);
6161
}
6262

63-
private void OkButtonClick(object sender, EventArgs e)
64-
{
65-
OnOkButtonClicked();
66-
}
67-
6863
public event EventHandler CancelButtonClicked;
69-
public void OnCancelButtonClicked()
64+
public void OnCancelButtonClicked(object sender, EventArgs e)
7065
{
71-
Hide();
66+
var handler = CancelButtonClicked;
67+
if (handler != null)
68+
{
69+
handler(this, EventArgs.Empty);
70+
}
7271
}
7372

7473
public event EventHandler OkButtonClicked;
75-
public void OnOkButtonClicked()
74+
public void OnOkButtonClicked(object sender, EventArgs e)
7675
{
7776
var handler = OkButtonClicked;
7877
if (handler != null)

‎RetailCoder.VBE/UI/Refactorings/RenameDialog.Designer.cs

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎RetailCoder.VBE/UI/Refactorings/RenameDialog.cs

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ public RenameDialog()
1414
InitializeComponent();
1515
InitializeCaptions();
1616

17-
OkButton.Click += OkButtonClick;
18-
CancelButton.Click += CancelButtonClick;
1917
Shown += RenameDialog_Shown;
2018
NewNameBox.TextChanged += NewNameBox_TextChanged;
2119
}
@@ -41,18 +39,8 @@ private void RenameDialog_Shown(object sender, EventArgs e)
4139
NewNameBox.Focus();
4240
}
4341

44-
private void OkButtonClick(object sender, EventArgs e)
45-
{
46-
OnOkButtonClicked();
47-
}
48-
49-
private void CancelButtonClick(object sender, EventArgs e)
50-
{
51-
OnCancelButtonClicked();
52-
}
53-
5442
public event EventHandler CancelButtonClicked;
55-
public void OnCancelButtonClicked()
43+
public void OnCancelButtonClicked(object sender, EventArgs e)
5644
{
5745
var handler = CancelButtonClicked;
5846
if (handler != null)
@@ -62,7 +50,7 @@ public void OnCancelButtonClicked()
6250
}
6351

6452
public event EventHandler OkButtonClicked;
65-
public void OnOkButtonClicked()
53+
public void OnOkButtonClicked(object sender, EventArgs e)
6654
{
6755
var handler = OkButtonClicked;
6856
if (handler != null)

‎RetailCoder.VBE/UI/Refactorings/ReorderParametersDialog.Designer.cs

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎RetailCoder.VBE/UI/Refactorings/ReorderParametersDialog.cs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -129,20 +129,19 @@ public void InitializeParameterGrid()
129129
MethodParametersGrid.Columns.Add(column);
130130
_selectedItem = Parameters[0];
131131
}
132-
133-
private void OkButtonClick(object sender, EventArgs e)
134-
{
135-
OnOkButtonClicked();
136-
}
137-
132+
138133
public event EventHandler CancelButtonClicked;
139-
public void OnCancelButtonClicked()
134+
public void OnCancelButtonClicked(object sender, EventArgs e)
140135
{
141-
Hide();
136+
var handler = CancelButtonClicked;
137+
if (handler != null)
138+
{
139+
handler(this, EventArgs.Empty);
140+
}
142141
}
143142

144143
public event EventHandler OkButtonClicked;
145-
public void OnOkButtonClicked()
144+
public void OnOkButtonClicked(object sender, EventArgs e)
146145
{
147146
var handler = OkButtonClicked;
148147
if (handler != null)

0 commit comments

Comments
 (0)