Changeset 7587 for trunk

Timestamp:

03/08/12 15:17:58 (13 years ago)

Author:

mkommend

Message:

#1794: Implemented analysis of interface hierarchies in MainFormManager for default view discovery.

File:

• trunk/sources/HeuristicLab.MainForm/3.3/MainFormManager.cs (modified) (1 diff)

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

@@ -118 +118 @@
         }
 
-        //check interfaces
-        IEnumerable<Type> nonInheritedInterfaces = type.GetInterfaces().Where(i => !i.IsAssignableFrom(type.BaseType));
-        List<Type> defaultViewList = new List<Type>();
-        foreach (Type defaultContentType in defaultViews.Keys) {
-          if (nonInheritedInterfaces.Contains(defaultContentType) || nonInheritedInterfaces.Any(i => i.CheckGenericTypes(defaultContentType)))
-            defaultViewList.Add(defaultViews[defaultContentType]);
-        }
-
-        //return only most spefic view as default view
-        foreach (Type viewType in defaultViewList.ToList()) {
-          if (defaultViewList.Any(t => t.IsSubclassOf(viewType)))
-            defaultViewList.Remove(viewType);
-        }
-
-        if (defaultViewList.Count == 1)
-          return TransformGenericTypeDefinition(defaultViewList[0], contentType);
-        else if (defaultViewList.Count > 1)
-          throw new InvalidOperationException("Could not determine which is the default view for type " + contentType.ToString() + ". Because more than one implemented interfaces have a default view.");
+        //check interfaces hierarchy of implemented and not inherited interfaces
+        var nonInheritedInterfaces = type.GetInterfaces().Where(i => !i.IsAssignableFrom(type.BaseType));
+        var interfaces = new HashSet<Type>(nonInheritedInterfaces);
+
+        while (interfaces.Any()) {
+          interfaces.RemoveWhere(i => interfaces.Any(x => x.GetInterfaces().Contains(i)));
+
+          List<Type> defaultViewList = (from defaultContentType in defaultViews.Keys
+                                        where interfaces.Contains(defaultContentType) ||
+                                              interfaces.Any(i => i.CheckGenericTypes(defaultContentType))
+                                        select defaultViews[defaultContentType]).ToList();
+
+          //return only most spefic view as default view
+          foreach (Type viewType in defaultViewList.ToList()) {
+            if (defaultViewList.Any(t => t.IsSubclassOf(viewType)))
+              defaultViewList.Remove(viewType);
+          }
+
+          if (defaultViewList.Count == 1)
+            return TransformGenericTypeDefinition(defaultViewList[0], contentType);
+          else if (defaultViewList.Count > 1)
+            throw new InvalidOperationException("Could not determine which is the default view for type " + contentType.ToString() + ". Because more than one implemented interfaces have a default view.");
+
+          interfaces = new HashSet<Type>(interfaces.SelectMany(i => i.GetInterfaces()));
+        }
 
         type = type.BaseType;