Changeset 8206 for branches/GP-MoveOperators/HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs

Timestamp:

07/03/12 16:46:35 (12 years ago)

Author:

gkronber

Message:

#1847: merged r8084:8205 from trunk into GP move operators branch

Location:

branches/GP-MoveOperators

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs (modified) (6 diffs)

branches/GP-MoveOperators/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; }
+    private Progress progress;
+    public Progress Progress {
+      get { return progress; }
       set {
-        if (isProgressing != value) {
-          isProgressing = value;
-          OnIsProgressingChanged();
-        }
-      }
-    }
-
-    private IProgress progress;
-    public IProgress Progress {
-      get { return progress; }
-      set { this.progress = value; }
-    }
+        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() {
@@ -475 +463 @@
       if (handler != null) handler(this, EventArgs.Empty);
     }
+    public event EventHandler IsProgressingChanged;
+    private void OnIsProgressingChanged() {
+      var handler = IsProgressingChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
     #endregion
 
@@ -519 +512 @@
     public event EventHandler HiveTasksChanged;
     protected virtual void OnHiveTasksChanged() {
-      if (jobResultPoller != null && jobResultPoller.IsPolling) {
-        jobResultPoller.Stop();
-        DeregisterResultPollingEvents();
-      }
+      StopResultPolling();
       if (this.HiveTasks != null && this.HiveTasks.Count > 0 && this.GetAllHiveTasks().All(x => x.Task.Id != Guid.Empty)) {
         if (IsFinished()) {
           this.ExecutionState = Core.ExecutionState.Stopped;
           this.RefreshAutomatically = false;
-        }
-
-        if (this.RefreshAutomatically) {
-          StartResultPolling();
+          if (jobResultPoller != null) DeregisterResultPollingEvents();
+        } else {
+          this.RefreshAutomatically = true;
         }
       }