1 files changed, 4 insertions, 37 deletions

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<IDataService, DataService>();
             ////}
 
+            SimpleIoc.Default.Register<INotificationProvider>(() => new DefaultNotificationProvider());
+
             SimpleIoc.Default.Register<MainViewVM>();
-            SimpleIoc.Default.Register<MachinesViewVM>();
-            SimpleIoc.Default.Register<OrganizationsViewVM>();
-            SimpleIoc.Default.Register<AddressesViewVM>();
-            SimpleIoc.Default.Register<UsersViewVM>();
 
             //Register View (Supervising Controller Pattern).
             if (!ViewModelBase.IsInDesignModeStatic)
@@ -55,37 +54,5 @@ namespace Tango.MachineStudio.UI
                 return ServiceLocator.Current.GetInstance<MainViewVM>();
             }
         }
-
-        public MachinesViewVM MachinesViewVM
-        {
-            get
-            {
-                return ServiceLocator.Current.GetInstance<MachinesViewVM>();
-            }
-        }
-
-        public OrganizationsViewVM OrganizationsViewVM
-        {
-            get
-            {
-                return ServiceLocator.Current.GetInstance<OrganizationsViewVM>();
-            }
-        }
-
-        public AddressesViewVM AddressesViewVM
-        {
-            get
-            {
-                return ServiceLocator.Current.GetInstance<AddressesViewVM>();
-            }
-        }
-
-        public UsersViewVM UsersViewVM
-        {
-            get
-            {
-                return ServiceLocator.Current.GetInstance<UsersViewVM>();
-            }
-        }
     }
 }
\ No newline at end of file