Changeset 6721 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views

Timestamp:

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

Author:

ascheibe

Message:

#1233 Review comments: renamed Job to Task

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3

Files:

• HiveJobs/HiveJobView.cs (modified) (5 diffs)
• HiveJobs/HiveJobView.designer.cs (modified) (2 diffs)
• HiveJobs/OptimizerHiveJobView.cs (modified) (1 diff)
• StateLog/StateLogGanttChartListView.cs (modified) (3 diffs)
• StateLog/StateLogGanttChartView.cs (modified) (1 diff)
• TreeView/DeleteJobTreeNodeAction.cs (modified) (1 diff)

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

@@ -47 +47 @@
       Content.ItemJobChanged += new EventHandler(Content_JobItemChanged);
       Content.JobChanged += new EventHandler(Content_JobChanged);
-      Content.JobStateChanged += new EventHandler(Content_JobStateChanged);
+      Content.JobStateChanged += new EventHandler(Content_TaskStateChanged);
       Content.StateLogChanged += new EventHandler(Content_StateLogChanged);
     }
@@ -54 +54 @@
       Content.ItemJobChanged -= new EventHandler(Content_JobItemChanged);
       Content.JobChanged -= new EventHandler(Content_JobChanged);
-      Content.JobStateChanged -= new EventHandler(Content_JobStateChanged);
+      Content.JobStateChanged -= new EventHandler(Content_TaskStateChanged);
       Content.StateLogChanged -= new EventHandler(Content_StateLogChanged);
       base.DeregisterContentEvents();
@@ -68 +68 @@
       Content_JobItemChanged(this, EventArgs.Empty);
       Content_JobChanged(this, EventArgs.Empty);
-      Content_JobStateChanged(this, EventArgs.Empty);
+      Content_TaskStateChanged(this, EventArgs.Empty);
     }
 
@@ -119 +119 @@
     }
 
-    protected virtual void Content_JobStateChanged(object sender, EventArgs e) {
+    protected virtual void Content_TaskStateChanged(object sender, EventArgs e) {
       if (InvokeRequired) {
-        Invoke(new EventHandler(Content_JobStateChanged), sender, e);
+        Invoke(new EventHandler(Content_TaskStateChanged), sender, e);
       } else {
         if (Content != null && Content.Job != null) {
@@ -201 +201 @@
       this.computeInParallelCheckBox.Enabled = !this.ReadOnly && this.Content != null && this.Content.ItemJob != null && this.Content.ItemJob.IsParallelizable;
 
-      this.modifyItemButton.Enabled = (Content != null && Content.ItemJob.Item != null && (Content.Job.State == JobState.Paused || Content.Job.State == JobState.Offline || Content.Job.State == JobState.Finished || Content.Job.State == JobState.Failed || Content.Job.State == JobState.Aborted));
+      this.modifyItemButton.Enabled = (Content != null && Content.ItemJob.Item != null && (Content.Job.State == TaskState.Paused || Content.Job.State == TaskState.Offline || Content.Job.State == TaskState.Finished || Content.Job.State == TaskState.Failed || Content.Job.State == TaskState.Aborted));
 
       optimizerItemView.ReadOnly = true;

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/HiveJobs/HiveJobView.designer.cs

@@ -241 +241 @@
       this.jobStatusGroupBox.TabIndex = 24;
       this.jobStatusGroupBox.TabStop = false;
-      this.jobStatusGroupBox.Text = "Job Status";
+      this.jobStatusGroupBox.Text = "Task Status";
       // 
       // stateTextBox
@@ -416 +416 @@
       this.jobIdLabel.Size = new System.Drawing.Size(36, 13);
       this.jobIdLabel.TabIndex = 25;
-      this.jobIdLabel.Text = "JobId:";
+      this.jobIdLabel.Text = "TaskId:";
       // 
       // jobIdTextBox

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

@@ -82 +82 @@
       base.SetEnabledStateOfControls();
 
-      this.restartButton.Enabled = Content != null && Content.IsControllable && !Content.Job.Command.HasValue && (Content.Job.State == JobState.Paused || Content.Job.State == JobState.Failed || Content.Job.State == JobState.Aborted);
-      this.pauseButton.Enabled = Content != null && Content.IsControllable && !Content.Job.Command.HasValue && Content.Job.State == JobState.Calculating;
-      this.stopButton.Enabled = Content != null && Content.IsControllable && !Content.Job.Command.HasValue && (Content.Job.State == JobState.Calculating || Content.Job.State == JobState.Waiting || Content.Job.State == JobState.Paused);
+      this.restartButton.Enabled = Content != null && Content.IsControllable && !Content.Job.Command.HasValue && (Content.Job.State == TaskState.Paused || Content.Job.State == TaskState.Failed || Content.Job.State == TaskState.Aborted);
+      this.pauseButton.Enabled = Content != null && Content.IsControllable && !Content.Job.Command.HasValue && Content.Job.State == TaskState.Calculating;
+      this.stopButton.Enabled = Content != null && Content.IsControllable && !Content.Job.Command.HasValue && (Content.Job.State == TaskState.Calculating || Content.Job.State == TaskState.Waiting || Content.Job.State == TaskState.Paused);
     }
   }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/StateLog/StateLogGanttChartListView.cs

@@ -65 +65 @@
           DateTime maxValue = Content.Max(x => x.Count > 0 ? x.Max(y => y.DateTime) : DateTime.MinValue);
           DateTime upperLimit;
-          if (Content.All(x => x.Count > 0 ? (x.Last().State == JobState.Finished || x.Last().State == JobState.Failed || x.Last().State == JobState.Aborted) : true)) {
+          if (Content.All(x => x.Count > 0 ? (x.Last().State == TaskState.Finished || x.Last().State == TaskState.Failed || x.Last().State == TaskState.Aborted) : true)) {
             upperLimit = DateTime.FromOADate(Math.Min(DateTime.Now.AddSeconds(10).ToOADate(), maxValue.AddSeconds(10).ToOADate()));
           } else {
@@ -73 +73 @@
           for (int i = 0; i < Content.Count; i++) {
             for (int j = 0; j < Content[i].Count - 1; j++) {
-              if (Content[i][j].State != JobState.Offline)
+              if (Content[i][j].State != TaskState.Offline)
                 AddData(ganttChart, i.ToString(), Content[i][j], Content[i][j + 1], upperLimit);
             }
@@ -85 +85 @@
 
     public static void SetupCategories(GanttChart ganttChart) {
-      ganttChart.AddCategory(JobState.Offline.ToString(), Color.Gainsboro);
-      ganttChart.AddCategory(JobState.Waiting.ToString(), Color.NavajoWhite);
-      ganttChart.AddCategory(JobState.Paused.ToString(), Color.PaleVioletRed);
-      ganttChart.AddCategory(JobState.Transferring.ToString(), Color.CornflowerBlue);
-      ganttChart.AddCategory(JobState.Calculating.ToString(), Color.DarkGreen);
-      ganttChart.AddCategory(JobState.Finished.ToString(), Color.White);
-      ganttChart.AddCategory(JobState.Aborted.ToString(), Color.Orange);
-      ganttChart.AddCategory(JobState.Failed.ToString(), Color.Red);
+      ganttChart.AddCategory(TaskState.Offline.ToString(), Color.Gainsboro);
+      ganttChart.AddCategory(TaskState.Waiting.ToString(), Color.NavajoWhite);
+      ganttChart.AddCategory(TaskState.Paused.ToString(), Color.PaleVioletRed);
+      ganttChart.AddCategory(TaskState.Transferring.ToString(), Color.CornflowerBlue);
+      ganttChart.AddCategory(TaskState.Calculating.ToString(), Color.DarkGreen);
+      ganttChart.AddCategory(TaskState.Finished.ToString(), Color.White);
+      ganttChart.AddCategory(TaskState.Aborted.ToString(), Color.Orange);
+      ganttChart.AddCategory(TaskState.Failed.ToString(), Color.Red);
     }
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/StateLog/StateLogGanttChartView.cs

@@ -63 +63 @@
         if (Content.Count > 0) {
           DateTime upperLimit;
-          if (Content.Last().State == JobState.Finished || Content.Last().State == JobState.Failed || Content.Last().State == JobState.Aborted) {
+          if (Content.Last().State == TaskState.Finished || Content.Last().State == TaskState.Failed || Content.Last().State == TaskState.Aborted) {
             upperLimit = DateTime.FromOADate(Math.Min(Content.Max(x => x.DateTime).ToOADate(), DateTime.Now.AddSeconds(10).ToOADate()));
           } else {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/TreeView/DeleteJobTreeNodeAction.cs

@@ -13 +13 @@
 
     public string Name {
-      get { return "Delete Job"; }
+      get { return "Delete Task"; }
     }