Changeset 2592

Timestamp:

01/05/10 11:07:21 (15 years ago)

Author:

gkronber

Message:

Merged missing changes (r2587, r2589) in plugin infrastructure from branch to trunk. #799

Location:

trunk/sources/HeuristicLab.PluginInfrastructure

Files:

• ApplicationManager.cs (modified) (9 diffs)
• BaseClasses/PluginBase.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure.csproj (modified) (1 diff)
• Interfaces/IApplicationManager.cs (modified) (3 diffs)
• Interfaces/IPluginDescription.cs (modified) (1 diff)
• Manager/PluginDescription.cs (modified) (6 diffs)
• Manager/PluginManager.cs (modified) (1 diff)
• Sandboxing (copied) (copied from branches/PluginInfrastructure Refactoring/HeuristicLab.PluginInfrastructure/Sandboxing)
• Sandboxing/ISandboxManager.cs (copied) (copied from branches/PluginInfrastructure Refactoring/HeuristicLab.PluginInfrastructure/Sandboxing/ISandboxManager.cs)
• Sandboxing/SandboxManager.cs (copied) (copied from branches/PluginInfrastructure Refactoring/HeuristicLab.PluginInfrastructure/Sandboxing/SandboxManager.cs)

trunk/sources/HeuristicLab.PluginInfrastructure/ApplicationManager.cs

@@ -138 +138 @@
     /// </summary>
     /// <param name="plugins">bytearray of all assemblies that should be loaded</param>
-    public void LoadAssemblies(IEnumerable<byte[]> assemblies) {
+    internal void LoadAssemblies(IEnumerable<byte[]> assemblies) {
       foreach (byte[] asm in assemblies) {
         Assembly loadedAsm = Assembly.Load(asm);
@@ -156 +156 @@
     /// <typeparam name="T">Most general type.</typeparam>
     /// <returns>Enumerable of the created instances.</returns>
-    public static IEnumerable<T> GetInstances<T>(IPluginDescription plugin) where T : class {
+    internal static IEnumerable<T> GetInstances<T>(IPluginDescription plugin) where T : class {
       return from t in GetTypes(typeof(T), plugin)
              select (T)Activator.CreateInstance(t);
@@ -175 +175 @@
     /// <typeparam name="T">Most general type.</typeparam>
     /// <returns>Enumerable of the created instances.</returns>
-    public static IEnumerable<T> GetInstances<T>() where T : class {
+    internal static IEnumerable<T> GetInstances<T>() where T : class {
       return from i in GetInstances(typeof(T))
              select (T)i;
@@ -185 +185 @@
     /// <typeparam name="type">Most general type.</typeparam>
     /// <returns>Enumerable of the created instances.</returns>
-    public static IEnumerable<object> GetInstances(Type type) {
+    internal static IEnumerable<object> GetInstances(Type type) {
       return from t in GetTypes(type)
              select Activator.CreateInstance(t);
@@ -195 +195 @@
     /// <param name="type">Most general type for which to find matching types.</param>
     /// <returns>Enumerable of the discovered types.</returns>
-    public static IEnumerable<Type> GetTypes(Type type) {
+    internal static IEnumerable<Type> GetTypes(Type type) {
       return from asm in AppDomain.CurrentDomain.GetAssemblies()
              from t in GetTypes(type, asm)
@@ -208 +208 @@
     /// <param name="plugin">The plugin the subtypes must be part of.</param>
     /// <returns>Enumerable of the discovered types.</returns>
-    public static IEnumerable<Type> GetTypes(Type type, IPluginDescription pluginDescription) {
+    internal static IEnumerable<Type> GetTypes(Type type, IPluginDescription pluginDescription) {
       PluginDescription pluginDesc = (PluginDescription)pluginDescription;
       return from asm in AppDomain.CurrentDomain.GetAssemblies()
@@ -252 +252 @@
     #region IApplicationManager Members
 
-
     IEnumerable<T> IApplicationManager.GetInstances<T>(IPluginDescription plugin) {
       return GetInstances<T>(plugin);
@@ -261 +260 @@
     }
 
+    IEnumerable<object> IApplicationManager.GetInstances(Type type) {
+      return GetInstances(type);
+    }
+
     IEnumerable<Type> IApplicationManager.GetTypes(Type type) {
       return GetTypes(type);
@@ -269 +272 @@
     }
 
+    /// <summary>
+    /// Finds the plugin that declares the <paramref name="type">type</paramref>.
+    /// </summary>
+    /// <param name="type">The type of interest.</param>
+    /// <returns>The description of the plugin that declares the given type or null if the type has not been declared by a known plugin.</returns>
+    public IPluginDescription GetDeclaringPlugin(Type type) {
+      foreach (PluginDescription info in Plugins) {
+        if (info.Assemblies.Contains(Path.GetFullPath(type.Assembly.Location))) return info;
+      }
+      return null;
+    }
     #endregion
   }

trunk/sources/HeuristicLab.PluginInfrastructure/BaseClasses/PluginBase.cs

@@ -35 +35 @@
     /// Initializes a new instance of <see cref="PluginBase"/>.
     /// </summary>
-    protected PluginBase() { }
+    public PluginBase() { }
 
     private PluginAttribute PluginAttribute {

trunk/sources/HeuristicLab.PluginInfrastructure/HeuristicLab.PluginInfrastructure.csproj

@@ -149 +149 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <Compile Include="Sandboxing\ISandboxManager.cs" />
+    <Compile Include="Sandboxing\SandboxManager.cs" />
     <Compile Include="Service References\UpdateLocationReference\Reference.cs">
       <AutoGen>True</AutoGen>

trunk/sources/HeuristicLab.PluginInfrastructure/Interfaces/IApplicationManager.cs

@@ -41 +41 @@
 
     /// <summary>
-    /// Dynamically loads assemblies given in binary form.
-    /// </summary>
-    /// <param name="assemblies">Assemblies that should be loaded in binary form.</param>
-    void LoadAssemblies(IEnumerable<byte[]> assemblies);
-
-    /// <summary>
     /// Discovers and creates instances of <typeparamref name="T"/> and all types implementing or inheriting <typeparamref name="T"/> (directly and indirectly) declared in any assembly of <paramref name="plugin"/>.
     /// </summary>
@@ -61 +55 @@
 
     /// <summary>
+    /// Discovers and creates instances of <paramref name="type"/> and all types implementing or inheriting <paramref name="type"/> (directly and indirectly).
+    /// </summary>
+    /// <param name="type">The type or super-type to discover.</typeparam>
+    /// <returns>An enumerable of instances of the discovered types.</returns>
+    IEnumerable<object> GetInstances(Type type);
+
+    /// <summary>
     /// Discovers all types implementing or inheriting <paramref name="type"/> (directly and indirectly).
     /// </summary>
@@ -73 +74 @@
     /// <returns>An enumerable of discovered types.</returns>
     IEnumerable<Type> GetTypes(Type type, IPluginDescription plugin);
+    /// <summary>
+    /// Finds the plugin that declares the <paramref name="type">type</paramref>.
+    /// </summary>
+    /// <param name="type">The type of interest.</param>
+    /// <returns>The description of the plugin that declares the given type or null if the type has not been declared by a known plugin.</returns>
+    IPluginDescription GetDeclaringPlugin(Type type);
   }
 }

trunk/sources/HeuristicLab.PluginInfrastructure/Interfaces/IPluginDescription.cs

@@ -32 +32 @@
     /// </summary>
     string Name { get; }
+    /// <summary>
+    /// Gets the version of the plugin.
+    /// </summary>
+    Version Version { get; }
+    /// <summary>
+    /// Gets the build date of the plugin.
+    /// </summary>
+    DateTime BuildDate { get; }
+    /// <summary>
+    /// Gets the dependencies of the plugin.
+    /// </summary>
+    IEnumerable<IPluginDescription> Dependencies { get; }
+    /// <summary>
+    /// Gets the file names of files that are part of the plugin.
+    /// </summary>
+    IEnumerable<string> Files { get; }
   }
 }

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Text;
+using System.Linq;
 
 namespace HeuristicLab.PluginInfrastructure.Manager {
@@ -35 +36 @@
     private string name;
     /// <summary>
-    /// Gets or sets the name of the plugin.
+    /// Gets the name of the plugin.
     /// </summary>
     public string Name {
@@ -52 +53 @@
     private Version version;
     /// <summary>
-    /// Gets or sets the version of the plugin.
+    /// Gets the version of the plugin.
     /// </summary>
-    internal Version Version {
+    public Version Version {
       get { return version; }
-      set { version = value; }
+      internal set { version = value; }
     }
     private DateTime buildDate;
     /// <summary>
-    /// Gets or sets the build date of the plugin.
+    /// Gets the build date of the plugin.
     /// </summary>
-    internal DateTime BuildDate {
+    public DateTime BuildDate {
       get { return buildDate; }
-      set { buildDate = value; }
+      internal set { buildDate = value; }
     }
 
@@ -81 +82 @@
     /// These files are deleted when the plugin is removed or updated.
     /// </summary>
-    internal IEnumerable<string> Files {
+    public IEnumerable<string> Files {
       get { return files; }
     }
@@ -90 +91 @@
 
     private List<PluginDescription> dependencies = new List<PluginDescription>();
+    internal IEnumerable<PluginDescription> Dependencies {
+      get { return dependencies; }
+    }
     /// <summary>
     /// Gets all dependencies of the plugin.
     /// </summary>
-    internal IEnumerable<PluginDescription> Dependencies {
-      get { return dependencies; }
+    IEnumerable<IPluginDescription> IPluginDescription.Dependencies {
+      get { return dependencies.Cast<IPluginDescription>(); }
     }
 
@@ -100 +104 @@
       dependencies.Add(dependency);
     }
-
 
     private List<string> assemblies = new List<string>();

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

@@ -112 +112 @@
 
     /// <summary>
-    /// Starts and application in a separate AppDomain.
-    /// Loads all enabled plugins and starts the application via a PluginRunner instance activated in the new AppDomain.
+    /// Starts an application in a separate AppDomain.
+    /// Loads all enabled plugins and starts the application via an ApplicationManager instance activated in the new AppDomain.
     /// </summary>
     /// <param name="appInfo">application to run</param>