Changeset 13338 for branches/RefactorPluginInfrastructure-2522/HeuristicLab.Clients.Access.Views/3.3

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.Clients.Access.Views/3.3

Files:

• ClientViews/ClientRegistrationDialog.cs (modified) (2 diffs)
• UserViews/ChangePasswordDialog.cs (modified) (2 diffs)
• UserViews/LightweightUserGroupSelectionView.cs (modified) (2 diffs)
• UserViews/RefreshableLightweightUserInformationView.cs (modified) (3 diffs)
• UserViews/RefreshableLightweightUserView.cs (modified) (1 diff)

branches/RefactorPluginInfrastructure-2522/HeuristicLab.Clients.Access.Views/3.3/ClientViews/ClientRegistrationDialog.cs

@@ -25 +25 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using HeuristicLab.MainForm;
 
 namespace HeuristicLab.Clients.Access.Views {
@@ -103 +104 @@
           btnCollectInformation.Enabled = true;
           btnCancel.Enabled = true;
-          PluginInfrastructure.ErrorHandling.ShowErrorDialog(task.Exception);
+          MainFormManager.MainForm.ShowError(task.Exception.Message, task.Exception);
         }
       }

branches/RefactorPluginInfrastructure-2522/HeuristicLab.Clients.Access.Views/3.3/UserViews/ChangePasswordDialog.cs

@@ -23 +23 @@
 using System.Windows.Forms;
 using HeuristicLab.Clients.Common;
+using HeuristicLab.MainForm;
 using CcSettings = HeuristicLab.Clients.Common.Properties;
 
@@ -105 +106 @@
       call.BeginInvoke(delegate(IAsyncResult result) {
         Exception ex = call.EndInvoke(result);
-        if (ex != null) PluginInfrastructure.ErrorHandling.ShowErrorDialog(ex);
+        if (ex != null) 
+          MainFormManager.MainForm.ShowError(ex.Message, ex);
       }, null);
     }

branches/RefactorPluginInfrastructure-2522/HeuristicLab.Clients.Access.Views/3.3/UserViews/LightweightUserGroupSelectionView.cs

@@ -23 +23 @@
 using System.Windows.Forms;
 using HeuristicLab.Core;
+using HeuristicLab.MainForm;
 using HeuristicLab.PluginInfrastructure;
 
@@ -47 +48 @@
         AccessClient.Instance.Refreshing += new EventHandler(Instance_Refreshing);
         AccessClient.Instance.Refreshed += new EventHandler(Instance_Refreshed);
-        AccessClient.Instance.RefreshAsync(new Action<Exception>((Exception ex) => ErrorHandling.ShowErrorDialog(this, "Refresh failed.", ex)));
+        AccessClient.Instance.RefreshAsync(new Action<Exception>((Exception ex) => MainFormManager.MainForm.ShowError("Refresh failed.", ex)));
         AccessClient.Instance.Refreshing -= new EventHandler(Instance_Refreshing);
         AccessClient.Instance.Refreshed -= new EventHandler(Instance_Refreshed);

branches/RefactorPluginInfrastructure-2522/HeuristicLab.Clients.Access.Views/3.3/UserViews/RefreshableLightweightUserInformationView.cs

@@ -22 +22 @@
 using System;
 using System.Windows.Forms;
+using HeuristicLab.MainForm;
 
 namespace HeuristicLab.Clients.Access.Views {
@@ -39 +40 @@
 
     protected override void RefreshData() {
-      Content.ExecuteActionAsync(RefreshUserData, PluginInfrastructure.ErrorHandling.ShowErrorDialog);
+      Content.ExecuteActionAsync(RefreshUserData, (ex) => MainFormManager.MainForm.ShowError(ex.Message, ex));
     }
 
@@ -71 +72 @@
       AccessClient.Instance.ExecuteActionAsync(new Action(delegate {
         AccessClient.CallAccessService(x => x.UpdateLightweightUser(UserInformation.Instance.User));
-      }), HeuristicLab.PluginInfrastructure.ErrorHandling.ShowErrorDialog);
+      }), (ex) => MainFormManager.MainForm.ShowError(ex.Message, ex));
     }
   }

branches/RefactorPluginInfrastructure-2522/HeuristicLab.Clients.Access.Views/3.3/UserViews/RefreshableLightweightUserView.cs

@@ -64 +64 @@
       });
 
-      Content.ExecuteActionAsync(completeRefreshAction, new Action<Exception>((Exception ex) => ErrorHandling.ShowErrorDialog(this, "Refresh failed.", ex)));
+      Content.ExecuteActionAsync(completeRefreshAction, new Action<Exception>((Exception ex) => MainFormManager.MainForm.ShowError("Refresh failed.", ex)));
     }