Changeset 8145 for trunk/sources/HeuristicLab.Clients.Access.Views

Timestamp:

06/28/12 12:00:51 (12 years ago)

Author:

ascheibe

Message:

#1762 implemented review comments:

• removed self disposing. The progress view now reacts if a progress is set and Finish() is now called on the progress object and not the view.
• Moved Cancel event from ProgressView to Progress
• throw ArgumentNullException if the parent view is null

File:

• trunk/sources/HeuristicLab.Clients.Access.Views/3.3/ClientViews/ClientView.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Clients.Access.Views/3.3/ClientViews/ClientView.cs

@@ -35 +35 @@
 
     private ProgressView progressView;
+    IProgress progress;
 
     public ClientView() {
       InitializeComponent();
+      progressView = new ProgressView(this);
     }
 
@@ -82 +84 @@
         Invoke(new Action(StartProgressView));
       } else {
-        if (progressView == null) {
-          IProgress prog = new Progress();
-          prog.Status = "Downloading client information. Please be patient.";
-          progressView = new ProgressView(this, prog);
-        }
+        progress = new Progress();
+        progress.Status = "Downloading client information. Please be patient.";
+        progressView.Progress = progress;
       }
     }
@@ -94 +94 @@
         Invoke(new Action(FinishProgressView));
       } else {
-        if (progressView != null) {
-          progressView.Finish();
-          progressView = null;
-          SetEnabledStateOfControls();
-        }
+        progress.Finish();
+        SetEnabledStateOfControls();
       }
     }