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

Timestamp:

09/08/11 16:38:28 (13 years ago)

Author:

ascheibe

Message:

#1233 more renaming for more consistency

Location:

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

Files:

• HiveJobs/HiveJobListView.cs (modified) (2 diffs)
• HiveJobs/HiveJobView.cs (modified) (11 diffs)
• HiveJobs/OptimizerHiveJobView.cs (modified) (3 diffs)
• TreeView/DeleteJobTreeNodeAction.cs (modified) (2 diffs)
• TreeView/HiveJobItemTreeView.cs (modified) (4 diffs)
• TreeView/NewExperimentTreeNodeAction.cs (modified) (2 diffs)

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

@@ -27 +27 @@
 namespace HeuristicLab.Clients.Hive.Views {
   [View("JobItemList View")]
-  [Content(typeof(IItemList<HiveJob>), false)]
-  public partial class HiveJobListView : ItemListView<HiveJob> {
+  [Content(typeof(IItemList<HiveTask>), false)]
+  public partial class HiveJobListView : ItemListView<HiveTask> {
 
     public HiveJobListView() {
@@ -35 +35 @@
     }
 
-    protected override HiveJob CreateItem() {
+    protected override HiveTask CreateItem() {
       return null;
     }

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

@@ -26 +26 @@
 
 namespace HeuristicLab.Clients.Hive.Views {
-  [View("HiveJob View")]
-  [Content(typeof(HiveJob), true)]
-  [Content(typeof(HiveJob<>), false)]
+  [View("HiveTask View")]
+  [Content(typeof(HiveTask), true)]
+  [Content(typeof(HiveTask<>), false)]
   public partial class HiveJobView : ItemView {
-    public new HiveJob Content {
-      get { return (HiveJob)base.Content; }
+    public new HiveTask Content {
+      get { return (HiveTask)base.Content; }
       set {
         if (base.Content != value) {
@@ -61 +61 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      if (Content != null && Content.Job != null) {
-        computeInParallelCheckBox.Checked = Content.ItemJob.ComputeInParallel;
+      if (Content != null && Content.Task != null) {
+        computeInParallelCheckBox.Checked = Content.ItemTask.ComputeInParallel;
       } else {
         computeInParallelCheckBox.Checked = false;
@@ -72 +72 @@
 
     protected virtual void RegisterJobEvents() {
-      if (Content != null && Content.Job != null) {
-        Content.ItemJob.ComputeInParallelChanged += new EventHandler(OptimizerJob_ComputeInParallelChanged);
-        Content.ItemJob.ItemChanged += new EventHandler(Job_ItemChanged);
+      if (Content != null && Content.Task != null) {
+        Content.ItemTask.ComputeInParallelChanged += new EventHandler(OptimizerJob_ComputeInParallelChanged);
+        Content.ItemTask.ItemChanged += new EventHandler(Job_ItemChanged);
       }
     }
 
     protected virtual void DeregisterJobEvents() {
-      if (Content != null && Content.Job != null) {
-        Content.ItemJob.ComputeInParallelChanged -= new EventHandler(OptimizerJob_ComputeInParallelChanged);
-        Content.ItemJob.ItemChanged -= new EventHandler(Job_ItemChanged);
+      if (Content != null && Content.Task != null) {
+        Content.ItemTask.ComputeInParallelChanged -= new EventHandler(OptimizerJob_ComputeInParallelChanged);
+        Content.ItemTask.ItemChanged -= new EventHandler(Job_ItemChanged);
       }
     }
@@ -90 +90 @@
         Invoke(new EventHandler(Content_JobChanged), sender, e);
       } else {
-        if (Content != null && Content.Job != null) {
-          this.jobIdTextBox.Text = Content.Job.Id.ToString();
-          this.dateCreatedTextBox.Text = Content.Job.DateCreated.HasValue ? Content.Job.DateCreated.ToString() : string.Empty;
-          this.priorityTextBox.Text = Content.Job.Priority.ToString();
-          this.coresNeededTextBox.Text = Content.Job.CoresNeeded.ToString();
-          this.memoryNeededTextBox.Text = Content.Job.MemoryNeeded.ToString();
+        if (Content != null && Content.Task != null) {
+          this.jobIdTextBox.Text = Content.Task.Id.ToString();
+          this.dateCreatedTextBox.Text = Content.Task.DateCreated.HasValue ? Content.Task.DateCreated.ToString() : string.Empty;
+          this.priorityTextBox.Text = Content.Task.Priority.ToString();
+          this.coresNeededTextBox.Text = Content.Task.CoresNeeded.ToString();
+          this.memoryNeededTextBox.Text = Content.Task.MemoryNeeded.ToString();
         } else {
           this.jobIdTextBox.Text = string.Empty;
@@ -112 +112 @@
 
     protected virtual void Job_ItemChanged(object sender, EventArgs e) {
-      if (Content != null && Content.Job != null && Content.ItemJob.Item != null) {
-        optimizerItemView.Content = Content.ItemJob.Item;
+      if (Content != null && Content.Task != null && Content.ItemTask.Item != null) {
+        optimizerItemView.Content = Content.ItemTask.Item;
       } else {
         optimizerItemView.Content = null;
@@ -123 +123 @@
         Invoke(new EventHandler(Content_TaskStateChanged), sender, e);
       } else {
-        if (Content != null && Content.Job != null) {
-          this.stateTextBox.Text = Content.Job.State.ToString();
-          this.commandTextBox.Text = Content.Job.Command.ToString();
-          this.executionTimeTextBox.Text = Content.Job.ExecutionTime.ToString();
-          this.dateFinishedTextBox.Text = Content.Job.DateFinished.ToString();
-          this.exceptionTextBox.Text = Content.Job.CurrentStateLog != null ? Content.Job.CurrentStateLog.Exception : string.Empty;
-          this.lastUpdatedTextBox.Text = Content.Job.LastJobDataUpdate.ToString();
+        if (Content != null && Content.Task != null) {
+          this.stateTextBox.Text = Content.Task.State.ToString();
+          this.commandTextBox.Text = Content.Task.Command.ToString();
+          this.executionTimeTextBox.Text = Content.Task.ExecutionTime.ToString();
+          this.dateFinishedTextBox.Text = Content.Task.DateFinished.ToString();
+          this.exceptionTextBox.Text = Content.Task.CurrentStateLog != null ? Content.Task.CurrentStateLog.Exception : string.Empty;
+          this.lastUpdatedTextBox.Text = Content.Task.LastJobDataUpdate.ToString();
         } else {
           this.stateTextBox.Text = string.Empty;
@@ -148 +148 @@
         Invoke(new EventHandler(OptimizerJob_ComputeInParallelChanged), sender, e);
       } else {
-        computeInParallelCheckBox.Checked = Content.ItemJob.ComputeInParallel;
+        computeInParallelCheckBox.Checked = Content.ItemTask.ComputeInParallel;
       }
     }
@@ -154 +154 @@
     protected virtual void Content_StateLogChanged(object sender, EventArgs e) {
       if (Content != null) {
-        if (Content.ItemJob.ComputeInParallel) {
+        if (Content.ItemTask.ComputeInParallel) {
           this.stateLogViewHost.Content = Content.ChildStateLogList;
         } else {
@@ -167 +167 @@
     #region Child Control Events
     protected virtual void computeInParallelCheckBox_CheckedChanged(object sender, EventArgs e) {
-      if (Content != null && Content.ItemJob != null) {
-        this.Content.ItemJob.ComputeInParallel = this.computeInParallelCheckBox.Checked;
+      if (Content != null && Content.ItemTask != null) {
+        this.Content.ItemTask.ComputeInParallel = this.computeInParallelCheckBox.Checked;
       }
     }
@@ -180 +180 @@
 
     protected virtual void modifyItemButton_Click(object sender, EventArgs e) {
-      MainFormManager.MainForm.ShowContent(Content.ItemJob.Item);
+      MainFormManager.MainForm.ShowContent(Content.ItemTask.Item);
     }
     #endregion
@@ -199 +199 @@
       this.coresNeededTextBox.ReadOnly = this.ReadOnly;
       this.memoryNeededTextBox.ReadOnly = this.ReadOnly;
-      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 == TaskState.Paused || Content.Job.State == TaskState.Offline || Content.Job.State == TaskState.Finished || Content.Job.State == TaskState.Failed || Content.Job.State == TaskState.Aborted));
+      this.computeInParallelCheckBox.Enabled = !this.ReadOnly && this.Content != null && this.Content.ItemTask != null && this.Content.ItemTask.IsParallelizable;
+
+      this.modifyItemButton.Enabled = (Content != null && Content.ItemTask.Item != null && (Content.Task.State == TaskState.Paused || Content.Task.State == TaskState.Offline || Content.Task.State == TaskState.Finished || Content.Task.State == TaskState.Failed || Content.Task.State == TaskState.Aborted));
 
       optimizerItemView.ReadOnly = true;

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

@@ -25 +25 @@
 
 namespace HeuristicLab.Clients.Hive.Views {
-  [View("OptimizerHiveJob View")]
-  [Content(typeof(OptimizerHiveJob), true)]
+  [View("OptimizerHiveTask View")]
+  [Content(typeof(OptimizerHiveTask), true)]
   public partial class OptimizerHiveJobView : HiveJobView {
-    public new OptimizerHiveJob Content {
-      get { return (OptimizerHiveJob)base.Content; }
+    public new OptimizerHiveTask Content {
+      get { return (OptimizerHiveTask)base.Content; }
       set {
         if (base.Content != value) {
@@ -42 +42 @@
 
     protected override void Job_ItemChanged(object sender, EventArgs e) {
-      if (Content != null && Content.Job != null && Content.ItemJob.Item != null) {
-        runCollectionViewHost.Content = Content.ItemJob.Item.Runs;
+      if (Content != null && Content.Task != null && Content.ItemTask.Item != null) {
+        runCollectionViewHost.Content = Content.ItemTask.Item.Runs;
       } else {
         runCollectionViewHost.Content = null;
@@ -82 +82 @@
       base.SetEnabledStateOfControls();
 
-      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);
+      this.restartButton.Enabled = Content != null && Content.IsControllable && !Content.Task.Command.HasValue && (Content.Task.State == TaskState.Paused || Content.Task.State == TaskState.Failed || Content.Task.State == TaskState.Aborted);
+      this.pauseButton.Enabled = Content != null && Content.IsControllable && !Content.Task.Command.HasValue && Content.Task.State == TaskState.Calculating;
+      this.stopButton.Enabled = Content != null && Content.IsControllable && !Content.Task.Command.HasValue && (Content.Task.State == TaskState.Calculating || Content.Task.State == TaskState.Waiting || Content.Task.State == TaskState.Paused);
     }
   }

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

@@ -5 +5 @@
 using HeuristicLab.Optimization;
 namespace HeuristicLab.Clients.Hive.Views.ExperimentManager.TreeView {
-  public class DeleteJobTreeNodeAction : IItemTreeNodeAction<HiveJob> {
-    private ItemCollection<HiveJob> hiveJobs;
+  public class DeleteJobTreeNodeAction : IItemTreeNodeAction<HiveTask> {
+    private ItemCollection<HiveTask> hiveJobs;
     
-    public DeleteJobTreeNodeAction(ItemCollection<HiveJob> hiveJobs) {
+    public DeleteJobTreeNodeAction(ItemCollection<HiveTask> hiveJobs) {
       this.hiveJobs = hiveJobs;
     }
@@ -20 +20 @@
     }
 
-    public void Execute(HiveJob item, HiveJob parentItem) {
+    public void Execute(HiveTask item, HiveTask parentItem) {
       if (parentItem == null) {
         hiveJobs.Remove(item);
       } else {
-        var experiment = parentItem.ItemJob.Item as Experiment;
+        var experiment = parentItem.ItemTask.Item as Experiment;
         if (experiment != null) {
-          experiment.Optimizers.Remove(((OptimizerJob)item.ItemJob).Item);
+          experiment.Optimizers.Remove(((OptimizerTask)item.ItemTask).Item);
         }
       }

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

@@ -30 +30 @@
 
 namespace HeuristicLab.Clients.Hive.Views.ExperimentManager {
-  [View("HiveJob ItemTreeView")]
-  [Content(typeof(ItemCollection<HiveJob>), IsDefaultView = false)]
-  public partial class HiveJobItemTreeView : ItemTreeView<HiveJob> {
-    public new ItemCollection<HiveJob> Content {
-      get { return (ItemCollection<HiveJob>)base.Content; }
+  [View("HiveTask ItemTreeView")]
+  [Content(typeof(ItemCollection<HiveTask>), IsDefaultView = false)]
+  public partial class HiveJobItemTreeView : ItemTreeView<HiveTask> {
+    public new ItemCollection<HiveTask> Content {
+      get { return (ItemCollection<HiveTask>)base.Content; }
       set { base.Content = value; }
     }
@@ -76 +76 @@
       if (optimizer != null) {
         if (treeView.SelectedNode == null) {
-          Content.Add(new OptimizerHiveJob(optimizer));
+          Content.Add(new OptimizerHiveTask(optimizer));
         } else {
-          var experiment = ((HiveJob)treeView.SelectedNode.Tag).ItemJob.Item as Experiment;
+          var experiment = ((HiveTask)treeView.SelectedNode.Tag).ItemTask.Item as Experiment;
           if (experiment != null) {
             experiment.Optimizers.Add(optimizer);
@@ -88 +88 @@
     protected override void removeButton_Click(object sender, EventArgs e) {
       if (treeView.SelectedNode != null) {
-        var selectedItem = (HiveJob)treeView.SelectedNode.Tag;
+        var selectedItem = (HiveTask)treeView.SelectedNode.Tag;
         var parentItem = GetParentItem(selectedItem);
         if (parentItem == null) {
-          Content.Remove((HiveJob)treeView.SelectedNode.Tag);
+          Content.Remove((HiveTask)treeView.SelectedNode.Tag);
         } else {
-          var experiment = parentItem.ItemJob.Item as Experiment;
+          var experiment = parentItem.ItemTask.Item as Experiment;
           if (experiment != null) {
-            experiment.Optimizers.Remove(((OptimizerJob)selectedItem.ItemJob).Item);
+            experiment.Optimizers.Remove(((OptimizerTask)selectedItem.ItemTask).Item);
           }
         }
@@ -102 +102 @@
     #endregion
 
-    protected override ICollection<IItemTreeNodeAction<HiveJob>> GetTreeNodeItemActions(HiveJob selectedItem) {
+    protected override ICollection<IItemTreeNodeAction<HiveTask>> GetTreeNodeItemActions(HiveTask selectedItem) {
       return base.GetTreeNodeItemActions(selectedItem);
     }

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

@@ -25 +25 @@
 
 namespace HeuristicLab.Clients.Hive {
-  public class NewExperimentTreeNodeAction : IItemTreeNodeAction<HiveJob> {
-    private ItemCollection<HiveJob> hiveJobs;
+  public class NewExperimentTreeNodeAction : IItemTreeNodeAction<HiveTask> {
+    private ItemCollection<HiveTask> hiveJobs;
 
-    public NewExperimentTreeNodeAction(ItemCollection<HiveJob> hiveJobs) {
+    public NewExperimentTreeNodeAction(ItemCollection<HiveTask> hiveJobs) {
       this.hiveJobs = hiveJobs;
     }
@@ -40 +40 @@
     }
 
-    public void Execute(HiveJob item, HiveJob parentItem) {
+    public void Execute(HiveTask item, HiveTask parentItem) {
       if (item != null) {
-        var experiment = item.ItemJob.Item as Experiment;
+        var experiment = item.ItemTask.Item as Experiment;
         experiment.Optimizers.Add(new Experiment());
       } else {
-        hiveJobs.Add(new OptimizerHiveJob(new Experiment()));
+        hiveJobs.Add(new OptimizerHiveTask(new Experiment()));
       }
     }