Changeset 13338 for branches/RefactorPluginInfrastructure-2522/HeuristicLab.Common

Timestamp:

11/23/15 16:14:30 (9 years ago)

Author:

gkronber

Message:

#2522:

• moved UI components out of HeuristicLab.PluginInfrastructure -> HeuristicLab.PluginInfrastructure.UI
• moved ErrorDialog to HeuristicLab.MainForm.WindowsForms
• moved ErrorHandling (for building an error message string) to HeuristicLab.Common
• Changed exception handlers in Views to use MainForm.ShowError()
• Changed usages for ErrorDialog in non-UI components to throw exceptions instead.

Location:

branches/RefactorPluginInfrastructure-2522/HeuristicLab.Common/3.3

Files:

• ErrorHandling.cs (moved) (moved from branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/ErrorHandling/ErrorHandling.cs) (3 diffs)
• HeuristicLab.Common-3.3.csproj (modified) (1 diff)

branches/RefactorPluginInfrastructure-2522/HeuristicLab.Common/3.3/ErrorHandling.cs

@@ -21 +21 @@
 
 using System;
-using System.Windows.Forms;
+using HeuristicLab.PluginInfrastructure;
 
-namespace HeuristicLab.PluginInfrastructure {
+namespace HeuristicLab.Common {
   public static class ErrorHandling {
     public static string BuildErrorMessage(Exception exception) {
@@ -29 +29 @@
         return string.Empty;
       } else {
+        var asm = typeof(ErrorHandling).Assembly;
         string message =
-          "HeuristicLab version: " + AssemblyHelpers.GetFileVersion(typeof(ErrorHandling).Assembly) + Environment.NewLine +
+          "HeuristicLab version: " + asm.GetFileVersion() + Environment.NewLine +
           exception.GetType().Name + ": " + exception.Message + Environment.NewLine +
                          exception.StackTrace;
@@ -44 +45 @@
       }
     }
-
-    public static void ShowErrorDialog(Exception exception) {
-      ShowErrorDialog(string.Empty, exception);
-    }
-    public static void ShowErrorDialog(Control owner, Exception exception) {
-      ShowErrorDialog(owner, string.Empty, exception);
-    }
-    public static void ShowErrorDialog(string message, Exception exception) {
-      using (ErrorDialog dialog = new ErrorDialog(message, exception)) {
-        dialog.StartPosition = FormStartPosition.CenterScreen;
-        dialog.ShowDialog();
-      }
-    }
-    public static void ShowErrorDialog(Control owner, string message, Exception exception) {
-      if (owner == null) throw new ArgumentNullException("owner");
-      if (owner.InvokeRequired) {
-        owner.Invoke(new Action<Control, string, Exception>(ShowErrorDialog), owner, message, exception);
-      } else {
-        using (ErrorDialog dialog = new ErrorDialog(message, exception)) {
-          dialog.ShowDialog(owner);
-        }
-      }
-    }
   }
 }

branches/RefactorPluginInfrastructure-2522/HeuristicLab.Common/3.3/HeuristicLab.Common-3.3.csproj

@@ -131 +131 @@
     <Compile Include="Constants.cs" />
     <Compile Include="ArrayExtensions.cs" />
+    <Compile Include="ErrorHandling.cs" />
     <Compile Include="ListExtensions.cs" />
     <Compile Include="Point2D.cs" />