Changeset 6897 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administrator

Timestamp:

10/10/11 15:20:01 (13 years ago)

Author:

ascheibe

Message:

#1233

• fixed bug that occurred when setting the Heartbeat Interval for a group of slaves
• slave reports HbInterval now correct on first start

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views

Files:

• ResourcesView.cs (modified) (1 diff)
• SlaveView.cs (modified) (1 diff)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs

@@ -196 +196 @@
     void SlaveViewContent_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e) {
       OnContentChanged();
+      if (e.PropertyName == "HbInterval") {
+        UpdateChildHbIntervall(slaveView.Content);
+      }
+    }
+
+    private void UpdateChildHbIntervall(Resource resource) {
+      foreach (Resource r in Content.Where(x => x.ParentResourceId == resource.Id)) {
+        r.HbInterval = resource.HbInterval;
+        if (r is SlaveGroup) {
+          UpdateChildHbIntervall(r);
+        }
+      }
     }
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/SlaveView.cs

@@ -124 +124 @@
             Content.HbInterval = interval;
           }
-          catch (Exception ex) {
+          catch (Exception) {
             MessageBox.Show("Please enter a numeric value for the Heartbeat Interval.", "HeuristicLab Hive Administrator", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            txtHbIntervall.Text = "0";
+            txtHbIntervall.Text = "10";
           }
         }