Changeset 7256 for trunk/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views

Timestamp:

01/02/12 15:32:40 (13 years ago)

Author:

ascheibe

Message:

#1725

• moved Hive resources to HL common resources
• added missing invokes and usings for displaying the hive information dialog

File:

• trunk/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs

@@ -51 +51 @@
     public ResourcesView() {
       InitializeComponent();
-      treeSlaveGroup.ImageList.Images.Add(HiveImageLibrary.Slave);
-      treeSlaveGroup.ImageList.Images.Add(HiveImageLibrary.SlaveGroup);
+      treeSlaveGroup.ImageList.Images.Add(HeuristicLab.Common.Resources.VSImageLibrary.MonitorLarge);
+      treeSlaveGroup.ImageList.Images.Add(HeuristicLab.Common.Resources.VSImageLibrary.NetworkCenterLarge);
 
       HiveAdminClient.Instance.Refreshing += new EventHandler(Instance_Refreshing);
@@ -346 +346 @@
 
     void ResetView() {
-      treeSlaveGroup.Nodes.Clear();
-
-      if (slaveView.Content != null && slaveView.Content is SlaveGroup) {
-        slaveView.Content.PropertyChanged -= new System.ComponentModel.PropertyChangedEventHandler(SlaveViewContent_PropertyChanged);
-      }
-      slaveView.Content = null;
-      if (scheduleView.Content != null) {
-        scheduleView.Content.Clear();
-      }
-      HiveAdminClient.Instance.ResetDowntime();
+      if (this.InvokeRequired) {
+        Invoke(new Action(ResetView));
+      } else {
+        treeSlaveGroup.Nodes.Clear();
+
+        if (slaveView.Content != null && slaveView.Content is SlaveGroup) {
+          slaveView.Content.PropertyChanged -= new System.ComponentModel.PropertyChangedEventHandler(SlaveViewContent_PropertyChanged);
+        }
+        slaveView.Content = null;
+        if (scheduleView.Content != null) {
+          scheduleView.Content.Clear();
+        }
+        HiveAdminClient.Instance.ResetDowntime();
+      }
     }
 
     private void UpdateResources() {
-      if (this.InvokeRequired) {
-        this.Invoke(new Action(ResetView));
-      } else {
-        ResetView();
-      }
+      ResetView();
 
       try {
@@ -370 +370 @@
       }
       catch (MessageSecurityException) {
+        ShowMessageSecurityException();
+      }
+      catch (AnonymousUserException) {
+        ShowHiveInformationDialog();
+      }
+    }
+
+    private void ShowMessageSecurityException() {
+      if (this.InvokeRequired) {
+        Invoke(new Action(ShowMessageSecurityException));
+      } else {
         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);
       }
-      catch (AnonymousUserException) {
-        HiveInformationDialog dialog = new HiveInformationDialog();
-        dialog.ShowDialog(this);
+    }
+
+    private void ShowHiveInformationDialog() {
+      if (this.InvokeRequired) {
+        Invoke(new Action(ShowHiveInformationDialog));
+      } else {
+        using (HiveInformationDialog dialog = new HiveInformationDialog()) {
+          dialog.ShowDialog(this);
+        }
       }
     }