From 2a51f05523c1397b77eca5e5188520919205638c Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Wed, 13 Dec 2017 15:19:55 +0200 Subject: Successfully separated Machine Studio to modules... --- .../Tango.MachineStudio.UI/ViewModelLocator.cs | 41 +++------------------- 1 file changed, 4 insertions(+), 37 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs') diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs index 2d3492ba0..1f08e31ca 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs @@ -3,9 +3,10 @@ using GalaSoft.MvvmLight.Ioc; using Microsoft.Practices.ServiceLocation; using System; using Tango.Logging; +using Tango.MachineStudio.Common.Notifications; +using Tango.MachineStudio.UI.Notifications; using Tango.MachineStudio.UI.SupervisingController; using Tango.MachineStudio.UI.ViewModels; -using Tango.MachineStudio.UI.ViewModels.DBViewModels; using Tango.MachineStudio.UI.Views; namespace Tango.MachineStudio.UI @@ -34,11 +35,9 @@ namespace Tango.MachineStudio.UI //// SimpleIoc.Default.Register(); ////} + SimpleIoc.Default.Register(() => new DefaultNotificationProvider()); + SimpleIoc.Default.Register(); - SimpleIoc.Default.Register(); - SimpleIoc.Default.Register(); - SimpleIoc.Default.Register(); - SimpleIoc.Default.Register(); //Register View (Supervising Controller Pattern). if (!ViewModelBase.IsInDesignModeStatic) @@ -55,37 +54,5 @@ namespace Tango.MachineStudio.UI return ServiceLocator.Current.GetInstance(); } } - - public MachinesViewVM MachinesViewVM - { - get - { - return ServiceLocator.Current.GetInstance(); - } - } - - public OrganizationsViewVM OrganizationsViewVM - { - get - { - return ServiceLocator.Current.GetInstance(); - } - } - - public AddressesViewVM AddressesViewVM - { - get - { - return ServiceLocator.Current.GetInstance(); - } - } - - public UsersViewVM UsersViewVM - { - get - { - return ServiceLocator.Current.GetInstance(); - } - } } } \ No newline at end of file -- cgit v1.3.1