Skip to content

Commit 32cf4d4

Browse files
Hosch250Hosch250
committed
Refactor MessageBox.Show() out of Rename, uses our IMessageBox instead.
1 parent 66b6665 commit 32cf4d4

File tree

6 files changed

+27
-25
lines changed

6 files changed

+27
-25
lines changed

‎RetailCoder.VBE/Inspections/DefaultProjectNameInspectionResult.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ private void RenameProject()
3737
using (var view = new RenameDialog())
3838
{
3939
var factory = new RenamePresenterFactory(vbe, view, _parseResult, new RubberduckMessageBox(), _factory);
40-
var refactoring = new RenameRefactoring(factory);
40+
var refactoring = new RenameRefactoring(factory, new RubberduckMessageBox());
4141
refactoring.Refactor(Target);
4242
}
4343
}

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@ namespace Rubberduck.Refactorings.Rename
1616
public class RenameRefactoring : IRefactoring
1717
{
1818
private readonly IRefactoringPresenterFactory<IRenamePresenter> _factory;
19+
private readonly IMessageBox _messageBox;
1920
private RenameModel _model;
2021

21-
public RenameRefactoring(IRefactoringPresenterFactory<IRenamePresenter> factory)
22+
public RenameRefactoring(IRefactoringPresenterFactory<IRenamePresenter> factory, IMessageBox messageBox)
2223
{
2324
_factory = factory;
25+
_messageBox = messageBox;
2426
}
2527

2628
public void Refactor()
@@ -121,7 +123,7 @@ private void Rename()
121123
{
122124
var message = string.Format(RubberduckUI.RenameDialog_ConflictingNames, _model.NewName,
123125
ambiguousId.IdentifierName);
124-
var rename = MessageBox.Show(message, RubberduckUI.RenameDialog_Caption,
126+
var rename = _messageBox.Show(message, RubberduckUI.RenameDialog_Caption,
125127
MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation);
126128

127129
if (rename == DialogResult.No)
@@ -192,7 +194,7 @@ private void RenameModule()
192194
}
193195
catch (COMException)
194196
{
195-
MessageBox.Show(RubberduckUI.RenameDialog_ModuleRenameError, RubberduckUI.RenameDialog_Caption);
197+
_messageBox.Show(RubberduckUI.RenameDialog_ModuleRenameError, RubberduckUI.RenameDialog_Caption);
196198
}
197199
}
198200

@@ -208,7 +210,7 @@ private void RenameProject()
208210
}
209211
catch (COMException)
210212
{
211-
MessageBox.Show(RubberduckUI.RenameDialog_ProjectRenameError, RubberduckUI.RenameDialog_Caption);
213+
_messageBox.Show(RubberduckUI.RenameDialog_ProjectRenameError, RubberduckUI.RenameDialog_Caption);
212214
}
213215
}
214216

‎RetailCoder.VBE/UI/FormContextMenu.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ private void Rename()
6060
using (var view = new RenameDialog())
6161
{
6262
var factory = new RenamePresenterFactory(_vbe, view, result, new RubberduckMessageBox(), _factory);
63-
var refactoring = new RenameRefactoring(factory);
63+
var refactoring = new RenameRefactoring(factory, new RubberduckMessageBox());
6464
refactoring.Refactor(controlToRename);
6565
}
6666
}

‎RetailCoder.VBE/UI/ProjectExplorerContextMenu.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ private void Rename_Click(CommandBarButton Ctrl, ref bool CancelDefault)
151151
using (var view = new RenameDialog())
152152
{
153153
var factory = new RenamePresenterFactory(_vbe, view, results, new RubberduckMessageBox(), _factory);
154-
var refactoring = new RenameRefactoring(factory);
154+
var refactoring = new RenameRefactoring(factory, new RubberduckMessageBox());
155155
refactoring.Refactor(declaration);
156156
}
157157
}

‎RetailCoder.VBE/UI/RefactorMenu.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ public void Rename()
442442
using (var view = new RenameDialog())
443443
{
444444
var factory = new RenamePresenterFactory(IDE, view, result, new RubberduckMessageBox(), _factory);
445-
var refactoring = new RenameRefactoring(factory);
445+
var refactoring = new RenameRefactoring(factory, new RubberduckMessageBox());
446446
refactoring.Refactor();
447447
}
448448
}
@@ -455,7 +455,7 @@ public void Rename(Declaration target)
455455
using (var view = new RenameDialog())
456456
{
457457
var factory = new RenamePresenterFactory(IDE, view, result, new RubberduckMessageBox(), _factory);
458-
var refactoring = new RenameRefactoring(factory);
458+
var refactoring = new RenameRefactoring(factory, new RubberduckMessageBox());
459459
refactoring.Refactor(target);
460460
}
461461
}

‎RubberduckTests/Refactoring/RenameTests.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void RenameRefactoring_RenameSub()
4848
var factory = SetupFactory(model);
4949

5050
//Act
51-
var refactoring = new RenameRefactoring(factory.Object);
51+
var refactoring = new RenameRefactoring(factory.Object, null);
5252
refactoring.Refactor(qualifiedSelection);
5353

5454
//Assert
@@ -86,7 +86,7 @@ Dim val2 As Integer
8686
var factory = SetupFactory(model);
8787

8888
//Act
89-
var refactoring = new RenameRefactoring(factory.Object);
89+
var refactoring = new RenameRefactoring(factory.Object, null);
9090
refactoring.Refactor(qualifiedSelection);
9191

9292
//Assert
@@ -122,7 +122,7 @@ public void RenameRefactoring_RenameParameter()
122122
var factory = SetupFactory(model);
123123

124124
//Act
125-
var refactoring = new RenameRefactoring(factory.Object);
125+
var refactoring = new RenameRefactoring(factory.Object, null);
126126
refactoring.Refactor(qualifiedSelection);
127127

128128
//Assert
@@ -168,7 +168,7 @@ End Sub
168168
var factory = SetupFactory(model);
169169

170170
//Act
171-
var refactoring = new RenameRefactoring(factory.Object);
171+
var refactoring = new RenameRefactoring(factory.Object, null);
172172
refactoring.Refactor(qualifiedSelection);
173173

174174
//Assert
@@ -208,7 +208,7 @@ Dim val2 As Integer
208208
var factory = SetupFactory(model);
209209

210210
//Act
211-
var refactoring = new RenameRefactoring(factory.Object);
211+
var refactoring = new RenameRefactoring(factory.Object, null);
212212
refactoring.Refactor(qualifiedSelection);
213213

214214
//Assert
@@ -246,7 +246,7 @@ public void RenameRefactoring_RenameParameter_UpdatesReferences()
246246
var factory = SetupFactory(model);
247247

248248
//Act
249-
var refactoring = new RenameRefactoring(factory.Object);
249+
var refactoring = new RenameRefactoring(factory.Object, null);
250250
refactoring.Refactor(qualifiedSelection);
251251

252252
//Assert
@@ -288,7 +288,7 @@ Private Property Set Goo(ByVal arg1 As Integer, ByVal arg2 As String)
288288
var factory = SetupFactory(model);
289289

290290
//Act
291-
var refactoring = new RenameRefactoring(factory.Object);
291+
var refactoring = new RenameRefactoring(factory.Object, null);
292292
refactoring.Refactor(qualifiedSelection);
293293

294294
//Assert
@@ -330,7 +330,7 @@ Private Property Let Goo(ByVal arg1 As String)
330330
var factory = SetupFactory(model);
331331

332332
//Act
333-
var refactoring = new RenameRefactoring(factory.Object);
333+
var refactoring = new RenameRefactoring(factory.Object, null);
334334
refactoring.Refactor(qualifiedSelection);
335335

336336
//Assert
@@ -368,7 +368,7 @@ public void RenameRefactoring_RenameFunction()
368368
var factory = SetupFactory(model);
369369

370370
//Act
371-
var refactoring = new RenameRefactoring(factory.Object);
371+
var refactoring = new RenameRefactoring(factory.Object, null);
372372
refactoring.Refactor(qualifiedSelection);
373373

374374
//Assert
@@ -418,7 +418,7 @@ End Sub
418418
var factory = SetupFactory(model);
419419

420420
//Act
421-
var refactoring = new RenameRefactoring(factory.Object);
421+
var refactoring = new RenameRefactoring(factory.Object, null);
422422
refactoring.Refactor(qualifiedSelection);
423423

424424
//Assert
@@ -454,7 +454,7 @@ public void RenameRefactoring_RefactorWithDeclaration()
454454
var factory = SetupFactory(model);
455455

456456
//Act
457-
var refactoring = new RenameRefactoring(factory.Object);
457+
var refactoring = new RenameRefactoring(factory.Object, null);
458458
refactoring.Refactor(model.Target);
459459

460460
//Assert
@@ -508,7 +508,7 @@ Private Sub IClass1_DoNothing(ByVal a As Integer, ByVal b As String)
508508
var factory = SetupFactory(model);
509509

510510
//Act
511-
var refactoring = new RenameRefactoring(factory.Object);
511+
var refactoring = new RenameRefactoring(factory.Object, null);
512512
refactoring.Refactor(qualifiedSelection);
513513

514514
//Assert
@@ -561,7 +561,7 @@ Private Sub abc_Goo(ByVal i As Integer, ByVal s As String)
561561
var factory = SetupFactory(model);
562562

563563
//Act
564-
var refactoring = new RenameRefactoring(factory.Object);
564+
var refactoring = new RenameRefactoring(factory.Object, null);
565565
refactoring.Refactor(qualifiedSelection);
566566

567567
//Assert
@@ -621,7 +621,7 @@ Private Sub IClass1_DoNothing(ByVal a As Integer, ByVal b As String)
621621
var factory = SetupFactory(model);
622622

623623
//Act
624-
var refactoring = new RenameRefactoring(factory.Object);
624+
var refactoring = new RenameRefactoring(factory.Object, null);
625625
refactoring.Refactor(model.Selection);
626626

627627
//Assert
@@ -693,7 +693,7 @@ public void Rename_PresenterIsNull()
693693
var factory = new RenamePresenterFactory(vbe.Object, null, parseResult, null, codePaneFactory);
694694

695695
//act
696-
var refactoring = new RenameRefactoring(factory);
696+
var refactoring = new RenameRefactoring(factory, null);
697697
refactoring.Refactor();
698698

699699
Assert.AreEqual(inputCode, module.Lines());
@@ -989,7 +989,7 @@ public void RenameRefactoring_RenameProject()
989989
var factory = SetupFactory(model);
990990

991991
//Act
992-
var refactoring = new RenameRefactoring(factory.Object);
992+
var refactoring = new RenameRefactoring(factory.Object, null);
993993
refactoring.Refactor(model.Target);
994994

995995
//Assert

0 commit comments

Comments
 (0)