Changeset 6727


Ignore:
Timestamp:
09/08/11 17:28:49 (8 years ago)
Author:
ascheibe
Message:

#1233 the last bunch of renames, hopefully

Location:
branches/HeuristicLab.Hive-3.4/sources
Files:
1 added
2 deleted
3 edited
8 copied
4 moved

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/Views/RefreshableHiveExperimentView.Designer.cs

    r6725 r6727  
    5151      this.tabControl = new System.Windows.Forms.TabControl();
    5252      this.jobsTabPage = new System.Windows.Forms.TabPage();
    53       this.jobsTreeView = new HeuristicLab.Clients.Hive.Views.ExperimentManager.HiveJobItemTreeView();
     53      this.jobsTreeView = new HeuristicLab.Clients.Hive.Views.ExperimentManager.HiveTaskItemTreeView();
    5454      this.stateTabPage = new System.Windows.Forms.TabPage();
    5555      this.stateLogViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
     
    470470    private Core.Views.LogView logView;
    471471    private System.Windows.Forms.TabPage jobsTabPage;
    472     private HiveJobItemTreeView jobsTreeView;
     472    private HiveTaskItemTreeView jobsTreeView;
    473473    private System.Windows.Forms.Label nameLabel;
    474474    private System.Windows.Forms.TextBox nameTextBox;
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/HeuristicLab.Clients.Hive.Views-3.3.csproj

    r6717 r6727  
    125125  </ItemGroup>
    126126  <ItemGroup>
    127     <Compile Include="HiveJobs\OptimizerHiveJobView.cs">
    128       <SubType>UserControl</SubType>
    129     </Compile>
    130     <Compile Include="HiveJobs\OptimizerHiveJobView.designer.cs">
    131       <DependentUpon>OptimizerHiveJobView.cs</DependentUpon>
     127    <Compile Include="HiveTasks\OptimizerHiveTaskView.cs">
     128      <SubType>UserControl</SubType>
     129    </Compile>
     130    <Compile Include="HiveTasks\OptimizerHiveTaskView.designer.cs">
     131      <DependentUpon>OptimizerHiveTaskView.cs</DependentUpon>
    132132    </Compile>
    133133    <Compile Include="HiveItemView.cs">
     
    137137      <DependentUpon>HiveItemView.cs</DependentUpon>
    138138    </Compile>
    139     <Compile Include="HiveJobs\HiveJobListView.cs">
    140       <SubType>UserControl</SubType>
    141     </Compile>
    142     <Compile Include="HiveJobs\HiveJobListView.designer.cs">
    143       <DependentUpon>HiveJobListView.cs</DependentUpon>
    144     </Compile>
    145     <Compile Include="HiveJobs\HiveJobView.cs">
    146       <SubType>UserControl</SubType>
    147     </Compile>
    148     <Compile Include="HiveJobs\HiveJobView.designer.cs">
    149       <DependentUpon>HiveJobView.cs</DependentUpon>
    150     </Compile>
    151     <Compile Include="TreeView\NewExperimentTreeNodeAction.cs" />
    152     <Compile Include="TreeView\DeleteJobTreeNodeAction.cs" />
    153     <Compile Include="TreeView\HiveJobItemTreeView.cs">
    154       <SubType>UserControl</SubType>
    155     </Compile>
    156     <Compile Include="TreeView\HiveJobItemTreeView.Designer.cs">
    157       <DependentUpon>HiveJobItemTreeView.cs</DependentUpon>
     139    <Compile Include="HiveTasks\HiveTaskListView.cs">
     140      <SubType>UserControl</SubType>
     141    </Compile>
     142    <Compile Include="HiveTasks\HiveTaskListView.designer.cs">
     143      <DependentUpon>HiveTaskListView.cs</DependentUpon>
     144    </Compile>
     145    <Compile Include="HiveTasks\HiveTaskView.cs">
     146      <SubType>UserControl</SubType>
     147    </Compile>
     148    <Compile Include="HiveTasks\HiveTaskView.designer.cs">
     149      <DependentUpon>HiveTaskView.cs</DependentUpon>
     150    </Compile>
     151    <Compile Include="TreeView\NewTaskTreeNodeAction.cs" />
     152    <Compile Include="TreeView\DeleteTaskTreeNodeAction.cs" />
     153    <Compile Include="TreeView\HiveTaskItemTreeView.cs">
     154      <SubType>UserControl</SubType>
     155    </Compile>
     156    <Compile Include="TreeView\HiveTaskItemTreeView.Designer.cs">
     157      <DependentUpon>HiveTaskItemTreeView.cs</DependentUpon>
    158158    </Compile>
    159159    <Compile Include="TreeView\ItemTreeView.cs">
     
    218218  </ItemGroup>
    219219  <ItemGroup>
    220     <EmbeddedResource Include="HiveJobs\OptimizerHiveJobView.resx">
    221       <DependentUpon>OptimizerHiveJobView.cs</DependentUpon>
    222     </EmbeddedResource>
    223     <EmbeddedResource Include="HiveJobs\HiveJobView.resx">
    224       <DependentUpon>HiveJobView.cs</DependentUpon>
     220    <EmbeddedResource Include="HiveTasks\OptimizerHiveTaskView.resx">
     221      <DependentUpon>OptimizerHiveTaskView.cs</DependentUpon>
     222    </EmbeddedResource>
     223    <EmbeddedResource Include="HiveTasks\HiveTaskView.resx">
     224      <DependentUpon>HiveTaskView.cs</DependentUpon>
    225225    </EmbeddedResource>
    226226    <EmbeddedResource Include="TreeView\ItemTreeView.resx">
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/HiveTaskListView.cs

    r6726 r6727  
    2626
    2727namespace HeuristicLab.Clients.Hive.Views {
    28   [View("JobItemList View")]
     28  [View("TaskItemList View")]
    2929  [Content(typeof(IItemList<HiveTask>), false)]
    30   public partial class HiveJobListView : ItemListView<HiveTask> {
     30  public partial class HiveTaskListView : ItemListView<HiveTask> {
    3131
    32     public HiveJobListView() {
     32    public HiveTaskListView() {
    3333      InitializeComponent();
    34       itemsGroupBox.Text = "Jobs";
     34      itemsGroupBox.Text = "Tasks";
    3535    }
    3636
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/HiveTaskListView.designer.cs

    r6726 r6727  
    11namespace HeuristicLab.Clients.Hive.Views {
    2   partial class HiveJobListView {
     2  partial class HiveTaskListView {
    33    /// <summary>
    44    /// Required designer variable.
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/HiveTaskView.cs

    r6726 r6727  
    2929  [Content(typeof(HiveTask), true)]
    3030  [Content(typeof(HiveTask<>), false)]
    31   public partial class HiveJobView : ItemView {
     31  public partial class HiveTaskView : ItemView {
    3232    public new HiveTask Content {
    3333      get { return (HiveTask)base.Content; }
     
    3939    }
    4040
    41     public HiveJobView() {
     41    public HiveTaskView() {
    4242      InitializeComponent();
    4343    }
     
    4545    protected override void RegisterContentEvents() {
    4646      base.RegisterContentEvents();
    47       Content.ItemJobChanged += new EventHandler(Content_JobItemChanged);
    48       Content.JobChanged += new EventHandler(Content_JobChanged);
    49       Content.JobStateChanged += new EventHandler(Content_TaskStateChanged);
     47      Content.ItemTaskChanged += new EventHandler(Content_TaskItemChanged);
     48      Content.TaskChanged += new EventHandler(Content_TaskChanged);
     49      Content.TaskStateChanged += new EventHandler(Content_TaskStateChanged);
    5050      Content.StateLogChanged += new EventHandler(Content_StateLogChanged);
    5151    }
    5252
    5353    protected override void DeregisterContentEvents() {
    54       Content.ItemJobChanged -= new EventHandler(Content_JobItemChanged);
    55       Content.JobChanged -= new EventHandler(Content_JobChanged);
    56       Content.JobStateChanged -= new EventHandler(Content_TaskStateChanged);
     54      Content.ItemTaskChanged -= new EventHandler(Content_TaskItemChanged);
     55      Content.TaskChanged -= new EventHandler(Content_TaskChanged);
     56      Content.TaskStateChanged -= new EventHandler(Content_TaskStateChanged);
    5757      Content.StateLogChanged -= new EventHandler(Content_StateLogChanged);
    5858      base.DeregisterContentEvents();
     
    6666        computeInParallelCheckBox.Checked = false;
    6767      }
    68       Content_JobItemChanged(this, EventArgs.Empty);
    69       Content_JobChanged(this, EventArgs.Empty);
     68      Content_TaskItemChanged(this, EventArgs.Empty);
     69      Content_TaskChanged(this, EventArgs.Empty);
    7070      Content_TaskStateChanged(this, EventArgs.Empty);
    7171    }
    7272
    73     protected virtual void RegisterJobEvents() {
     73    protected virtual void RegisterTaskEvents() {
    7474      if (Content != null && Content.Task != null) {
    7575        Content.ItemTask.ComputeInParallelChanged += new EventHandler(OptimizerJob_ComputeInParallelChanged);
     
    7878    }
    7979
    80     protected virtual void DeregisterJobEvents() {
     80    protected virtual void DeregisterTaskEvents() {
    8181      if (Content != null && Content.Task != null) {
    8282        Content.ItemTask.ComputeInParallelChanged -= new EventHandler(OptimizerJob_ComputeInParallelChanged);
     
    8686
    8787    #region Content Events
    88     protected virtual void Content_JobChanged(object sender, EventArgs e) {
     88    protected virtual void Content_TaskChanged(object sender, EventArgs e) {
    8989      if (InvokeRequired) {
    90         Invoke(new EventHandler(Content_JobChanged), sender, e);
     90        Invoke(new EventHandler(Content_TaskChanged), sender, e);
    9191      } else {
    9292        if (Content != null && Content.Task != null) {
     
    106106    }
    107107
    108     protected virtual void Content_JobItemChanged(object sender, EventArgs e) {
    109       RegisterJobEvents();
     108    protected virtual void Content_TaskItemChanged(object sender, EventArgs e) {
     109      RegisterTaskEvents();
    110110      Job_ItemChanged(this, e);
    111111    }
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/HiveTaskView.designer.cs

    r6726 r6727  
    11namespace HeuristicLab.Clients.Hive.Views {
    2   partial class HiveJobView {
     2  partial class HiveTaskView {
    33    /// <summary>
    44    /// Required designer variable.
     
    458458      this.commandLabel.Text = "Command:";
    459459      //
    460       // HiveJobView
     460      // HiveTaskView
    461461      //
    462462      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    463463      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    464464      this.Controls.Add(this.tabControl);
    465       this.Name = "HiveJobView";
     465      this.Name = "HiveTaskView";
    466466      this.Size = new System.Drawing.Size(577, 407);
    467467      this.stateLogTabPage.ResumeLayout(false);
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/OptimizerHiveTaskView.cs

    r6726 r6727  
    2727  [View("OptimizerHiveTask View")]
    2828  [Content(typeof(OptimizerHiveTask), true)]
    29   public partial class OptimizerHiveJobView : HiveJobView {
     29  public partial class OptimizerHiveTaskView : HiveTaskView {
    3030    public new OptimizerHiveTask Content {
    3131      get { return (OptimizerHiveTask)base.Content; }
     
    3737    }
    3838
    39     public OptimizerHiveJobView() {
     39    public OptimizerHiveTaskView() {
    4040      InitializeComponent();
    4141    }
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/OptimizerHiveTaskView.designer.cs

    r6726 r6727  
    11namespace HeuristicLab.Clients.Hive.Views {
    2   partial class OptimizerHiveJobView {
     2  partial class OptimizerHiveTaskView {
    33    /// <summary>
    44    /// Required designer variable.
     
    2424    /// </summary>
    2525    private void InitializeComponent() {
    26       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OptimizerHiveJobView));
     26      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OptimizerHiveTaskView));
    2727      this.restartButton = new System.Windows.Forms.Button();
    2828      this.pauseButton = new System.Windows.Forms.Button();
     
    128128      this.runCollectionViewHost.ViewType = null;
    129129      //
    130       // OptimizerHiveJobView
     130      // OptimizerHiveTaskView
    131131      //
    132132      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    133133      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    134       this.Name = "OptimizerHiveJobView";
     134      this.Name = "OptimizerHiveTaskView";
    135135      this.stateLogTabPage.ResumeLayout(false);
    136136      this.detailsTabPage.ResumeLayout(false);
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/TreeView/DeleteTaskTreeNodeAction.cs

    r6726 r6727  
    55using HeuristicLab.Optimization;
    66namespace HeuristicLab.Clients.Hive.Views.ExperimentManager.TreeView {
    7   public class DeleteJobTreeNodeAction : IItemTreeNodeAction<HiveTask> {
    8     private ItemCollection<HiveTask> hiveJobs;
    9    
    10     public DeleteJobTreeNodeAction(ItemCollection<HiveTask> hiveJobs) {
    11       this.hiveJobs = hiveJobs;
     7  public class DeleteTaskTreeNodeAction : IItemTreeNodeAction<HiveTask> {
     8    private ItemCollection<HiveTask> hiveTasks;
     9
     10    public DeleteTaskTreeNodeAction(ItemCollection<HiveTask> hiveTasks) {
     11      this.hiveTasks = hiveTasks;
    1212    }
    1313
     
    2222    public void Execute(HiveTask item, HiveTask parentItem) {
    2323      if (parentItem == null) {
    24         hiveJobs.Remove(item);
     24        hiveTasks.Remove(item);
    2525      } else {
    2626        var experiment = parentItem.ItemTask.Item as Experiment;
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/TreeView/HiveTaskItemTreeView.Designer.cs

    r6726 r6727  
    2121
    2222namespace HeuristicLab.Clients.Hive.Views.ExperimentManager {
    23   partial class HiveJobItemTreeView {
     23  partial class HiveTaskItemTreeView {
    2424    /// <summary>
    2525    /// Required designer variable.
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/TreeView/HiveTaskItemTreeView.cs

    r6726 r6727  
    3232  [View("HiveTask ItemTreeView")]
    3333  [Content(typeof(ItemCollection<HiveTask>), IsDefaultView = false)]
    34   public partial class HiveJobItemTreeView : ItemTreeView<HiveTask> {
     34  public partial class HiveTaskItemTreeView : ItemTreeView<HiveTask> {
    3535    public new ItemCollection<HiveTask> Content {
    3636      get { return (ItemCollection<HiveTask>)base.Content; }
     
    3838    }
    3939
    40     public HiveJobItemTreeView() {
     40    public HiveTaskItemTreeView() {
    4141      InitializeComponent();
    4242    }
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/TreeView/NewTaskTreeNodeAction.cs

    r6726 r6727  
    2525
    2626namespace HeuristicLab.Clients.Hive {
    27   public class NewExperimentTreeNodeAction : IItemTreeNodeAction<HiveTask> {
     27  public class NewTaskTreeNodeAction : IItemTreeNodeAction<HiveTask> {
    2828    private ItemCollection<HiveTask> hiveJobs;
    2929
    30     public NewExperimentTreeNodeAction(ItemCollection<HiveTask> hiveJobs) {
     30    public NewTaskTreeNodeAction(ItemCollection<HiveTask> hiveJobs) {
    3131      this.hiveJobs = hiveJobs;
    3232    }
    3333
    34     public string Name { 
    35       get { return "New Experiment..."; }
     34    public string Name {
     35      get { return "New Task..."; }
    3636    }
    3737
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/HiveJobs/HiveTask.cs

    r6725 r6727  
    286286
    287287    #region Event Handler
    288     public event EventHandler JobChanged;
     288    public event EventHandler TaskChanged;
    289289    private void OnTaskChanged() {
    290       EventHandler handler = JobChanged;
     290      EventHandler handler = TaskChanged;
    291291      if (handler != null) handler(this, EventArgs.Empty);
    292292    }
    293293
    294     public event EventHandler JobStateChanged;
     294    public event EventHandler TaskStateChanged;
    295295    private void OnTaskStateChanged() {
    296       EventHandler handler = JobStateChanged;
     296      EventHandler handler = TaskStateChanged;
    297297      if (handler != null) handler(this, EventArgs.Empty);
    298298    }
    299299
    300     public event EventHandler ItemJobChanged;
     300    public event EventHandler ItemTaskChanged;
    301301    private void OnItemTaskChanged() {
    302302      ItemJob_ComputeInParallelChanged(this, EventArgs.Empty);
    303       var handler = ItemJobChanged;
     303      var handler = ItemTaskChanged;
    304304      if (handler != null) handler(this, EventArgs.Empty);
    305305    }
Note: See TracChangeset for help on using the changeset viewer.