1 files changed, 9 insertions, 10 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
index 52602e6de..0bbcfd313 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
@@ -1,5 +1,4 @@
-using Microsoft.Practices.ServiceLocation;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -8,7 +7,6 @@ using System.Threading.Tasks;
 using Tango.Core.Helpers;
 using Tango.MachineStudio.Common.StudioApplication;
 using Tango.MachineStudio.Common.Navigation;
-using GalaSoft.MvvmLight.Ioc;
 using System.Reflection;
 using System.Collections;
 using Tango.Core;
@@ -20,6 +18,7 @@ using System.Windows;
 using Tango.Integration.Services;
 using Tango.MachineStudio.Common.EventLogging;
 using Tango.BL.Enumerations;
+using Tango.Core.DI;
 
 namespace Tango.MachineStudio.UI.StudioApplication
 {
@@ -136,7 +135,7 @@ namespace Tango.MachineStudio.UI.StudioApplication
             await Task.Factory.StartNew(async () =>
             {
                 //Do Shutdown Procedures...
-                foreach (var vm in ServiceLocator.Current.GetAllInstancesByBase<IShutdownRequestBlocker>())
+                foreach (var vm in TangoIOC.Default.GetAllInstancesByBase<IStudioViewModel>())
                 {
                     try
                     {
@@ -153,7 +152,7 @@ namespace Tango.MachineStudio.UI.StudioApplication
                     }
                 }
 
-                foreach (var vm in ServiceLocator.Current.GetAllInstancesByBase<IShutdownListener>())
+                foreach (var vm in TangoIOC.Default.GetAllInstancesByBase<IStudioViewModel>())
                 {
                     vm.OnShuttingDown();
                 }
@@ -191,7 +190,7 @@ namespace Tango.MachineStudio.UI.StudioApplication
                     LogManager.Log(ex, "Error disconnecting from machine.");
                 }
 
-                var eventLogger = ServiceLocator.Current.GetInstance<IEventLogger>();
+                var eventLogger = TangoIOC.Default.GetInstance<IEventLogger>();
                 if (eventLogger != null)
                 {
                     eventLogger.Log(EventTypes.ApplicationTerminated, "Application Terminated!");
@@ -210,18 +209,18 @@ namespace Tango.MachineStudio.UI.StudioApplication
         /// </summary>
         /// <param name="moduleName">Name of the module.</param>
         /// <param name="args">The arguments.</param>
-        public void RequestModule(string moduleName, object args)
+        public void RequestModule(string moduleName, params object[] args)
         {
             IStudioModule module = _moduleLoader.UserModules.SingleOrDefault(x => x.Name == moduleName);
 
             if (module != null)
             {
-                ServiceLocator.Current.GetInstance<ViewModels.MainViewVM>().StartModule(module);
+                TangoIOC.Default.GetInstance<ViewModels.MainViewVM>().StartModule(module);
 
                 //Notify request listeners.
-                foreach (var vm in ServiceLocator.Current.GetAllInstancesByBase<IModuleRequestListener>())
+                foreach (var vm in TangoIOC.Default.GetAllInstancesByBase<IStudioViewModel>())
                 {
-                    vm.OnRequestModule(module, args);
+                    vm.OnModuleRequest(module, args);
                 }
             }
             else