Changeset 2591 for trunk/sources/HeuristicLab.OptimizationFrontend/3.2/MainForm.cs

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

File:

• trunk/sources/HeuristicLab.OptimizationFrontend/3.2/MainForm.cs (modified) (5 diffs)

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();
         }