Reorganizing of UI support classes

Author: BZngr

Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldViewModel.cs

@@ -12,72 +12,10 @@ namespace Rubberduck.UI.Refactorings.EncapsulateField
 {
     public class EncapsulateFieldViewModel : RefactoringViewModelBase<EncapsulateFieldModel>
     {
-        private class MasterDetailSelectionManager
-        {
-            private const string _neverATargetID = "_Never_a_TargetID_";
-            private bool _detailFieldIsFlagged;
-
-            public MasterDetailSelectionManager(IEncapsulateFieldCandidate selected)
-                : this(selected?.TargetID)
-            {
-                if (selected != null)
-                {
-                    DetailField = new ViewableEncapsulatedField(selected);
-                }
-            }
-
-            private MasterDetailSelectionManager(string targetID)
-            {
-                SelectionTargetID = targetID;
-                DetailField = null;
-                _detailFieldIsFlagged = false;
-            }
-
-
-            private IEncapsulatedFieldViewData _detailField;
-            public IEncapsulatedFieldViewData DetailField
-            {
-                set
-                {
-                    _detailField = value;
-                    _detailFieldIsFlagged = _detailField?.EncapsulateFlag ?? false;
-                }
-                get => _detailField;
-            }
-
-            private string _selectionTargetID;
-            public string SelectionTargetID
-            {
-                set => _selectionTargetID = value;
-                get => _selectionTargetID ?? _neverATargetID;
-            }
-
-            public bool DetailUpdateRequired
-            {
-                get
-                {
-                    if (DetailField is null)
-                    {
-                        return true;
-                    }
-
-                    if (_detailFieldIsFlagged != DetailField.EncapsulateFlag)
-                    {
-                        _detailFieldIsFlagged = !_detailFieldIsFlagged;
-                        return true;
-                    }
-                    return SelectionTargetID != DetailField?.TargetID;
-                }
-            }
-        }
-
         private MasterDetailSelectionManager _masterDetailManager;
-        public RubberduckParserState State { get; }
 
-        public EncapsulateFieldViewModel(EncapsulateFieldModel model, RubberduckParserState state) : base(model)
+        public EncapsulateFieldViewModel(EncapsulateFieldModel model) : base(model)
         {
-            State = state;
-
             SelectAllCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), _ => ToggleSelection(true));
             DeselectAllCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), _ => ToggleSelection(false));
 
@@ -159,18 +97,6 @@ public IObjectStateUDT SelectedObjectStateUDT
             }
         }
 
-        private void SetObjectStateUDT()
-        {
-            foreach (var field in UDTFields)
-            {
-                field.IsSelected = _selectedObjectStateUDT == field;
-            }
-            OnPropertyChanged(nameof(SelectedObjectStateUDT));
-            OnPropertyChanged(nameof(EncapsulationFields));
-            OnPropertyChanged(nameof(PropertiesPreview));
-        }
-
-
         public IEncapsulatedFieldViewData SelectedField
         {
             set
@@ -191,25 +117,6 @@ public IEncapsulatedFieldViewData SelectedField
             get => EncapsulationFields.FirstOrDefault(f => f.TargetID.Equals(_masterDetailManager.SelectionTargetID));
         }
 
-        private void UpdateDetailForSelection()
-        {
-
-            RefreshValidationResults();
-
-            OnPropertyChanged(nameof(SelectedFieldIsNotFlagged));
-            OnPropertyChanged(nameof(GroupBoxHeaderContent));
-            OnPropertyChanged(nameof(PropertyName));
-            OnPropertyChanged(nameof(IsReadOnly));
-            OnPropertyChanged(nameof(HasValidNames));
-            OnPropertyChanged(nameof(EnableReadOnlyOption));
-            OnPropertyChanged(nameof(SelectedFieldIsPrivateUDT));
-            OnPropertyChanged(nameof(SelectedFieldHasEditablePropertyName));
-            OnPropertyChanged(nameof(SelectionHasValidEncapsulationAttributes));
-            OnPropertyChanged(nameof(PropertiesPreview));
-            OnPropertyChanged(nameof(EncapsulationFields));
-            OnPropertyChanged(nameof(ValidationErrorMessage));
-        }
-
         public string PropertyName
         {
             set
@@ -291,34 +198,31 @@ public bool ConvertFieldsToUDTMembers
         private bool _selectionHasValidEncapsulationAttributes;
         public bool SelectionHasValidEncapsulationAttributes => _selectionHasValidEncapsulationAttributes;
 
-        private Dictionary<string, string> _failedValidationResults = new Dictionary<string, string>();
-        private void RefreshValidationResults()
-        {
-            _failedValidationResults.Clear();
-            _hasValidNames = true;
-            _selectionHasValidEncapsulationAttributes = true;
-            _validationErrorMessage = string.Empty;
+        public string PropertiesPreview => Model.PreviewRefactoring();
 
-            foreach (var field in EncapsulationFields.Where(ef => ef.EncapsulateFlag))
-            {
-                if (!field.TryValidateEncapsulationAttributes(out var errorMessage))
-                {
-                    _failedValidationResults.Add(field.TargetID, errorMessage);
-                }
-            }
+        public CommandBase SelectAllCommand { get; }
 
-            _hasValidNames = !_failedValidationResults.Any();
-            if (_failedValidationResults.TryGetValue(_masterDetailManager.SelectionTargetID, out var errorMsg))
+        public CommandBase DeselectAllCommand { get; }
+
+        public CommandBase IsReadOnlyCommand { get; }
+
+        public CommandBase PropertyChangeCommand { get; }
+
+        public CommandBase EncapsulateFlagChangeCommand { get; }
+
+        public CommandBase ReadOnlyChangeCommand { get; }
+
+        private void SetObjectStateUDT()
+        {
+            foreach (var field in UDTFields)
             {
-                _validationErrorMessage = errorMsg;
-                _selectionHasValidEncapsulationAttributes = false;
+                field.IsSelected = _selectedObjectStateUDT == field;
             }
+            OnPropertyChanged(nameof(SelectedObjectStateUDT));
+            OnPropertyChanged(nameof(EncapsulationFields));
+            OnPropertyChanged(nameof(PropertiesPreview));
         }
 
-        public string PropertiesPreview => Model.PreviewRefactoring();
-
-        public CommandBase SelectAllCommand { get; }
-        public CommandBase DeselectAllCommand { get; }
         private void ToggleSelection(bool value)
         {
             _lastCheckedBoxes.Clear();
@@ -340,11 +244,48 @@ private void ToggleSelection(bool value)
             UpdateDetailForSelection();
         }
 
-        public CommandBase IsReadOnlyCommand { get; }
-        public CommandBase PropertyChangeCommand { get; }
+        private Dictionary<string, string> _failedValidationResults = new Dictionary<string, string>();
+        private void RefreshValidationResults()
+        {
+            _failedValidationResults.Clear();
+            _hasValidNames = true;
+            _selectionHasValidEncapsulationAttributes = true;
+            _validationErrorMessage = string.Empty;
 
-        public CommandBase EncapsulateFlagChangeCommand { get; }
-        public CommandBase ReadOnlyChangeCommand { get; }
+            foreach (var field in EncapsulationFields.Where(ef => ef.EncapsulateFlag))
+            {
+                if (!field.TryValidateEncapsulationAttributes(out var errorMessage))
+                {
+                    _failedValidationResults.Add(field.TargetID, errorMessage);
+                }
+            }
+
+            _hasValidNames = !_failedValidationResults.Any();
+            if (_failedValidationResults.TryGetValue(_masterDetailManager.SelectionTargetID, out var errorMsg))
+            {
+                _validationErrorMessage = errorMsg;
+                _selectionHasValidEncapsulationAttributes = false;
+            }
+        }
+
+        private void UpdateDetailForSelection()
+        {
+
+            RefreshValidationResults();
+
+            OnPropertyChanged(nameof(SelectedFieldIsNotFlagged));
+            OnPropertyChanged(nameof(GroupBoxHeaderContent));
+            OnPropertyChanged(nameof(PropertyName));
+            OnPropertyChanged(nameof(IsReadOnly));
+            OnPropertyChanged(nameof(HasValidNames));
+            OnPropertyChanged(nameof(EnableReadOnlyOption));
+            OnPropertyChanged(nameof(SelectedFieldIsPrivateUDT));
+            OnPropertyChanged(nameof(SelectedFieldHasEditablePropertyName));
+            OnPropertyChanged(nameof(SelectionHasValidEncapsulationAttributes));
+            OnPropertyChanged(nameof(PropertiesPreview));
+            OnPropertyChanged(nameof(EncapsulationFields));
+            OnPropertyChanged(nameof(ValidationErrorMessage));
+        }
 
         private void ChangeIsReadOnlyFlag(object param)
         {

Rubberduck.Core/UI/Refactorings/EncapsulateField/MasterDetailSelectionManager.cs

@@ -0,0 +1,69 @@
+using Rubberduck.Refactorings.EncapsulateField;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Rubberduck.UI.Refactorings.EncapsulateField
+{
+    public class MasterDetailSelectionManager
+    {
+        private const string _neverATargetID = "_Never_a_TargetID_";
+        private bool _detailFieldIsFlagged;
+
+        public MasterDetailSelectionManager(IEncapsulateFieldCandidate selected)
+            : this(selected?.TargetID)
+        {
+            if (selected != null)
+            {
+                DetailField = new ViewableEncapsulatedField(selected);
+            }
+        }
+
+        private MasterDetailSelectionManager(string targetID)
+        {
+            SelectionTargetID = targetID;
+            DetailField = null;
+            _detailFieldIsFlagged = false;
+        }
+
+
+        private IEncapsulatedFieldViewData _detailField;
+        public IEncapsulatedFieldViewData DetailField
+        {
+            set
+            {
+                _detailField = value;
+                _detailFieldIsFlagged = _detailField?.EncapsulateFlag ?? false;
+            }
+            get => _detailField;
+        }
+
+        private string _selectionTargetID;
+        public string SelectionTargetID
+        {
+            set => _selectionTargetID = value;
+            get => _selectionTargetID ?? _neverATargetID;
+        }
+
+        public bool DetailUpdateRequired
+        {
+            get
+            {
+                if (DetailField is null)
+                {
+                    return true;
+                }
+
+                if (_detailFieldIsFlagged != DetailField.EncapsulateFlag)
+                {
+                    _detailFieldIsFlagged = !_detailFieldIsFlagged;
+                    return true;
+                }
+                return SelectionTargetID != DetailField?.TargetID;
+            }
+        }
+    }
+
+}

Rubberduck.Core/UI/Refactorings/EncapsulateField/ViewableEncapsulatedField.cs

@@ -57,10 +57,6 @@ public bool HasValidEncapsulationAttributes
         public bool TryValidateEncapsulationAttributes(out string errorMessage)
         {
             errorMessage = string.Empty;
-            if (IsPrivateUserDefinedType)
-            {
-                return true;
-            }
             return _efd.TryValidateEncapsulationAttributes(out errorMessage);
         }