Free cookie consent management tool by TermsFeed Policy Generator

Changeset 6792


Ignore:
Timestamp:
09/16/11 20:35:40 (11 years ago)
Author:
ascheibe
Message:

#1233 Hive Experiment Manager is now called Hive Job Manager

Location:
branches/HeuristicLab.Hive-3.4/sources
Files:
5 edited
16 moved

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3

    • Property svn:ignore
      •  

        old new  
        55obj
        66*.suo
         7HeuristicLabClientsHiveJobManagerPlugin.cs
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/HeuristicLab.Clients.Hive.JobManager-3.3.csproj

    r6756 r6792  
    99    <OutputType>Library</OutputType>
    1010    <AppDesignerFolder>Properties</AppDesignerFolder>
    11     <RootNamespace>HeuristicLab.Clients.Hive.ExperimentManager</RootNamespace>
    12     <AssemblyName>HeuristicLab.Clients.Hive.ExperimentManager-3.3</AssemblyName>
     11    <RootNamespace>HeuristicLab.Clients.Hive.JobManager</RootNamespace>
     12    <AssemblyName>HeuristicLab.Clients.Hive.JobManager-3.3</AssemblyName>
    1313    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
     
    151151  </ItemGroup>
    152152  <ItemGroup>
    153     <Compile Include="Views\HiveExperimentManagerView.cs">
    154       <SubType>UserControl</SubType>
    155     </Compile>
    156     <Compile Include="Views\HiveExperimentManagerView.Designer.cs">
    157       <DependentUpon>HiveExperimentManagerView.cs</DependentUpon>
    158     </Compile>
    159     <Compile Include="MenuItems\ExperimentManagerMenuItem.cs" />
    160     <Compile Include="Views\HiveExperimentPermissionListView.cs">
    161       <SubType>UserControl</SubType>
    162     </Compile>
    163     <Compile Include="Views\HiveExperimentPermissionListView.Designer.cs">
    164       <DependentUpon>HiveExperimentPermissionListView.cs</DependentUpon>
    165     </Compile>
    166     <Compile Include="Views\HiveExperimentPermissionView.cs">
    167       <SubType>UserControl</SubType>
    168     </Compile>
    169     <Compile Include="Views\HiveExperimentPermissionView.Designer.cs">
    170       <DependentUpon>HiveExperimentPermissionView.cs</DependentUpon>
    171     </Compile>
    172     <Compile Include="Views\RefreshableHiveExperimentListView.cs">
    173       <SubType>UserControl</SubType>
    174     </Compile>
    175     <Compile Include="Views\RefreshableHiveExperimentListView.Designer.cs">
    176       <DependentUpon>RefreshableHiveExperimentListView.cs</DependentUpon>
    177     </Compile>
    178     <Compile Include="Views\RefreshableHiveExperimentView.cs">
    179       <SubType>UserControl</SubType>
    180     </Compile>
    181     <Compile Include="Views\RefreshableHiveExperimentView.Designer.cs">
    182       <DependentUpon>RefreshableHiveExperimentView.cs</DependentUpon>
    183     </Compile>
    184     <Compile Include="HeuristicLabClientsHiveExperimentManagerPlugin.cs" />
    185     <None Include="HeuristicLabClientsHiveExperimentManagerPlugin.cs.frame" />
     153    <Compile Include="HeuristicLabClientsHiveJobManagerPlugin.cs" />
     154    <Compile Include="Views\HiveJobManagerView.cs">
     155      <SubType>UserControl</SubType>
     156    </Compile>
     157    <Compile Include="Views\HiveJobManagerView.Designer.cs">
     158      <DependentUpon>HiveJobManagerView.cs</DependentUpon>
     159    </Compile>
     160    <Compile Include="MenuItems\JobManagerMenuItem.cs" />
     161    <Compile Include="Views\HiveJobPermissionListView.cs">
     162      <SubType>UserControl</SubType>
     163    </Compile>
     164    <Compile Include="Views\HiveJobPermissionListView.Designer.cs">
     165      <DependentUpon>HiveJobPermissionListView.cs</DependentUpon>
     166    </Compile>
     167    <Compile Include="Views\HiveJobPermissionView.cs">
     168      <SubType>UserControl</SubType>
     169    </Compile>
     170    <Compile Include="Views\HiveJobPermissionView.Designer.cs">
     171      <DependentUpon>HiveJobPermissionView.cs</DependentUpon>
     172    </Compile>
     173    <Compile Include="Views\RefreshableHiveJobListView.cs">
     174      <SubType>UserControl</SubType>
     175    </Compile>
     176    <Compile Include="Views\RefreshableHiveJobListView.Designer.cs">
     177      <DependentUpon>RefreshableHiveJobListView.cs</DependentUpon>
     178    </Compile>
     179    <Compile Include="Views\RefreshableHiveJobView.cs">
     180      <SubType>UserControl</SubType>
     181    </Compile>
     182    <Compile Include="Views\RefreshableHiveJobView.Designer.cs">
     183      <DependentUpon>RefreshableHiveJobView.cs</DependentUpon>
     184    </Compile>
     185    <None Include="HeuristicLabClientsHiveJobManagerPlugin.cs.frame" />
    186186    <Compile Include="Properties\AssemblyInfo.cs" />
    187187    <None Include="Properties\AssemblyInfo.cs.frame" />
     
    205205  </ItemGroup>
    206206  <ItemGroup>
    207     <EmbeddedResource Include="Views\HiveExperimentManagerView.resx">
    208       <DependentUpon>HiveExperimentManagerView.cs</DependentUpon>
     207    <EmbeddedResource Include="Views\HiveJobManagerView.resx">
     208      <DependentUpon>HiveJobManagerView.cs</DependentUpon>
    209209      <SubType>Designer</SubType>
    210210    </EmbeddedResource>
    211     <EmbeddedResource Include="Views\HiveExperimentPermissionView.resx">
    212       <DependentUpon>HiveExperimentPermissionView.cs</DependentUpon>
     211    <EmbeddedResource Include="Views\HiveJobPermissionView.resx">
     212      <DependentUpon>HiveJobPermissionView.cs</DependentUpon>
    213213    </EmbeddedResource>
    214     <EmbeddedResource Include="Views\RefreshableHiveExperimentView.resx">
    215       <DependentUpon>RefreshableHiveExperimentView.cs</DependentUpon>
     214    <EmbeddedResource Include="Views\RefreshableHiveJobView.resx">
     215      <DependentUpon>RefreshableHiveJobView.cs</DependentUpon>
    216216    </EmbeddedResource>
    217217  </ItemGroup>
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/HeuristicLabClientsHiveJobManagerPlugin.cs.frame

    r6756 r6792  
    2222using HeuristicLab.PluginInfrastructure;
    2323
    24 namespace HeuristicLab.Clients.Hive.ExperimentManager {
    25   [Plugin("HeuristicLab.Clients.Hive.ExperimentManager", "3.3.5.$WCREV$")]
    26   [PluginFile("HeuristicLab.Clients.Hive.ExperimentManager-3.3.dll", PluginFileType.Assembly)]
     24namespace HeuristicLab.Clients.Hive.JobManager {
     25  [Plugin("HeuristicLab.Clients.Hive.JobManager", "3.3.5.$WCREV$")]
     26  [PluginFile("HeuristicLab.Clients.Hive.JobManager-3.3.dll", PluginFileType.Assembly)]
    2727  [PluginDependency("HeuristicLab.Clients.Hive", "3.3")]
    2828  [PluginDependency("HeuristicLab.Clients.Hive.Views", "3.3")]
     
    3939  [PluginDependency("HeuristicLab.Optimizer", "3.3")]
    4040  [PluginDependency("HeuristicLab.Persistence", "3.3")]   
    41   public class HeuristicLabClientsHiveExperimentManagerPlugin : PluginBase {
     41  public class HeuristicLabClientsHiveJobManagerPlugin : PluginBase {
    4242  }
    4343}
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/MenuItems/JobManagerMenuItem.cs

    r6756 r6792  
    2727  public class ExperimentManagerMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
    2828    public override string Name {
    29       get { return "&Experiment Manager"; }
     29      get { return "&Job Manager"; }
    3030    }
    3131    public override IEnumerable<string> Structure {
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/Properties/AssemblyInfo.cs.frame

    r6385 r6792  
    2727// set of attributes. Change these attribute values to modify the information
    2828// associated with an assembly.
    29 [assembly: AssemblyTitle("HeuristicLab.Clients.Hive.ExperimentManager")]
     29[assembly: AssemblyTitle("HeuristicLab.Clients.Hive.JobManager")]
    3030[assembly: AssemblyDescription("")]
    3131[assembly: AssemblyConfiguration("")]
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/Views/HiveJobManagerView.Designer.cs

    r6756 r6792  
    2020#endregion
    2121
    22 namespace HeuristicLab.Clients.Hive.ExperimentManager.Views {
    23   partial class HiveExperimentManagerView {
     22namespace HeuristicLab.Clients.Hive.JobManager.Views {
     23  partial class HiveJobManagerView {
    2424    /// <summary>
    2525    /// Required designer variable.
     
    4545    /// </summary>
    4646    private void InitializeComponent() {
    47       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HiveExperimentManagerView));
    48       this.hiveExperimentListView = new RefreshableHiveExperimentListView();
     47      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HiveJobManagerView));
     48      this.hiveExperimentListView = new RefreshableHiveJobListView();
    4949      this.refreshButton = new System.Windows.Forms.Button();
    5050      this.SuspendLayout();
     
    8686    #endregion
    8787
    88     private RefreshableHiveExperimentListView hiveExperimentListView;
     88    private RefreshableHiveJobListView hiveExperimentListView;
    8989    private System.Windows.Forms.Button refreshButton;
    9090
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/Views/HiveJobManagerView.cs

    r6764 r6792  
    2828using HeuristicLab.PluginInfrastructure;
    2929
    30 namespace HeuristicLab.Clients.Hive.ExperimentManager.Views {
     30namespace HeuristicLab.Clients.Hive.JobManager.Views {
    3131  /// <summary>
    3232  /// The base class for visual representations of items.
    3333  /// </summary>
    34   [View("Hive Experiment Manager")]
     34  [View("Hive Job Manager")]
    3535  [Content(typeof(HiveClient), true)]
    36   public partial class HiveExperimentManagerView : AsynchronousContentView {
     36  public partial class HiveJobManagerView : AsynchronousContentView {
    3737
    3838    public new HiveClient Content {
     
    4444    /// Initializes a new instance of <see cref="ItemBaseView"/>.
    4545    /// </summary>
    46     public HiveExperimentManagerView() {
     46    public HiveJobManagerView() {
    4747      InitializeComponent();
    4848    }
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/Views/HiveJobPermissionListView.Designer.cs

    r6756 r6792  
    1 namespace HeuristicLab.Clients.Hive.ExperimentManager.Views {
    2   partial class HiveExperimentPermissionListView {
     1namespace HeuristicLab.Clients.Hive.JobManager.Views {
     2  partial class HiveJobPermissionListView {
    33    /// <summary>
    44    /// Required designer variable.
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/Views/HiveJobPermissionListView.cs

    r6791 r6792  
    2525using HeuristicLab.MainForm;
    2626
    27 namespace HeuristicLab.Clients.Hive.ExperimentManager.Views {
    28   [View("HiveExperimentPermissionList View")]
     27namespace HeuristicLab.Clients.Hive.JobManager.Views {
     28  [View("Hive Job Permission List")]
    2929  [Content(typeof(HiveItemCollection<JobPermission>), false)]
    30   public partial class HiveExperimentPermissionListView : ItemCollectionView<JobPermission> {
     30  public partial class HiveJobPermissionListView : ItemCollectionView<JobPermission> {
    3131
    3232    private Guid hiveExperimentId;
     
    3636    }
    3737
    38     public HiveExperimentPermissionListView() {
     38    public HiveJobPermissionListView() {
    3939      InitializeComponent();
    4040      itemsGroupBox.Text = "Permissions";
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/Views/HiveJobPermissionView.Designer.cs

    r6791 r6792  
    1 namespace HeuristicLab.Clients.Hive.ExperimentManager.Views {
    2   partial class HiveExperimentPermissionView {
     1namespace HeuristicLab.Clients.Hive.JobManager.Views {
     2  partial class HiveJobPermissionView {
    33    /// <summary>
    44    /// Required designer variable.
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/Views/HiveJobPermissionView.cs

    r6756 r6792  
    2424using HeuristicLab.MainForm;
    2525
    26 namespace HeuristicLab.Clients.Hive.ExperimentManager.Views {
    27   [View("JobPermission View")]
     26namespace HeuristicLab.Clients.Hive.JobManager.Views {
     27  [View("Hive Job Permission")]
    2828  [Content(typeof(JobPermission), true)]
    29   public partial class HiveExperimentPermissionView : HiveItemView {
     29  public partial class HiveJobPermissionView : HiveItemView {
    3030    public new JobPermission Content {
    3131      get { return (JobPermission)base.Content; }
     
    3333    }
    3434
    35     public HiveExperimentPermissionView() {
     35    public HiveJobPermissionView() {
    3636      InitializeComponent();
    3737      permissionComboBox.Items.Add(Permission.Read);
     
    6868    }
    6969    private void usernameTextBox_Validated(object sender, System.EventArgs e) {
    70      
     70
    7171    }
    7272
     
    7575    }
    7676    private void permissionComboBox_Validated(object sender, System.EventArgs e) {
    77      
     77
    7878    }
    7979    #endregion
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/Views/RefreshableHiveJobListView.Designer.cs

    r6756 r6792  
    1 namespace HeuristicLab.Clients.Hive.ExperimentManager.Views {
    2   partial class RefreshableHiveExperimentListView {
     1namespace HeuristicLab.Clients.Hive.JobManager.Views {
     2  partial class RefreshableHiveJobListView {
    33    /// <summary>
    44    /// Required designer variable.
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/Views/RefreshableHiveJobListView.cs

    r6791 r6792  
    2626using HeuristicLab.MainForm;
    2727
    28 namespace HeuristicLab.Clients.Hive.ExperimentManager.Views {
    29   [View("HiveExperimentList View")]
     28namespace HeuristicLab.Clients.Hive.JobManager.Views {
     29  [View("Refreshable Hive Job List")]
    3030  [Content(typeof(ItemCollection<RefreshableJob>), false)]
    31   public partial class RefreshableHiveExperimentListView : HeuristicLab.Core.Views.ItemCollectionView<RefreshableJob> {
     31  public partial class RefreshableHiveJobListView : HeuristicLab.Core.Views.ItemCollectionView<RefreshableJob> {
    3232
    33     public RefreshableHiveExperimentListView() {
     33    public RefreshableHiveJobListView() {
    3434      InitializeComponent();
    3535      itemsGroupBox.Text = "Jobs";
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/Views/RefreshableHiveJobView.Designer.cs

    r6791 r6792  
    1 namespace HeuristicLab.Clients.Hive.ExperimentManager.Views {
    2   partial class RefreshableHiveExperimentView {
     1namespace HeuristicLab.Clients.Hive.JobManager.Views {
     2  partial class RefreshableHiveJobView {
    33    /// <summary>
    44    /// Required designer variable.
     
    2525    private void InitializeComponent() {
    2626      this.components = new System.ComponentModel.Container();
    27       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RefreshableHiveExperimentView));
     27      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RefreshableHiveJobView));
    2828      this.tabControl = new System.Windows.Forms.TabControl();
    2929      this.tasksTabPage = new System.Windows.Forms.TabPage();
     
    3131      this.permissionTabPage = new System.Windows.Forms.TabPage();
    3232      this.refreshPermissionsButton = new System.Windows.Forms.Button();
    33       this.hiveExperimentPermissionListView = new HeuristicLab.Clients.Hive.ExperimentManager.Views.HiveExperimentPermissionListView();
     33      this.hiveExperimentPermissionListView = new HeuristicLab.Clients.Hive.JobManager.Views.HiveJobPermissionListView();
    3434      this.runsTabPage = new System.Windows.Forms.TabPage();
    3535      this.stateTabPage = new System.Windows.Forms.TabPage();
     
    481481    private HeuristicLab.MainForm.WindowsForms.ViewHost stateLogViewHost;
    482482    private System.Windows.Forms.TabPage permissionTabPage;
    483     private HiveExperimentPermissionListView hiveExperimentPermissionListView;
     483    private HiveJobPermissionListView hiveExperimentPermissionListView;
    484484    private System.Windows.Forms.Button refreshPermissionsButton;
    485485    private System.Windows.Forms.TabPage runsTabPage;
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/Views/RefreshableHiveJobView.cs

    r6791 r6792  
    2929using HeuristicLab.Common;
    3030using HeuristicLab.Core;
    31 using HeuristicLab.Core.Views;
    3231using HeuristicLab.MainForm;
    3332using HeuristicLab.Optimization;
    3433using HeuristicLab.PluginInfrastructure;
    3534
    36 namespace HeuristicLab.Clients.Hive.ExperimentManager.Views {
     35namespace HeuristicLab.Clients.Hive.JobManager.Views {
    3736  /// <summary>
    3837  /// The base class for visual representations of items.
    3938  /// </summary>
    40   [View("Hive Experiment View")]
     39  [View("Hive Job View")]
    4140  [Content(typeof(RefreshableJob), true)]
    42   public partial class RefreshableHiveExperimentView : HeuristicLab.Core.Views.ItemView {
     41  public partial class RefreshableHiveJobView : HeuristicLab.Core.Views.ItemView {
    4342    private ProgressView progressView;
    4443
     
    5150    /// Initializes a new instance of <see cref="ItemBaseView"/>.
    5251    /// </summary>
    53     public RefreshableHiveExperimentView() {
     52    public RefreshableHiveJobView() {
    5453      InitializeComponent();
    5554    }
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Hive 3.4.sln

    r6744 r6792  
    7878Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.HiveEngine.ConsoleTests-3.3", "HeuristicLab.HiveEngine\3.3\Tests\HeuristicLab.HiveEngine.ConsoleTests-3.3.csproj", "{87D9FBB9-8E54-4770-9C84-B4B571D9EDD5}"
    7979EndProject
    80 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.ExperimentManager-3.3", "HeuristicLab.Clients.Hive.ExperimentManager\3.3\HeuristicLab.Clients.Hive.ExperimentManager-3.3.csproj", "{DBFD7205-61AF-40EF-8776-3052DEF91CF3}"
     80Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.JobManager-3.3", "HeuristicLab.Clients.Hive.ExperimentManager\3.3\HeuristicLab.Clients.Hive.JobManager-3.3.csproj", "{DBFD7205-61AF-40EF-8776-3052DEF91CF3}"
    8181EndProject
    8282Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Administrator-3.3", "HeuristicLab.Clients.Hive.Administrator\3.3\HeuristicLab.Clients.Hive.Administrator-3.3.csproj", "{5211F1AD-BBA2-4C62-8749-DCA0A25CF5D8}"
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine.Views/3.3/HeuristicLab.HiveEngine.Views-3.3.csproj

    r6701 r6792  
    145145  </ItemGroup>
    146146  <ItemGroup>
    147     <ProjectReference Include="..\..\HeuristicLab.Clients.Hive.ExperimentManager\3.3\HeuristicLab.Clients.Hive.ExperimentManager-3.3.csproj">
     147    <ProjectReference Include="..\..\HeuristicLab.Clients.Hive.ExperimentManager\3.3\HeuristicLab.Clients.Hive.JobManager-3.3.csproj">
    148148      <Project>{DBFD7205-61AF-40EF-8776-3052DEF91CF3}</Project>
    149       <Name>HeuristicLab.Clients.Hive.ExperimentManager-3.3</Name>
     149      <Name>HeuristicLab.Clients.Hive.JobManager-3.3</Name>
    150150    </ProjectReference>
    151151    <ProjectReference Include="..\..\HeuristicLab.Clients.Hive.Views\3.3\HeuristicLab.Clients.Hive.Views-3.3.csproj">
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine.Views/3.3/HiveEngineView.Designer.cs

    r6444 r6792  
    1 using HeuristicLab.Clients.Hive.ExperimentManager.Views;
     1using HeuristicLab.Clients.Hive.JobManager.Views;
    22namespace HeuristicLab.HiveEngine.Views {
    33  partial class HiveEngineView {
     
    3333      this.tabControl = new System.Windows.Forms.TabControl();
    3434      this.jobsTabPage = new System.Windows.Forms.TabPage();
    35       this.hiveExperimentListView = new HeuristicLab.Clients.Hive.ExperimentManager.Views.RefreshableHiveExperimentListView();
     35      this.hiveExperimentListView = new HeuristicLab.Clients.Hive.JobManager.Views.RefreshableHiveJobListView();
    3636      this.logTabPage = new System.Windows.Forms.TabPage();
    3737      this.logView = new HeuristicLab.Core.Views.LogView();
     
    230230    private System.Windows.Forms.TextBox executionTimeTextBox;
    231231    private HeuristicLab.Core.Views.LogView logView;
    232     private RefreshableHiveExperimentListView hiveExperimentListView;
     232    private RefreshableHiveJobListView hiveExperimentListView;
    233233    private System.Windows.Forms.CheckBox isPrivilegedCheckBox;
    234234  }
Note: See TracChangeset for help on using the changeset viewer.