Changeset 5779 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/Job.cs

Timestamp:

03/21/11 15:05:48 (14 years ago)

Author:

cneumuel

Message:

#1233

• implemented pause, stop for single jobs
• introduced Command property for jobs (to distinguish between state and command (abort vs. aborted))
• improved behaviour of ItemTreeView (double click opens new window, selected item stays marked)
• fixed bugs in StateLogGanttChartListView and HiveJobView
• fixed cloning of client-side dtos

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/Job.cs (modified) (3 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/Job.cs

@@ -30 +30 @@
     public Job() { }
 
-    protected Job(Job original, Cloner cloner) {
+    protected Job(Job original, Cloner cloner) : base(original, cloner) {
       this.Priority = original.Priority;
       this.CoresNeeded = original.CoresNeeded;
@@ -38 +38 @@
       this.IsParentJob = original.IsParentJob;
       this.FinishWhenChildJobsFinished = original.FinishWhenChildJobsFinished;
-      this.ExecutionTime = original.ExecutionTime;
-      this.ParentJobId = original.ParentJobId;
-      this.StateLog = new List<StateLog>(original.StateLog);
-      this.State = original.State;
-      this.Id = original.Id;
     }
 
@@ -50 +45 @@
 
     public override string ToString() {
-      return string.Format("State: {0}, SlaveId: {1}, DateCreated: {2}, DateCalculated: {3}, CoresNeeded: {4}, MemoryNeeded: {5}", State, CurrentStateLog.SlaveId, DateCreated.HasValue ? DateCreated.ToString() : "-", CoresNeeded, MemoryNeeded);
+      return string.Format("State: {0}, SlaveId: {1}, DateCreated: {2}, CoresNeeded: {3}, MemoryNeeded: {4}", 
+        State, 
+        CurrentStateLog != null ? (CurrentStateLog.SlaveId.HasValue ? CurrentStateLog.SlaveId.Value.ToString() : string.Empty) : string.Empty, 
+        DateCreated.HasValue ? DateCreated.ToString() : string.Empty, 
+        CoresNeeded, 
+        MemoryNeeded);
     }
   }