Changeset 6377 for branches/GP.Grammar.Editor/HeuristicLab.PluginInfrastructure/3.3/Manager

Timestamp:

06/07/11 12:49:03 (14 years ago)

Author:

mkommend

Message:

#1479: Merged trunk changes into branch.

File:

• branches/GP.Grammar.Editor/HeuristicLab.PluginInfrastructure/3.3/Manager/PluginValidator.cs (modified) (1 diff)

branches/GP.Grammar.Editor/HeuristicLab.PluginInfrastructure/3.3/Manager/PluginValidator.cs

@@ -406 +406 @@
     // and sets the dependencies in the plugin descriptions
     private void BuildDependencyTree(IEnumerable<PluginDescription> pluginDescriptions) {
-      foreach (var desc in pluginDescriptions) {
+      foreach (var desc in pluginDescriptions.Where(x => x.PluginState != PluginState.Disabled)) {
         var missingDependencies = new List<PluginDependency>();
         foreach (var dependency in pluginDependencies[desc]) {
           var matchingDescriptions = from availablePlugin in pluginDescriptions
+                                     where availablePlugin.PluginState != PluginState.Disabled
                                      where availablePlugin.Name == dependency.Name
                                      where IsCompatiblePluginVersion(availablePlugin.Version, dependency.Version)