Changeset 6864

Timestamp:

10/04/11 16:14:02 (13 years ago)

Author:

ascheibe

Message:

#1233 show messageboxes instead of exceptions if the username or password is wrong

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• HeuristicLab.Clients.Hive.Administrator/3.3/HeuristicLab.Clients.Hive.Administrator-3.3.csproj (modified) (1 diff)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/HeuristicLab.Clients.Hive.JobManager-3.3.csproj (modified) (1 diff)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.cs (modified) (3 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administrator/3.3/HeuristicLab.Clients.Hive.Administrator-3.3.csproj

@@ -147 +147 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Forms.DataVisualization" />

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs

@@ -23 +23 @@
 using System.Drawing;
 using System.Linq;
+using System.ServiceModel.Security;
 using System.Threading;
 using System.Threading.Tasks;
@@ -67 +68 @@
       while (!stopProgressTask) {
         int diff = (progressBar.Maximum - progressBar.Minimum) / 10;
-        progressBar.Value = (progressBar.Value + diff) % progressBar.Maximum;
+
+        if (progressBar.InvokeRequired) {
+          progressBar.Invoke(new Action(delegate() { progressBar.Value = (progressBar.Value + diff) % progressBar.Maximum; }));
+        } else {
+          progressBar.Value = (progressBar.Value + diff) % progressBar.Maximum;
+        }
+
         //ok, this is not very clever...
         Thread.Sleep(500);
       }
-      progressBar.Value = progressBar.Minimum;
+      if (progressBar.InvokeRequired) {
+        progressBar.Invoke(new Action(delegate() { progressBar.Value = progressBar.Minimum; }));
+      } else {
+        progressBar.Value = progressBar.Minimum;
+      }
     }
 
@@ -339 +350 @@
       }
 
-      HiveAdminClient.Instance.Refresh();
-      Content = HiveAdminClient.Instance.Resources;
+      try {
+        HiveAdminClient.Instance.Refresh();
+        Content = HiveAdminClient.Instance.Resources;
+      }
+      catch (MessageSecurityException) {
+        MessageBox.Show("A Message Security error has occured. This normally means that your user name or password is wrong.", "HeuristicLab Hive Administrator", MessageBoxButtons.OK, MessageBoxIcon.Error);
+      }
     }
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.JobManager/3.3/HeuristicLab.Clients.Hive.JobManager-3.3.csproj

@@ -145 +145 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Forms.DataVisualization" />

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.cs

@@ -22 +22 @@
 using System;
 using System.Linq;
+using System.ServiceModel.Security;
 using System.Windows.Forms;
 using HeuristicLab.Collections;
@@ -70 +71 @@
         hiveExperimentListView.Content = Content.Jobs;
         if (Content != null)
-          Content.RefreshAsync(new Action<Exception>((Exception ex) => ErrorHandling.ShowErrorDialog(this, "Refresh failed.", ex)));
+          Content.RefreshAsync(new Action<Exception>((Exception ex) => HandleServiceException(ex)));
       }
     }
@@ -101 +102 @@
 
     private void refreshButton_Click(object sender, EventArgs e) {
-      Content.RefreshAsync(new Action<Exception>((Exception ex) => ErrorHandling.ShowErrorDialog(this, "Refresh failed.", ex)));
+      Content.RefreshAsync(new Action<Exception>((Exception ex) => HandleServiceException(ex)));
+    }
+
+    private void HandleServiceException(Exception ex) {
+      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 Administrator", MessageBoxButtons.OK, MessageBoxIcon.Error);
+      } else {
+        ErrorHandling.ShowErrorDialog(this, "Refresh failed.", ex);
+      }
     }