Changeset 13352

Timestamp:

11/24/15 11:53:58 (8 years ago)

Author:

gkronber

Message:

#2522 added overrides for ShowError in IMainForm

Location:

branches/RefactorPluginInfrastructure-2522

Files:

• HeuristicLab.MainForm.WindowsForms/3.3/Dialogs/ErrorDialog.cs (modified) (2 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.3/Interfaces/IMainForm.cs (modified) (1 diff)

branches/RefactorPluginInfrastructure-2522/HeuristicLab.MainForm.WindowsForms/3.3/Dialogs/ErrorDialog.cs

@@ -26 +26 @@
 namespace HeuristicLab.MainForm.WindowsForms {
   public partial class ErrorDialog : Form {
-    public ErrorDialog() {
+    public ErrorDialog() : this(null, null) { }
+    public ErrorDialog(Exception exception) : this(null, exception) { }
+    public ErrorDialog(string message) : this(message, null) { }
+    public ErrorDialog(string message, Exception exception) {
       InitializeComponent();
-      Initialize(null, null);
-    }
-    public ErrorDialog(Exception exception)
-      : this() {
-      Initialize(null, exception);
-    }
-    public ErrorDialog(string message, Exception exception)
-      : this() {
       Initialize(message, exception);
     }
@@ -59 +54 @@
         System.Diagnostics.Process.Start("mailto:" + supportLinkLabel.Text);
         supportLinkLabel.LinkVisited = true;
-      }
-      catch (Exception) { }
+      } catch (Exception) { }
     }
   }

branches/RefactorPluginInfrastructure-2522/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs

@@ -602 +602 @@
 
     #region Error Handling
+    public void ShowError(string message) {
+      ShowErrorDialog(this, message);
+    }
+    public void ShowError(Exception ex) {
+      ShowErrorDialog(this, ex);
+    }
     public void ShowError(string message, Exception exception) {
       ShowErrorDialog(this, message, exception);
+    }
+    private void ShowErrorDialog(Control owner, string message) {
+      if (owner == null) throw new ArgumentNullException("owner");
+      if (owner.InvokeRequired) {
+        owner.Invoke(new Action<Control, string, Exception>(ShowErrorDialog), owner, message);
+      } else {
+        using (ErrorDialog dialog = new ErrorDialog(message)) {
+          dialog.ShowDialog(owner);
+        }
+      }
+    }
+    private void ShowErrorDialog(Control owner, Exception ex) {
+      if (owner == null) throw new ArgumentNullException("owner");
+      if (owner.InvokeRequired) {
+        owner.Invoke(new Action<Control, string, Exception>(ShowErrorDialog), owner, ex);
+      } else {
+        using (ErrorDialog dialog = new ErrorDialog(ex)) {
+          dialog.ShowDialog(owner);
+        }
+      }
     }
     private void ShowErrorDialog(Control owner, string message, Exception exception) {

branches/RefactorPluginInfrastructure-2522/HeuristicLab.MainForm/3.3/Interfaces/IMainForm.cs

@@ -42 +42 @@
     IContentView ShowContent(IContent content, Type viewType);
     void ShowError(string message, Exception e);
+    void ShowError(string message);
+    void ShowError(Exception e);
 
     Type UserInterfaceItemType { get; }