1 files changed, 46 insertions, 51 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
index fa3a38c5c..c4b8a1a59 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
@@ -1,7 +1,5 @@
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Ioc;
-using Microsoft.Practices.ServiceLocation;
 using System;
+using Tango.Core.DI;
 using Tango.Integration.Services;
 using Tango.Logging;
 using Tango.MachineStudio.Common.Authentication;
@@ -40,66 +38,63 @@ namespace Tango.MachineStudio.UI
         /// </summary>
         public ViewModelLocator()
         {
-            ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default);
-
             ////if (ViewModelBase.IsInDesignModeStatic)
             ////{
             ////    // Create design time view services and models
-            ////    SimpleIoc.Default.Register<IDataService, DesignDataService>();
+            ////    TangoIOC.Default.Register<IDataService, DesignDataService>();
             ////}
             ////else
             ////{
             ////    // Create run time view services and models
-            ////    SimpleIoc.Default.Register<IDataService, DataService>();
+            ////    TangoIOC.Default.Register<IDataService, DataService>();
             ////}
 
-            SimpleIoc.Default.Unregister<INotificationProvider>();
-            SimpleIoc.Default.Unregister<IAuthenticationProvider>();
-            SimpleIoc.Default.Unregister<INavigationManager>();
-            SimpleIoc.Default.Unregister<IStudioModuleLoader>();
-            SimpleIoc.Default.Unregister<IStudioApplicationManager>();
-            SimpleIoc.Default.Unregister<ExternalBridgeScanner>();
-            SimpleIoc.Default.Unregister<IVideoCaptureProvider>();
-            SimpleIoc.Default.Unregister<IDiagnosticsFrameProvider>();
-            SimpleIoc.Default.Unregister<IEventLogger>();
-            SimpleIoc.Default.Unregister<ISpeechProvider>();
-            SimpleIoc.Default.Unregister<IHtmlPresenter>();
+            TangoIOC.Default.Unregister<INotificationProvider>();
+            TangoIOC.Default.Unregister<IAuthenticationProvider>();
+            TangoIOC.Default.Unregister<INavigationManager>();
+            TangoIOC.Default.Unregister<IStudioModuleLoader>();
+            TangoIOC.Default.Unregister<IStudioApplicationManager>();
+            TangoIOC.Default.Unregister<ExternalBridgeScanner>();
+            TangoIOC.Default.Unregister<IVideoCaptureProvider>();
+            TangoIOC.Default.Unregister<IDiagnosticsFrameProvider>();
+            TangoIOC.Default.Unregister<IEventLogger>();
+            TangoIOC.Default.Unregister<ISpeechProvider>();
+            TangoIOC.Default.Unregister<IHtmlPresenter>();
 
-            SimpleIoc.Default.Register<INotificationProvider, DefaultNotificationProvider>();
-            SimpleIoc.Default.Register<IAuthenticationProvider, DefaultAuthenticationProvider>();
-            SimpleIoc.Default.Register<INavigationManager, DefaultNavigationManager>();
-            SimpleIoc.Default.Register<IStudioModuleLoader, DefaultStudioModuleLoader>();
-            SimpleIoc.Default.Register<IStudioApplicationManager, DefaultStudioApplicationManager>();
-            SimpleIoc.Default.Register<ExternalBridgeScanner, ExternalBridgeScanner>();
-            SimpleIoc.Default.Register<ExternalBridgeScanner, ExternalBridgeScanner>();
-            SimpleIoc.Default.Register<IVideoCaptureProvider, DefaultVideoCaptureProvider>();
-            SimpleIoc.Default.Register<IDiagnosticsFrameProvider, DefaultDiagnosticsFrameProvider>();
-            SimpleIoc.Default.Register<IEventLogger, DefaultEventLogger>();
-            SimpleIoc.Default.Register<ISpeechProvider, DefaultSpeechProvider>();
-            SimpleIoc.Default.Register<IHtmlPresenter, DefaultHtmlPresenter>();
+            TangoIOC.Default.Register<INotificationProvider, DefaultNotificationProvider>();
+            TangoIOC.Default.Register<IAuthenticationProvider, DefaultAuthenticationProvider>();
+            TangoIOC.Default.Register<INavigationManager, DefaultNavigationManager>();
+            TangoIOC.Default.Register<IStudioModuleLoader, DefaultStudioModuleLoader>();
+            TangoIOC.Default.Register<IStudioApplicationManager, DefaultStudioApplicationManager>();
+            TangoIOC.Default.Register<ExternalBridgeScanner, ExternalBridgeScanner>();
+            TangoIOC.Default.Register<IVideoCaptureProvider, DefaultVideoCaptureProvider>();
+            TangoIOC.Default.Register<IDiagnosticsFrameProvider, DefaultDiagnosticsFrameProvider>();
+            TangoIOC.Default.Register<IEventLogger, DefaultEventLogger>();
+            TangoIOC.Default.Register<ISpeechProvider, DefaultSpeechProvider>();
+            TangoIOC.Default.Register<IHtmlPresenter, DefaultHtmlPresenter>();
 
-            SimpleIoc.Default.Register<MainViewVM>();
-            SimpleIoc.Default.Register<LoadingViewVM>();
-            SimpleIoc.Default.Register<ShutdownViewVM>();
-            SimpleIoc.Default.Register<LoginViewVM>();
-            SimpleIoc.Default.Register<MachineConnectionViewVM>();
-            SimpleIoc.Default.Register<ConnectedMachineViewVM>();
-            SimpleIoc.Default.Register<MachineLoginViewVM>();
-            SimpleIoc.Default.Register<UpdateViewVM>();
+            TangoIOC.Default.Register<MainViewVM>();
+            TangoIOC.Default.Register<LoadingViewVM>();
+            TangoIOC.Default.Register<ShutdownViewVM>();
+            TangoIOC.Default.Register<LoginViewVM>();
+            TangoIOC.Default.Register<MachineConnectionViewVM>();
+            TangoIOC.Default.Register<ConnectedMachineViewVM>();
+            TangoIOC.Default.Register<MachineLoginViewVM>();
+            TangoIOC.Default.Register<UpdateViewVM>();
 
             //Register View (Supervising Controller Pattern).
-            if (!ViewModelBase.IsInDesignModeStatic)
-            {
-                LogManager.Log(String.Format("Registering Supervising Controller {0}...", nameof(IMainView)));
-                SimpleIoc.Default.Register(() => (IMainView)MainView.Self);
-            }
+            //if (!ViewModelBase.IsInDesignModeStatic)
+            //{
+            //    LogManager.Log(String.Format("Registering Supervising Controller {0}...", nameof(IMainView)));
+            //    TangoIOC.Default.Register(() => (IMainView)MainView.Self);
+            //}
         }
 
         public MainViewVM MainViewVM
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<MainViewVM>();
+                return TangoIOC.Default.GetInstance<MainViewVM>();
             }
         }
 
@@ -107,7 +102,7 @@ namespace Tango.MachineStudio.UI
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<LoadingViewVM>();
+                return TangoIOC.Default.GetInstance<LoadingViewVM>();
             }
         }
 
@@ -115,7 +110,7 @@ namespace Tango.MachineStudio.UI
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<ShutdownViewVM>();
+                return TangoIOC.Default.GetInstance<ShutdownViewVM>();
             }
         }
 
@@ -123,7 +118,7 @@ namespace Tango.MachineStudio.UI
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<LoginViewVM>();
+                return TangoIOC.Default.GetInstance<LoginViewVM>();
             }
         }
 
@@ -131,7 +126,7 @@ namespace Tango.MachineStudio.UI
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<MachineConnectionViewVM>();
+                return TangoIOC.Default.GetInstance<MachineConnectionViewVM>();
             }
         }
 
@@ -139,7 +134,7 @@ namespace Tango.MachineStudio.UI
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<ConnectedMachineViewVM>();
+                return TangoIOC.Default.GetInstance<ConnectedMachineViewVM>();
             }
         }
 
@@ -147,7 +142,7 @@ namespace Tango.MachineStudio.UI
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<MachineLoginViewVM>();
+                return TangoIOC.Default.GetInstance<MachineLoginViewVM>();
             }
         }
 
@@ -155,7 +150,7 @@ namespace Tango.MachineStudio.UI
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<UpdateViewVM>();
+                return TangoIOC.Default.GetInstance<UpdateViewVM>();
             }
         }
     }