Changeset 2444 for branches/Mainform refactoring/HeuristicLab.MainForm/3.2

Timestamp:

10/20/09 16:22:27 (15 years ago)

Author:

mkommend

Message:

refactored MainFormManager to use linq syntax (ticket #771)

File:

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

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

@@ -44 +44 @@
 
           DiscoveryService ds = new DiscoveryService();
-          Type[] types = ds.GetTypes(typeof(IView));
+          IEnumerable<Type> types =
+            from t in ds.GetTypes(typeof(IView))
+            where !t.IsAbstract && !t.IsInterface && !t.IsGenericType
+            select t;
 
-          foreach (Type t in types.Where(t => !t.IsAbstract && !t.IsInterface && !t.IsGenericType)) {
+          foreach (Type t in types) {
             foreach (Type viewableType in GetViewableType(t)) {
               if (viewableType != null) {
@@ -69 +72 @@
 
     private static IEnumerable<Type> GetViewableType(Type t) {
-      foreach (Type interfaceType in t.GetInterfaces().Where(i => i.Namespace == "HeuristicLab.MainForm" && i.Name.StartsWith("IView"))) {
-        if (interfaceType.IsGenericType && !interfaceType.IsGenericTypeDefinition)
+      IEnumerable<Type> interfaceTypes =
+       from type in t.GetInterfaces()
+       where type.Namespace == "HeuristicLab.MainForm" && type.Name.StartsWith("IView")  &&
+             type.IsGenericType && !type.IsGenericTypeDefinition
+       select type;
+
+      foreach (Type interfaceType in interfaceTypes) {      
           yield return interfaceType.GetGenericArguments()[0];
       }
@@ -100 +108 @@
         return defaultViews[viewableType];
       else {
-        List<Type> temp = defaultViews.Keys.Where(x => x.IsAssignableFrom(viewableType)).ToList();
+        List<Type> temp = (from t in defaultViews.Keys
+                           where t.IsAssignableFrom(viewableType)
+                           select t).ToList();
         //no assignable type found
         if (temp.Count == 0)