Changeset 14029 for branches/crossvalidation-2434/HeuristicLab.Clients.Hive.JobManager

Timestamp:

07/08/16 14:40:02 (8 years ago)

Author:

gkronber

Message:

#2434: merged trunk changes r12934:14026 from trunk to branch

Location:

branches/crossvalidation-2434

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive.JobManager/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Clients.Hive.JobManager/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.cs (modified) (2 diffs)

branches/crossvalidation-2434/HeuristicLab.Clients.Hive.JobManager/3.3/Plugin.cs.frame

@@ -23 +23 @@
 
 namespace HeuristicLab.Clients.Hive.JobManager {
-  [Plugin("HeuristicLab.Clients.Hive.JobManager", "3.3.12.$WCREV$")]
+  [Plugin("HeuristicLab.Clients.Hive.JobManager", "3.3.13.$WCREV$")]
   [PluginFile("HeuristicLab.Clients.Hive.JobManager-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Clients.Hive", "3.3")]

branches/crossvalidation-2434/HeuristicLab.Clients.Hive.JobManager/3.3/Properties/AssemblyInfo.cs.frame

@@ -55 +55 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.12.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.13.$WCREV$")]

branches/crossvalidation-2434/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.cs

@@ -107 +107 @@
       } else {
         if (ex is MessageSecurityException) {
-          MessageBox.Show("A Message Security error has occured. This normally means that your user name or password is wrong.", "HeuristicLab Hive Job Manager", MessageBoxButtons.OK, MessageBoxIcon.Error);
+          string message =
+            "A Message Security error has occured. This normally means that your user name or password is wrong. Detailed information: " + Environment.NewLine;
+          message += HiveServiceLocator.Instance.GetEndpointInformation();
+          ErrorHandling.ShowErrorDialog(this, message, ex);
         } else if (ex is AnonymousUserException) {
           using (HiveInformationDialog dialog = new HiveInformationDialog()) {
@@ -113 +116 @@
           }
         } else {
-          ErrorHandling.ShowErrorDialog(this, "Refresh failed.", ex);
+          ErrorHandling.ShowErrorDialog(this,
+            "Refresh failed. Detailed information: " + Environment.NewLine + HiveServiceLocator.Instance.GetEndpointInformation(), ex);
         }
       }