From de099bd3b50b8ea52b212b8d322626582c2648be Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Sun, 22 Apr 2018 13:35:22 +0300
Subject: Implemented new TangoIOC container & TangoMessenger. Got rid of
 MVVMLite libs ! Got rid of IShutdownRequestBlocker, IShutdownListener,
 IModuleRequestListener. Implemented IStudioViewModel & StudioViewModel.

---
 .../ViewModels/DirectSynchronizationViewVM.cs              |  4 ++--
 .../ViewModels/LocalSynchronizationViewVM.cs               |  6 +++---
 .../ViewModels/RemoteSynchronizationViewVM.cs              | 14 ++++++++++----
 3 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/DirectSynchronizationViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/DirectSynchronizationViewVM.cs
index b4dd67178..bb5ef68f1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/DirectSynchronizationViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/DirectSynchronizationViewVM.cs
@@ -1,5 +1,4 @@
 using Google.Protobuf;
-using Microsoft.Practices.ServiceLocation;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -21,6 +20,7 @@ using Tango.SharedUI;
 using Tango.Synchronization;
 using Tango.Synchronization.Local;
 using Tango.Synchronization.Remote;
+using Tango.Core.DI;
 
 namespace Tango.MachineStudio.Synchronization.ViewModels
 {
@@ -168,7 +168,7 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
         {
             if (_mainView == null)
             {
-                _mainView = ServiceLocator.Current.GetInstance<MainViewVM>();
+                _mainView = TangoIOC.Default.GetInstance<MainViewVM>();
                 _mainView.Log = String.Empty;
             }
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/LocalSynchronizationViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/LocalSynchronizationViewVM.cs
index 2621f622a..d3cb23d64 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/LocalSynchronizationViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/LocalSynchronizationViewVM.cs
@@ -1,5 +1,4 @@
-using Microsoft.Practices.ServiceLocation;
-using Microsoft.Win32;
+using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -9,6 +8,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Tango.Core.Commands;
+using Tango.Core.DI;
 using Tango.Logging;
 using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.Synchronization.Navigation;
@@ -178,7 +178,7 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
         {
             if (_mainView == null)
             {
-                _mainView = ServiceLocator.Current.GetInstance<MainViewVM>();
+                _mainView = TangoIOC.Default.GetInstance<MainViewVM>();
                 _mainView.Log = String.Empty;
             }
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/RemoteSynchronizationViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/RemoteSynchronizationViewVM.cs
index 57b3af1a8..75b5fe95a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/RemoteSynchronizationViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/RemoteSynchronizationViewVM.cs
@@ -21,7 +21,8 @@ using Tango.SharedUI;
 using Tango.Synchronization;
 using Tango.Synchronization.Local;
 using Tango.Synchronization.Remote;
-using Microsoft.Practices.ServiceLocation;
+using Tango.Core.DI;
+using Tango.MachineStudio.Common;
 
 namespace Tango.MachineStudio.Synchronization.ViewModels
 {
@@ -30,7 +31,7 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
     /// </summary>
     /// <seealso cref="Tango.SharedUI.ViewModel" />
     /// <seealso cref="Tango.MachineStudio.Common.StudioApplication.IShutdownRequestBlocker" />
-    public class RemoteSynchronizationViewVM : ViewModel, IShutdownRequestBlocker
+    public class RemoteSynchronizationViewVM : StudioViewModel<SynchronizationModule>
     {
         private SyncNavigationManager _navigation;
         private String _slaveDBFile;
@@ -117,7 +118,7 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
         {
             if (_mainView == null)
             {
-                _mainView = ServiceLocator.Current.GetInstance<MainViewVM>();
+                _mainView = TangoIOC.Default.GetInstance<MainViewVM>();
                 _mainView.Log = String.Empty;
             }
 
@@ -407,11 +408,15 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
             InvokeUINow(() => _notification.ShowInfo(message));
         }
 
+        #endregion
+
+        #region IStudioModuleVM
+
         /// <summary>
         /// Called when the application is shutting down.
         /// </summary>
         /// <returns></returns>
-        public Task<bool> OnShutdownRequest()
+        public override Task<bool> OnShutdownRequest()
         {
             if (_comparer != null)
             {
@@ -420,6 +425,7 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
             return Task.FromResult(true);
         }
 
+
         #endregion
     }
 }
-- 
cgit v1.3.1