Changeset 2591 for trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2

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.MainForm.WindowsForms/3.2

Files:

• HeuristicLabMainFormWindowsFormsPlugin.cs (modified) (1 diff)
• MainFormBase.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/HeuristicLabMainFormWindowsFormsPlugin.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.MainForm.WindowsForms {
-  [ClassInfo(Name = "HeuristicLab.MainForm.WindowsForms-3.2")]
-  [PluginFile(Filename = "HeuristicLab.MainForm.WindowsForms-3.2.dll", Filetype = PluginFileType.Assembly)]
-  [PluginFile(Filename = "WeifenLuo.WinFormsUI.Docking.dll", Filetype = PluginFileType.Assembly)]
-  [Dependency(Dependency = "HeuristicLab.MainForm-3.2")]
+  [Plugin("HeuristicLab.MainForm.WindowsForms-3.2")]
+  [PluginFile("HeuristicLab.MainForm.WindowsForms-3.2.dll", PluginFileType.Assembly)]
+  [PluginFile("WeifenLuo.WinFormsUI.Docking.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.MainForm-3.2")]
   public class HeuristicLabMainFormTestPlugin : PluginBase {
   }

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/MainFormBase.cs

@@ -269 +269 @@
 
     #region create menu and toolbar
-    protected virtual void CreateGUI() {
-      DiscoveryService ds = new DiscoveryService();
-
-      object[] items = ds.GetInstances(userInterfaceItemType);
+    protected virtual void CreateGUI() {      
+
       IEnumerable<IMenuItem> toolStripMenuItems =
-        from mi in items
+        from mi in ApplicationManager.Manager.GetInstances(userInterfaceItemType)
         where mi is IMenuItem
         orderby ((IMenuItem)mi).Position
@@ -281 +279 @@
         AddToolStripMenuItem(menuItem);
 
-      items = ds.GetInstances(userInterfaceItemType);
       IEnumerable<IToolBarItem> toolStripButtonItems =
-        from bi in items
+        from bi in ApplicationManager.Manager.GetInstances(userInterfaceItemType)
         where bi is IToolBarItem
         orderby ((IToolBarItem)bi).Position