Changeset 7357

Timestamp:

01/18/12 11:51:08 (13 years ago)

Author:

spimming

Message:

#1680:

• removed unnecessary invoke-calls
• moved method call to disable controls out of the worker

File:

• branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3/Views/AddAzureServiceDialog.cs (modified) (11 diffs)

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3/Views/AddAzureServiceDialog.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Diagnostics;
 using System.Windows.Forms;
 using HeuristicLab.Clients.Hive.CloudManager.Model;
@@ -23 +22 @@
       InitializeComponent();
       isInitializing = true;
+      bwCompleted = true;
 
       this.subscriptions = new BindingList<Subscription>(subs);
@@ -49 +49 @@
     protected override void OnFormClosing(FormClosingEventArgs e) {
       if (!bwCompleted) {
-        worker.CancelAsync();
-        this.Enabled = false;
+        SetAllControlsEnabled(this, false);
         e.Cancel = true;
         closePending = true;
@@ -71 +70 @@
       foreach (Control ctrl in frm.Controls) {
         if (!(ctrl is ProgressBar)) {
-          this.Invoke((MethodInvoker)delegate { ctrl.Enabled = isEnabled; });
+          ctrl.Enabled = isEnabled;
         }
       }
@@ -104 +103 @@
         // checked == false
         SetGroupBoxControlsEnabled(gbNewHostedService, false);
-        if (hostedServices == null) {
+        if (hostedServices.Count == 0) {
           cbNewHostedService.Checked = true;
         }
@@ -114 +113 @@
         Subscription item = (Subscription)cmbChooseSubscription.SelectedItem;
         if (item != null) {
+          bwCompleted = false;
           progressBar.Visible = true;
+          SetAllControlsEnabled(this, false);
           worker.RunWorkerAsync(item);
         }
@@ -123 +124 @@
       using (var form = new AddCertificate()) {
         form.ShowDialog();
-        Debug.WriteLine("End - AddCertificateDialog");
       }
     }
@@ -144 +144 @@
           }
         }
-
       }
     }
@@ -150 +149 @@
     private void UpdateTask(object sender, DoWorkEventArgs e) {
       try {
-        SetAllControlsEnabled(this, false);
-
         Subscription item = (Subscription)e.Argument;
         item = CloudManagerClient.Instance.AzureProvider.GetSubscriptionInfo(item.SubscriptionID, item.CertificateThumbprint);
@@ -163 +160 @@
         this.Invoke((MethodInvoker)delegate { UpdateBindingList<string>(locations, locs); });
         this.Invoke((MethodInvoker)delegate { UpdateBindingList<AffinityGroup>(affinityGroups, groups); });
-
-        SetAllControlsEnabled(this, true);
       }
       catch (Exception ex) {
@@ -172 +167 @@
 
     private void WorkerCompleted(object sender, RunWorkerCompletedEventArgs e) {
-      this.Invoke((MethodInvoker)delegate { progressBar.Visible = false; });
+      SetAllControlsEnabled(this, true);
+      progressBar.Visible = false;
       bwCompleted = true;
       if (closePending) {