Changeset 2517 for branches/PluginInfrastructure Refactoring/HeuristicLab.PluginInfrastructure/Manager

Timestamp:

11/20/09 16:35:13 (15 years ago)

Author:

gkronber

Message:

Worked on plugin installation manager and update location service. #799

Location:

branches/PluginInfrastructure Refactoring/HeuristicLab.PluginInfrastructure/Manager

Files:

• ApplicationDescription.cs (modified) (2 diffs)
• DefaultApplicationManager.cs (modified) (8 diffs)
• PluginDescription.cs (modified) (2 diffs)
• PluginInfrastructureCancelEventArgs.cs (added)
• PluginValidator.cs (modified) (3 diffs)

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

@@ -37 +37 @@
     public string Name {
       get { return name; }
-      set { name = value; }
+      internal set { name = value; }
     }
     private Version version;
@@ -53 +53 @@
     /// Gets or sets the description of the application.
     /// </summary>
-    public string Description {
+    internal string Description {
       get { return description; }
       set { description = value; }

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

@@ -80 +80 @@
     private void LoadPlugins(IEnumerable<PluginDescription> plugins) {
       // 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 desc in PluginDescriptionIterator.IterateDependenciesBottomUp(plugins.Where(x => x.PluginState != PluginState.Disabled))) {
         foreach (string assembly in desc.Assemblies) {
           var asm = Assembly.LoadFrom(assembly);
@@ -105 +105 @@
           plugin.OnUnload();
         }
-        foreach (var desc in PluginDescriptionIterator.IterateInDependencyOrder(plugins.Where(x => x.PluginState != PluginState.Disabled))) {
+        foreach (var desc in PluginDescriptionIterator.IterateDependenciesBottomUp(plugins.Where(x => x.PluginState != PluginState.Disabled))) {
           desc.Unload();
           OnPluginUnloaded(new PluginInfrastructureEventArgs("Plugin unloaded", desc));
@@ -134 +134 @@
     /// <typeparam name="T">Most general type.</typeparam>
     /// <returns>Enumerable of the created instances.</returns>
-    public IEnumerable<T> GetInstances<T>(IPluginDescription plugin) where T : class {
+    public static IEnumerable<T> GetInstances<T>(IPluginDescription plugin) where T : class {
       return from t in GetTypes(typeof(T), plugin)
              where !t.IsAbstract && !t.IsInterface && !t.HasElementType
@@ -155 +155 @@
     /// <typeparam name="T">Most general type.</typeparam>
     /// <returns>Enumerable of the created instances.</returns>
-    public IEnumerable<T> GetInstances<T>() where T : class {
+    public static IEnumerable<T> GetInstances<T>() where T : class {
       return from i in GetInstances(typeof(T))
              select (T)i;
@@ -165 +165 @@
     /// <typeparam name="type">Most general type.</typeparam>
     /// <returns>Enumerable of the created instances.</returns>
-    public IEnumerable<object> GetInstances(Type type) {
+    public static IEnumerable<object> GetInstances(Type type) {
       return from t in GetTypes(type)
              where !t.IsAbstract && !t.IsInterface && !t.HasElementType
@@ -176 +176 @@
     /// <param name="type">Most general type for which to find matching types.</param>
     /// <returns>Enumerable of the discovered types.</returns>
-    public IEnumerable<Type> GetTypes(Type type) {
+    public static IEnumerable<Type> GetTypes(Type type) {
       return from asm in AppDomain.CurrentDomain.GetAssemblies()
              from t in GetTypes(type, asm)
@@ -189 +189 @@
     /// <param name="plugin">The plugin the subtypes must be part of.</param>
     /// <returns>Enumerable of the discovered types.</returns>
-    public IEnumerable<Type> GetTypes(Type type, IPluginDescription pluginDescription) {
+    public static IEnumerable<Type> GetTypes(Type type, IPluginDescription pluginDescription) {
       PluginDescription pluginDesc = (PluginDescription)pluginDescription;
       return from asm in AppDomain.CurrentDomain.GetAssemblies()
@@ -225 +225 @@
       return null;
     }
+
+    #region IApplicationManager Members
+
+
+    IEnumerable<T> IApplicationManager.GetInstances<T>(IPluginDescription plugin) {
+      return GetInstances<T>(plugin);
+    }
+
+    IEnumerable<T> IApplicationManager.GetInstances<T>() {
+      return GetInstances<T>();
+    }
+
+    IEnumerable<Type> IApplicationManager.GetTypes(Type type) {
+      return GetTypes(type);
+    }
+
+    IEnumerable<Type> IApplicationManager.GetTypes(Type type, IPluginDescription plugin) {
+      return GetTypes(type, plugin);
+    }
+
+    #endregion
   }
 }

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

@@ -30 +30 @@
   /// </summary>
   [Serializable]
-  internal sealed class PluginDescription : IPluginDescription {
+  public sealed class PluginDescription : IPluginDescription {
     private int nTimesLoaded;
 
@@ -46 +46 @@
     /// Gets or sets the description of the plugin.
     /// </summary>
-    public string Description {
+    internal string Description {
       get { return description; }
-      internal set { description = value; }
+      set { description = value; }
     }
     private Version version;

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

@@ -218 +218 @@
 
       // minimal sanity check of the attribute values
-      if (!string.IsNullOrEmpty(pluginName) && !string.IsNullOrEmpty(pluginDescription) &&
+      if (!string.IsNullOrEmpty(pluginName) &&
           pluginFiles.Count > 0 &&
           pluginAssemblies.Count > 0 &&
@@ -250 +250 @@
           var matchingDescriptions = pluginDescriptions.Where(x => x.Name == pluginName);
           if (matchingDescriptions.Count() > 0) {
-            desc.AddDependency(matchingDescriptions.First());
+            desc.AddDependency(matchingDescriptions.Single());
           } else {
             // no plugin description that matches the dependency name is available => plugin is disabled
             desc.Disable();
-            break; // stop processing more dependencies
           }
         }
@@ -279 +278 @@
     private void LoadPlugins(IEnumerable<PluginDescription> pluginDescriptions) {
       // load all loadable plugins (all dependencies available) into the execution context
-      foreach (var desc in PluginDescriptionIterator.IterateInDependencyOrder(pluginDescriptions
+      foreach (var desc in PluginDescriptionIterator.IterateDependenciesBottomUp(pluginDescriptions
                                                                                 .Where(x => x.PluginState != PluginState.Disabled))) {
         List<Type> types = new List<Type>();