Changeset 9896 for trunk/sources

Timestamp:

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

Author:

ascheibe

Message:

#1042 changed MainForm progress handling to work with controls instead of views

File:

• trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs

@@ -347 +347 @@
     #region progress views
     private readonly Dictionary<IContent, IProgress> contentProgressLookup = new Dictionary<IContent, IProgress>();
-    private readonly Dictionary<IView, IProgress> viewProgressLookup = new Dictionary<IView, IProgress>();
+    private readonly Dictionary<Control, IProgress> viewProgressLookup = new Dictionary<Control, IProgress>();
     private readonly List<ProgressView> progressViews = new List<ProgressView>();
 
@@ -369 +369 @@
       var progress = new Progress(progressMessage, ProgressState.Started);
       foreach (var contentView in contentViews) {
-        progressViews.Add(new ProgressView((Control)contentView, progress));
+        progressViews.Add(new ProgressView(contentView, progress));
       }
 
@@ -379 +379 @@
     /// Adds a <see cref="ProgressView"/> to the specified view.
     /// </summary>
-    public IProgress AddOperationProgressToView(IView view, string progressMessage) {
+    public IProgress AddOperationProgressToView(Control view, string progressMessage) {
       var progress = new Progress(progressMessage, ProgressState.Started);
       AddOperationProgressToView(view, progress);
@@ -385 +385 @@
     }
 
-    public void AddOperationProgressToView(IView view, IProgress progress) {
+    public void AddOperationProgressToView(Control view, IProgress progress) {
       if (view == null) throw new ArgumentNullException("view", "The view must not be null.");
       if (progress == null) throw new ArgumentNullException("progress", "The progress must not be null.");
 
-      var control = view as Control;
-      if (control == null) throw new ArgumentException("The passed view must be a control.", "view");
+     if (view == null) throw new ArgumentException("The passed view must be a control.", "view");
 
       IProgress oldProgress;
@@ -401 +400 @@
       }
 
-      progressViews.Add(new ProgressView(control, progress));
+      progressViews.Add(new ProgressView(view, progress));
       viewProgressLookup[view] = progress;
     }
@@ -424 +423 @@
     /// Removes an existing <see cref="ProgressView"/> from the specified view.
     /// </summary>
-    public void RemoveOperationProgressFromView(IView view, bool finishProgress = true) {
+    public void RemoveOperationProgressFromView(Control view, bool finishProgress = true) {
       IProgress progress;
       if (!viewProgressLookup.TryGetValue(view, out progress))