Changeset 5131 for trunk/sources

Timestamp:

12/17/10 16:22:57 (14 years ago)

Author:

swagner

Message:

Fixed exceptions in plugin infrastructure when trying to instantiate types which do not provide a parameterless constructor (#1309).

Location:

trunk/sources/HeuristicLab.PluginInfrastructure/3.3

Files:

• DefaultApplicationManager.cs (modified) (3 diffs)
• LightweightApplicationManager.cs (modified) (1 diff)

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/DefaultApplicationManager.cs

@@ -158 +158 @@
     /// <returns>Enumerable of the created instances.</returns>
     internal static IEnumerable<T> GetInstances<T>(IPluginDescription plugin) where T : class {
-      return from t in GetTypes(typeof(T), plugin, true)
-             select (T)Activator.CreateInstance(t);
+      List<T> instances = new List<T>();
+      foreach (Type t in GetTypes(typeof(T), plugin, true)) {
+        T instance = null;
+        try { instance = (T)Activator.CreateInstance(t); }
+        catch { }
+        if (instance != null) instances.Add(instance);
+      }
+      return instances;
     }
     /// <summary>
@@ -168 +174 @@
     /// <returns>Enumerable of the created instances.</returns>
     private static IEnumerable<T> GetInstances<T>(Assembly asm) where T : class {
-      return from t in GetTypes(typeof(T), asm, true)
-             select (T)Activator.CreateInstance(t);
+      List<T> instances = new List<T>();
+      foreach (Type t in GetTypes(typeof(T), asm, true)) {
+        T instance = null;
+        try { instance = (T)Activator.CreateInstance(t); }
+        catch { }
+        if (instance != null) instances.Add(instance);
+      }
+      return instances;
     }
     /// <summary>
@@ -187 +199 @@
     /// <returns>Enumerable of the created instances.</returns>
     internal static IEnumerable<object> GetInstances(Type type) {
-      return (from t in GetTypes(type, true)
-              select Activator.CreateInstance(t)).ToList();
+      List<object> instances = new List<object>();
+      foreach (Type t in GetTypes(type, true)) {
+        object instance = null;
+        try { instance = Activator.CreateInstance(t); }
+        catch { }
+        if (instance != null) instances.Add(instance);
+      }
+      return instances;
     }
 

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/LightweightApplicationManager.cs

@@ -72 +72 @@
     /// <returns>Enumerable of the created instances.</returns>
     public IEnumerable<object> GetInstances(Type type) {
-      return from t in GetTypes(type, true)
-             select Activator.CreateInstance(t);
+      List<object> instances = new List<object>();
+      foreach (Type t in GetTypes(type, true)) {
+        object instance = null;
+        try { instance = Activator.CreateInstance(t); }
+        catch { }
+        if (instance != null) instances.Add(instance);
+      }
+      return instances;
     }