Changeset 12644

Timestamp:

07/07/15 13:54:27 (9 years ago)

Author:

ascheibe

Message:

#2409 simplified IProgrammableItem discovery

File:

• trunk/sources/HeuristicLab.Clients.Hive/3.3/Util/PluginUtil.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Clients.Hive/3.3/Util/PluginUtil.cs

@@ -26 +26 @@
 using System.Security.Cryptography;
 using System.ServiceModel;
-using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.PluginInfrastructure;
@@ -41 +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);
@@ -95 +95 @@
 
     public static List<IPluginDescription> GetPluginsForTask(IEnumerable<Type> usedTypes, object task) {
-      if (task.GetObjectGraphObjects().Any(x => typeof(IProgrammableItem).IsInstanceOfType(x))) {
+      if (usedTypes.Any(x => x.GetInterfaces().Any(y => y == typeof(IProgrammableItem)))) {
         //when a programmable item is used all plugins that are currently loaded need to be sent to Hive
         return ApplicationManager.Manager.Plugins.ToList();