Changeset 2591 for trunk/sources/HeuristicLab.OptimizationFrontend

Timestamp:

01/05/10 10:31:40 (15 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.OptimizationFrontend/3.2

Files:

• AvailableOperatorsForm.cs (modified) (1 diff)
• HeuristicLab.OptimizationFrontend-3.2.csproj (modified) (2 diffs)
• HeuristicLabOptimizationFrontendApplication.cs (modified) (1 diff)
• HeuristicLabOptimizationFrontendPlugin.cs (modified) (1 diff)
• MainForm.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.OptimizationFrontend/3.2/AvailableOperatorsForm.cs

@@ -56 +56 @@
       builtinOperatorsTreeView.TreeViewNodeSorter = nodeSorter;
 
-      DiscoveryService discoveryService = new DiscoveryService();
-      PluginInfo[] plugins = discoveryService.Plugins;
-      foreach(PluginInfo plugin in plugins) {
+      foreach(IPluginDescription plugin in ApplicationManager.Manager.Plugins) {
         TreeNode pluginItem = new TreeNode();
         pluginItem.Text = plugin.Name;
         pluginItem.Tag = plugin;
 
-        Type[] operators = discoveryService.GetTypes(typeof(IOperator), plugin);
-        foreach(Type type in operators) {
+        foreach(Type type in ApplicationManager.Manager.GetTypes(typeof(IOperator), plugin)) {
           if(!type.IsAbstract) {
             TreeNode operatorItem = new TreeNode();

trunk/sources/HeuristicLab.OptimizationFrontend/3.2/HeuristicLab.OptimizationFrontend-3.2.csproj

@@ -11 +11 @@
     <RootNamespace>HeuristicLab.OptimizationFrontend</RootNamespace>
     <AssemblyName>HeuristicLab.OptimizationFrontend-3.2</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
@@ -70 +70 @@
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />

trunk/sources/HeuristicLab.OptimizationFrontend/3.2/HeuristicLabOptimizationFrontendApplication.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.OptimizationFrontend {
-  [ClassInfo(Name = "HeuristicLab 3.2", Description="Next generation heuristic optimization environment.")]
+  [Application("HeuristicLab 3.2", "Next generation heuristic optimization environment.")]
   class HeuristicLabOptimizationFrontendApplication : ApplicationBase {
     public override void Run() {
       Form mainForm = new MainForm();
-      PluginManager.ControlManager = (IControlManager)mainForm;
+      ControlManager.RegisterManager((IControlManager)mainForm);
       Application.Run(mainForm);
     }

trunk/sources/HeuristicLab.OptimizationFrontend/3.2/HeuristicLabOptimizationFrontendPlugin.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.OptimizationFrontend {
-  [ClassInfo(Name = "HeuristicLab.OptimizationFrontend-3.2")]
-  [PluginFile(Filename = "HeuristicLab.OptimizationFrontend-3.2.dll", Filetype = PluginFileType.Assembly)]
-  [Dependency(Dependency = "HeuristicLab.Core-3.2")]
+  [Plugin("HeuristicLab.OptimizationFrontend-3.2")]
+  [PluginFile("HeuristicLab.OptimizationFrontend-3.2.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.Core-3.2")]
   public class HeuristicLabOptimizationFrontendPlugin : PluginBase {
   }

trunk/sources/HeuristicLab.OptimizationFrontend/3.2/MainForm.cs

@@ -26 +26 @@
 using System.Drawing;
 using System.Text;
+using System.Linq;
 using System.Threading;
 using System.Windows.Forms;
@@ -58 +59 @@
       runningTasks = 0;
 
-      DiscoveryService discoveryService = new DiscoveryService();
-
       // discover creatable items
-      Type[] creatables = discoveryService.GetTypes(typeof(IEditable));
-      string[] names = new string[creatables.Length];
-      for (int i = 0; i < creatables.Length; i++)
-        names[i] = creatables[i].Name;
-      Array.Sort(names, creatables);
+      IEnumerable<Type> creatables = from x in ApplicationManager.Manager.GetTypes(typeof(IEditable))
+                                     orderby x.Name
+                                     select x;
       foreach (Type type in creatables) {
         if (!type.IsAbstract) {
@@ -84 +81 @@
 
     #region IControlManager Members
-    public void ShowControl(IControl control) {
-      if (InvokeRequired) Invoke((Action<IControl>)ShowControl, control);
+    public void ShowControl(object control) {
+      if (InvokeRequired) Invoke((Action<object>)ShowControl, control);
       else {
         if (control is IEditor) {
@@ -176 +173 @@
         else {
           editor.Filename = task.filename;
-          PluginManager.ControlManager.ShowControl(editor);
+          ControlManager.Manager.ShowControl(editor);
         }
         lock (locker) {
@@ -239 +236 @@
           MessageBox.Show("The selected item doesn't provide an editor.", "Editor Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
         } else {
-          PluginManager.ControlManager.ShowControl(editor);
+          ControlManager.Manager.ShowControl(editor);
           EnableDisableItems();
         }