Changeset 2591 for trunk/sources/HeuristicLab.SimOpt

Timestamp:

01/05/10 10:31:40 (14 years ago)

Author:

gkronber

Message:

Copied refactored plugin infrastructure from branch and merged changeset r2586:2589 from branch into the trunk. #799

Location:

trunk/sources/HeuristicLab.SimOpt/3.2

Files:

• HeuristicLabSimOptPlugin.cs (modified) (1 diff)
• SimOptProblemInjectorView.cs (modified) (1 diff)

trunk/sources/HeuristicLab.SimOpt/3.2/HeuristicLabSimOptPlugin.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.SimOpt {
-  [ClassInfo(Name = "HeuristicLab.SimOpt-3.2")]
-  [PluginFile(Filename = "HeuristicLab.SimOpt-3.2.dll", Filetype = PluginFileType.Assembly)]
-  [Dependency(Dependency = "HeuristicLab.Core-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Data-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Operators-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Constraints-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Evolutionary-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Selection-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Random-3.2")]
+  [Plugin("HeuristicLab.SimOpt-3.2")]
+  [PluginFile("HeuristicLab.SimOpt-3.2.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.Core-3.2")]
+  [PluginDependency("HeuristicLab.Data-3.2")]
+  [PluginDependency("HeuristicLab.Operators-3.2")]
+  [PluginDependency("HeuristicLab.Constraints-3.2")]
+  [PluginDependency("HeuristicLab.Evolutionary-3.2")]
+  [PluginDependency("HeuristicLab.Selection-3.2")]
+  [PluginDependency("HeuristicLab.Random-3.2")]
   public class HeuristicLabSimOptPlugin : PluginBase {
   }

trunk/sources/HeuristicLab.SimOpt/3.2/SimOptProblemInjectorView.cs

@@ -71 +71 @@
     private void UpdateDataTypeTreeView() {
       dataTypeTreeView.Nodes.Clear();
-      DiscoveryService discoveryService = new DiscoveryService();
-      foreach (PluginInfo plugin in discoveryService.Plugins) {
+      foreach (IPluginDescription plugin in ApplicationManager.Manager.Plugins) {
         TreeNode pluginNode = new TreeNode(plugin.Name);
         pluginNode.Tag = null;
 
-        Type[] types = discoveryService.GetTypes(typeof(IObjectData), plugin);
-        foreach (Type type in types) {
+        foreach (Type type in ApplicationManager.Manager.GetTypes(typeof(IObjectData), plugin)) {
           if (!type.IsAbstract) {
             TreeNode itemNode = new TreeNode();