Changeset 11557 for trunk

Timestamp:

11/19/14 14:26:07 (10 years ago)

Author:

ascheibe

Message:

#2158 improved error handling for nested views

Location:

trunk/sources/HeuristicLab.Core.Views/3.3

Files:

• ItemView.cs (modified) (1 diff)
• NestingLevelErrorControl.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Core.Views/3.3/ItemView.cs

@@ -47 +47 @@
 
       if (CountParentControls() > MaximumNestingLevel) {
-        NestingLevelErrorControl errorControl = new NestingLevelErrorControl();
+        //capture content, needed because it is set at a later time
+        NestingLevelErrorControl errorControl = new NestingLevelErrorControl(() => Content, this.GetType());
         errorControl.Dock = DockStyle.Fill;
-        //capture content, needed because it is set at a later time
-        errorControl.Content = () => Content;
 
         Controls.Clear();

trunk/sources/HeuristicLab.Core.Views/3.3/NestingLevelErrorControl.cs

@@ -28 +28 @@
   public partial class NestingLevelErrorControl : UserControl {
     public Func<IContent> Content { get; set; }
+    public Type ViewType { get; set; }
 
     public NestingLevelErrorControl() {
@@ -33 +34 @@
     }
 
+    public NestingLevelErrorControl(Func<IContent> content, Type viewType)
+      : this() {
+      Content = content;
+      ViewType = viewType;
+    }
+
     private void showButton_Click(object sender, System.EventArgs e) {
-      if (Content != null) {
-        if (MainFormManager.MainForm.ShowContent(Content()) == null) {
-          using (TypeSelectorDialog dialog = new TypeSelectorDialog()) {
-            dialog.Caption = "Unable to find view for content. Please choose a appropriate view.";
-            dialog.TypeSelector.Configure(typeof(IContentView), false, false);
-
-            if (dialog.ShowDialog(this) == DialogResult.OK) {
-              MainFormManager.MainForm.ShowContent(Content(), dialog.TypeSelector.SelectedType);
-            }
-          }
-        }
+      if (Content != null && ViewType != null) {
+        MainFormManager.MainForm.ShowContent(Content(), ViewType);
       }
     }