Changeset 12689 for branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/Util

Timestamp:

07/08/15 15:32:12 (9 years ago)

Author:

dglaser

Message:

#2388: Merged trunk into HiveStatistics branch

Location:

branches/HiveStatistics/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive/3.3/Util/PluginUtil.cs (modified) (6 diffs)

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/Util/PluginUtil.cs

@@ -26 +26 @@
 using System.Security.Cryptography;
 using System.ServiceModel;
+using HeuristicLab.Core;
 using HeuristicLab.PluginInfrastructure;
 
@@ -39 +40 @@
     /// <param name="neededPlugins">List of plugins which need to be uploaded</param>
     /// <returns></returns>
-    public static List<Guid> GetPluginDependencies(IHiveService service, List<Plugin> onlinePlugins, List<Plugin> alreadyUploadedPlugins, IEnumerable<IPluginDescription> neededPlugins) {
+    public static List<Guid> GetPluginDependencies(IHiveService service, List<Plugin> onlinePlugins, List<Plugin> alreadyUploadedPlugins,
+                                                   IEnumerable<IPluginDescription> neededPlugins) {
       var pluginIds = new List<Guid>();
       Dictionary<IPluginDescription, byte[]> checksumsNeededPlugins = CalcChecksumsForPlugins(neededPlugins);
@@ -61 +63 @@
               alreadyUploadedPlugins.Add(p);
               pluginIds.Add(p.Id);
-            }
-            catch (FaultException<PluginAlreadyExistsFault> fault) {
+            } catch (FaultException<PluginAlreadyExistsFault> fault) {
               onlinePlugins.Add(service.GetPlugin(fault.Detail.Id));
             }
@@ -79 +80 @@
     }
 
-    public static Plugin CreatePlugin(IPluginDescription plugin) {
-      return new Plugin() { Name = plugin.Name, Version = plugin.Version };
-    }
-
     public static List<PluginData> CreatePluginDatas(IPluginDescription plugin) {
       List<PluginData> pluginDatas = new List<PluginData>();
@@ -96 +93 @@
     }
 
-    public static void CollectDeclaringPlugins(List<IPluginDescription> plugins, IEnumerable<Type> usedTypes) {
+    public static List<IPluginDescription> GetPluginsForTask(IEnumerable<Type> usedTypes, object task) {
+      if (usedTypes.Any(x => typeof(IProgrammableItem).IsAssignableFrom(x))) {
+        //when a programmable item is used all plugins that are currently loaded need to be sent to Hive
+        return ApplicationManager.Manager.Plugins.ToList();
+      } else {
+        return CollectDeclaringPlugins(usedTypes);
+      }
+    }
+
+    private static List<IPluginDescription> CollectDeclaringPlugins(IEnumerable<Type> usedTypes) {
+      List<IPluginDescription> plugins = new List<IPluginDescription>();
       foreach (Type type in usedTypes) {
         var plugin = ApplicationManager.Manager.GetDeclaringPlugin(type);
@@ -104 +111 @@
         }
       }
+      return plugins;
     }
 
-    public static void CollectPluginDependencies(List<IPluginDescription> plugins, IPluginDescription plugin) {
+    private static void CollectPluginDependencies(List<IPluginDescription> plugins, IPluginDescription plugin) {
       if (plugin == null) return;
       foreach (var dependency in plugin.Dependencies) {