Skip to content

Commit 166ddf6

Browse files
MDoernerMDoerner
committed
Rename IBaseRefactoring to IRefactoringAction
Also renames all corresponding classes.
1 parent 8a31079 commit 166ddf6

File tree

42 files changed

+95
-95
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+95
-95
lines changed

‎Rubberduck.Refactorings/Abstract/CodeOnlyBaseRefactoringBase.cs renamed to ‎Rubberduck.Refactorings/Abstract/CodeOnlyRefactoringActionBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
namespace Rubberduck.Refactorings
66
{
7-
public abstract class CodeOnlyBaseRefactoringBase<TModel> : ICodeOnlyBaseRefactoring<TModel>
7+
public abstract class CodeOnlyRefactoringActionBase<TModel> : ICodeOnlyRefactoringAction<TModel>
88
where TModel : class, IRefactoringModel
99
{
1010
private readonly IRewritingManager _rewritingManager;
1111

12-
protected CodeOnlyBaseRefactoringBase(IRewritingManager rewritingManager)
12+
protected CodeOnlyRefactoringActionBase(IRewritingManager rewritingManager)
1313
{
1414
_rewritingManager = rewritingManager;
1515
}

‎Rubberduck.Refactorings/Abstract/IBaseRefactoring.cs renamed to ‎Rubberduck.Refactorings/Abstract/IRefactoringAction.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace Rubberduck.Refactorings
66
/// The heart of a refactoring: this part of the refactoring performs the actual transformation of the code once all necessary information has been gathered.
77
/// </summary>
88
/// <typeparam name="TModel">The model used by the refactoring containing all information needed to specify what to do.</typeparam>
9-
public interface IBaseRefactoring<in TModel> where TModel : class, IRefactoringModel
9+
public interface IRefactoringAction<in TModel> where TModel : class, IRefactoringModel
1010
{
1111
/// <summary>
1212
/// Performs the actual refactoring based on the parameters specified in the model.
@@ -26,7 +26,7 @@ public interface IRefactoringPreviewProvider<in TModel>
2626
string Preview(TModel model);
2727
}
2828

29-
public interface ICodeOnlyBaseRefactoring<in TModel> : IBaseRefactoring<TModel>
29+
public interface ICodeOnlyRefactoringAction<in TModel> : IRefactoringAction<TModel>
3030
where TModel : class, IRefactoringModel
3131
{
3232
/// <summary>

‎Rubberduck.Refactorings/Abstract/BaseRefactoringBase.cs renamed to ‎Rubberduck.Refactorings/Abstract/RefactoringActionBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
namespace Rubberduck.Refactorings
66
{
7-
public abstract class BaseRefactoringBase<TModel> : IBaseRefactoring<TModel>
7+
public abstract class RefactoringActionBase<TModel> : IRefactoringAction<TModel>
88
where TModel : class, IRefactoringModel
99
{
1010
private readonly IRewritingManager _rewritingManager;
1111

12-
protected BaseRefactoringBase(IRewritingManager rewritingManager)
12+
protected RefactoringActionBase(IRewritingManager rewritingManager)
1313
{
1414
_rewritingManager = rewritingManager;
1515
}

‎Rubberduck.Refactorings/Abstract/BaseRefactoringWithSuspensionBase.cs renamed to ‎Rubberduck.Refactorings/Abstract/RefactoringActionWithSuspension.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66

77
namespace Rubberduck.Refactorings
88
{
9-
public abstract class BaseRefactoringWithSuspensionBase<TModel> : BaseRefactoringBase<TModel>
9+
public abstract class RefactoringActionWithSuspension<TModel> : RefactoringActionBase<TModel>
1010
where TModel : class, IRefactoringModel
1111
{
1212
private readonly IParseManager _parseManager;
1313

1414
private readonly Logger _logger;
1515

16-
protected BaseRefactoringWithSuspensionBase(IParseManager parseManager, IRewritingManager rewritingManager)
16+
protected RefactoringActionWithSuspension(IParseManager parseManager, IRewritingManager rewritingManager)
1717
: base(rewritingManager)
1818
{
1919
_parseManager = parseManager;

‎Rubberduck.Refactorings/ExtractInterface/ExtractInterfaceRefactoring.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ namespace Rubberduck.Refactorings.ExtractInterface
1212
{
1313
public class ExtractInterfaceRefactoring : InteractiveRefactoringBase<IExtractInterfacePresenter, ExtractInterfaceModel>
1414
{
15-
private readonly IBaseRefactoring<ExtractInterfaceModel> _baseRefactoring;
15+
private readonly IRefactoringAction<ExtractInterfaceModel> _refactoringAction;
1616
private readonly IDeclarationFinderProvider _declarationFinderProvider;
1717

1818
public ExtractInterfaceRefactoring(
19-
ExtractInterfaceBaseRefactoring baseRefactoring,
19+
ExtractInterfaceRefactoringAction refactoringAction,
2020
IDeclarationFinderProvider declarationFinderProvider,
2121
IRefactoringPresenterFactory factory,
2222
ISelectionProvider selectionProvider,
2323
IUiDispatcher uiDispatcher)
2424
:base(selectionProvider, factory, uiDispatcher)
2525
{
26-
_baseRefactoring = baseRefactoring;
26+
_refactoringAction = refactoringAction;
2727
_declarationFinderProvider = declarationFinderProvider;
2828
}
2929

@@ -61,7 +61,7 @@ protected override ExtractInterfaceModel InitializeModel(Declaration target)
6161

6262
protected override void RefactorImpl(ExtractInterfaceModel model)
6363
{
64-
_baseRefactoring.Refactor(model);
64+
_refactoringAction.Refactor(model);
6565
}
6666

6767
//TODO: Redesign how refactoring commands are wired up to make this a responsibility of the command again.

‎Rubberduck.Refactorings/ExtractInterface/ExtractInterfaceBaseRefactoring.cs renamed to ‎Rubberduck.Refactorings/ExtractInterface/ExtractInterfaceRefactoringAction.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,21 @@
1414

1515
namespace Rubberduck.Refactorings.ExtractInterface
1616
{
17-
public class ExtractInterfaceBaseRefactoring : BaseRefactoringWithSuspensionBase<ExtractInterfaceModel>
17+
public class ExtractInterfaceRefactoringAction : RefactoringActionWithSuspension<ExtractInterfaceModel>
1818
{
19-
private readonly ICodeOnlyBaseRefactoring<AddInterfaceImplementationsModel> _addImplementationsRefactoring;
19+
private readonly ICodeOnlyRefactoringAction<AddInterfaceImplementationsModel> _addImplementationsRefactoringAction;
2020
private readonly IParseTreeProvider _parseTreeProvider;
2121
private readonly IProjectsProvider _projectsProvider;
2222

23-
public ExtractInterfaceBaseRefactoring(
24-
AddInterFaceImplementationsBaseRefactoring addImplementationsRefactoring,
23+
public ExtractInterfaceRefactoringAction(
24+
AddInterfaceImplementationsRefactoringAction addImplementationsRefactoringAction,
2525
IParseTreeProvider parseTreeProvider,
2626
IParseManager parseManager,
2727
IRewritingManager rewritingManager,
2828
IProjectsProvider projectsProvider)
2929
: base(parseManager, rewritingManager)
3030
{
31-
_addImplementationsRefactoring = addImplementationsRefactoring;
31+
_addImplementationsRefactoringAction = addImplementationsRefactoringAction;
3232
_parseTreeProvider = parseTreeProvider;
3333
_projectsProvider = projectsProvider;
3434
}
@@ -131,7 +131,7 @@ private void AddInterfaceMembersToClass(ExtractInterfaceModel model, IRewriteSes
131131
var membersToImplement = model.SelectedMembers.Select(m => m.Member).ToList();
132132

133133
var addMembersModel = new AddInterfaceImplementationsModel(targetModule, interfaceName, membersToImplement);
134-
_addImplementationsRefactoring.Refactor(addMembersModel, rewriteSession);
134+
_addImplementationsRefactoringAction.Refactor(addMembersModel, rewriteSession);
135135
}
136136

137137
private static string GetInterfaceModuleBody(ExtractInterfaceModel model)

‎Rubberduck.Refactorings/ImplementInterface/AddInterfaceImplementations/AddInterFaceImplementationsBaseRefactoring.cs renamed to ‎Rubberduck.Refactorings/ImplementInterface/AddInterfaceImplementations/AddInterfaceImplementationsRefactoringAction.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88

99
namespace Rubberduck.Refactorings.AddInterfaceImplementations
1010
{
11-
public class AddInterFaceImplementationsBaseRefactoring : CodeOnlyBaseRefactoringBase<AddInterfaceImplementationsModel>
11+
public class AddInterfaceImplementationsRefactoringAction : CodeOnlyRefactoringActionBase<AddInterfaceImplementationsModel>
1212
{
1313
private const string MemberBody = " Err.Raise 5 'TODO implement interface member";
1414

15-
public AddInterFaceImplementationsBaseRefactoring(IRewritingManager rewritingManager)
15+
public AddInterfaceImplementationsRefactoringAction(IRewritingManager rewritingManager)
1616
: base(rewritingManager)
1717
{}
1818

‎Rubberduck.Refactorings/ImplementInterface/ImplementInterfaceRefactoring.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ namespace Rubberduck.Refactorings.ImplementInterface
1212
{
1313
public class ImplementInterfaceRefactoring : RefactoringBase
1414
{
15-
private readonly IBaseRefactoring<ImplementInterfaceModel> _baseRefactoring;
15+
private readonly IRefactoringAction<ImplementInterfaceModel> _refactoringAction;
1616
private readonly IDeclarationFinderProvider _declarationFinderProvider;
1717

1818
public ImplementInterfaceRefactoring(
19-
ImplementInterfaceBaseRefactoring baseRefactoring,
19+
ImplementInterfaceRefactoringAction refactoringAction,
2020
IDeclarationFinderProvider declarationFinderProvider,
2121
ISelectionProvider selectionProvider)
2222
:base(selectionProvider)
2323
{
24-
_baseRefactoring = baseRefactoring;
24+
_refactoringAction = refactoringAction;
2525
_declarationFinderProvider = declarationFinderProvider;
2626
}
2727

@@ -59,7 +59,7 @@ public override void Refactor(QualifiedSelection target)
5959
}
6060

6161
var model = Model(targetInterface, targetClass);
62-
_baseRefactoring.Refactor(model);
62+
_refactoringAction.Refactor(model);
6363
}
6464

6565
private static ImplementInterfaceModel Model(ClassModuleDeclaration targetInterface, ClassModuleDeclaration targetClass)

‎Rubberduck.Refactorings/ImplementInterface/ImplementInterfaceBaseRefactoring.cs renamed to ‎Rubberduck.Refactorings/ImplementInterface/ImplementInterfaceRefactoringAction.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55

66
namespace Rubberduck.Refactorings.ImplementInterface
77
{
8-
public class ImplementInterfaceBaseRefactoring : BaseRefactoringBase<ImplementInterfaceModel>
8+
public class ImplementInterfaceRefactoringAction : RefactoringActionBase<ImplementInterfaceModel>
99
{
10-
private readonly ICodeOnlyBaseRefactoring<AddInterfaceImplementationsModel> _addImplementationsRefactoring;
10+
private readonly ICodeOnlyRefactoringAction<AddInterfaceImplementationsModel> _addImplementationsRefactoringAction;
1111

12-
public ImplementInterfaceBaseRefactoring(
13-
AddInterFaceImplementationsBaseRefactoring addImplementationsRefactoring,
12+
public ImplementInterfaceRefactoringAction(
13+
AddInterfaceImplementationsRefactoringAction addImplementationsRefactoringAction,
1414
IRewritingManager rewritingManager)
1515
: base(rewritingManager)
1616
{
17-
_addImplementationsRefactoring = addImplementationsRefactoring;
17+
_addImplementationsRefactoringAction = addImplementationsRefactoringAction;
1818
}
1919

2020
protected override void Refactor(ImplementInterfaceModel model, IRewriteSession rewriteSession)
@@ -35,7 +35,7 @@ private void ImplementMissingMembers(ModuleDeclaration targetInterface, ModuleDe
3535
var nonImplementedMembers = interfaceMembers.Where(member => !implemented.Contains(member));
3636

3737
var addMembersModel = new AddInterfaceImplementationsModel(targetClass.QualifiedModuleName, targetInterface.IdentifierName, nonImplementedMembers.ToList());
38-
_addImplementationsRefactoring.Refactor(addMembersModel, rewriteSession);
38+
_addImplementationsRefactoringAction.Refactor(addMembersModel, rewriteSession);
3939
}
4040
}
4141
}

‎Rubberduck.Refactorings/IntroduceField/IntroduceFieldRefactoring.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ namespace Rubberduck.Refactorings.IntroduceField
1010
{
1111
public class IntroduceFieldRefactoring : RefactoringBase
1212
{
13-
private readonly IBaseRefactoring<IntroduceFieldModel> _baseRefactoring;
13+
private readonly IRefactoringAction<IntroduceFieldModel> _refactoringAction;
1414
private readonly ISelectedDeclarationProvider _selectedDeclarationProvider;
1515

1616
public IntroduceFieldRefactoring(
17-
IntroduceFieldBaseRefactoring baseRefactoring,
17+
IntroduceFieldRefactoringAction refactoringAction,
1818
ISelectionProvider selectionProvider,
1919
ISelectedDeclarationProvider selectedDeclarationProvider)
2020
:base(selectionProvider)
2121
{
22-
_baseRefactoring = baseRefactoring;
22+
_refactoringAction = refactoringAction;
2323
_selectedDeclarationProvider = selectedDeclarationProvider;
2424
}
2525

@@ -58,7 +58,7 @@ public override void Refactor(Declaration target)
5858
private void PromoteVariable(Declaration target)
5959
{
6060
var model = Model(target);
61-
_baseRefactoring.Refactor(model);
61+
_refactoringAction.Refactor(model);
6262
}
6363

6464
private static IntroduceFieldModel Model(Declaration target)

0 commit comments

Comments
 (0)