Changeset 7270 for branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs

Timestamp:

01/04/12 16:45:02 (12 years ago)

Author:

spimming

Message:

#1680:

• merged changes from trunk into branch

Location:

branches/HeuristicLab.Hive.Azure

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive/3.3 (modified) (1 prop)
• HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs (modified) (5 diffs)

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3

@@ -2 +2 @@
 Plugin.cs
 bin
+*.vs10x

@@ -2 +2 @@
 Plugin.cs
 bin
+*.vs10x

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -265 +265 @@
     private void jobResultPoller_JobResultReceived(object sender, EventArgs<IEnumerable<LightweightTask>> e) {
       foreach (LightweightTask lightweightTask in e.Value) {
-        HiveTask hiveTask = GetHiveJobById(lightweightTask.Id);
+        HiveTask hiveTask = GetHiveTaskById(lightweightTask.Id);
         if (hiveTask != null) {
           // lastJobDataUpdate equals DateTime.MinValue right after it was uploaded. When the first results are polled, this value is updated
@@ -279 +279 @@
             jobDownloader.DownloadTaskData(hiveTask.Task, (localJob, itemJob) => {
               log.LogMessage(string.Format("Finished downloading task {0}", localJob.Id));
-              HiveTask localHiveTask = GetHiveJobById(localJob.Id);
+              HiveTask localHiveTask = GetHiveTaskById(localJob.Id);
 
               if (itemJob == null) {
@@ -294 +294 @@
                 } else {
                   if (localJob.ParentTaskId.HasValue) {
-                    HiveTask parentHiveTask = GetHiveJobById(localJob.ParentTaskId.Value);
+                    HiveTask parentHiveTask = GetHiveTaskById(localJob.ParentTaskId.Value);
                     parentHiveTask.IntegrateChild(itemJob, localJob.Id);
                   } else {
@@ -317 +317 @@
     }
 
-    public HiveTask GetHiveJobById(Guid jobId) {
-      foreach (HiveTask job in this.HiveTasks) {
-        var hj = job.GetHiveTaskByTaskId(jobId);
+    public HiveTask GetHiveTaskById(Guid jobId) {
+      foreach (HiveTask t in this.HiveTasks) {
+        var hj = t.GetHiveTaskByTaskId(jobId);
         if (hj != null)
           return hj;

@@ -2 +2 @@
 Plugin.cs
 bin
+*.vs10x