Changeset 5782 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4

Timestamp:

03/21/11 21:50:39 (13 years ago)

Author:

ascheibe

Message:

#1233

• fixed job pause bug... again
• general Executor improvements

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/Jobs/OptimizerJob.cs (modified) (5 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/Jobs/OptimizerJob.cs

@@ -154 +154 @@
     }
 
-    public void Pause() {
+    public virtual void Pause() {
       optimizer.Pause();
     }
@@ -173 +173 @@
 
     public event EventHandler JobPaused;
-    protected void OnJobPaused(object sender, EventArgs e) {
+    protected virtual void OnJobPaused() {
       EventHandler handler = JobPaused;
       if (handler != null) handler(this, EventArgs.Empty);
@@ -218 +218 @@
     protected virtual void RegisterEvents() {
       optimizer.Stopped += new EventHandler(optimizer_Stopped);
-      optimizer.Paused += new EventHandler(OnJobPaused);
+      optimizer.Paused += new EventHandler(optimizer_Paused);
       optimizer.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(optimizer_ExceptionOccurred);
       optimizer.DescriptionChanged += new EventHandler(optimizer_DescriptionChanged);
@@ -229 +229 @@
     protected virtual void DeregisterEvents() {
       optimizer.Stopped -= new EventHandler(optimizer_Stopped);
-      optimizer.Paused -= new EventHandler(OnJobPaused);
+      optimizer.Paused -= new EventHandler(optimizer_Paused);
       optimizer.ExceptionOccurred -= new EventHandler<EventArgs<Exception>>(optimizer_ExceptionOccurred);
       optimizer.DescriptionChanged -= this.DescriptionChanged;
@@ -265 +265 @@
       OnJobStopped();
     }
+
+    protected virtual void optimizer_Paused(object sender, EventArgs e) {
+      OnJobPaused();
+    }
     #endregion