Changeset 4414 for trunk/sources

Timestamp:

09/16/10 14:49:34 (14 years ago)

Author:

cneumuel

Message:

Changes to PluginInfrastructure for Hive compatibility (#1191)

Location:

trunk/sources/HeuristicLab.PluginInfrastructure/3.3

Files:

• Manager/PluginInfrastructureEventArgs.cs (modified) (1 diff)
• Manager/PluginManager.cs (modified) (4 diffs)
• Sandboxing/SandboxManager.cs (modified) (1 diff)

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Manager/PluginInfrastructureEventArgs.cs

@@ -24 +24 @@
 namespace HeuristicLab.PluginInfrastructure.Manager {
   [Serializable]
-  internal sealed class PluginInfrastructureEventArgs : EventArgs {
-    internal object Entity { get; private set; }
-    internal PluginInfrastructureEventArgs(object entity) {
+  public sealed class PluginInfrastructureEventArgs : EventArgs {
+    public object Entity { get; private set; }
+    public PluginInfrastructureEventArgs(object entity) {
       this.Entity = entity;
     }
 
     private static PluginInfrastructureEventArgs emptyArgs = new PluginInfrastructureEventArgs(string.Empty);
-    internal new static PluginInfrastructureEventArgs Empty {
+    public new static PluginInfrastructureEventArgs Empty {
       get { return emptyArgs; }
     }

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Manager/PluginManager.cs

@@ -31 +31 @@
   /// Class to manage different plugins.
   /// </summary>
-  internal sealed class PluginManager : MarshalByRefObject {
-    internal event EventHandler<PluginInfrastructureEventArgs> PluginLoaded;
-    internal event EventHandler<PluginInfrastructureEventArgs> PluginUnloaded;
-    internal event EventHandler<PluginInfrastructureEventArgs> Initializing;
-    internal event EventHandler<PluginInfrastructureEventArgs> Initialized;
-    internal event EventHandler<PluginInfrastructureEventArgs> ApplicationStarting;
-    internal event EventHandler<PluginInfrastructureEventArgs> ApplicationStarted;
+  public sealed class PluginManager : MarshalByRefObject {
+    public event EventHandler<PluginInfrastructureEventArgs> PluginLoaded;
+    public event EventHandler<PluginInfrastructureEventArgs> PluginUnloaded;
+    public event EventHandler<PluginInfrastructureEventArgs> Initializing;
+    public event EventHandler<PluginInfrastructureEventArgs> Initialized;
+    public event EventHandler<PluginInfrastructureEventArgs> ApplicationStarting;
+    public event EventHandler<PluginInfrastructureEventArgs> ApplicationStarted;
 
     private string pluginDir;
@@ -45 +45 @@
     /// Gets all installed plugins.
     /// </summary>
-    internal IEnumerable<PluginDescription> Plugins {
+    public IEnumerable<PluginDescription> Plugins {
       get { return plugins; }
     }
@@ -60 +60 @@
     private bool initialized;
 
-    internal PluginManager(string pluginDir) {
+    public PluginManager(string pluginDir) {
       this.pluginDir = pluginDir;
       plugins = new List<PluginDescription>();
@@ -70 +70 @@
     /// Determines installed plugins and checks if all plugins are loadable.
     /// </summary>
-    internal void DiscoverAndCheckPlugins() {
+    public void DiscoverAndCheckPlugins() {
       OnInitializing(PluginInfrastructureEventArgs.Empty);
       AppDomainSetup setup = AppDomain.CurrentDomain.SetupInformation;

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Sandboxing/SandboxManager.cs

@@ -87 +87 @@
       DefaultApplicationManager applicationManager =
         (DefaultApplicationManager)applicationDomain.CreateInstanceAndUnwrap(applicationManagerType.Assembly.FullName, applicationManagerType.FullName, true, BindingFlags.NonPublic | BindingFlags.Instance, null, null, null, null, null);
+      PluginManager pm = new PluginManager(name);
+      pm.DiscoverAndCheckPlugins();
       ApplicationDescription[] apps = ApplicationManager.Manager.Applications.Cast<ApplicationDescription>().ToArray();
       PluginDescription[] plugins = ApplicationManager.Manager.Plugins.Cast<PluginDescription>().ToArray();