Changeset 3710 for trunk/sources/HeuristicLab.PluginInfrastructure

Timestamp:

05/07/10 21:10:46 (14 years ago)

Author:

gkronber

Message:

Implemented reviewer comments. #893 (HeuristicLab 3.3.0 application review)

File:

• trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/UploadPluginsView.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/UploadPluginsView.cs

@@ -118 +118 @@
       var selectedPlugins = (IEnumerable<IPluginDescription>)e.Argument;
       DeploymentService.AdminClient adminClient = DeploymentService.AdminClientFactory.CreateClient();
+      Dictionary<IPluginDescription, DeploymentService.PluginDescription> cachedPluginDescriptions =
+        new Dictionary<IPluginDescription, DeploymentService.PluginDescription>();
       try {
         foreach (var plugin in IteratePlugins(selectedPlugins)) {
-          adminClient.DeployPlugin(MakePluginDescription(plugin), CreateZipPackage(plugin));
+          adminClient.DeployPlugin(MakePluginDescription(plugin, cachedPluginDescriptions), CreateZipPackage(plugin));
         }
         adminClient.Close();
@@ -227 +229 @@
         var matchingLocalPlugin = (from localPlugin in localAndServerPlugins.Keys
                                    where localPlugin.Name == plugin.Name
-                                   where localPlugin.Version == localPlugin.Version
+                                   where localPlugin.Version == plugin.Version
                                    select localPlugin).SingleOrDefault();
         if (matchingLocalPlugin != null) {
@@ -296 +298 @@
     }
 
-    private DeploymentService.PluginDescription MakePluginDescription(IPluginDescription plugin) {
-      var dependencies = from dep in plugin.Dependencies
-                         select MakePluginDescription(dep);
-      return new DeploymentService.PluginDescription(plugin.Name, plugin.Version, dependencies, plugin.ContactName, plugin.ContactEmail, plugin.LicenseText);
+    private DeploymentService.PluginDescription MakePluginDescription(IPluginDescription plugin, Dictionary<IPluginDescription, DeploymentService.PluginDescription> cachedPluginDescriptions) {
+      if (!cachedPluginDescriptions.ContainsKey(plugin)) {
+        var dependencies = (from dep in plugin.Dependencies
+                            select MakePluginDescription(dep, cachedPluginDescriptions))
+                           .ToList();
+        cachedPluginDescriptions.Add(plugin,
+          new DeploymentService.PluginDescription(plugin.Name, plugin.Version, dependencies, plugin.ContactName, plugin.ContactEmail, plugin.LicenseText));
+      }
+      return cachedPluginDescriptions[plugin];
     }
     #endregion