Changeset 16116


Ignore:
Timestamp:
08/30/18 11:05:03 (3 years ago)
Author:
jkarder
Message:

#2839: worked on hive project management

  • fixed plugin dependencies
  • fixed NullReferenceException in HiveTaskView
  • added cloning ctor for AssignedJobResource and AssignedProjectResource
Location:
branches/2839_HiveProjectManagement
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed
  • branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Plugin.cs.frame

    r16057 r16116  
    3232  [PluginDependency("HeuristicLab.Core", "3.3")]
    3333  [PluginDependency("HeuristicLab.Core.Views", "3.3")] 
     34  [PluginDependency("HeuristicLab.Clients.Common", "3.3")]
    3435  [PluginDependency("HeuristicLab.Clients.Hive", "3.3")]
    3536  [PluginDependency("HeuristicLab.Clients.Hive.Views", "3.3")]
     37  [PluginDependency("HeuristicLab.Data", "3.3")]
     38  [PluginDependency("HeuristicLab.Data.Views", "3.3")]
    3639  [PluginDependency("HeuristicLab.DayView", "1.0.0.0")]
    3740  [PluginDependency("HeuristicLab.Optimizer", "3.3")]
  • branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager/3.3/Plugin.cs.frame

    r16057 r16116  
    2525  [Plugin("HeuristicLab.Clients.Hive.JobManager", "3.3.15.$WCREV$")]
    2626  [PluginFile("HeuristicLab.Clients.Hive.JobManager-3.3.dll", PluginFileType.Assembly)]
     27  [PluginDependency("HeuristicLab.Clients.Access", "3.3")]
     28  [PluginDependency("HeuristicLab.Clients.Common", "3.3")]
    2729  [PluginDependency("HeuristicLab.Clients.Hive", "3.3")]
    2830  [PluginDependency("HeuristicLab.Clients.Hive.Views", "3.3")]
  • branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/HiveTaskView.cs

    r16094 r16116  
    213213
    214214    private void coresNeededComboBox_SelectedIndexChanged(object sender, EventArgs e) {
    215       int cores;
    216       if (int.TryParse(coresNeededComboBox.SelectedItem.ToString(), out cores))
    217         Content.Task.CoresNeeded = cores;
     215      if (Content != null && Content.Task != null) {
     216        int cores;
     217        if (int.TryParse(coresNeededComboBox.SelectedItem.ToString(), out cores) && Content.Task.CoresNeeded != cores)
     218          Content.Task.CoresNeeded = cores;
     219      }
    218220    }
    219221  }
  • branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive/3.3/HeuristicLab.Clients.Hive-3.3.csproj

    r15401 r16116  
    125125    <Compile Include="HiveAdminClient.cs" />
    126126    <Compile Include="HiveClient.cs" />
     127    <Compile Include="ServiceClients\AssignedJobResource.cs" />
     128    <Compile Include="ServiceClients\AssignedProjectResource.cs" />
    127129    <Compile Include="ServiceClients\Project.cs" />
    128130    <Compile Include="ServiceClients\UserPriority.cs" />
Note: See TracChangeset for help on using the changeset viewer.