Changeset 8156 for trunk/sources/HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs

Timestamp:

06/28/12 18:49:22 (12 years ago)

Author:

ascheibe

Message:

#1762 Removed IProgressReporter and changed the Hive Job Manager accordingly.

File:

• trunk/sources/HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs

@@ -31 +31 @@
 
 namespace HeuristicLab.Clients.Hive {
-  public class RefreshableJob : IHiveItem, IDeepCloneable, IContent, IProgressReporter, IComparable<RefreshableJob> {
+  public class RefreshableJob : IHiveItem, IDeepCloneable, IContent, IComparable<RefreshableJob> {
     private JobResultPoller jobResultPoller;
     private ConcurrentTaskDownloader<ItemTask> jobDownloader;
     private static object locker = new object();
+
+    public bool IsProgressing { get; set; }
 
     private Job job;
@@ -165 +167 @@
     }
 
-    private bool isProgressing;
-    public bool IsProgressing {
-      get { return isProgressing; }
-      set {
-        if (isProgressing != value) {
-          isProgressing = value;
-          OnIsProgressingChanged();
-        }
-      }
-    }
-
     private IProgress progress;
     public IProgress Progress {
       get { return progress; }
-      set { this.progress = value; }
-    }
+      set {
+        this.progress = value;
+        OnIsProgressingChanged();
+      }
+    }
+
 
     private ThreadSafeLog log;
@@ -229 +224 @@
 
     #region JobResultPoller Events
-
     public void StartResultPolling() {
       if (jobResultPoller == null) {
@@ -410 +404 @@
     }
 
-    public event EventHandler IsProgressingChanged;
-    protected virtual void OnIsProgressingChanged() {
-      var handler = IsProgressingChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-
     public event EventHandler IsDownloadableChanged;
     private void OnIsDownloadableChanged() {
@@ -473 +461 @@
     protected virtual void OnTaskReceived() {
       var handler = TaskReceived;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+    public event EventHandler IsProgressingChanged;
+    private void OnIsProgressingChanged() {
+      var handler = IsProgressingChanged;
       if (handler != null) handler(this, EventArgs.Empty);
     }