Bind CodeMetrics CommandMenuItem and related

Vogel612 · Vogel612 · commit 76f3914bcda8 · 2017-11-21T22:41:45.000+01:00
diff --git a/RetailCoder.VBE/Navigation/CodeMetrics/CodeMetricsViewModel.cs b/RetailCoder.VBE/Navigation/CodeMetrics/CodeMetricsViewModel.cs
@@ -12,16 +12,11 @@ public class CodeMetricsViewModel : ViewModelBase
     {
         private readonly RubberduckParserState _state;
 
-        public CodeMetricsViewModel(RubberduckParserState state, List<CommandBase> commands, ICodeMetricsAnalyst analyst)
+        public CodeMetricsViewModel(RubberduckParserState state, ICodeMetricsAnalyst analyst)
 
         {
             _state = state;
-            var reparseCommand = commands.OfType<ReparseCommand>().SingleOrDefault();
-            RefreshCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(),
-                reparseCommand == null ? (Action<object>)(o => { }) :
-                o => reparseCommand.Execute(o),
-                o => !IsBusy && reparseCommand != null && reparseCommand.CanExecute(o));
-            
+            // FIXME deregister event on destruction
             _state.StateChanged += (_, change) =>
             {
                 if (change.State == ParserState.Ready)
@@ -47,7 +42,7 @@ private set
         }
 
         
-        public CommandBase RefreshCommand { get; set; }
+        //public CommandBase RefreshCommand { get; set; }
 
 
         private bool _canSearch;
diff --git a/RetailCoder.VBE/Root/RubberduckIoCInstaller.cs b/RetailCoder.VBE/Root/RubberduckIoCInstaller.cs
@@ -43,6 +43,8 @@
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using Rubberduck.VBEditor.SafeComWrappers.Office.Core.Abstract;
 using Component = Castle.MicroKernel.Registration.Component;
+using Rubberduck.UI.CodeMetrics;
+using Rubberduck.Navigation.CodeMetrics;
 
 namespace Rubberduck.Root
 {
@@ -463,6 +465,7 @@ private static Type[] NavigateMenuItems()
 #if DEBUG
                 typeof(RegexSearchReplaceCommandMenuItem),
 #endif
+                
                 typeof(FindSymbolCommandMenuItem),
                 typeof(FindAllReferencesCommandMenuItem),
                 typeof(FindAllImplementationsCommandMenuItem)
@@ -486,6 +489,7 @@ private Type[] ToolsMenuItems()
             {
                 typeof(RegexAssistantCommandMenuItem),
                 typeof(ToDoExplorerCommandMenuItem),
+                typeof(CodeMetricsCommandMenuItem),
                 typeof(ExportAllCommandMenuItem)
             };
 
@@ -598,6 +602,12 @@ private void RegisterCommandsWithPresenters(IWindsorContainer container)
                 .LifestyleTransient()
                 .Named(typeof(CodeExplorerCommand).Name));
 
+            container.Register(Component.For<CommandBase>()
+                .ImplementedBy<CodeMetricsCommand>()
+                .DependsOn(Dependency.OnComponent<IDockablePresenter, CodeMetricsDockablePresenter>())
+                .LifestyleSingleton()
+                .Named(typeof(CodeMetricsCommand).Name));
+
             container.Register(Component.For<CommandBase>()
                 .ImplementedBy<ToDoExplorerCommand>()
                 .DependsOn(Dependency.OnComponent<IDockablePresenter, ToDoExplorerDockablePresenter>())
diff --git a/RetailCoder.VBE/UI/CodeMetrics/CodeMetricsControl.xaml b/RetailCoder.VBE/UI/CodeMetrics/CodeMetricsControl.xaml
@@ -10,7 +10,7 @@
              ResxExtension.DefaultResxName="Rubberduck.UI.RubberduckUI" 
              Language="{UICulture}"
              Name="CodeMetrics"
-             mc:Ignorable="d" 
+             mc:Ignorable="d"
              d:DesignHeight="300" d:DesignWidth="300" d:DataContext="{d:DesignInstance codeMetrics:CodeMetricsViewModel}">
     <UserControl.Resources>
         <ResourceDictionary>
@@ -100,15 +100,15 @@
 
     <Grid UseLayoutRounding="True">
         <Grid.RowDefinitions>
-            <RowDefinition Height="30"/>
+            <!--<RowDefinition Height="30"/>-->
             <RowDefinition Height="20"/>
             <RowDefinition Height="*" MinHeight="64" />
         </Grid.RowDefinitions>
 
-        <ToolBarTray Grid.Row="0" IsLocked="True">
+        <!--<ToolBarTray Grid.Row="0" IsLocked="True">
             <ToolBar Style="{DynamicResource ToolBarWithOverflowOnlyShowingWhenNeededStyle}">
 
-                <Button Command="{Binding RefreshCommand}">
+                <Button>
                     <Image Height="16" Source="../../Resources/arrow-circle-double.png">
                         <Image.Style>
                             <Style TargetType="Image">
@@ -125,7 +125,7 @@
                     </Button.ToolTip>
                 </Button>
             </ToolBar>
-        </ToolBarTray>
+        </ToolBarTray>-->
 
         <Border Grid.Row="1" 
                 BorderBrush="{StaticResource {x:Static SystemColors.ControlBrushKey}}" 
diff --git a/RetailCoder.VBE/UI/CodeMetrics/CodeMetricsWindow.cs b/RetailCoder.VBE/UI/CodeMetrics/CodeMetricsWindow.cs
@@ -7,9 +7,9 @@ namespace Rubberduck.UI.CodeMetrics
     [ExcludeFromCodeCoverage]
     public partial class CodeMetricsWindow : UserControl, IDockableUserControl
     {
-        private const string ClassId = "C5318B59-172F-417C-88E3-B377CDA2D80A";
-        string IDockableUserControl.ClassId { get { return ClassId; } }
-        string IDockableUserControl.Caption { get { return RubberduckUI.CodeExplorerDockablePresenter_Caption; } }
+        private const string ClassId = "C5318B5A-172F-417C-88E3-B377CDA2D809";
+        string IDockableUserControl.ClassId => ClassId;
+        string IDockableUserControl.Caption => RubberduckUI.CodeMetricsDockablePresenter_Caption;
 
         private CodeMetricsWindow()
         {
diff --git a/RetailCoder.VBE/UI/Command/MenuItems/CodeMetricsCommandMenuItem.cs b/RetailCoder.VBE/UI/Command/MenuItems/CodeMetricsCommandMenuItem.cs
@@ -3,7 +3,7 @@
 
 namespace Rubberduck.UI.Command.MenuItems
 {
-    class CodeMetricsCommandMenuItem : CommandMenuItemBase
+    public class CodeMetricsCommandMenuItem : CommandMenuItemBase
     {
         public CodeMetricsCommandMenuItem(CommandBase command) 
             : base(command)
@@ -12,6 +12,6 @@ public CodeMetricsCommandMenuItem(CommandBase command)
         public override bool EvaluateCanExecute(RubberduckParserState state) => true;
 
         public override string Key => "RubberduckMenu_CodeMetrics";
-        public override int DisplayOrder => (int)NavigationMenuItemDisplayOrder.CodeMetrics;
+        public override int DisplayOrder => (int)ToolsMenuItemDisplayOrder.CodeMetrics;
     }
 }
diff --git a/RetailCoder.VBE/UI/Command/MenuItems/ParentMenus/NavigateParentMenu.cs b/RetailCoder.VBE/UI/Command/MenuItems/ParentMenus/NavigateParentMenu.cs
@@ -16,7 +16,6 @@ public enum NavigationMenuItemDisplayOrder
     {
         CodeExplorer,
         RegexSearchReplace,
-        CodeMetrics,
         FindSymbol,
         FindAllReferences,
         FindImplementations
diff --git a/RetailCoder.VBE/UI/Command/MenuItems/ParentMenus/ToolsParentMenu.cs b/RetailCoder.VBE/UI/Command/MenuItems/ParentMenus/ToolsParentMenu.cs
@@ -15,6 +15,7 @@ public ToolsParentMenu(IEnumerable<IMenuItem> items)
     public enum ToolsMenuItemDisplayOrder
     {
         SourceControl,
+        CodeMetrics,
         ToDoExplorer,
         RegexAssistant,
         ExportAll,
diff --git a/RetailCoder.VBE/UI/RubberduckUI.resx b/RetailCoder.VBE/UI/RubberduckUI.resx
@@ -2131,4 +2131,10 @@ Would you like to import them to Rubberduck?</value>
   <data name="AboutWindow_CopyVersionMessage" xml:space="preserve">
     <value>Version information copied to clipboard.</value>
   </data>
+  <data name="CodeMetricsDockablePresenter_Caption" xml:space="preserve">
+    <value>Code Metrics</value>
+  </data>
+  <data name="RubberduckMenu_CodeMetrics" xml:space="preserve">
+    <value>Code Metrics</value>
+  </data>
 </root>
diff --git a/Retailcoder.VBE/UI/RubberduckUI.resx b/Retailcoder.VBE/UI/RubberduckUI.resx

Original file line number	Diff line number	Diff line change
`@@ -12,16 +12,11 @@ public class CodeMetricsViewModel : ViewModelBase`
`12`	`12`	`{`
`13`	`13`	`private readonly RubberduckParserState _state;`
`14`	`14`
`15`		`- public CodeMetricsViewModel(RubberduckParserState state, List<CommandBase> commands, ICodeMetricsAnalyst analyst)`
	`15`	`+ public CodeMetricsViewModel(RubberduckParserState state, ICodeMetricsAnalyst analyst)`
`16`	`16`
`17`	`17`	`{`
`18`	`18`	`_state = state;`
`19`		`- var reparseCommand = commands.OfType<ReparseCommand>().SingleOrDefault();`
`20`		`- RefreshCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(),`
`21`		`- reparseCommand == null ? (Action<object>)(o => { }) :`
`22`		`- o => reparseCommand.Execute(o),`
`23`		`- o => !IsBusy && reparseCommand != null && reparseCommand.CanExecute(o));`
`24`		`-`
	`19`	`+ // FIXME deregister event on destruction`
`25`	`20`	`_state.StateChanged += (_, change) =>`
`26`	`21`	`{`
`27`	`22`	`if (change.State == ParserState.Ready)`
`@@ -47,7 +42,7 @@ private set`
`47`	`42`	`}`
`48`	`43`
`49`	`44`
`50`		`- public CommandBase RefreshCommand { get; set; }`
	`45`	`+ //public CommandBase RefreshCommand { get; set; }`
`51`	`46`
`52`	`47`
`53`	`48`	`private bool _canSearch;`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@ namespace Rubberduck.UI.CodeMetrics`
`7`	`7`	`[ExcludeFromCodeCoverage]`
`8`	`8`	`public partial class CodeMetricsWindow : UserControl, IDockableUserControl`
`9`	`9`	`{`
`10`		`- private const string ClassId = "C5318B59-172F-417C-88E3-B377CDA2D80A";`
`11`		`- string IDockableUserControl.ClassId { get { return ClassId; } }`
`12`		`- string IDockableUserControl.Caption { get { return RubberduckUI.CodeExplorerDockablePresenter_Caption; } }`
	`10`	`+ private const string ClassId = "C5318B5A-172F-417C-88E3-B377CDA2D809";`
	`11`	`+ string IDockableUserControl.ClassId => ClassId;`
	`12`	`+ string IDockableUserControl.Caption => RubberduckUI.CodeMetricsDockablePresenter_Caption;`
`13`	`13`
`14`	`14`	`private CodeMetricsWindow()`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace Rubberduck.UI.Command.MenuItems`
`5`	`5`	`{`
`6`		`- class CodeMetricsCommandMenuItem : CommandMenuItemBase`
	`6`	`+ public class CodeMetricsCommandMenuItem : CommandMenuItemBase`
`7`	`7`	`{`
`8`	`8`	`public CodeMetricsCommandMenuItem(CommandBase command)`
`9`	`9`	`: base(command)`
`@@ -12,6 +12,6 @@ public CodeMetricsCommandMenuItem(CommandBase command)`
`12`	`12`	`public override bool EvaluateCanExecute(RubberduckParserState state) => true;`
`13`	`13`
`14`	`14`	`public override string Key => "RubberduckMenu_CodeMetrics";`
`15`		`- public override int DisplayOrder => (int)NavigationMenuItemDisplayOrder.CodeMetrics;`
	`15`	`+ public override int DisplayOrder => (int)ToolsMenuItemDisplayOrder.CodeMetrics;`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ public enum NavigationMenuItemDisplayOrder`
`16`	`16`	`{`
`17`	`17`	`CodeExplorer,`
`18`	`18`	`RegexSearchReplace,`
`19`		`- CodeMetrics,`
`20`	`19`	`FindSymbol,`
`21`	`20`	`FindAllReferences,`
`22`	`21`	`FindImplementations`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ public ToolsParentMenu(IEnumerable<IMenuItem> items)`
`15`	`15`	`public enum ToolsMenuItemDisplayOrder`
`16`	`16`	`{`
`17`	`17`	`SourceControl,`
	`18`	`+ CodeMetrics,`
`18`	`19`	`ToDoExplorer,`
`19`	`20`	`RegexAssistant,`
`20`	`21`	`ExportAll,`