Changeset 9193 for branches/UnloadJobs

Timestamp:

01/28/13 15:27:11 (12 years ago)

Author:

ascheibe

Message:

#2005 simplified refreshing of jobs in the Hive client as this isn't needed anymore

File:

• branches/UnloadJobs/HeuristicLab.Clients.Hive/3.3/HiveClient.cs (modified) (2 diffs)

branches/UnloadJobs/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

@@ -109 +109 @@
         IsAllowedPrivileged = HiveServiceLocator.Instance.CallHiveService((s) => s.IsAllowedPrivileged());
 
-        var oldJobs = jobs ?? new ItemCollection<RefreshableJob>();
         jobs = new HiveItemCollection<RefreshableJob>();
         var jobsLoaded = HiveServiceLocator.Instance.CallHiveService<IEnumerable<Job>>(s => s.GetJobs());
 
         foreach (var j in jobsLoaded) {
-          var job = oldJobs.SingleOrDefault(x => x.Id == j.Id);
-          if (job == null) {
-            // new
-            jobs.Add(new RefreshableJob(j) { IsAllowedPrivileged = this.isAllowedPrivileged });
-          } else {
-            // update
-            job.Job = j;
-            job.IsAllowedPrivileged = this.isAllowedPrivileged;
-            jobs.Add(job);
-          }
-        }
-        // remove those which were not in the list of loaded hiveexperiments
-        foreach (var job in oldJobs) {
-          if (job.Id == Guid.Empty) {
-            // experiment not uploaded... keep
-            jobs.Add(job);
-          } else {
-            job.RefreshAutomatically = false; // stop results polling
-          }
+          jobs.Add(new RefreshableJob(j) { IsAllowedPrivileged = this.isAllowedPrivileged });
         }
       }
@@ -143 +124 @@
       }
     }
+
     public void RefreshAsync(Action<Exception> exceptionCallback) {
       var call = new Func<Exception>(delegate() {