Changeset 7929

Timestamp:

05/29/12 23:11:44 (13 years ago)

Author:

ascheibe

Message:

#1174 fixed OKB for ContentView unit test

Location:

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Administration/Views

Files:

• AlgorithmView.cs (modified) (1 diff)
• ProblemView.cs (modified) (1 diff)

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Administration/Views/AlgorithmView.cs

@@ -63 +63 @@
 
       platformComboBox.SelectedValueChanged -= new EventHandler(platformComboBox_SelectedValueChanged);
-      platformComboBoxValues = AdministrationClient.Instance.Platforms.ToList();
+      if (AdministrationClient.Instance.Platforms != null)
+        platformComboBoxValues = AdministrationClient.Instance.Platforms.ToList();
       platformComboBox.DataSource = platformComboBoxValues;
       platformComboBox.SelectedValueChanged += new EventHandler(platformComboBox_SelectedValueChanged);
 
       algorithmClassComboBox.SelectedValueChanged -= new EventHandler(algorithmClassComboBox_SelectedValueChanged);
-      algorithmClassComboBoxValues = AdministrationClient.Instance.AlgorithmClasses.ToList();
+      if (AdministrationClient.Instance.AlgorithmClasses != null)
+        algorithmClassComboBoxValues = AdministrationClient.Instance.AlgorithmClasses.ToList();
       algorithmClassComboBox.DataSource = algorithmClassComboBoxValues;
       algorithmClassComboBox.SelectedValueChanged += new EventHandler(algorithmClassComboBox_SelectedValueChanged);

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Administration/Views/ProblemView.cs

@@ -63 +63 @@
 
       platformComboBox.SelectedValueChanged -= new EventHandler(platformComboBox_SelectedValueChanged);
-      platformComboBoxValues = AdministrationClient.Instance.Platforms.ToList();
+      if (AdministrationClient.Instance.Platforms != null)
+        platformComboBoxValues = AdministrationClient.Instance.Platforms.ToList();
       platformComboBox.DataSource = platformComboBoxValues;
       platformComboBox.SelectedValueChanged += new EventHandler(platformComboBox_SelectedValueChanged);
 
       problemClassComboBox.SelectedValueChanged -= new EventHandler(problemClassComboBox_SelectedValueChanged);
-      problemClassComboBoxValues = AdministrationClient.Instance.ProblemClasses.ToList();
+      if (AdministrationClient.Instance.ProblemClasses != null)
+        problemClassComboBoxValues = AdministrationClient.Instance.ProblemClasses.ToList();
       problemClassComboBox.DataSource = problemClassComboBoxValues;
       problemClassComboBox.SelectedValueChanged += new EventHandler(problemClassComboBox_SelectedValueChanged);