Changeset 2922 for trunk/sources/HeuristicLab.PluginInfrastructure/Manager

Timestamp:

03/03/10 18:08:26 (15 years ago)

Author:

gkronber

Message:

Worked on GUI for plugin management. #891 (Refactor GUI for plugin management)

Location:

trunk/sources/HeuristicLab.PluginInfrastructure/Manager

Files:

• ApplicationDescription.cs (modified) (1 diff)
• PluginDescription.cs (modified) (2 diffs)
• PluginInfrastructureCancelEventArgs.cs (modified) (1 diff)
• PluginInfrastructureEventArgs.cs (modified) (1 diff)
• PluginManager.cs (modified) (10 diffs)
• PluginValidator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.PluginInfrastructure/Manager/ApplicationDescription.cs

@@ -86 +86 @@
 
     public override string ToString() {
-      return Name;
+      return Name + " " + Version;
     }
   }

trunk/sources/HeuristicLab.PluginInfrastructure/Manager/PluginDescription.cs

@@ -48 +48 @@
     /// Gets or sets the description of the plugin.
     /// </summary>
-    internal string Description {
+    public string Description {
       get { return description; }
-      set { description = value; }
+      internal set { description = value; }
     }
     private Version version;
@@ -188 +188 @@
     /// <returns>The name of the plugin.</returns>
     public override string ToString() {
-      return Name;
+      return Name + " " + Version;
     }
 

trunk/sources/HeuristicLab.PluginInfrastructure/Manager/PluginInfrastructureCancelEventArgs.cs

@@ -29 +29 @@
   [Serializable]
   internal sealed class PluginInfrastructureCancelEventArgs : CancelEventArgs {
-    internal string Action { get; private set; }
-    internal object Entity { get; private set; }
-    internal PluginInfrastructureCancelEventArgs(string action, object entity)
+    internal IEnumerable<string> Entities { get; private set; }
+    internal PluginInfrastructureCancelEventArgs(IEnumerable<string> entities)
       : base() {
-      this.Action = action;
-      this.Entity = entity;
+      this.Entities = entities;
     }
   }

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

@@ -28 +28 @@
   [Serializable]
   internal sealed class PluginInfrastructureEventArgs : EventArgs {
-    internal string Action { get; private set; }
     internal object Entity { get; private set; }
-    internal PluginInfrastructureEventArgs(string action, object entity) {
-      this.Action = action;
+    internal PluginInfrastructureEventArgs(object entity) {
       this.Entity = entity;
+    }
+
+    private static PluginInfrastructureEventArgs emptyArgs = new PluginInfrastructureEventArgs(string.Empty);
+    internal static PluginInfrastructureEventArgs Empty {
+      get { return emptyArgs; }
     }
   }

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

@@ -36 +36 @@
   /// </summary>
   internal sealed class PluginManager : MarshalByRefObject {
-    /// <summary>
-    /// Event handler for actions in the plugin manager.
-    /// </summary>
-    internal event EventHandler<PluginInfrastructureEventArgs> Action;
+    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;
 
     private string pluginDir;
@@ -66 +68 @@
       plugins = new List<PluginDescription>();
       applications = new List<ApplicationDescription>();
-      Reset();
-    }
-
-    internal void Reset() {
       initialized = false;
-      if (plugins != null && plugins.Any(x => x.PluginState == PluginState.Loaded)) throw new InvalidOperationException("Reset() is not allowed while applications are active.");
-      plugins.Clear();
-      applications.Clear();
     }
 
@@ -80 +75 @@
     /// </summary>
     internal void DiscoverAndCheckPlugins() {
-      OnAction(new PluginInfrastructureEventArgs("Initializing", "PluginInfrastructure"));
+      OnInitializing(PluginInfrastructureEventArgs.Empty);
       AppDomainSetup setup = AppDomain.CurrentDomain.SetupInformation;
       setup.PrivateBinPath = pluginDir;
@@ -92 +87 @@
         remoteValidator.PluginLoaded +=
           delegate(object sender, PluginInfrastructureEventArgs e) {
-            OnAction(e);
+            OnPluginLoaded(e);
           };
         // get list of plugins and applications from the validator
@@ -98 +93 @@
         plugins.AddRange(remoteValidator.Plugins);
         applications.AddRange(remoteValidator.Applications);
-        OnAction(new PluginInfrastructureEventArgs("Initialized", "PluginInfrastructure"));
       }
       finally {
@@ -104 +98 @@
         AppDomain.Unload(pluginDomain);
         // unload all plugins
-        foreach (var pluginDescription in plugins.Where(x => x.PluginState == PluginState.Loaded))
+        foreach (var pluginDescription in plugins.Where(x => x.PluginState == PluginState.Loaded)) {
           pluginDescription.Unload();
+          OnPluginUnloaded(new PluginInfrastructureEventArgs(pluginDescription));
+        }
         initialized = true;
+        OnInitialized(PluginInfrastructureEventArgs.Empty);
       }
     }
@@ -122 +119 @@
       // and remotely tell it to start the application
 
-      OnAction(new PluginInfrastructureEventArgs("Starting application", appInfo));
+      OnApplicationStarting(new PluginInfrastructureEventArgs(appInfo));
       AppDomain applicationDomain = null;
       try {
@@ -134 +131 @@
         applicationManager.PluginUnloaded += applicationManager_PluginUnloaded;
         applicationManager.PrepareApplicationDomain(applications, plugins);
-        OnAction(new PluginInfrastructureEventArgs("Started application", appInfo));
+        OnApplicationStarted(new PluginInfrastructureEventArgs(appInfo));
         applicationManager.Run(appInfo);
       }
@@ -150 +147 @@
       // can be started or stopped at the same time
       lock (locker) {
+        // also unload the matching plugin description in this AppDomain
         plugins.First(x => x.Equals(desc)).Unload();
       }
-      OnAction(new PluginInfrastructureEventArgs(e.Action, e.Entity));
+      OnPluginUnloaded(e);
     }
 
@@ -161 +159 @@
       // can be started or stopped at the same time
       lock (locker) {
+        // also load the matching plugin description in this AppDomain
         plugins.First(x => x.Equals(desc)).Load();
       }
-      OnAction(new PluginInfrastructureEventArgs(e.Action, e.Entity));
-    }
-
-    private void OnAction(PluginInfrastructureEventArgs e) {
-      if (Action != null) {
-        Action(this, e);
-      }
-    }
+      OnPluginLoaded(e);
+    }
+
+    #region event raising methods
+    private void OnPluginLoaded(PluginInfrastructureEventArgs e) {
+      if (PluginLoaded != null) {
+        PluginLoaded(this, e);
+      }
+    }
+
+    private void OnPluginUnloaded(PluginInfrastructureEventArgs e) {
+      if (PluginUnloaded != null) {
+        PluginUnloaded(this, e);
+      }
+    }
+
+    private void OnInitializing(PluginInfrastructureEventArgs e) {
+      if (Initializing != null) {
+        Initializing(this, e);
+      }
+    }
+
+    private void OnInitialized(PluginInfrastructureEventArgs e) {
+      if (Initialized != null) {
+        Initialized(this, e);
+      }
+    }
+
+    private void OnApplicationStarting(PluginInfrastructureEventArgs e) {
+      if (ApplicationStarting != null) {
+        ApplicationStarting(this, e);
+      }
+    }
+
+    private void OnApplicationStarted(PluginInfrastructureEventArgs e) {
+      if (ApplicationStarted != null) {
+        ApplicationStarted(this, e);
+      }
+    }
+    #endregion
 
     // infinite lease time
     /// <summary>
-    /// Initializes the life time service with infinite lease time.
+    /// Make sure that the plugin manager is never disposed (necessary for cross-app-domain events)
     /// </summary>
     /// <returns><c>null</c>.</returns>

trunk/sources/HeuristicLab.PluginInfrastructure/Manager/PluginValidator.cs

@@ -504 +504 @@
             IPlugin plugin = (IPlugin)Activator.CreateInstance(pluginType);
             plugin.OnLoad();
-            OnPluginLoaded(new PluginInfrastructureEventArgs("Plugin loaded", plugin.Name));
+            OnPluginLoaded(new PluginInfrastructureEventArgs(desc));
           }
         }