1 files changed, 13 insertions, 16 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModelLocator.cs
index 090a323a2..861bf56bf 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModelLocator.cs
@@ -1,6 +1,4 @@
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Ioc;
-using Microsoft.Practices.ServiceLocation;
+using Tango.Core.DI;
 using Tango.MachineStudio.Synchronization.Navigation;
 using Tango.MachineStudio.Synchronization.ViewModels;
 
@@ -17,23 +15,22 @@ namespace Tango.MachineStudio.Synchronization
         /// </summary>
         static ViewModelLocator()
         {
-            ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default);
-            SimpleIoc.Default.Register<MainViewVM>();
-            SimpleIoc.Default.Register<MenuViewVM>();
-            SimpleIoc.Default.Register<LocalSynchronizationViewVM>();
-            SimpleIoc.Default.Register<RemoteSynchronizationViewVM>();
-            SimpleIoc.Default.Register<DirectSynchronizationViewVM>();
+            TangoIOC.Default.Register<MainViewVM>();
+            TangoIOC.Default.Register<MenuViewVM>();
+            TangoIOC.Default.Register<LocalSynchronizationViewVM>();
+            TangoIOC.Default.Register<RemoteSynchronizationViewVM>();
+            TangoIOC.Default.Register<DirectSynchronizationViewVM>();
 
-            SimpleIoc.Default.Unregister<SyncNavigationManager>();
+            TangoIOC.Default.Unregister<SyncNavigationManager>();
 
-            SimpleIoc.Default.Register<SyncNavigationManager, SyncNavigationManager>();
+            TangoIOC.Default.Register<SyncNavigationManager, SyncNavigationManager>();
         }
 
         public static MainViewVM MainViewVM
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<MainViewVM>();
+                return TangoIOC.Default.GetInstance<MainViewVM>();
             }
         }
 
@@ -41,7 +38,7 @@ namespace Tango.MachineStudio.Synchronization
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<MenuViewVM>();
+                return TangoIOC.Default.GetInstance<MenuViewVM>();
             }
         }
 
@@ -49,7 +46,7 @@ namespace Tango.MachineStudio.Synchronization
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<LocalSynchronizationViewVM>();
+                return TangoIOC.Default.GetInstance<LocalSynchronizationViewVM>();
             }
         }
 
@@ -57,7 +54,7 @@ namespace Tango.MachineStudio.Synchronization
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<RemoteSynchronizationViewVM>();
+                return TangoIOC.Default.GetInstance<RemoteSynchronizationViewVM>();
             }
         }
 
@@ -65,7 +62,7 @@ namespace Tango.MachineStudio.Synchronization
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<DirectSynchronizationViewVM>();
+                return TangoIOC.Default.GetInstance<DirectSynchronizationViewVM>();
             }
         }
     }