Changeset 7433 for branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3/Model

Timestamp:

01/31/12 15:25:18 (13 years ago)

Author:

spimming

Message:

#1680:

• If CloudManagerClient contains hostedservice, merge them in add-method
• Merge methods added deployment and hostedservice
• Update/merge treeview in CloudResourceView
• Indicate a change of the trackbar (DeploymentView)

Location:

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

Files:

• Deployment.cs (modified) (1 diff)
• HostedService.cs (modified) (2 diffs)

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3/Model/Deployment.cs

@@ -99 +99 @@
       //this.Modified = deployment.Modified;
       //this.NewInstanceCount = deployment.NewInstanceCount;
+
+      if (!this.Modified) {
+        this.Modified = deployment.Modified;
+        this.NewInstanceCount = deployment.NewInstanceCount;
+      }
     }
   }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3/Model/HostedService.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
 using HeuristicLab.Common;
@@ -61 +62 @@
       return new HostedService(this, cloner);
     }
+
+    public void Merge(HostedService hostedService) {
+      if (!this.Equals(hostedService)) {
+        throw new ArgumentException("Objects must be equal to be merged.", "subscription");
+      }
+      this.ServiceName = hostedService.ServiceName;
+      this.Url = hostedService.Url;
+      this.Subscription = hostedService.Subscription;
+      this.HostedServiceProperties = hostedService.HostedServiceProperties;
+
+      foreach (Deployment dep in hostedService.Deployments) {
+        int idx = this.Deployments.IndexOf(dep);
+        if (idx != -1) {
+          this.Deployments[idx].Merge(dep);
+        } else {
+          this.Deployments.Add(dep);
+        }
+      }
+
+      foreach (Deployment dep in this.Deployments) {
+        int idx = hostedService.Deployments.IndexOf(dep);
+        if (idx == -1) {
+          this.Deployments.Remove(dep);
+        }
+      }
+    }
   }
 }