Skip to content

Commit ceaf532

Browse files
committed
Update EncapsulateFieldNewCodeRefactoringAction
Relocate and functional updates
1 parent ab8d942 commit ceaf532

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldInsertNewCodeModel.cs renamed to Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldInsertNewCode/EncapsulateFieldInsertNewCodeModel.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
using Rubberduck.Refactorings.CodeBlockInsert;
33
using System.Collections.Generic;
44
using System.Linq;
5+
using Rubberduck.Refactorings.EncapsulateField;
56

6-
namespace Rubberduck.Refactorings.EncapsulateField
7+
namespace Rubberduck.Refactorings.EncapsulateFieldInsertNewCode
78
{
89
public class EncapsulateFieldInsertNewCodeModel : IRefactoringModel
910
{
@@ -14,25 +15,24 @@ public EncapsulateFieldInsertNewCodeModel(IEnumerable<IEncapsulateFieldCandidate
1415
{
1516
QualifiedModuleName = _selectedCandidates.Select(f => f.QualifiedModuleName).First();
1617
}
18+
19+
NewContent = new Dictionary<NewContentType, List<string>>
20+
{
21+
{ NewContentType.PostContentMessage, new List<string>() },
22+
{ NewContentType.DeclarationBlock, new List<string>() },
23+
{ NewContentType.CodeSectionBlock, new List<string>() },
24+
{ NewContentType.TypeDeclarationBlock, new List<string>() }
25+
};
1726
}
1827

1928
public bool IncludeNewContentMarker { set; get; } = false;
2029

2130
public QualifiedModuleName QualifiedModuleName { get; } = new QualifiedModuleName();
2231

23-
private Dictionary<NewContentType, List<string>> _newContent { set; get; }
24-
public Dictionary<NewContentType, List<string>> NewContent
25-
{
26-
set => _newContent = value;
27-
get => _newContent;
28-
}
32+
public Dictionary<NewContentType, List<string>> NewContent { set; get; }
2933

3034
private List<IEncapsulateFieldCandidate> _selectedCandidates;
3135
public IEnumerable<IEncapsulateFieldCandidate> SelectedFieldCandidates
3236
=> _selectedCandidates;
33-
//{
34-
// //set => _selectedCandidates = value.ToList();
35-
// get => _selectedCandidates;
36-
//}
3737
}
3838
}

Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldInsertNewCodeRefactoringAction.cs renamed to Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldInsertNewCode/EncapsulateFieldInsertNewCodeRefactoringAction.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
using System;
99
using System.Diagnostics;
1010
using System.Linq;
11+
using Rubberduck.Refactorings.EncapsulateField;
1112

12-
namespace Rubberduck.Refactorings.EncapsulateField
13+
namespace Rubberduck.Refactorings.EncapsulateFieldInsertNewCode
1314
{
1415
public class EncapsulateFieldInsertNewCodeRefactoringAction : CodeOnlyRefactoringActionBase<EncapsulateFieldInsertNewCodeModel>
1516
{

0 commit comments

Comments
 (0)