Changeset 1936 for trunk/sources/HeuristicLab.PluginInfrastructure

Timestamp:

05/28/09 17:26:51 (15 years ago)

Author:

kgrading

Message:

switchback to dynamic loading (#653)

Location:

trunk/sources/HeuristicLab.PluginInfrastructure

Files:

• PluginManager.cs (modified) (1 diff)
• Runner.cs (modified) (1 diff)

trunk/sources/HeuristicLab.PluginInfrastructure/PluginManager.cs

@@ -225 +225 @@
       setup.ApplicationBase = AppDomain.CurrentDomain.SetupInformation.ApplicationBase;      
       AppDomain applicationDomain = AppDomain.CreateDomain(friendlyName, AppDomain.CurrentDomain.Evidence, setup, pset, CreateStrongName(Assembly.GetExecutingAssembly()));
-                      
       Runner remoteRunner = (Runner)applicationDomain.CreateInstanceAndUnwrap(typeof(Runner).Assembly.GetName().Name, typeof(Runner).FullName);
       NotifyListeners(PluginManagerAction.Initializing, "All plugins");
 
-      //if (assemblyFiles != null && assemblyFiles.Count > 0)
-      //  remoteRunner.LoadPlugins(assemblyFiles);
+      if (assemblyFiles != null && assemblyFiles.Count > 0)
+        remoteRunner.LoadPlugins(assemblyFiles);
       
       //if (depPlugins != null && depPlugins.Count > 0) {        
-        remoteRunner.LoadPlugins(ActivePlugins);
+        //remoteRunner.LoadPlugins(ActivePlugins);
       //}
-      NotifyListeners(PluginManagerAction.Initialized, "All plugins");
+      NotifyListeners(PluginManagerAction.Initialized, "All plugins");    
       return applicationDomain;
     }

trunk/sources/HeuristicLab.PluginInfrastructure/Runner.cs

@@ -47 +47 @@
     /// <param name="plugins">bytearray of all plugins that should be loaded</param>
     public void LoadPlugins(ICollection<byte[]> plugins) {
-      foreach (byte[] plugin in plugins)
-        Assembly.Load(plugin);
+      foreach (byte[] plugin in plugins) {
+        Assembly.Load(plugin);        
+      }
     }