Changeset 13739 for branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services/Jobs

Timestamp:

03/29/16 17:02:16 (9 years ago)

Author:

jlodewyc

Message:

#2582 Overhaul Login service, done

File:

• branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services/Jobs/FileOpeningService.cs (modified) (4 diffs)

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services/Jobs/FileOpeningService.cs

@@ -16 +16 @@
     public class FileOpeningService
     {
+        public Guid UserId { get; set; }
+
+        private WebLoginService weblog;
         public RefreshableJob Job { get; set; }
         public FileOpeningViewModel vm { get; set; }
@@ -22 +25 @@
             get; set; }
         public List<int> previousLogs { get; set; }
-        private static FileOpeningService instance;
-        public static FileOpeningService Instance
+        
+
+        public FileOpeningService(Guid u)
         {
-            get
-            {
-                if (instance == null)
-                {
-                    instance = new FileOpeningService();
-                }
-                return instance;
-            }
+            weblog = WebLoginService.Instance;
+            UserId = u;
         }
+
+
         /// <summary>
         /// Clears loaded jobs and start new one
@@ -58 +58 @@
         {
            // HiveClientWeb.Instance.Refresh();
-            HiveClientWeb.LoadJob(Job);
+            weblog.getClientWeb(UserId).LoadJob(Job);
         }
         /// <summary>
@@ -68 +68 @@
             if (vm != null)
             {
-
-
-
-                HiveServiceLocatorWeb serv = (HiveServiceLocatorWeb)HiveServiceLocatorWeb.Instance;
-                //job.Job.Id = serv.getHiveServiceClient().AddJob(job.Job);
-                //  job.Job =  serv.getHiveServiceClient().GetJob(job.Job.Id);
-
-                HiveClientWeb.CurrentEnv = env;
-                HiveClientWeb.Instance.Refresh();
-                HiveClientWeb.StartJob((ex) => { throw ex; }, Job, CancellationToken.None);
+                var clientWeb = weblog.getClientWeb(UserId);
+                clientWeb.CurrentEnv = env;
+                clientWeb.Refresh();
+                clientWeb.StartJob((ex) => { throw ex; }, Job, CancellationToken.None);
                 return Job;
             }