Changeset 7069 for trunk

Timestamp:

11/24/11 17:04:12 (13 years ago)

Author:

mkommend

Message:

#1689: Corrected type discovery and adapted MainFormManager to work correctly.

Location:

trunk/sources

Files:

• HeuristicLab.MainForm/3.3/MainFormManager.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/3.3/LightweightApplicationManager.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/3.3/SandboxApplicationManager.cs (modified) (1 diff)

trunk/sources/HeuristicLab.MainForm/3.3/MainFormManager.cs

@@ -49 +49 @@
         MainFormManager.mainform = mainForm;
         IEnumerable<Type> types =
-          from t in ApplicationManager.Manager.GetTypes(typeof(IContentView))
+          from t in ApplicationManager.Manager.GetTypes(typeof(IContentView), false)
           where !t.IsAbstract && !t.IsInterface && ContentAttribute.HasContentAttribute(t)
           select t;

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

@@ -124 +124 @@
         var assemblyTypes = assembly.GetTypes();
 
-        return from t in assemblyTypes
-               where !IsNonDiscoverableType(t)
-               where CheckTypeCompatibility(type, t)
-               where onlyInstantiable == false || (!t.IsAbstract && !t.IsInterface && !t.HasElementType && !t.IsGenericTypeDefinition)
-               select BuildType(t, type);
+        var buildTypes = from t in assemblyTypes
+                         where !IsNonDiscoverableType(t)
+                         where CheckTypeCompatibility(type, t)
+                         where onlyInstantiable == false || (!t.IsAbstract && !t.IsInterface && !t.HasElementType)
+                         select BuildType(t, type);
+
+        return from t in buildTypes
+               where onlyInstantiable == false || !t.IsGenericTypeDefinition
+               select t;
       }
       catch (TypeLoadException) {

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

@@ -262 +262 @@
     /// <returns>Enumerable of the discovered types.</returns>
     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 && !t.IsGenericTypeDefinition)
-             select BuildType(t, type);
+      var buildTypes = from t in assembly.GetTypes()
+                       where !IsNonDiscoverableType(t)
+                       where CheckTypeCompatibility(type, t)
+                       where onlyInstantiable == false ||
+                             (!t.IsAbstract && !t.IsInterface && !t.HasElementType)
+                       select BuildType(t, type);
+
+      return from t in buildTypes
+             where onlyInstantiable == false || !t.IsGenericTypeDefinition
+             select t;
     }