Changeset 8145 for trunk/sources/HeuristicLab.Clients.Hive.JobManager

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

Location:

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views

Files:

• HiveResourceSelector.cs (modified) (4 diffs)
• RefreshableHiveJobView.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.cs

@@ -42 +42 @@
     private ISet<TreeNode> filteredTreeNodes;
     private ISet<TreeNode> nodeStore;
+    private IProgress currentProgress;
 
     private ISet<Resource> selectedResources;
@@ -68 +69 @@
       imageList.Images.Add(HeuristicLab.Common.Resources.VSImageLibrary.MonitorLarge);
       imageList.Images.Add(HeuristicLab.Common.Resources.VSImageLibrary.NetworkCenterLarge);
+      progressView = new ProgressView(this);
     }
 
@@ -74 +76 @@
         Invoke(new Action(StartProgressView));
       } else {
-        if (progressView == null) {
-          IProgress prog = new Progress();
-          prog.Status = "Downloading resources. Please be patient.";
-          progressView = new ProgressView(this, prog);
-        }
+        currentProgress = new Progress();
+        currentProgress.Status = "Downloading resources. Please be patient.";
+        progressView.Progress = currentProgress;
       }
     }
@@ -86 +86 @@
         Invoke(new Action(FinishProgressView));
       } else {
-        if (progressView != null) {
-          progressView.Finish();
-          progressView = null;
-          SetEnabledStateOfControls();
-        }
+        currentProgress.Finish();
+        SetEnabledStateOfControls();
       }
     }

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs

@@ -55 +55 @@
     public RefreshableHiveJobView() {
       InitializeComponent();
+      progressView = new ProgressView(this);
     }
 
@@ -475 +476 @@
         Invoke(new Action(SetProgressView));
       } else {
-        if (progressView == null) {
-          progressView = new ProgressView(this, Content.Progress);
-        } else {
-          progressView.Progress = Content.Progress;
-        }
+        progressView.Progress = Content.Progress;
       }
     }
@@ -487 +484 @@
         Invoke(new Action<IProgress>(SetProgressView), progress);
       } else {
-        if (progressView == null) {
-          progressView = new ProgressView(this, progress);
-        } else {
-          progressView.Progress = progress;
-        }
+        progressView.Progress = progress;
       }
     }
@@ -499 +492 @@
         Invoke(new Action(FinishProgressView));
       } else {
-        if (progressView != null) {
-          progressView.Finish();
-          progressView = null;
-          SetEnabledStateOfControls();
-        }
+        if (Content.Progress != null)
+          Content.Progress.Finish();
+        SetEnabledStateOfControls();
       }
     }