Changeset 6721 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/Executor.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.Slave/3.3/Executor.cs (modified) (4 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/Executor.cs

@@ -100 +100 @@
     public void Pause() {
       IsPausing = true;
-      // wait until job is started. if this does not happen, the Job is null an we give up
+      // wait until job is started. if this does not happen, the Task is null an we give up
       jobStartedSem.WaitOne(Settings.Default.ExecutorSemTimeouts);
       if (job == null) {
-        CurrentException = new Exception("Pausing job " + this.JobId + ": Job is null");
+        CurrentException = new Exception("Pausing job " + this.JobId + ": Task is null");
         executorQueue.AddMessage(ExecutorMessageType.ExceptionOccured);
         return;
@@ -123 +123 @@
     public void Stop() {
       IsStopping = true;
-      // wait until job is started. if this does not happen, the Job is null an we give up
+      // wait until job is started. if this does not happen, the Task is null an we give up
       jobStartedSem.WaitOne(Settings.Default.ExecutorSemTimeouts);
       if (job == null) {
-        CurrentException = new Exception("Stopping job " + this.JobId + ": Job is null");
+        CurrentException = new Exception("Stopping job " + this.JobId + ": Task is null");
         executorQueue.AddMessage(ExecutorMessageType.ExceptionOccured);
       }
@@ -157 +157 @@
     }
 
-    #region Job Events
+    #region Task Events
     private void Job_JobFailed(object sender, EventArgs e) {
       IsStopping = true;
@@ -185 +185 @@
     #endregion
 
-    public JobData GetJobData() {
+    public TaskData GetJobData() {
       if (jobDataInvalid) return null;
 
       if (job.ExecutionState == ExecutionState.Started) {
-        throw new InvalidStateException("Job is still running");
+        throw new InvalidStateException("Task is still running");
       } else {
-        JobData jobData = new JobData();
+        TaskData jobData = new TaskData();
         if (job == null) {
           //send empty job and save exception
-          jobData.Data = PersistenceUtil.Serialize(new JobData());
+          jobData.Data = PersistenceUtil.Serialize(new TaskData());
           if (CurrentException == null) {
-            CurrentException = new Exception("Job with id " + this.JobId + " is null, sending empty job");
+            CurrentException = new Exception("Task with id " + this.JobId + " is null, sending empty job");
           }
         } else {
           jobData.Data = PersistenceUtil.Serialize(job);
         }
-        jobData.JobId = JobId;
+        jobData.TaskId = JobId;
         return jobData;
       }