Changeset 5848 for trunk/sources

Timestamp:

03/28/11 18:07:43 (14 years ago)

Author:

mkommend

Message:

#1049: Adapted TypeSelector to respect the new() constraint on generic types.

File:

• trunk/sources/HeuristicLab.Core.Views/3.3/TypeSelector.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Core.Views/3.3/TypeSelector.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Windows.Forms;
@@ -114 +115 @@
           pluginNode.Tag = plugin;
 
-          var types = from t in ApplicationManager.Manager.GetTypes(BaseType, plugin, false)
+          var types = from t in ApplicationManager.Manager.GetTypes(BaseType, plugin, ShowNotInstantiableTypes)
                       orderby t.Name ascending
                       select t;
@@ -120 +121 @@
             bool valid = true;
             valid = valid && (ShowGenericTypes || !type.ContainsGenericParameters);
-            valid = valid && (ShowNotInstantiableTypes || !type.IsAbstract);
-            valid = valid && (ShowNotInstantiableTypes || !type.IsInterface);
-            valid = valid && (ShowNotInstantiableTypes || !type.HasElementType);
             valid = valid && (ShowNotInstantiableTypes || type.GetConstructor(Type.EmptyTypes) != null); //check for public default ctor
             if (valid) {
@@ -132 +130 @@
               else if (type.ContainsGenericParameters) typeNode.ImageIndex = 3;
               else if (imageList.Images.ContainsKey(type.FullName)) typeNode.ImageIndex = imageList.Images.IndexOfKey(type.FullName);
-              else if (typeof(IItem).IsAssignableFrom(type) && !type.IsInterface && !type.IsAbstract) {
-                try {
-                  IItem item = (IItem)Activator.CreateInstance(type);
-                  imageList.Images.Add(type.FullName, item.ItemImage);
-                  typeNode.ImageIndex = imageList.Images.IndexOfKey(type.FullName);
-                }
-                catch (Exception) { }
+              else if (typeof(IItem).IsAssignableFrom(type) && !type.IsInterface && !type.IsAbstract && type.GetConstructor(Type.EmptyTypes) != null) {
+                IItem item = (IItem)Activator.CreateInstance(type);
+                imageList.Images.Add(type.FullName, item.ItemImage);
+                typeNode.ImageIndex = imageList.Images.IndexOfKey(type.FullName);
               }
               typeNode.SelectedImageIndex = typeNode.ImageIndex;
@@ -258 +253 @@
       Type param = typeParametersListView.SelectedItems[0].Tag as Type;
       Type[] contraints = param.GetGenericParameterConstraints();
-      typeSelectorDialog.TypeSelector.Configure(typeof(IItem), true, true);
+      bool showNotInstantiableTypes = !param.GenericParameterAttributes.HasFlag(GenericParameterAttributes.DefaultConstructorConstraint);
+      typeSelectorDialog.TypeSelector.Configure(typeof(IItem), showNotInstantiableTypes, true);
 
       if (typeSelectorDialog.ShowDialog(this) == DialogResult.OK) {