Changeset 6721 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/HiveJobs/HiveJob.cs

Timestamp:

09/08/11 13:41:25 (13 years ago)

Author:

ascheibe

Message:

#1233 Review comments: renamed Job to Task

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/HiveJobs/HiveJob.cs (modified) (10 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/HiveJobs/HiveJob.cs

@@ -34 +34 @@
 namespace HeuristicLab.Clients.Hive {
 
-  [Item("Hive Job", "Represents a hive job.")]
+  [Item("Hive Task", "Represents a hive job.")]
   [StorableClass]
   public class HiveJob : NamedItem, IItemTree<HiveJob> {
@@ -45 +45 @@
           return HeuristicLab.Common.Resources.VSImageLibrary.Event;
         } else {
-          if (job.State == JobState.Waiting) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutablePrepared;
-          else if (job.State == JobState.Calculating) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStarted;
-          else if (job.State == JobState.Transferring) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStarted;
-          else if (job.State == JobState.Paused) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutablePaused;
-          else if (job.State == JobState.Aborted) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStopped;
-          else if (job.State == JobState.Failed) return HeuristicLab.Common.Resources.VSImageLibrary.Error;
-          else if (job.State == JobState.Finished) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStopped;
+          if (job.State == TaskState.Waiting) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutablePrepared;
+          else if (job.State == TaskState.Calculating) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStarted;
+          else if (job.State == TaskState.Transferring) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStarted;
+          else if (job.State == TaskState.Paused) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutablePaused;
+          else if (job.State == TaskState.Aborted) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStopped;
+          else if (job.State == TaskState.Failed) return HeuristicLab.Common.Resources.VSImageLibrary.Error;
+          else if (job.State == TaskState.Finished) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStopped;
           else return HeuristicLab.Common.Resources.VSImageLibrary.Event;
         }
@@ -58 +58 @@
 
     [Storable]
-    protected Job job;
-    public Job Job {
+    protected Task job;
+    public Task Job {
       get { return job; }
       set {
@@ -154 +154 @@
     #region Constructors and Cloning
     public HiveJob() {
-      this.Job = new Job() { CoresNeeded = 1, MemoryNeeded = 0 };
-      job.State = JobState.Offline;
+      this.Job = new Task() { CoresNeeded = 1, MemoryNeeded = 0 };
+      job.State = TaskState.Offline;
       this.childHiveJobs = new ItemList<HiveJob>();
       syncJobsWithOptimizers = true;
@@ -168 +168 @@
     }
 
-    public HiveJob(Job job, JobData jobData, bool autoCreateChildHiveJobs) {
+    public HiveJob(Task job, TaskData jobData, bool autoCreateChildHiveJobs) {
       this.syncJobsWithOptimizers = autoCreateChildHiveJobs;
       this.Job = job;
@@ -251 +251 @@
     }
 
-    public virtual void UpdateFromLightweightJob(LightweightJob lightweightJob) {
+    public virtual void UpdateFromLightweightJob(LightweightTask lightweightJob) {
       if (lightweightJob != null) {
         job.Id = lightweightJob.Id;
-        job.ParentJobId = lightweightJob.ParentJobId;
+        job.ParentTaskId = lightweightJob.ParentTaskId;
         job.ExecutionTime = lightweightJob.ExecutionTime;
         job.State = lightweightJob.State;
@@ -268 +268 @@
 
     /// <summary>
-    /// Creates a JobData object containing the Job and the IJob-Object as byte[]
+    /// Creates a TaskData object containing the Task and the IJob-Object as byte[]
     /// </summary>
     /// <param name="withoutChildOptimizers">
     ///   if true the Child-Optimizers will not be serialized (if the job contains an Experiment)
     /// </param>
-    public virtual JobData GetAsJobData(bool withoutChildOptimizers, out List<IPluginDescription> plugins) {
+    public virtual TaskData GetAsJobData(bool withoutChildOptimizers, out List<IPluginDescription> plugins) {
       plugins = new List<IPluginDescription>();
       if (this.itemJob == null)
@@ -280 +280 @@
       IEnumerable<Type> usedTypes;
       byte[] jobByteArray = PersistenceUtil.Serialize(this.ItemJob, out usedTypes);
-      JobData jobData = new JobData() { JobId = job.Id, Data = jobByteArray };
+      TaskData jobData = new TaskData() { TaskId = job.Id, Data = jobByteArray };
       PluginUtil.CollectDeclaringPlugins(plugins, usedTypes);
       return jobData;
@@ -478 +478 @@
     public void Restart() {
       ServiceLocator.Instance.CallHiveService(service => {
-        JobData jobData = new JobData();
-        jobData.JobId = this.job.Id;
+        TaskData jobData = new TaskData();
+        jobData.TaskId = this.job.Id;
         jobData.Data = PersistenceUtil.Serialize(this.itemJob);
         service.UpdateJobData(this.Job, jobData);
         service.RestartJob(this.job.Id);
-        Job job = service.GetJob(this.job.Id);
+        Task job = service.GetJob(this.job.Id);
         this.job.LastJobDataUpdate = job.LastJobDataUpdate;
       });
@@ -504 +504 @@
   }
 
-  [Item("Hive Job", "Represents a hive job.")]
+  [Item("Hive Task", "Represents a hive job.")]
   [StorableClass]
   public class HiveJob<T> : HiveJob where T : ItemJob {