Changeset 4264 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/JobManager.cs

Timestamp:

08/19/10 13:30:56 (14 years ago)

Author:

cneumuel

Message:

Split up "State" to "JobState" and "SlaveState" (#1159)

File:

• branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/JobManager.cs (modified) (8 diffs)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/JobManager.cs

@@ -58 +58 @@
       List<JobDto> allJobs = new List<JobDto>(DaoLocator.JobDao.FindAll());
       foreach (JobDto curJob in allJobs) {
-        if (curJob.State != State.Calculating && curJob.State != State.Finished) {
+        if (curJob.State != JobState.Calculating && curJob.State != JobState.Finished) {
           DaoLocator.JobDao.SetJobOffline(curJob);
         }
@@ -86 +86 @@
     }
 
-    public ResponseList<JobDto> GetAllJobsWithFilter(State jobState, int offset, int count) {
+    public ResponseList<JobDto> GetAllJobsWithFilter(JobState jobState, int offset, int count) {
       ResponseList<JobDto> response = new ResponseList<JobDto>();
       response.List = new List<JobDto>(DaoLocator.JobDao.FindWithLimitations(jobState, offset, count));
@@ -153 +153 @@
 
       if (job != null && job.JobInfo != null) {
-        if (job.JobInfo.State != State.Offline) {
+        if (job.JobInfo.State != JobState.Offline) {
           response.StatusMessage = ResponseStatus.AddNewJob_JobStateMustBeOffline;
           return response;
@@ -222 +222 @@
 
       //if it's a snapshot but the result hasn't reached the server yet...
-      if (snapshot && (job.State == State.RequestSnapshot || job.State == State.RequestSnapshotSent)) {
+      if (snapshot && (job.State == JobState.SnapshotRequested || job.State == JobState.SnapshotSent)) {
         response.StatusMessage = ResponseStatus.GetLastSerializedResult_JobResultNotYetThere;
 
@@ -229 +229 @@
 
       //if it's NOT a snapshot, NEITHER request NOR is it finished
-      if (!requested && !snapshot && job.State != State.Finished) {
+      if (!requested && !snapshot && job.State != JobState.Finished) {
         response.StatusMessage = ResponseStatus.GetLastSerializedResult_JobResultNotYetThere;
 
@@ -248 +248 @@
 
       JobDto job = DaoLocator.JobDao.FindById(jobId);
-      if (job.State == State.RequestSnapshot || job.State == State.RequestSnapshotSent) {
+      if (job.State == JobState.SnapshotRequested || job.State == JobState.SnapshotSent) {
         response.StatusMessage = ResponseStatus.RequestSnapshot_SnapshotAlreadyRequested;
         return response;
       }
-      if (job.State != State.Calculating) {
+      if (job.State != JobState.Calculating) {
         response.StatusMessage = ResponseStatus.RequestSnapshot_JobIsNotBeeingCalculated;
         return response;
       }
       // job is in correct state
-      job.State = State.RequestSnapshot;
+      job.State = JobState.SnapshotRequested;
       DaoLocator.JobDao.Update(job);
 
@@ -275 +275 @@
         return response; // no commit needed
       }
-      if (job.State == State.Abort) {
+      if (job.State == JobState.Aborted) {
         //response.Success = true;
         response.StatusMessage = ResponseStatus.AbortJob_AbortAlreadyRequested;
         return response; // no commit needed
       }
-      if (job.State != State.Calculating && job.State != State.RequestSnapshot && job.State != State.RequestSnapshotSent) {
+      if (job.State != JobState.Calculating && job.State != JobState.SnapshotRequested && job.State != JobState.SnapshotSent) {
         //response.Success = false;
         response.StatusMessage = ResponseStatus.AbortJob_JobIsNotBeeingCalculated;
@@ -286 +286 @@
       }
       // job is in correct state
-      job.State = State.Abort;
+      job.State = JobState.Aborted;
       DaoLocator.JobDao.Update(job);