Update instancing selection to use combobox

IvenBach · IvenBach · commit d0a341a4caa2 · 2020-01-21T15:52:13.000-08:00
diff --git a/Rubberduck.Core/UI/Converters/ClassInstancingToBooleanConverter.cs b/Rubberduck.Core/UI/Converters/ClassInstancingToBooleanConverter.cs
diff --git a/Rubberduck.Core/UI/Refactorings/ExtractInterface/ExtractInterfaceView.xaml b/Rubberduck.Core/UI/Refactorings/ExtractInterface/ExtractInterfaceView.xaml
@@ -13,7 +13,8 @@
             </ResourceDictionary.MergedDictionaries>
 
             <BitmapImage x:Key="InvalidInterfaceImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-circle.png" />
-            <converters:InvertBoolValueConverter x:Key="InvertBool" />
+            <converters:BoolToVisibleVisibilityConverter x:Key="BoolToVisibility" />
+            <converters:BoolToHiddenVisibilityConverter x:Key="BoolToHiddenVisibility" />
         </ResourceDictionary>
     </UserControl.Resources>
     <Grid>
@@ -51,16 +52,17 @@
                        VerticalAlignment="Top"
                        Visibility="{Binding IsValidInterfaceName, Converter={StaticResource BoolToHiddenVisibility}}"/>
             </StackPanel>
-            
+
             <GroupBox Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=ExtractInterface_InstancingGroupBox}"
                       Grid.Row="1" Margin="5" Padding="5">
-                <StackPanel Orientation="Vertical">
-                    <RadioButton Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=ExtractInterface_PrivateRadioButton}"
-                                 IsEnabled="{Binding IsPrivateInterfaceEnabled}"
-                                 IsChecked="{Binding IsPublicInterfaceChecked, Converter={StaticResource InvertBool}}" />
-                    <RadioButton Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=ExtractInterface_PublicNotCreatableRadioButton}"
-                                 IsChecked="{Binding IsPublicInterfaceChecked, Mode=TwoWay}" />
-                </StackPanel>
+                <Grid>
+                    <ComboBox ItemsSource="{Binding ClassInstances}"
+                              SelectedValue="{Binding InterfaceInstancing, Mode=TwoWay}"
+                              Visibility="{Binding IsClassInstancingMutable, Converter={StaticResource BoolToVisibility}}">
+                    </ComboBox>
+                    <Label Visibility="{Binding IsClassInstancingMutable, Converter={StaticResource BoolToHiddenVisibility}}"
+                           Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=ExtractInterface_PublicInstancingMandatedByPublicClass}" />
+                </Grid>
             </GroupBox>
 
             <GroupBox Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=ExtractInterface_MembersGroupBox}"
diff --git a/Rubberduck.Core/UI/Refactorings/ExtractInterface/ExtractInterfaceViewModel.cs b/Rubberduck.Core/UI/Refactorings/ExtractInterface/ExtractInterfaceViewModel.cs
@@ -61,11 +61,29 @@ public bool IsValidInterfaceName
             }
         }
 
-        public bool IsPrivateInterfaceEnabled
+        public bool IsClassInstancingMutable
         {
             get
             {
-                return Model.ImplementingClassInstancing != ClassInstancing.PublicNotCreatable;
+                return Model.ImplementingClassInstancing != ClassInstancing.Public;
+            }
+        }
+
+        public IEnumerable<ClassInstancing> ClassInstances => Enum.GetValues(typeof(ClassInstancing)).Cast<ClassInstancing>();
+
+        public ClassInstancing InterfaceInstancing
+        {
+            get => Model.InterfaceInstancing;
+
+            set
+            {
+                if (value == Model.InterfaceInstancing)
+                {
+                    return;
+                }
+
+                Model.InterfaceInstancing = value;
+                OnPropertyChanged();
             }
         }
 
@@ -81,7 +99,7 @@ public bool IsPublicInterfaceChecked
                 }
 
                 Model.InterfaceInstancing = value 
-                    ? ClassInstancing.PublicNotCreatable 
+                    ? ClassInstancing.Public 
                     : ClassInstancing.Private;
                 isPublicInterfaceChecked = value;
                 OnPropertyChanged();                
diff --git a/Rubberduck.Refactorings/ExtractInterface/ExtractInterfaceModel.cs b/Rubberduck.Refactorings/ExtractInterface/ExtractInterfaceModel.cs
@@ -8,8 +8,8 @@ namespace Rubberduck.Refactorings.ExtractInterface
 {
     public enum ClassInstancing
     {
-        Private = 0,
-        PublicNotCreatable,
+        Public = 0,
+        Private
     }
 
     public class ExtractInterfaceModel : IRefactoringModel
@@ -21,9 +21,9 @@ public class ExtractInterfaceModel : IRefactoringModel
         public ObservableCollection<InterfaceMember> Members { get; set; } = new ObservableCollection<InterfaceMember>();
         public IEnumerable<InterfaceMember> SelectedMembers => Members.Where(m => m.IsSelected);
         public ClassInstancing ImplementingClassInstancing => System.Convert.ToBoolean(TargetDeclaration.Attributes.ExposedAttribute.Values.First())
-                ? ClassInstancing.PublicNotCreatable
+                ? ClassInstancing.Public
                 : ClassInstancing.Private;
-        public ClassInstancing InterfaceInstancing { get; set; } = ClassInstancing.PublicNotCreatable;
+        public ClassInstancing InterfaceInstancing { get; set; } = ClassInstancing.Public;
 
         public static readonly DeclarationType[] MemberTypes =
         {
diff --git a/Rubberduck.Refactorings/ExtractInterface/ExtractInterfaceRefactoring.cs b/Rubberduck.Refactorings/ExtractInterface/ExtractInterfaceRefactoring.cs
@@ -136,7 +136,7 @@ private void AddInterfaceClass(Declaration implementingClass, string interfaceNa
                         interfaceModule.InsertLines(1, "'@Interface");
                         interfaceModule.InsertLines(4, interfaceBody);
 
-                        if (interfaceInstancing == ClassInstancing.PublicNotCreatable)
+                        if (interfaceInstancing == ClassInstancing.Public)
                         {
                             AddExposedAttribute(components, interfaceComponent);
                         }
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
@@ -1782,10 +1782,13 @@ Import aborted.</value>
   <data name="ExtractInterface_InstancingGroupBox" xml:space="preserve">
     <value>Instancing</value>
   </data>
-  <data name="ExtractInterface_PrivateRadioButton" xml:space="preserve">
+  <data name="ExtractInterface_Private" xml:space="preserve">
     <value>Private</value>
   </data>
-  <data name="ExtractInterface_PublicNotCreatableRadioButton" xml:space="preserve">
-    <value>Public (Not Creatable)</value>
+  <data name="ExtractInterface_Public" xml:space="preserve">
+    <value>Public</value>
+  </data>
+  <data name="ExtractInterface_PublicInstancingMandatedByPublicClass" xml:space="preserve">
+    <value>'Public' will be chosen. For private instancing make implementing class private also.</value>
   </data>
 </root>

Original file line number	Diff line number	Diff line change
`@@ -61,11 +61,29 @@ public bool IsValidInterfaceName`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
`64`		`- public bool IsPrivateInterfaceEnabled`
	`64`	`+ public bool IsClassInstancingMutable`
`65`	`65`	`{`
`66`	`66`	`get`
`67`	`67`	`{`
`68`		`- return Model.ImplementingClassInstancing != ClassInstancing.PublicNotCreatable;`
	`68`	`+ return Model.ImplementingClassInstancing != ClassInstancing.Public;`
	`69`	`+ }`
	`70`	`+ }`
	`71`	`+`
	`72`	`+ public IEnumerable<ClassInstancing> ClassInstances => Enum.GetValues(typeof(ClassInstancing)).Cast<ClassInstancing>();`
	`73`	`+`
	`74`	`+ public ClassInstancing InterfaceInstancing`
	`75`	`+ {`
	`76`	`+ get => Model.InterfaceInstancing;`
	`77`	`+`
	`78`	`+ set`
	`79`	`+ {`
	`80`	`+ if (value == Model.InterfaceInstancing)`
	`81`	`+ {`
	`82`	`+ return;`
	`83`	`+ }`
	`84`	`+`
	`85`	`+ Model.InterfaceInstancing = value;`
	`86`	`+ OnPropertyChanged();`
`69`	`87`	`}`
`70`	`88`	`}`
`71`	`89`
`@@ -81,7 +99,7 @@ public bool IsPublicInterfaceChecked`
`81`	`99`	`}`
`82`	`100`
`83`	`101`	`Model.InterfaceInstancing = value`
`84`		`- ? ClassInstancing.PublicNotCreatable`
	`102`	`+ ? ClassInstancing.Public`
`85`	`103`	`: ClassInstancing.Private;`
`86`	`104`	`isPublicInterfaceChecked = value;`
`87`	`105`	`OnPropertyChanged();`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ namespace Rubberduck.Refactorings.ExtractInterface`
`8`	`8`	`{`
`9`	`9`	`public enum ClassInstancing`
`10`	`10`	`{`
`11`		`- Private = 0,`
`12`		`- PublicNotCreatable,`
	`11`	`+ Public = 0,`
	`12`	`+ Private`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`public class ExtractInterfaceModel : IRefactoringModel`
`@@ -21,9 +21,9 @@ public class ExtractInterfaceModel : IRefactoringModel`
`21`	`21`	`public ObservableCollection<InterfaceMember> Members { get; set; } = new ObservableCollection<InterfaceMember>();`
`22`	`22`	`public IEnumerable<InterfaceMember> SelectedMembers => Members.Where(m => m.IsSelected);`
`23`	`23`	`public ClassInstancing ImplementingClassInstancing => System.Convert.ToBoolean(TargetDeclaration.Attributes.ExposedAttribute.Values.First())`
`24`		`- ? ClassInstancing.PublicNotCreatable`
	`24`	`+ ? ClassInstancing.Public`
`25`	`25`	`: ClassInstancing.Private;`
`26`		`- public ClassInstancing InterfaceInstancing { get; set; } = ClassInstancing.PublicNotCreatable;`
	`26`	`+ public ClassInstancing InterfaceInstancing { get; set; } = ClassInstancing.Public;`
`27`	`27`
`28`	`28`	`public static readonly DeclarationType[] MemberTypes =`
`29`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ private void AddInterfaceClass(Declaration implementingClass, string interfaceNa`
`136`	`136`	`interfaceModule.InsertLines(1, "'@Interface");`
`137`	`137`	`interfaceModule.InsertLines(4, interfaceBody);`
`138`	`138`
`139`		`- if (interfaceInstancing == ClassInstancing.PublicNotCreatable)`
	`139`	`+ if (interfaceInstancing == ClassInstancing.Public)`
`140`	`140`	`{`
`141`	`141`	`AddExposedAttribute(components, interfaceComponent);`
`142`	`142`	`}`