Changeset 7424

Timestamp:

01/27/12 16:58:29 (13 years ago)

Author:

spimming

Message:

#1680:

• ErrorProvider added to form
• Implemented Validation methods for controls
• Check Validation methods for controls in form when btn is clicked

Location:

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3

Files:

• Azure/AzureProvider.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.CloudManager-3.3.csproj (modified) (1 diff)
• Validation.cs (added)
• Views/AddAzureServiceDialog.Designer.cs (modified) (7 diffs)
• Views/AddAzureServiceDialog.cs (modified) (4 diffs)

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3/Azure/AzureProvider.cs

@@ -67 +67 @@
       foreach (HostedService serv in services) {
         serv.Subscription = subscription;
-        foreach (Deployment dep in serv.Deployments) {
-          dep.Subscription = subscription;
+        if (serv.Deployments != null) {
+          foreach (Deployment dep in serv.Deployments) {
+            dep.Subscription = subscription;
+          }
         }
       }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3/HeuristicLab.Clients.Hive.CloudManager-3.3.csproj

@@ -76 +76 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <Compile Include="Validation.cs" />
     <Compile Include="Views\AddAzureServiceDialog.cs">
       <SubType>Form</SubType>

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

@@ -24 +24 @@
     /// </summary>
     private void InitializeComponent() {
+      this.components = new System.ComponentModel.Container();
       this.label1 = new System.Windows.Forms.Label();
       this.cmbChooseSubscription = new System.Windows.Forms.ComboBox();
@@ -53 +54 @@
       this.btnCancel = new System.Windows.Forms.Button();
       this.lblCertificateFile = new System.Windows.Forms.Label();
+      this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
       this.gbNewHostedService.SuspendLayout();
       this.panelDeploymentOptions.SuspendLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.SuspendLayout();
       // 
@@ -171 +174 @@
       this.tbServiceName.Size = new System.Drawing.Size(377, 20);
       this.tbServiceName.TabIndex = 3;
+      this.tbServiceName.Validating += new System.ComponentModel.CancelEventHandler(this.tbServiceName_Validating);
       // 
       // label4
@@ -187 +191 @@
       this.tbLabel.Size = new System.Drawing.Size(453, 20);
       this.tbLabel.TabIndex = 1;
+      this.tbLabel.Validating += new System.ComponentModel.CancelEventHandler(this.tbLabel_Validating);
       // 
       // label3
@@ -330 +335 @@
       this.lblCertificateFile.TabIndex = 19;
       // 
+      // errorProvider
+      // 
+      this.errorProvider.ContainerControl = this;
+      // 
       // AddAzureServiceDialog
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.AutoValidate = System.Windows.Forms.AutoValidate.EnableAllowFocusChange;
       this.ClientSize = new System.Drawing.Size(496, 436);
       this.Controls.Add(this.lblCertificateFile);
@@ -358 +368 @@
       this.panelDeploymentOptions.ResumeLayout(false);
       this.panelDeploymentOptions.PerformLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -394 +405 @@
     private System.Windows.Forms.Button btnCancel;
     private System.Windows.Forms.Label lblCertificateFile;
+    private System.Windows.Forms.ErrorProvider errorProvider;
   }
 }

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

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using HeuristicLab.Clients.Hive.CloudManager.Azure;
@@ -108 +109 @@
           }
       }
-    }
-
-    private bool ValidateInput() {
-      bool valid = true;
-      // TODO: input validation
-      // see http://stackoverflow.com/questions/769184/winform-ui-validation
-      return valid;
     }
 
@@ -166 +160 @@
       if (cmbChooseSubscription.SelectedItem != null) {
         Subscription sub = (Subscription)cmbChooseSubscription.SelectedItem;
-        if (ValidateInput()) {
+        // the controls collection can be the whole form or just a panel or group
+        if (Validation.hasValidationErrors(this.Controls)) {
+          return;
+        } else {
           bool newHostedServiceChecked = cbNewHostedService.Checked;
           bool regionChecked = rbRegion.Checked;
@@ -301 +298 @@
       }
     }
+
+    private void tbServiceName_Validating(object sender, CancelEventArgs e) {
+      if (cbNewHostedService.Checked) {
+        string url = tbServiceName.Text.Trim();
+        if (url == String.Empty) {
+          errorProvider.SetError(tbServiceName, "A URL is required for the hosted service.");
+          e.Cancel = true;
+        } else if (!isValidHostedServiceUrl(url)) {
+          errorProvider.SetError(tbLabel, "A hosted service name must be between 1 and 63 " +
+                                          "characters long, and be composed of letters, numbers " +
+                                          "and hyphens. Hyphens shouldn't be first or last letter.");
+          e.Cancel = true;
+        } else {
+          errorProvider.SetError(tbServiceName, "");
+        }
+      }
+    }
+
+    private void tbLabel_Validating(object sender, CancelEventArgs e) {
+      if (cbNewHostedService.Checked) {
+        if (tbLabel.Text.Trim() == String.Empty) {
+          errorProvider.SetError(tbLabel, "A name is required for the hosted service.");
+          e.Cancel = true;
+        } else {
+          errorProvider.SetError(tbLabel, "");
+        }
+      }
+    }
+
+    private bool isValidHostedServiceUrl(string url) {
+      string regexString = @"[a-zA-Z0-9]+[a-zA-Z0-9-]{0,61}[a-zA-Z0-9]+";  //TODO
+      Regex regex = new Regex(regexString);
+      if (regex.IsMatch(url)) {
+        return true;
+      } else {
+        return false;
+      }
+    }
   }
 }