Changeset 7782 for trunk/sources/HeuristicLab.Clients.Hive.JobManager

Timestamp:

05/04/12 17:57:40 (12 years ago)

Author:

ascheibe

Message:

#1722 fixed a NullReferenceException in Hive JobManager

File:

• trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs

@@ -69 +69 @@
       Content.IsAllowedPrivilegedChanged += new EventHandler(Content_IsAllowedPrivilegedChanged);
       Content.Loaded += new EventHandler(Content_Loaded);
+      Content.TaskReceived += new EventHandler(Content_TaskReceived);
     }
 
@@ -83 +84 @@
       Content.ExecutionTimeChanged -= new EventHandler(Content_ExecutionTimeChanged);
       Content.Loaded -= new EventHandler(Content_Loaded);
+      Content.TaskReceived -= new EventHandler(Content_TaskReceived);
       base.DeregisterContentEvents();
     }
@@ -167 +169 @@
 
     #region Content Events
+    void Content_TaskReceived(object sender, EventArgs e) {
+      runCollectionViewHost.Content = GetAllRunsFromJob(Content);
+    }
+
     private void HiveTasks_ItemsAdded(object sender, CollectionItemsChangedEventArgs<HiveTask> e) {
       if (InvokeRequired)
         Invoke(new CollectionItemsChangedEventHandler<HiveTask>(HiveTasks_ItemsAdded), sender, e);
       else {
-        foreach (HiveTask t in e.Items) {
-          t.TaskStateChanged += new EventHandler(HiveTask_TaskStateChanged);
-        }
         SetEnabledStateOfControls();
       }
@@ -182 +185 @@
         Invoke(new CollectionItemsChangedEventHandler<HiveTask>(HiveTasks_ItemsRemoved), sender, e);
       else {
-        foreach (HiveTask t in e.Items) {
-          t.TaskStateChanged -= new EventHandler(HiveTask_TaskStateChanged);
-        }
         SetEnabledStateOfControls();
       }
@@ -193 +193 @@
         Invoke(new CollectionItemsChangedEventHandler<HiveTask>(HiveTasks_CollectionReset), sender, e);
       else {
-        foreach (HiveTask t in e.Items) {
-          t.TaskStateChanged -= new EventHandler(HiveTask_TaskStateChanged);
-        }
-        SetEnabledStateOfControls();
-      }
-    }
-
-    void HiveTask_TaskStateChanged(object sender, EventArgs e) {
-      runCollectionViewHost.Content = GetAllRunsFromJob(Content);
+        SetEnabledStateOfControls();
+      }
     }