Merge pull request #3471 from MDoerner/PortToCastleWindsor

Ported DI/IoC over to Castle Windsor. Farewell Ninject!

Author: retailcoder

RetailCoder.VBE/Extension.cs

@@ -1,7 +1,4 @@
 using Extensibility;
-using Ninject;
-using Ninject.Extensions.Factory;
-using Rubberduck.Root;
 using Rubberduck.UI;
 using System;
 using System.ComponentModel;
@@ -13,9 +10,10 @@
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using System.Windows.Threading;
+using Castle.Windsor;
 using Microsoft.Vbe.Interop;
-using Ninject.Extensions.Interception;
 using NLog;
+using Rubberduck.Root;
 using Rubberduck.Settings;
 using Rubberduck.SettingsProvider;
 using Rubberduck.VBEditor.Events;
@@ -41,7 +39,9 @@ public class _Extension : IDTExtensibility2
         private bool _isInitialized;
         private bool _isBeginShutdownExecuted;
 
-        private IKernel _kernel;
+        private GeneralSettings _initialSettings;
+
+        private IWindsorContainer _container;
         private App _app;
         private readonly Logger _logger = LogManager.GetCurrentClassLogger();
 
@@ -152,12 +152,12 @@ private void InitializeAddIn()
             };
             var configProvider = new GeneralConfigProvider(configLoader);
 
-            var settings = configProvider.Create();
-            if (settings != null)
+            _initialSettings = configProvider.Create();
+            if (_initialSettings != null)
             {
                 try
                 {
-                    var cultureInfo = CultureInfo.GetCultureInfo(settings.Language.Code);
+                    var cultureInfo = CultureInfo.GetCultureInfo(_initialSettings.Language.Code);
                     Dispatcher.CurrentDispatcher.Thread.CurrentUICulture = cultureInfo;
                 }
                 catch (CultureNotFoundException)
@@ -170,7 +170,7 @@ private void InitializeAddIn()
             }
 
             Splash splash = null;
-            if (settings.ShowSplash)
+            if (_initialSettings.ShowSplash)
             {
                 splash = new Splash
                 {
@@ -210,10 +210,9 @@ private void Startup()
                 currentDomain.UnhandledException += HandlAppDomainException;
                 currentDomain.AssemblyResolve += LoadFromSameFolder;
 
-                _kernel = new StandardKernel(new NinjectSettings {LoadExtensions = true}, new FuncModule(), new DynamicProxyModule());
-                _kernel.Load(new RubberduckModule(_ide, _addin));
-
-                _app = _kernel.Get<App>();
+                _container = new WindsorContainer().Install(new RubberduckIoCInstaller(_ide, _addin, _initialSettings));
+                
+                _app = _container.Resolve<App>();
                 _app.Startup();
 
                 _isInitialized = true;
@@ -253,11 +252,11 @@ private void ShutdownAddIn()
                     _app = null;
                 }
 
-                if (_kernel != null)
+                if (_container != null)
                 {
                     _logger.Log(LogLevel.Trace, "Disposing IoC container...");
-                    _kernel.Dispose();
-                    _kernel = null;
+                    _container.Dispose();
+                    _container = null;
                 }
 
                 _isInitialized = false;