Changeset 9894 for trunk/sources/HeuristicLab.MainForm

Timestamp:

08/22/13 11:31:32 (11 years ago)

Author:

ascheibe

Message:

#1042

• changed Hive views to use MainForm for progress handling
• removed Cancel timeout
• setter for ProgressState is now private
• added Start methods to Progress
• removed unused methods from RefreshableHiveJobView

Location:

trunk/sources/HeuristicLab.MainForm/3.3

Files:

• Interfaces/IProgress.cs (modified) (4 diffs)
• Progress.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.MainForm/3.3/Interfaces/IProgress.cs

@@ -41 +41 @@
     /// If it is reused it may be Started again.
     /// </summary>
-    ProgressState ProgressState { get; set; }
+    ProgressState ProgressState { get; }
     /// <summary>
     /// Returns whether the operation can be canceled or not.
@@ -54 +54 @@
     /// </summary>
     /// <exception cref="NotSupportedException">Thrown when cancellation is not supported.</exception>
-    /// <param name="timeoutMs">The operation is given a certain timeout to cancel. If the operation doesn't cancel in this time it will be forcibly closed.</param>
-    void Cancel(int timeoutMs = 0);
+    void Cancel();
     /// <summary>
     /// Sets the ProgressValue to 1 and the ProgressState to Finished.
@@ -61 +60 @@
     void Finish();
 
+    /// <summary>
+    /// Starts or restarts a Progress. 
+    /// </summary>
+    void Start();
+
     void Start(string status);
-
-    void Start();
 
     /// <summary>
@@ -82 +84 @@
     event EventHandler CanBeCanceledChanged;
     /// <summary>
-    /// A cancelation is requested with a certain timeout (in ms) in which it should occur gracefully. If the timeout is surpassed, it should be forcibly canceled.
+    /// A cancelation is requested.
     /// </summary>
-    event EventHandler<EventArgs<int>> CancelRequested;
+    event EventHandler CancelRequested;
   }
 }

trunk/sources/HeuristicLab.MainForm/3.3/Progress.cs

@@ -21 +21 @@
 
 using System;
-using HeuristicLab.Common;
 
 namespace HeuristicLab.MainForm {
@@ -50 +49 @@
     public ProgressState ProgressState {
       get { return progressState; }
-      set {
+      private set {
         if (progressState != value) {
           progressState = value;
@@ -83 +82 @@
     }
 
-    public void Cancel(int timeoutMs = 0) {
+    public void Cancel() {
       if (canBeCanceled)
-        OnCancelRequested(timeoutMs);
+        OnCancelRequested();
     }
 
@@ -126 +125 @@
       var handler = CanBeCanceledChanged;
       if (handler != null) handler(this, EventArgs.Empty);
-
     }
 
-    public event EventHandler<EventArgs<int>> CancelRequested;
-    private void OnCancelRequested(int timeoutMs) {
+    public event EventHandler CancelRequested;
+    private void OnCancelRequested() {
       var handler = CancelRequested;
       if (handler != null) throw new NotSupportedException("Cancel request was ignored.");
-      else handler(this, new EventArgs<int>(timeoutMs));
+      else handler(this, EventArgs.Empty);
     }
     #endregion