Changeset 7615 for branches/HeuristicLab.TimeSeries/HeuristicLab.Clients.Hive.Views/3.3

Timestamp:

03/15/12 09:11:17 (13 years ago)

Author:

gkronber

Message:

#1081 merged r7462:7609 from trunk into time series branch

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive.Views/3.3/HeuristicLab.Clients.Hive.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/HiveTaskView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/OptimizerHiveTaskView.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Views/3.3/Progress (deleted)

branches/HeuristicLab.TimeSeries/HeuristicLab.Clients.Hive.Views/3.3/HeuristicLab.Clients.Hive.Views-3.3.csproj

@@ -165 +165 @@
     <None Include="Plugin.cs.frame" />
     <Compile Include="Plugin.cs" />
-    <Compile Include="Progress\ProgressView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Progress\ProgressView.designer.cs">
-      <DependentUpon>ProgressView.cs</DependentUpon>
-    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <None Include="Properties\AssemblyInfo.cs.frame" />

branches/HeuristicLab.TimeSeries/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/HiveTaskView.cs

@@ -207 +207 @@
 
     private void priorityComboBox_SelectedIndexChanged(object sender, EventArgs e) {
-      if (Content.Task.Priority != priorityComboBox.SelectedIndex) {
+      if (Content != null && Content.Task != null && Content.Task.Priority != priorityComboBox.SelectedIndex) {
         Content.Task.Priority = priorityComboBox.SelectedIndex;
       }

branches/HeuristicLab.TimeSeries/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/OptimizerHiveTaskView.cs

@@ -21 +21 @@
 
 using System;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 using HeuristicLab.MainForm;
-using System.Threading.Tasks;
+using HeuristicLab.MainForm.WindowsForms;
 using HeuristicLab.PluginInfrastructure;
 
@@ -75 +76 @@
         FinishProgressView();
         ErrorHandling.ShowErrorDialog(this, "An error occured while resuming the task.", t.Exception);
-      }, TaskContinuationOptions.OnlyOnFaulted); 
+      }, TaskContinuationOptions.OnlyOnFaulted);
     }