Changeset 2495

Timestamp:

11/16/09 14:25:50 (15 years ago)

Author:

gkronber

Message:

Fixed loading of plugins in correct order as defined by plugin dependencies in AppDomains for applications. (ApplicationManager) #799

Location:

branches/PluginInfrastructure Refactoring

Files:

• HeuristicLab.PluginInfrastructure.Manager/ApplicationManager.cs (modified) (4 diffs)
• HeuristicLab.PluginInfrastructure.Manager/Loader.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/ApplicationManager.cs (modified) (1 diff)
• HeuristicLab/MainForm.cs (modified) (2 diffs)

branches/PluginInfrastructure Refactoring/HeuristicLab.PluginInfrastructure.Manager/ApplicationManager.cs

@@ -28 +28 @@
 using System.Security;
 using System.Linq;
+using System.IO;
 
 namespace HeuristicLab.PluginInfrastructure.Manager {
@@ -75 +76 @@
       // load all loadable plugins (all dependencies available) into the execution context
       foreach (var desc in PluginDescriptionIterator.IterateInDependencyOrder(plugins.Where(x => x.PluginState != PluginState.Disabled))) {
-        foreach (var plugin in GetInstances<IPlugin>(desc)) {
-          plugin.OnLoad();
-          FirePluginLoaded(plugin.Name);
+        foreach (string assembly in desc.Assemblies) {
+          var asm = Assembly.LoadFrom(assembly);
+
+          // instantiate and load all plugins in this assembly
+          foreach (var plugin in GetInstances<IPlugin>(asm)) {
+            plugin.OnLoad();
+            FirePluginLoaded(plugin.Name);
+          }
         }
         desc.Load();
       }
+
     }
 
@@ -128 +135 @@
     }
     /// <summary>
+    /// Creates an instance of all types declared in assembly <param name="asm"/> that are subtypes or the same type of the specified type and declared in <paramref name="plugin"/>
+    /// </summary>
+    /// <typeparam name="T">Most general type.</typeparam>
+    /// <param name="asm">Declaring assembly.</param>
+    /// <returns>Enumerable of the created instances.</returns>
+    public IEnumerable<T> GetInstances<T>(Assembly asm) where T : class {
+      return from t in GetTypes(typeof(T), asm)
+             where !t.IsAbstract && !t.IsInterface && !t.HasElementType
+             select (T)Activator.CreateInstance(t);
+    }
+    /// <summary>
     /// Creates an instance of all types that are subtypes or the same type of the specified type
     /// </summary>
@@ -167 +185 @@
     /// <returns>Enumerable of the discovered types.</returns>
     public IEnumerable<Type> GetTypes(Type type, IPluginDescription pluginDescription) {
-      throw new NotImplementedException();
-      //return from asm in AppDomain.CurrentDomain.GetAssemblies()
-      //       where pluginDescription.Assemblies.Contains(asm.Location)
-      //       from t in GetTypes(type, asm)
-      //       select t;
+      return from asm in AppDomain.CurrentDomain.GetAssemblies()
+             where pluginDescription.Assemblies.Any(asmPath => Path.GetFullPath(asmPath) == Path.GetFullPath(asm.Location))
+             from t in GetTypes(type, asm)
+             select t;
     }
 

branches/PluginInfrastructure Refactoring/HeuristicLab.PluginInfrastructure.Manager/Loader.cs

@@ -195 +195 @@
           string pluginFileName = (string)attributeData.ConstructorArguments[0].Value;
           PluginFileType fileType = (PluginFileType)attributeData.ConstructorArguments[1].Value;
-          pluginFiles.Add(PluginDir + "/" + pluginFileName);
+          pluginFiles.Add(Path.Combine(PluginDir, pluginFileName));
           if (fileType == PluginFileType.Assembly) {
-            pluginAssemblies.Add(PluginDir + "/" + pluginFileName);
+            pluginAssemblies.Add(Path.Combine(PluginDir, pluginFileName));
           }
         }

branches/PluginInfrastructure Refactoring/HeuristicLab.PluginInfrastructure/ApplicationManager.cs

@@ -38 +38 @@
 
     public static void RegisterApplicationManager(IApplicationManager manager) {
-      if (appManager != null) throw new InvalidOperationException("An control manager has already been set.");
+      if (appManager != null) throw new InvalidOperationException("The application manager has already been set.");
       appManager = manager;
     }

branches/PluginInfrastructure Refactoring/HeuristicLab/MainForm.cs

@@ -31 +31 @@
 using System.Threading;
 using HeuristicLab.PluginInfrastructure.Manager;
+using System.IO;
 
 namespace HeuristicLab {
@@ -44 +45 @@
 
       abortRequested = false;
-      pluginManager = new PluginManager(HeuristicLab.PluginInfrastructure.Properties.Settings.Default.PluginDir);
+      string pluginPath = Path.GetFullPath(HeuristicLab.PluginInfrastructure.Properties.Settings.Default.PluginDir);
+      pluginManager = new PluginManager(pluginPath);
       SplashScreen splashScreen = new SplashScreen(pluginManager, 1000, "Loading HeuristicLab...");
       splashScreen.Owner = this;