Free cookie consent management tool by TermsFeed Policy Generator

Changeset 6688


Ignore:
Timestamp:
08/31/11 19:27:45 (13 years ago)
Author:
ascheibe
Message:

#1233 some renaming to be more consistent with OKB

Location:
branches/HeuristicLab.Hive-3.4/sources
Files:
11 added
6 deleted
17 edited
2 moved

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 obj
        31HeuristicLab.Clients.Hive.Administration-3.4.csproj.user
        42HeuristicLab.Clients.Hive.Administration-3.4.csproj.vs10x
        53HeuristicLabClientsHiveAdministrationPlugin.cs
         4HeuristicLabClientsHiveAdministratorPlugin.cs
         5bin
         6obj

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/HiveAdministratorClient.cs

    r6682 r6688  
    2424using HeuristicLab.Core;
    2525
    26 namespace HeuristicLab.Clients.Hive.Administration {
    27   [Item("Hive Administration", "Hive Administration")]
    28   public class HiveAdministrationClient : Item {
     26namespace HeuristicLab.Clients.Hive.Administrator {
     27  [Item("Hive Administrator", "Hive Administrator")]
     28  public class HiveAdministratorClient : Item {
    2929    public List<SlaveGroup> SlaveGroups;
    3030    public List<Slave> Slaves;
    3131
    3232
    33     public HiveAdministrationClient() {
     33    public HiveAdministratorClient() {
    3434      UpdateSlaveGroups();
    3535    }
    3636
    37     protected HiveAdministrationClient(HiveAdministrationClient original, Cloner cloner)
     37    protected HiveAdministratorClient(HiveAdministratorClient original, Cloner cloner)
    3838      : base(original, cloner) {
    3939      //TODO: clone
    4040    }
    4141    public override IDeepCloneable Clone(HeuristicLab.Common.Cloner cloner) {
    42       return new HiveAdministrationClient(this, cloner);
     42      return new HiveAdministratorClient(this, cloner);
    4343    }
    4444

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Properties/AssemblyInfo.cs.frame

    r6385 r6688  
    2727// set of attributes. Change these attribute values to modify the information
    2828// associated with an assembly.
    29 [assembly: AssemblyTitle("HeuristicLab.Clients.Hive.Administration")]
     29[assembly: AssemblyTitle("HeuristicLab.Clients.Hive.Administrator")]
    3030[assembly: AssemblyDescription("")]
    3131[assembly: AssemblyConfiguration("")]

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/Common/UpdateControl.Designer.cs

    r6373 r6688  
    1 namespace HeuristicLab.Clients.Hive.Administration.Views.Common {
     1namespace HeuristicLab.Clients.Hive.Administrator.Views.Common {
    22  partial class UpdateControl {
    33    /// <summary>

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/Common/UpdateControl.cs

    r6373 r6688  
    33using System.Windows.Forms;
    44
    5 namespace HeuristicLab.Clients.Hive.Administration.Views.Common {
     5namespace HeuristicLab.Clients.Hive.Administrator.Views.Common {
    66  public partial class UpdateControl : UserControl {
    77    public UpdateControl() {

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/HiveAppointment.cs

    r6451 r6688  
    2424using System.Xml.Serialization;
    2525
    26 namespace HeuristicLab.Clients.Hive.Administration.Views {
     26namespace HeuristicLab.Clients.Hive.Administrator.Views {
    2727
    2828  public class HiveAppointment : Calendar.Appointment {

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/MenuItems/AdministratorMenuItem.cs

    r6682 r6688  
    2121
    2222using System.Collections.Generic;
    23 using HeuristicLab.Clients.Hive.Administration;
     23using HeuristicLab.Clients.Hive.Administrator;
    2424using HeuristicLab.MainForm;
    2525
    2626namespace HeuristicLab.Optimizer.MenuItems {
    27   public class AdministrationMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
     27  public class AdministratorMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
    2828    public override string Name {
    29       get { return "&Administration"; }
     29      get { return "&Administrator"; }
    3030    }
    3131    public override IEnumerable<string> Structure {
    … …  
    3333    }
    3434    public override void Execute() {
    35       MainFormManager.MainForm.ShowContent(new HiveAdministrationClient());
     35      MainFormManager.MainForm.ShowContent(new HiveAdministratorClient());
    3636    }
    3737    public override int Position {

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/Recurrence.Designer.cs

    r6451 r6688  
    1 namespace HeuristicLab.Clients.Hive.Administration.Views {
     1namespace HeuristicLab.Clients.Hive.Administrator.Views {
    22  partial class Recurrence {
    33    /// <summary>

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/Recurrence.cs

    r6373 r6688  
    2424using System.Windows.Forms;
    2525
    26 namespace HeuristicLab.Clients.Hive.Administration.Views {
     26namespace HeuristicLab.Clients.Hive.Administrator.Views {
    2727
    2828  public enum RecurrenceMode {

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/RecurrentEvent.cs

    r6373 r6688  
    2323using System.Collections.Generic;
    2424
    25 namespace HeuristicLab.Clients.Hive.Administration.Views {
     25namespace HeuristicLab.Clients.Hive.Administrator.Views {
    2626  public class RecurrentEvent {
    2727    public DateTime DateFrom { get; set; }

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/ResourcesView.Designer.cs

    r6437 r6688  
    2020#endregion
    2121
    22 using HeuristicLab.Clients.Hive.Administration.Views.Common;
    23 namespace HeuristicLab.Clients.Hive.Administration.Views {
     22using HeuristicLab.Clients.Hive.Administrator.Views.Common;
     23namespace HeuristicLab.Clients.Hive.Administrator.Views {
    2424  partial class ResourcesView {
    2525    /// <summary>
    … …  
    5050      this.imageListSlaveGroups = new System.Windows.Forms.ImageList(this.components);
    5151      this.splitSlaves = new System.Windows.Forms.SplitContainer();
    52       this.updateSlaveGroup = new HeuristicLab.Clients.Hive.Administration.Views.Common.UpdateControl();
     52      this.updateSlaveGroup = new HeuristicLab.Clients.Hive.Administrator.Views.Common.UpdateControl();
    5353      this.btnSave = new System.Windows.Forms.Button();
    5454      this.btnRemoveGroup = new System.Windows.Forms.Button();
    … …  
    5757      this.tabSlaveGroup = new System.Windows.Forms.TabControl();
    5858      this.tabDetails = new System.Windows.Forms.TabPage();
    59       this.slaveView = new HeuristicLab.Clients.Hive.Administration.Views.SlaveView();
     59      this.slaveView = new HeuristicLab.Clients.Hive.Administrator.Views.SlaveView();
    6060      this.tabSchedule = new System.Windows.Forms.TabPage();
    61       this.updateScheduleControl = new HeuristicLab.Clients.Hive.Administration.Views.Common.UpdateControl();
    62       this.scheduleView = new HeuristicLab.Clients.Hive.Administration.Views.ScheduleView();
     61      this.updateScheduleControl = new HeuristicLab.Clients.Hive.Administrator.Views.Common.UpdateControl();
     62      this.scheduleView = new HeuristicLab.Clients.Hive.Administrator.Views.ScheduleView();
    6363      ((System.ComponentModel.ISupportInitialize)(this.splitSlaves)).BeginInit();
    6464      this.splitSlaves.Panel1.SuspendLayout();

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/ResourcesView.cs

    r6492 r6688  
    2929using HeuristicLab.MainForm;
    3030
    31 namespace HeuristicLab.Clients.Hive.Administration.Views {
     31namespace HeuristicLab.Clients.Hive.Administrator.Views {
    3232  [View("ResourcesView")]
    3333  [Content(typeof(IItemList<Resource>), IsDefaultView = true)]

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/ScheduleView.Designer.cs

    r6373 r6688  
    2020#endregion
    2121
    22 namespace HeuristicLab.Clients.Hive.Administration.Views {
     22namespace HeuristicLab.Clients.Hive.Administrator.Views {
    2323  partial class ScheduleView {
    2424    /// <summary>

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/ScheduleView.cs

    r6454 r6688  
    3131using HeuristicLab.MainForm;
    3232
    33 namespace HeuristicLab.Clients.Hive.Administration.Views {
     33namespace HeuristicLab.Clients.Hive.Administrator.Views {
    3434  [View("ScheduleView")]
    3535  [Content(typeof(IItemList<Downtime>), IsDefaultView = true)]

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/SlaveView.Designer.cs

    r6464 r6688  
    2020#endregion
    2121
    22 namespace HeuristicLab.Clients.Hive.Administration.Views {
     22namespace HeuristicLab.Clients.Hive.Administrator.Views {
    2323  partial class SlaveView {
    2424    /// <summary>

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/SlaveView.cs

    r6464 r6688  
    2626using HeuristicLab.MainForm.WindowsForms;
    2727
    28 namespace HeuristicLab.Clients.Hive.Administration.Views {
     28namespace HeuristicLab.Clients.Hive.Administrator.Views {
    2929  [View("SlaveView")]
    3030  [Content(typeof(Resource), IsDefaultView = true)]

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HeuristicLab.Clients.Hive-3.4.csproj

    r6463 r6688  
    121121    <None Include="app_services.config" />
    122122    <None Include="app.config" />
    123     <None Include="ClassDiagram.cd" />
    124123    <None Include="HeuristicLabClientsHivePlugin.cs.frame" />
    125124    <Compile Include="Exceptions\AddJobToHiveException.cs" />

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Hive 3.4.sln

    r6683 r6688  
    9393Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.ExperimentManager-3.4", "HeuristicLab.Clients.Hive.ExperimentManager\3.4\HeuristicLab.Clients.Hive.ExperimentManager-3.4.csproj", "{DBFD7205-61AF-40EF-8776-3052DEF91CF3}"
    9494EndProject
    95 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Administration-3.4", "HeuristicLab.Clients.Hive.Administration\3.4\HeuristicLab.Clients.Hive.Administration-3.4.csproj", "{5211F1AD-BBA2-4C62-8749-DCA0A25CF5D8}"
     95Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Administrator-3.4", "HeuristicLab.Clients.Hive.Administration\3.4\HeuristicLab.Clients.Hive.Administrator-3.4.csproj", "{5211F1AD-BBA2-4C62-8749-DCA0A25CF5D8}"
    9696EndProject
    9797Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.Hive.DbCreator-3.3", "HeuristicLab.Services.Hive.DbCreator\3.3\HeuristicLab.Services.Hive.DbCreator-3.3.csproj", "{691FC65E-CA1A-4477-B66F-EB49D21B7393}"

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/HeuristicLab.Services.Hive.DataAccess-3.4.csproj

    r6483 r6688  
    146146  </ItemGroup>
    147147  <ItemGroup>
    148     <Content Include="Tools\Query Daily Statistics.sql" />
    149     <Content Include="Tools\Query Statistics.sql" />
    150     <Content Include="Tools\Query Jobs.sql" />
    151     <Content Include="Tools\Initialize Hive Database.sql" />
    152     <Content Include="Tools\Prepare Hive Database.sql" />
     148    <Content Include="SQL Scripts\Query Daily Statistics.sql" />
     149    <Content Include="SQL Scripts\Query Statistics.sql" />
     150    <Content Include="SQL Scripts\Query Jobs.sql" />
     151    <Content Include="SQL Scripts\Initialize Hive Database.sql" />
     152    <Content Include="SQL Scripts\Prepare Hive Database.sql" />
    153153  </ItemGroup>
    154154  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Note: See TracChangeset for help on using the changeset viewer.