Changeset 2438

Timestamp:

10/18/09 01:18:23 (15 years ago)

Author:

mkommend

Message:

minor code refactoring (ticket #771)

File:

• branches/Mainform refactoring/HeuristicLab.MainForm/3.2/MainFormManager.cs (modified) (2 diffs)

branches/Mainform refactoring/HeuristicLab.MainForm/3.2/MainFormManager.cs

@@ -97 +97 @@
 
     public static Type GetDefaultViewType(Type viewableType) {
-      if (!defaultViews.ContainsKey(viewableType)) {
+      if (defaultViews.ContainsKey(viewableType))
+        return defaultViews[viewableType];
+      else {
         List<Type> temp = defaultViews.Keys.Where(x => x.IsAssignableFrom(viewableType)).ToList();
+        //no assignable type found
         if (temp.Count == 0)
           return null;
+        //only one assignable type found => return this one
         else if (temp.Count == 1)
           return defaultViews[temp[0]];
+        //more assignable types found => sort the types according to their assignable types
+        //and return most specific type => except there is a conflict
         else {
           temp.Sort(delegate(Type t1, Type t2) {
@@ -110 +116 @@
           }
           );
-          if (!temp[0].IsAssignableFrom(temp[1]) && !temp[1].IsAssignableFrom(temp[0]))
+          if (temp[1].IsAssignableFrom(temp[0]))
+            return defaultViews[temp[0]];
+          else
             throw new Exception("Could not determine which is the default view for type " + viewableType.ToString() + ".");
-          else
-            return defaultViews[temp[0]];
         }
-      } else
-        return defaultViews[viewableType];
+      }     
     }