Integrate RefactoringActions

Removes EncapsulateFieldRefactoringAction base class to make
UseBackingField and UseBackingUDTMember refactoring actions independent.
Common functionality has been moved to new refactoringActions that are
constructor injected into UseBackingField and UseBackingUDTMember
refactoring actions.

Author: BZngr

Rubberduck.Refactorings/DeclareFieldsAsUDTMembers/DeclareFieldsAsUDTMembersModel.cs

@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Rubberduck.Refactorings.MoveFieldsToUDT
+namespace Rubberduck.Refactorings.DeclareFieldsAsUDTMembers
 {
     public class DeclareFieldsAsUDTMembersModel : IRefactoringModel
     {

Rubberduck.Refactorings/DeclareFieldsAsUDTMembers/DeclareFieldsAsUDTMembersRefactoringAction.cs

@@ -6,7 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-namespace Rubberduck.Refactorings.MoveFieldsToUDT
+namespace Rubberduck.Refactorings.DeclareFieldsAsUDTMembers
 {
     public class DeclareFieldsAsUDTMembersRefactoringAction : CodeOnlyRefactoringActionBase<DeclareFieldsAsUDTMembersModel>
     {

Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldModel.cs

@@ -1,9 +1,9 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.VBEditor;
+using Rubberduck.Refactorings.CodeBlockInsert;
 
 namespace Rubberduck.Refactorings.EncapsulateField
 {
@@ -19,6 +19,8 @@ public class EncapsulateFieldModel : IRefactoringModel
 
         private IDictionary<Declaration, (Declaration, IEnumerable<Declaration>)> _udtFieldToUdtDeclarationMap = new Dictionary<Declaration, (Declaration, IEnumerable<Declaration>)>();
 
+        private Dictionary<NewContentType, List<string>> _newContent { set; get; }
+
         public EncapsulateFieldModel(
             Declaration target,
             IEnumerable<IEncapsulateFieldCandidate> candidates,
@@ -54,7 +56,10 @@ public EncapsulateFieldStrategy EncapsulateFieldStrategy
             get => _encapsulationFieldStategy;
             set
             {
-                if (_encapsulationFieldStategy == value) { return; }
+                if (_encapsulationFieldStategy == value)
+                {
+                    return;
+                }
 
                 _encapsulationFieldStategy = value;
 
@@ -96,27 +101,36 @@ public IEnumerable<IEncapsulateFieldCandidate> SelectedFieldCandidates
 
         public IEnumerable<IUserDefinedTypeCandidate> UDTFieldCandidates 
             => EncapsulationCandidates
-                    .Where(v => v is IUserDefinedTypeCandidate)
-                    .Cast<IUserDefinedTypeCandidate>();
+                .Where(v => v is IUserDefinedTypeCandidate)
+                .Cast<IUserDefinedTypeCandidate>();
 
         public IEnumerable<IUserDefinedTypeCandidate> SelectedUDTFieldCandidates 
             => SelectedFieldCandidates
-                    .Where(v => v is IUserDefinedTypeCandidate)
-                    .Cast<IUserDefinedTypeCandidate>();
+                .Where(v => v is IUserDefinedTypeCandidate)
+                .Cast<IUserDefinedTypeCandidate>();
 
         public IEncapsulateFieldCandidate this[string encapsulatedFieldTargetID]
             => EncapsulationCandidates.Where(c => c.TargetID.Equals(encapsulatedFieldTargetID)).Single();
 
         public IEncapsulateFieldCandidate this[Declaration fieldDeclaration]
             => EncapsulationCandidates.Where(c => c.Declaration == fieldDeclaration).Single();
-        
+
+        public void AddContentBlock(NewContentType contentType, string block)
+            => _newContent[contentType].Add(block);
+
+        public Dictionary<NewContentType, List<string>> NewContent
+        {
+            set => _newContent = value;
+            get => _newContent;
+        }
+
         private IObjectStateUDT _activeObjectStateUDT;
         public IObjectStateUDT ObjectStateUDTField
         {
             get
             {
                 _activeObjectStateUDT = ObjectStateUDTCandidates
-                            .SingleOrDefault(os => os.IsSelected) ?? _newObjectStateUDT;
+                    .SingleOrDefault(os => os.IsSelected) ?? _newObjectStateUDT;
 
                 return _activeObjectStateUDT;
             }