Changeset 7066 for trunk

Timestamp:

11/24/11 14:49:35 (13 years ago)

Author:

mkommend

Message:

#1689: Filtered generic type definitions if only instantiable types should be discovered.

Location:

trunk/sources/HeuristicLab.PluginInfrastructure/3.3

Files:

• LightweightApplicationManager.cs (modified) (1 diff)
• SandboxApplicationManager.cs (modified) (1 diff)

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

@@ -125 +125 @@
 
         return from t in assemblyTypes
+               where !IsNonDiscoverableType(t)
                where CheckTypeCompatibility(type, t)
-               where onlyInstantiable == false || (!t.IsAbstract && !t.IsInterface && !t.HasElementType)
-               where !IsNonDiscoverableType(t)
+               where onlyInstantiable == false || (!t.IsAbstract && !t.IsInterface && !t.HasElementType && !t.IsGenericTypeDefinition)
                select BuildType(t, type);
       }

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

@@ -263 +263 @@
     private static IEnumerable<Type> GetTypes(Type type, Assembly assembly, bool onlyInstantiable) {
       return from t in assembly.GetTypes()
+             where !IsNonDiscoverableType(t)
              where CheckTypeCompatibility(type, t)
              where onlyInstantiable == false ||
-                (!t.IsAbstract && !t.IsInterface && !t.HasElementType)
-             where !IsNonDiscoverableType(t)
+                (!t.IsAbstract && !t.IsInterface && !t.HasElementType && !t.IsGenericTypeDefinition)
              select BuildType(t, type);
     }