Cleaned up namespace, demagicked numbers

mansellan · mansellan · commit 99b8a331be56 · 2018-08-05T00:53:52.000+01:00
diff --git a/Rubberduck.Main/Root/RubberduckIoCInstaller.cs b/Rubberduck.Main/Root/RubberduckIoCInstaller.cs
@@ -50,7 +50,7 @@
 using Rubberduck.VBEditor.Utility;
 using Rubberduck.AutoComplete;
 using Rubberduck.CodeAnalysis.CodeMetrics;
-using Rubberduck.VBEditor.Host;
+using Rubberduck.VBEditor;
 
 namespace Rubberduck.Root
 {
@@ -401,7 +401,7 @@ private Type[] CodePaneContextMenuItems()
 
         private void RegisterFormDesignerContextMenu(IWindsorContainer container)
         {
-            var location = _addin.CommandBarLocations[CommandBarSite.MsForms];
+            var location = _addin.CommandBarLocations[CommandBarSite.MsForm];
             var controls = MainCommandBarControls(location.ParentId);
             var beforeIndex = FindRubberduckMenuInsertionIndex(controls, location.BeforeControlId);
             var menuItemTypes = FormDesignerContextMenuItems();
@@ -419,7 +419,7 @@ private Type[] FormDesignerContextMenuItems()
 
         private void RegisterFormDesignerControlContextMenu(IWindsorContainer container)
         {
-            var location = _addin.CommandBarLocations[CommandBarSite.MsFormsControl];
+            var location = _addin.CommandBarLocations[CommandBarSite.MsFormControl];
             var controls = MainCommandBarControls(location.ParentId);
             var beforeIndex = FindRubberduckMenuInsertionIndex(controls, location.BeforeControlId);
             var menuItemTypes = FormDesignerContextMenuItems();
diff --git a/Rubberduck.VBEEditor/CommandBarLocation.cs b/Rubberduck.VBEEditor/CommandBarLocation.cs
@@ -1,4 +1,4 @@
-﻿namespace Rubberduck.VBEditor.Host
+﻿namespace Rubberduck.VBEditor
 {
     public class CommandBarLocation
     {
diff --git a/Rubberduck.VBEEditor/CommandBarSite.cs b/Rubberduck.VBEEditor/CommandBarSite.cs
@@ -1,11 +1,11 @@
-﻿namespace Rubberduck.VBEditor.Host
+﻿namespace Rubberduck.VBEditor
 {
     public enum CommandBarSite
     {
         MenuBar,
         CodeWindow,
         ProjectExplorer,
-        MsForms,
-        MsFormsControl
+        MsForm,
+        MsFormControl
     }
 }
diff --git a/Rubberduck.VBEEditor/Rubberduck.VBEditor.csproj b/Rubberduck.VBEEditor/Rubberduck.VBEditor.csproj
@@ -66,11 +66,11 @@
     <Compile Include="Factories\ISafeComWrapperProvider.cs" />
     <Compile Include="Factories\VBEFactory.cs" />
     <Compile Include="HashCode.cs" />
-    <Compile Include="Host\CommandBarLocation.cs" />
+    <Compile Include="CommandBarLocation.cs" />
     <Compile Include="ISourceCodeHandler.cs" />
     <Compile Include="SafeComWrappers\Abstract\HostApplicationBase.cs" />
     <Compile Include="SafeComWrappers\Abstract\ISafeComWrapper.cs" />
-    <Compile Include="Host\CommandBarSite.cs" />
+    <Compile Include="CommandBarSite.cs" />
     <Compile Include="SafeComWrappers\SafeComWrapper.cs" />
     <Compile Include="SafeComWrappers\SafeRedirectedEventedComWrapper.cs" />
     <Compile Include="SafeComWrappers\VB\Abstract\IHostApplication.cs" />
diff --git a/Rubberduck.VBEEditor/SafeComWrappers/VB/Abstract/IAddIn.cs b/Rubberduck.VBEEditor/SafeComWrappers/VB/Abstract/IAddIn.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using System.Collections.Generic;
-using Rubberduck.VBEditor.Host;
 
 namespace Rubberduck.VBEditor.SafeComWrappers.Abstract
 {
diff --git a/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/AddIn.cs b/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/AddIn.cs
@@ -1,6 +1,5 @@
 ﻿using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using Rubberduck.VBEditor.Host;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using VB = Microsoft.Vbe.Interop.VB6;
 
@@ -9,16 +8,30 @@ namespace Rubberduck.VBEditor.SafeComWrappers.VB6
 {
     public class AddIn : SafeComWrapper<VB.AddIn>, IAddIn
     {
+
+        private const int MenuBar = 1;
+        private const int CodeWindow = 15;
+        private const int ProjectExplorer = 22;
+        private const int MsForm = 20;
+        private const int MsFormControl = 21;
+
+        private const int WindowMenu = 30009;
+        private const int ListProperties = 2529;
+        private const int ProjectProperties = 2578;
+        private const int UpdateUserControls = 746;
+        private const int ViewCode = 2558;
+
+
         public AddIn(VB.AddIn target, bool rewrapping = false) 
             : base(target, rewrapping)
-        {
+        {     
             CommandBarLocations = new ReadOnlyDictionary<CommandBarSite, CommandBarLocation>(new Dictionary<CommandBarSite, CommandBarLocation>
             {
-                {CommandBarSite.MenuBar, new CommandBarLocation(1, 30009)},
-                {CommandBarSite.CodeWindow, new CommandBarLocation(15, 2529)},
-                {CommandBarSite.ProjectExplorer, new CommandBarLocation(22, 2578)},
-                {CommandBarSite.MsForms, new CommandBarLocation(20, 746)},
-                {CommandBarSite.MsFormsControl, new CommandBarLocation(21, 2558)}
+                {CommandBarSite.MenuBar, new CommandBarLocation(MenuBar, WindowMenu)},
+                {CommandBarSite.CodeWindow, new CommandBarLocation(CodeWindow, ListProperties)},
+                {CommandBarSite.ProjectExplorer, new CommandBarLocation(ProjectExplorer, ProjectProperties)},
+                {CommandBarSite.MsForm, new CommandBarLocation(MsForm, UpdateUserControls)},
+                {CommandBarSite.MsFormControl, new CommandBarLocation(MsFormControl, ViewCode)}
             });
         }
 
diff --git a/Rubberduck.VBEditor.VBA/SafeComWrappers/VB/AddIn.cs b/Rubberduck.VBEditor.VBA/SafeComWrappers/VB/AddIn.cs
@@ -1,6 +1,5 @@
 ﻿using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using Rubberduck.VBEditor.Host;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using VB = Microsoft.Vbe.Interop;
 
@@ -9,16 +8,27 @@ namespace Rubberduck.VBEditor.SafeComWrappers.VBA
 {
     public class AddIn : SafeComWrapper<VB.AddIn>, IAddIn
     {
+        private const int MenuBar = 1;
+        private const int CodeWindow = 9;
+        private const int ProjectExplorer = 14;
+        private const int MsForm = 17;
+        private const int MsFormControl = 18;
+
+        private const int WindowMenu = 30009;
+        private const int ListProperties = 2529;
+        private const int ProjectProperties = 2578;
+        private const int ViewCode = 2558;
+
         public AddIn(VB.AddIn target, bool rewrapping = false) 
             : base(target, rewrapping)
         {
             CommandBarLocations = new ReadOnlyDictionary<CommandBarSite, CommandBarLocation>(new Dictionary<CommandBarSite, CommandBarLocation>
             {
-                {CommandBarSite.MenuBar, new CommandBarLocation(1, 30009)},
-                {CommandBarSite.CodeWindow, new CommandBarLocation(9, 2529)},
-                {CommandBarSite.ProjectExplorer, new CommandBarLocation(14, 2578)},
-                {CommandBarSite.MsForms, new CommandBarLocation(17, 2558)},
-                {CommandBarSite.MsFormsControl, new CommandBarLocation(18, 2558)}
+                {CommandBarSite.MenuBar, new CommandBarLocation(MenuBar, WindowMenu)},
+                {CommandBarSite.CodeWindow, new CommandBarLocation(CodeWindow, ListProperties)},
+                {CommandBarSite.ProjectExplorer, new CommandBarLocation(ProjectExplorer, ProjectProperties)},
+                {CommandBarSite.MsForm, new CommandBarLocation(MsForm, ViewCode)},
+                {CommandBarSite.MsFormControl, new CommandBarLocation(MsFormControl, ViewCode)}
             });
 
         }
diff --git a/RubberduckTests/IoCContainer/IoCRegistrationTests.cs b/RubberduckTests/IoCContainer/IoCRegistrationTests.cs
@@ -1,13 +1,8 @@
 ﻿using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using Castle.Windsor;
 using NUnit.Framework;
-using Moq;
 using Rubberduck.Settings;
-using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using Rubberduck.Root;
-using Rubberduck.UI;
-using Rubberduck.VBEditor.Host;
 using RubberduckTests.Mocks;
 
 namespace RubberduckTests.IoCContainer
diff --git a/RubberduckTests/Mocks/MockAddinBuilder.cs b/RubberduckTests/Mocks/MockAddinBuilder.cs
@@ -1,7 +1,7 @@
 ﻿using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using Moq;
-using Rubberduck.VBEditor.Host;
+using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace RubberduckTests.Mocks
@@ -24,8 +24,8 @@ private Mock<IAddIn> CreateAddInMock()
                 {CommandBarSite.MenuBar, new CommandBarLocation(1, 1)},
                 {CommandBarSite.CodeWindow, new CommandBarLocation(2, 2)},
                 {CommandBarSite.ProjectExplorer, new CommandBarLocation(3, 3)},
-                {CommandBarSite.MsForms, new CommandBarLocation(4, 4)},
-                {CommandBarSite.MsFormsControl, new CommandBarLocation(5, 5)}
+                {CommandBarSite.MsForm, new CommandBarLocation(4, 4)},
+                {CommandBarSite.MsFormControl, new CommandBarLocation(5, 5)}
             }));
 
             return addIn;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace Rubberduck.VBEditor.Host`
	`1`	`+namespace Rubberduck.VBEditor`
`2`	`2`	`{`
`3`	`3`	`public class CommandBarLocation`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`		`-namespace Rubberduck.VBEditor.Host`
	`1`	`+namespace Rubberduck.VBEditor`
`2`	`2`	`{`
`3`	`3`	`public enum CommandBarSite`
`4`	`4`	`{`
`5`	`5`	`MenuBar,`
`6`	`6`	`CodeWindow,`
`7`	`7`	`ProjectExplorer,`
`8`		`- MsForms,`
`9`		`- MsFormsControl`
	`8`	`+ MsForm,`
	`9`	`+ MsFormControl`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`		`-using Rubberduck.VBEditor.Host;`
`4`	`3`
`5`	`4`	`namespace Rubberduck.VBEditor.SafeComWrappers.Abstract`
`6`	`5`	`{`