From c165f37bb96ad40d863a436795c21b9085f3fde9 Mon Sep 17 00:00:00 2001
From: LukePulverenti <luke.pulverenti@gmail.com>
Date: Fri, 22 Feb 2013 22:49:00 -0500
Subject: more dependancy injection. still just beginning

---
 MediaBrowser.Common/Kernel/BaseKernel.cs | 52 ++++++--------------------------
 1 file changed, 9 insertions(+), 43 deletions(-)

(limited to 'MediaBrowser.Common/Kernel/BaseKernel.cs')

diff --git a/MediaBrowser.Common/Kernel/BaseKernel.cs b/MediaBrowser.Common/Kernel/BaseKernel.cs
index 202bd3cab..85954cb82 100644
--- a/MediaBrowser.Common/Kernel/BaseKernel.cs
+++ b/MediaBrowser.Common/Kernel/BaseKernel.cs
@@ -18,7 +18,6 @@ using System.Linq;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
-using SimpleInjector;
 
 namespace MediaBrowser.Common.Kernel
 {
@@ -223,12 +222,6 @@ namespace MediaBrowser.Common.Kernel
         /// <value>The task manager.</value>
         public TaskManager TaskManager { get; private set; }
 
-        /// <summary>
-        /// Gets the iso manager.
-        /// </summary>
-        /// <value>The iso manager.</value>
-        public IIsoManager IsoManager { get; private set; }
-
         /// <summary>
         /// Gets the rest services.
         /// </summary>
@@ -347,20 +340,14 @@ namespace MediaBrowser.Common.Kernel
         /// Initializes a new instance of the <see cref="BaseKernel{TApplicationPathsType}" /> class.
         /// </summary>
         /// <param name="appHost">The app host.</param>
-        /// <param name="isoManager">The iso manager.</param>
         /// <param name="logger">The logger.</param>
         /// <exception cref="System.ArgumentNullException">isoManager</exception>
-        protected BaseKernel(IApplicationHost appHost, IIsoManager isoManager, ILogger logger)
+        protected BaseKernel(IApplicationHost appHost, ILogger logger)
         {
             if (appHost == null)
             {
                 throw new ArgumentNullException("appHost");
             }
-            
-            if (isoManager == null)
-            {
-                throw new ArgumentNullException("isoManager");
-            }
 
             if (logger == null)
             {
@@ -368,7 +355,6 @@ namespace MediaBrowser.Common.Kernel
             }
 
             ApplicationHost = appHost;
-            IsoManager = isoManager;
             Logger = logger;
         }
 
@@ -471,11 +457,6 @@ namespace MediaBrowser.Common.Kernel
             CompositionContainer.Catalog.Dispose();
         }
 
-        /// <summary>
-        /// The ioc container
-        /// </summary>
-        private readonly Container _iocContainer = new Container();
-
         /// <summary>
         /// Composes the parts.
         /// </summary>
@@ -486,19 +467,18 @@ namespace MediaBrowser.Common.Kernel
 
             CompositionContainer = GetSafeCompositionContainer(concreteTypes.Select(i => new TypeCatalog(i)));
 
-            ComposeExportedValues(CompositionContainer, _iocContainer);
+            RegisterExportedValues(CompositionContainer);
 
             CompositionContainer.ComposeParts(this);
 
-            ComposePartsWithIocContainer(concreteTypes, _iocContainer);
+            FindParts(concreteTypes);
         }
 
         /// <summary>
         /// Composes the parts with ioc container.
         /// </summary>
         /// <param name="allTypes">All types.</param>
-        /// <param name="container">The container.</param>
-        protected virtual void ComposePartsWithIocContainer(Type[] allTypes, Container container)
+        protected virtual void FindParts(Type[] allTypes)
         {
             RestServices = GetExports<IRestfulService>(allTypes);
             WebSocketListeners = GetExports<IWebSocketListener>(allTypes);
@@ -530,21 +510,20 @@ namespace MediaBrowser.Common.Kernel
         /// <returns>System.Object.</returns>
         private object Instantiate(Type type)
         {
-            return _iocContainer.GetInstance(type);
+            return ApplicationHost.CreateInstance(type);
         }
 
         /// <summary>
         /// Composes the exported values.
         /// </summary>
         /// <param name="container">The container.</param>
-        /// <param name="iocContainer"></param>
-        protected virtual void ComposeExportedValues(CompositionContainer container, Container iocContainer)
+        protected virtual void RegisterExportedValues(CompositionContainer container)
         {
+            ApplicationHost.Register<IKernel>(this);
+            
             container.ComposeExportedValue("logger", Logger);
             container.ComposeExportedValue("appHost", ApplicationHost);
-
-            iocContainer.RegisterSingle(Logger);
-            iocContainer.RegisterSingle(ApplicationHost);
+            container.ComposeExportedValue("isoManager", ApplicationHost.Resolve<IIsoManager>());
         }
 
         /// <summary>
@@ -739,7 +718,6 @@ namespace MediaBrowser.Common.Kernel
             {
                 DisposeTcpManager();
                 DisposeTaskManager();
-                DisposeIsoManager();
                 DisposeHttpManager();
 
                 DisposeComposableParts();
@@ -753,18 +731,6 @@ namespace MediaBrowser.Common.Kernel
             }
         }
 
-        /// <summary>
-        /// Disposes the iso manager.
-        /// </summary>
-        private void DisposeIsoManager()
-        {
-            if (IsoManager != null)
-            {
-                IsoManager.Dispose();
-                IsoManager = null;
-            }
-        }
-
         /// <summary>
         /// Disposes the TCP manager.
         /// </summary>
-- 
cgit v1.2.3