Changeset 3828

Timestamp:

05/17/10 23:27:03 (15 years ago)

Author:

swagner

Message:

Enabled application managers to discover generic types (#1015)

Location:

trunk/sources/HeuristicLab.PluginInfrastructure

Files:

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

trunk/sources/HeuristicLab.PluginInfrastructure/DefaultApplicationManager.cs

@@ -242 +242 @@
              where CheckTypeCompatibility(type, t)
              where onlyInstantiable == false || (!t.IsAbstract && !t.IsInterface && !t.HasElementType)
-             select BuildType(type, t);
+             select BuildType(t, type);
     }
 
@@ -256 +256 @@
       return false;
     }
-    private static Type BuildType(Type type, Type other) {
-      if (type.IsGenericType && other.IsGenericType)
-        return other.GetGenericTypeDefinition().MakeGenericType(type.GetGenericArguments());
+    private static Type BuildType(Type type, Type protoType) {
+      if (type.IsGenericType && protoType.IsGenericType)
+        return type.GetGenericTypeDefinition().MakeGenericType(protoType.GetGenericArguments());
       else
-        return other;
+        return type;
     }
 

trunk/sources/HeuristicLab.PluginInfrastructure/LightweightApplicationManager.cs

@@ -109 +109 @@
     private static IEnumerable<Type> GetTypes(Type type, Assembly assembly, bool onlyInstantiable) {
       return from t in assembly.GetTypes()
-             where type.IsAssignableFrom(t)
+             where CheckTypeCompatibility(type, t)
              where onlyInstantiable == false || (!t.IsAbstract && !t.IsInterface && !t.HasElementType)
-             select t;
+             select BuildType(t, type);
+    }
+
+    private static bool CheckTypeCompatibility(Type type, Type other) {
+      if (type.IsAssignableFrom(other))
+        return true;
+      if (type.IsGenericType && other.IsGenericType) {
+        try {
+          if (type.IsAssignableFrom(other.GetGenericTypeDefinition().MakeGenericType(type.GetGenericArguments())))
+            return true;
+        }
+        catch (Exception) { }
+      }
+      return false;
+    }
+    private static Type BuildType(Type type, Type protoType) {
+      if (type.IsGenericType && protoType.IsGenericType)
+        return type.GetGenericTypeDefinition().MakeGenericType(protoType.GetGenericArguments());
+      else
+        return type;
     }