Changeset 2726 for trunk/sources/HeuristicLab.MainForm/3.2/MainFormManager.cs

Timestamp:

01/30/10 05:00:47 (14 years ago)

Author:

swagner

Message:

Corrected handling of generic content types (#857)

File:

• trunk/sources/HeuristicLab.MainForm/3.2/MainFormManager.cs (modified) (3 diffs)

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

@@ -83 +83 @@
         viewTypes[i] = TransformGenericTypeDefinition(viewTypes[i], contentType);
       }
-      return viewTypes;
+      return viewTypes.Where(t => t != null);
     }
 
@@ -150 +150 @@
         return viewType;
 
-      Type contentTypeBaseType = contentType;
+      Type contentTypeBaseType = null;
       foreach (Type type in ContentAttribute.GetViewableTypes(viewType)) {
+        contentTypeBaseType = contentType;
         while (contentTypeBaseType != null && (!contentTypeBaseType.IsGenericType ||
               type.GetGenericTypeDefinition() != contentTypeBaseType.GetGenericTypeDefinition()))
@@ -160 +161 @@
           IEnumerable<Type> implementedInterfaces = contentType.GetInterfaces().Where(t => t.IsGenericType);
           foreach (Type implementedInterface in implementedInterfaces) {
-            if (implementedInterface.CheckGenericTypes(viewType))
+            if (implementedInterface.CheckGenericTypes(type))
               contentTypeBaseType = implementedInterface;
           }
         }
+        if (contentTypeBaseType != null) break;
       }