From 00a491d93733d4625ad329b2ba8237f445364b3f Mon Sep 17 00:00:00 2001 From: Mirta Date: Wed, 30 Dec 2020 16:39:52 +0200 Subject: merge --- .../PPC/Tango.PPC.UI/ViewModelLocator.cs | 84 +--------------------- 1 file changed, 3 insertions(+), 81 deletions(-) (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs') diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs index 222d3a1e8..67b5dc19b 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs @@ -1,41 +1,26 @@ using System; -using System.Linq; using System.Windows; using Tango.Core.DI; using Tango.Integration.ExternalBridge; using Tango.Logging; using Tango.PPC.Common.Application; using Tango.PPC.Common.Authentication; -using Tango.PPC.Common.BackupRestore; using Tango.PPC.Common.Connection; using Tango.PPC.Common.Connectivity; -using Tango.PPC.Common.Console; -using Tango.PPC.Common.DataStore; using Tango.PPC.Common.Diagnostics; using Tango.PPC.Common.EventLogging; using Tango.PPC.Common.ExternalBridge; -using Tango.PPC.Common.FileSystem; using Tango.PPC.Common.HotSpot; -using Tango.PPC.Common.Insights; using Tango.PPC.Common.MachineSetup; using Tango.PPC.Common.MachineUpdate; using Tango.PPC.Common.Modules; using Tango.PPC.Common.Navigation; using Tango.PPC.Common.Notifications; using Tango.PPC.Common.OS; -using Tango.PPC.Common.Performance; using Tango.PPC.Common.Printing; -using Tango.PPC.Common.RemoteActions; using Tango.PPC.Common.RemoteAssistance; -using Tango.PPC.Common.RemoteDesktop; -using Tango.PPC.Common.RemoteJob; -using Tango.PPC.Common.SQL; using Tango.PPC.Common.Storage; -using Tango.PPC.Common.Synchronization; -using Tango.PPC.Common.SystemInfo; using Tango.PPC.Common.Threading; -using Tango.PPC.Common.ThreadLoading; -using Tango.PPC.Common.UpdatePackages; using Tango.PPC.Common.UWF; using Tango.PPC.Common.Web; using Tango.PPC.UI.Authentication; @@ -45,9 +30,7 @@ using Tango.PPC.UI.Navigation; using Tango.PPC.UI.Notifications; using Tango.PPC.UI.PPCApplication; using Tango.PPC.UI.Printing; -using Tango.PPC.UI.RemoteActions; using Tango.PPC.UI.Threading; -using Tango.PPC.UI.ThreadLoading; using Tango.PPC.UI.ViewModels; using Tango.PPC.UI.Views; using Tango.PPC.UI.ViewsContracts; @@ -88,30 +71,8 @@ namespace Tango.PPC.UI TangoIOC.Default.Unregister(); TangoIOC.Default.Unregister(); TangoIOC.Default.Unregister(); - TangoIOC.Default.Unregister(); - TangoIOC.Default.Unregister(); - TangoIOC.Default.Unregister(); - TangoIOC.Default.Unregister(); - TangoIOC.Default.Unregister(); - TangoIOC.Default.Unregister(); - TangoIOC.Default.Unregister(); - TangoIOC.Default.Unregister(); - TangoIOC.Default.Unregister(); - TangoIOC.Default.Unregister(); - TangoIOC.Default.Unregister(); - TangoIOC.Default.Unregister(); - TangoIOC.Default.Unregister(); - TangoIOC.Default.Unregister(); - - if (App.StartupArgs != null && App.StartupArgs.Contains("-webDebug")) - { - TangoIOC.Default.Register(new PPCWebClient("http://localhost:1111", null)); - } - else - { - TangoIOC.Default.Register(new PPCWebClient()); - } + TangoIOC.Default.Register(new PPCWebClient()); TangoIOC.Default.Register(new DefaultDispatcherProvider(Application.Current.Dispatcher)); TangoIOC.Default.Register(); TangoIOC.Default.Register(); @@ -119,14 +80,11 @@ namespace Tango.PPC.UI TangoIOC.Default.Register(); TangoIOC.Default.Register(); TangoIOC.Default.Register(); - TangoIOC.Default.Register(); TangoIOC.Default.Register(); TangoIOC.Default.Register(); TangoIOC.Default.Register(); TangoIOC.Default.Register(); - TangoIOC.Default.Register(); TangoIOC.Default.Register(); - TangoIOC.Default.Register(); TangoIOC.Default.Register(); TangoIOC.Default.Register(); TangoIOC.Default.Register(); @@ -135,17 +93,8 @@ namespace Tango.PPC.UI TangoIOC.Default.Register(); TangoIOC.Default.Register(); TangoIOC.Default.Register(); - TangoIOC.Default.Register(); - TangoIOC.Default.Register(); - TangoIOC.Default.Register(); - TangoIOC.Default.Register(); - TangoIOC.Default.Register(); - TangoIOC.Default.Register(); - TangoIOC.Default.Register(); - TangoIOC.Default.Register(); - TangoIOC.Default.Register(); - TangoIOC.Default.Register(); - TangoIOC.Default.Register(); + + //TangoIOC.Default.Register(new TeamFoundationServiceExtendedClient("https://twinetfs.visualstudio.com", String.Empty, "szzfokrceo4rhd4eqi5qpmxn3pa5iwl3q7tlqd36l2m7smz2ynoa")); TangoIOC.Default.Register(); TangoIOC.Default.Register(); @@ -158,9 +107,6 @@ namespace Tango.PPC.UI TangoIOC.Default.Register(); TangoIOC.Default.Register(); TangoIOC.Default.Register(); - TangoIOC.Default.Register(); - TangoIOC.Default.Register(); - TangoIOC.Default.Register(); TangoIOC.Default.GetInstance().ContentRendered += (_, __) => @@ -266,29 +212,5 @@ namespace Tango.PPC.UI return TangoIOC.Default.GetInstance(); } } - - public static RestartingViewVM RestartingViewVM - { - get - { - return TangoIOC.Default.GetInstance(); - } - } - - public static InternalModuleViewVM InternalModuleViewVM - { - get - { - return TangoIOC.Default.GetInstance(); - } - } - - public static PowerOffViewVM PowerOffViewVM - { - get - { - return TangoIOC.Default.GetInstance(); - } - } } } \ No newline at end of file -- cgit v1.3.1