1 files changed, 85 insertions, 88 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
index da2bdf631..d2506c362 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
@@ -1,6 +1,4 @@
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Ioc;
-using Microsoft.Practices.ServiceLocation;
+using Tango.Core.DI;
 using Tango.MachineStudio.DB.ViewModels;
 
 namespace Tango.MachineStudio.DB
@@ -16,65 +14,64 @@ namespace Tango.MachineStudio.DB
         /// </summary>
         static ViewModelLocator()
         {
-            ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default);
-            SimpleIoc.Default.Register<MainViewVM>();
-            SimpleIoc.Default.Register<MachinesViewVM>();
-            SimpleIoc.Default.Register<OrganizationsViewVM>();
-            SimpleIoc.Default.Register<AddressesViewVM>();
-            SimpleIoc.Default.Register<UsersViewVM>();
-            SimpleIoc.Default.Register<RolesViewVM>();
-            SimpleIoc.Default.Register<PermissionsViewVM>();
-            SimpleIoc.Default.Register<MachineVersionsViewVM>();
-            SimpleIoc.Default.Register<ConfigurationsViewVM>();
+            TangoIOC.Default.Register<MainViewVM>();
+            TangoIOC.Default.Register<MachinesViewVM>();
+            TangoIOC.Default.Register<OrganizationsViewVM>();
+            TangoIOC.Default.Register<AddressesViewVM>();
+            TangoIOC.Default.Register<UsersViewVM>();
+            TangoIOC.Default.Register<RolesViewVM>();
+            TangoIOC.Default.Register<PermissionsViewVM>();
+            TangoIOC.Default.Register<MachineVersionsViewVM>();
+            TangoIOC.Default.Register<ConfigurationsViewVM>();
 
-            SimpleIoc.Default.Register<ApplicationDisplayPanelVersionsViewVM>();
-            SimpleIoc.Default.Register<ApplicationFirmwareVersionsViewVM>();
-            SimpleIoc.Default.Register<ApplicationOsVersionsViewVM>();
-            SimpleIoc.Default.Register<ApplicationVersionsViewVM>();
-            SimpleIoc.Default.Register<EmbeddedFirmwareVersionsViewVM>();
-            SimpleIoc.Default.Register<EmbeddedSoftwareVersionsViewVM>();
-            SimpleIoc.Default.Register<HardwareVersionsViewVM>();
+            TangoIOC.Default.Register<ApplicationDisplayPanelVersionsViewVM>();
+            TangoIOC.Default.Register<ApplicationFirmwareVersionsViewVM>();
+            TangoIOC.Default.Register<ApplicationOsVersionsViewVM>();
+            TangoIOC.Default.Register<ApplicationVersionsViewVM>();
+            TangoIOC.Default.Register<EmbeddedFirmwareVersionsViewVM>();
+            TangoIOC.Default.Register<EmbeddedSoftwareVersionsViewVM>();
+            TangoIOC.Default.Register<HardwareVersionsViewVM>();
 
-            SimpleIoc.Default.Register<IdsPacksViewVM>();
-            SimpleIoc.Default.Register<IdsPackFormulasViewVM>();
-            SimpleIoc.Default.Register<DispenserTypesViewVM>();
-            SimpleIoc.Default.Register<LiquidTypesViewVM>();
-            SimpleIoc.Default.Register<CartridgeTypesViewVM>();
-            SimpleIoc.Default.Register<MidTankTypesViewVM>();
+            TangoIOC.Default.Register<IdsPacksViewVM>();
+            TangoIOC.Default.Register<IdsPackFormulasViewVM>();
+            TangoIOC.Default.Register<DispenserTypesViewVM>();
+            TangoIOC.Default.Register<LiquidTypesViewVM>();
+            TangoIOC.Default.Register<CartridgeTypesViewVM>();
+            TangoIOC.Default.Register<MidTankTypesViewVM>();
 
-            SimpleIoc.Default.Register<EventTypesViewVM>();
-            SimpleIoc.Default.Register<ActionTypesViewVM>();
+            TangoIOC.Default.Register<EventTypesViewVM>();
+            TangoIOC.Default.Register<ActionTypesViewVM>();
 
-            SimpleIoc.Default.Register<ContactsViewVM>();
+            TangoIOC.Default.Register<ContactsViewVM>();
 
-            SimpleIoc.Default.Register<MediaMaterialsViewVM>();
-            SimpleIoc.Default.Register<MediaColorsViewVM>();
-            SimpleIoc.Default.Register<MediaPurposesViewVM>();
-            SimpleIoc.Default.Register<MediaConditionsViewVM>();
-            SimpleIoc.Default.Register<LinearMassDensityUnitsViewVM>();
-            SimpleIoc.Default.Register<FiberShapesViewVM>();
-            SimpleIoc.Default.Register<FiberSynthsViewVM>();
-            SimpleIoc.Default.Register<RmlsViewVM>();
-            SimpleIoc.Default.Register<LiquidTypesRmlsViewVM>();
+            TangoIOC.Default.Register<MediaMaterialsViewVM>();
+            TangoIOC.Default.Register<MediaColorsViewVM>();
+            TangoIOC.Default.Register<MediaPurposesViewVM>();
+            TangoIOC.Default.Register<MediaConditionsViewVM>();
+            TangoIOC.Default.Register<LinearMassDensityUnitsViewVM>();
+            TangoIOC.Default.Register<FiberShapesViewVM>();
+            TangoIOC.Default.Register<FiberSynthsViewVM>();
+            TangoIOC.Default.Register<RmlsViewVM>();
+            TangoIOC.Default.Register<LiquidTypesRmlsViewVM>();
 
-            SimpleIoc.Default.Register<CctsViewVM>();
-            SimpleIoc.Default.Register<CatsViewVM>();
+            TangoIOC.Default.Register<CctsViewVM>();
+            TangoIOC.Default.Register<CatsViewVM>();
 
-            SimpleIoc.Default.Register<ProcessParametersTablesViewVM>();
-            SimpleIoc.Default.Register<ProcessParametersTablesGroupsViewVM>();
+            TangoIOC.Default.Register<ProcessParametersTablesViewVM>();
+            TangoIOC.Default.Register<ProcessParametersTablesGroupsViewVM>();
 
-            SimpleIoc.Default.Register<HardwareMotorTypesViewVM>();
-            SimpleIoc.Default.Register<HardwareDancerTypesViewVM>();
-            SimpleIoc.Default.Register<HardwarePidControlTypesViewVM>();
+            TangoIOC.Default.Register<HardwareMotorTypesViewVM>();
+            TangoIOC.Default.Register<HardwareDancerTypesViewVM>();
+            TangoIOC.Default.Register<HardwarePidControlTypesViewVM>();
 
-            SimpleIoc.Default.Register<EventTypesGroupsViewVM>();
+            TangoIOC.Default.Register<EventTypesGroupsViewVM>();
         }
 
         public static MainViewVM MainViewVM
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<MainViewVM>();
+                return TangoIOC.Default.GetInstance<MainViewVM>();
             }
         }
 
@@ -82,7 +79,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<MachinesViewVM>();
+                return TangoIOC.Default.GetInstance<MachinesViewVM>();
             }
         }
 
@@ -90,7 +87,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<OrganizationsViewVM>();
+                return TangoIOC.Default.GetInstance<OrganizationsViewVM>();
             }
         }
 
@@ -98,7 +95,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<AddressesViewVM>();
+                return TangoIOC.Default.GetInstance<AddressesViewVM>();
             }
         }
 
@@ -106,7 +103,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<UsersViewVM>();
+                return TangoIOC.Default.GetInstance<UsersViewVM>();
             }
         }
 
@@ -114,7 +111,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<RolesViewVM>();
+                return TangoIOC.Default.GetInstance<RolesViewVM>();
             }
         }
 
@@ -122,7 +119,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<PermissionsViewVM>();
+                return TangoIOC.Default.GetInstance<PermissionsViewVM>();
             }
         }
 
@@ -130,7 +127,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<MachineVersionsViewVM>();
+                return TangoIOC.Default.GetInstance<MachineVersionsViewVM>();
             }
         }
 
@@ -138,7 +135,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<ConfigurationsViewVM>();
+                return TangoIOC.Default.GetInstance<ConfigurationsViewVM>();
             }
         }
 
@@ -146,7 +143,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<ApplicationDisplayPanelVersionsViewVM>();
+                return TangoIOC.Default.GetInstance<ApplicationDisplayPanelVersionsViewVM>();
             }
         }
 
@@ -154,7 +151,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<ApplicationFirmwareVersionsViewVM>();
+                return TangoIOC.Default.GetInstance<ApplicationFirmwareVersionsViewVM>();
             }
         }
 
@@ -162,7 +159,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<ApplicationOsVersionsViewVM>();
+                return TangoIOC.Default.GetInstance<ApplicationOsVersionsViewVM>();
             }
         }
 
@@ -170,7 +167,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<ApplicationVersionsViewVM>();
+                return TangoIOC.Default.GetInstance<ApplicationVersionsViewVM>();
             }
         }
 
@@ -178,7 +175,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<EmbeddedFirmwareVersionsViewVM>();
+                return TangoIOC.Default.GetInstance<EmbeddedFirmwareVersionsViewVM>();
             }
         }
 
@@ -186,7 +183,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<EmbeddedSoftwareVersionsViewVM>();
+                return TangoIOC.Default.GetInstance<EmbeddedSoftwareVersionsViewVM>();
             }
         }
 
@@ -194,7 +191,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<HardwareVersionsViewVM>();
+                return TangoIOC.Default.GetInstance<HardwareVersionsViewVM>();
             }
         }
 
@@ -202,7 +199,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<IdsPacksViewVM>();
+                return TangoIOC.Default.GetInstance<IdsPacksViewVM>();
             }
         }
 
@@ -210,7 +207,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<DispenserTypesViewVM>();
+                return TangoIOC.Default.GetInstance<DispenserTypesViewVM>();
             }
         }
 
@@ -218,7 +215,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<LiquidTypesViewVM>();
+                return TangoIOC.Default.GetInstance<LiquidTypesViewVM>();
             }
         }
 
@@ -226,7 +223,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<CartridgeTypesViewVM>();
+                return TangoIOC.Default.GetInstance<CartridgeTypesViewVM>();
             }
         }
 
@@ -234,7 +231,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<EventTypesViewVM>();
+                return TangoIOC.Default.GetInstance<EventTypesViewVM>();
             }
         }
 
@@ -242,7 +239,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<ActionTypesViewVM>();
+                return TangoIOC.Default.GetInstance<ActionTypesViewVM>();
             }
         }
 
@@ -250,7 +247,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<ContactsViewVM>();
+                return TangoIOC.Default.GetInstance<ContactsViewVM>();
             }
         }
 
@@ -258,7 +255,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<MediaMaterialsViewVM>();
+                return TangoIOC.Default.GetInstance<MediaMaterialsViewVM>();
             }
         }
 
@@ -266,7 +263,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<MediaColorsViewVM>();
+                return TangoIOC.Default.GetInstance<MediaColorsViewVM>();
             }
         }
 
@@ -274,7 +271,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<MediaPurposesViewVM>();
+                return TangoIOC.Default.GetInstance<MediaPurposesViewVM>();
             }
         }
 
@@ -282,7 +279,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<MediaConditionsViewVM>();
+                return TangoIOC.Default.GetInstance<MediaConditionsViewVM>();
             }
         }
 
@@ -290,7 +287,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<LinearMassDensityUnitsViewVM>();
+                return TangoIOC.Default.GetInstance<LinearMassDensityUnitsViewVM>();
             }
         }
 
@@ -298,7 +295,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<FiberShapesViewVM>();
+                return TangoIOC.Default.GetInstance<FiberShapesViewVM>();
             }
         }
 
@@ -306,7 +303,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<FiberSynthsViewVM>();
+                return TangoIOC.Default.GetInstance<FiberSynthsViewVM>();
             }
         }
 
@@ -314,7 +311,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<RmlsViewVM>();
+                return TangoIOC.Default.GetInstance<RmlsViewVM>();
             }
         }
 
@@ -322,7 +319,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<CctsViewVM>();
+                return TangoIOC.Default.GetInstance<CctsViewVM>();
             }
         }
 
@@ -330,7 +327,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<CatsViewVM>();
+                return TangoIOC.Default.GetInstance<CatsViewVM>();
             }
         }
 
@@ -338,7 +335,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<MidTankTypesViewVM>();
+                return TangoIOC.Default.GetInstance<MidTankTypesViewVM>();
             }
         }
 
@@ -346,7 +343,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<LiquidTypesRmlsViewVM>();
+                return TangoIOC.Default.GetInstance<LiquidTypesRmlsViewVM>();
             }
         }
 
@@ -354,7 +351,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<ProcessParametersTablesViewVM>();
+                return TangoIOC.Default.GetInstance<ProcessParametersTablesViewVM>();
             }
         }
 
@@ -362,7 +359,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<ProcessParametersTablesGroupsViewVM>();
+                return TangoIOC.Default.GetInstance<ProcessParametersTablesGroupsViewVM>();
             }
         }
 
@@ -370,7 +367,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<IdsPackFormulasViewVM>();
+                return TangoIOC.Default.GetInstance<IdsPackFormulasViewVM>();
             }
         }
 
@@ -378,7 +375,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<HardwareMotorTypesViewVM>();
+                return TangoIOC.Default.GetInstance<HardwareMotorTypesViewVM>();
             }
         }
 
@@ -386,7 +383,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<HardwareDancerTypesViewVM>();
+                return TangoIOC.Default.GetInstance<HardwareDancerTypesViewVM>();
             }
         }
 
@@ -394,7 +391,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<HardwarePidControlTypesViewVM>();
+                return TangoIOC.Default.GetInstance<HardwarePidControlTypesViewVM>();
             }
         }
 
@@ -402,7 +399,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<EventTypesGroupsViewVM>();
+                return TangoIOC.Default.GetInstance<EventTypesGroupsViewVM>();
             }
         }
     }