Changeset 5850 for trunk/sources/HeuristicLab.Core.Views

Timestamp:

03/28/11 19:12:31 (13 years ago)

Author:

mkommend

Message:

#1454: Implemented TypeDiscovery with multiple base types and adapted TypeSelector and CrossValidation.

File:

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

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

@@ -35 +35 @@
     protected TypeSelectorDialog typeSelectorDialog;
 
-    protected Type baseType;
-    public Type BaseType {
-      get { return baseType; }
+    protected IEnumerable<Type> baseTypes;
+    public IEnumerable<Type> BaseTypes {
+      get { return baseTypes; }
     }
     protected bool showNotInstantiableTypes;
@@ -86 +86 @@
 
     public virtual void Configure(Type baseType, bool showNotInstantiableTypes, bool showGenericTypes) {
-      if (baseType == null) throw new ArgumentNullException();
+      Configure(new List<Type>() { baseType }, showNotInstantiableTypes, showGenericTypes);
+    }
+
+    public virtual void Configure(IEnumerable<Type> baseTypes, bool showNotInstantiableTypes, bool showGenericTypes) {
+      if (baseTypes == null) throw new ArgumentNullException();
       if (InvokeRequired)
-        Invoke(new Action<Type, bool, bool>(Configure), baseType, showNotInstantiableTypes, showGenericTypes);
+        Invoke(new Action<IEnumerable<Type>, bool, bool>(Configure), baseTypes, showNotInstantiableTypes, showGenericTypes);
       else {
-        this.baseType = baseType;
+        this.baseTypes = baseTypes;
         this.showNotInstantiableTypes = showNotInstantiableTypes;
         this.showGenericTypes = showGenericTypes;
@@ -115 +119 @@
           pluginNode.Tag = plugin;
 
-          var types = from t in ApplicationManager.Manager.GetTypes(BaseType, plugin, ShowNotInstantiableTypes)
+          var types = from t in ApplicationManager.Manager.GetTypes(BaseTypes, plugin, ShowNotInstantiableTypes)
                       orderby t.Name ascending
                       select t;
@@ -252 +256 @@
       }
       Type param = typeParametersListView.SelectedItems[0].Tag as Type;
-      Type[] contraints = param.GetGenericParameterConstraints();
+      Type[] constraints = param.GetGenericParameterConstraints();
       bool showNotInstantiableTypes = !param.GenericParameterAttributes.HasFlag(GenericParameterAttributes.DefaultConstructorConstraint);
-      typeSelectorDialog.TypeSelector.Configure(typeof(IItem), showNotInstantiableTypes, true);
+      typeSelectorDialog.TypeSelector.Configure(constraints, showNotInstantiableTypes, true);
 
       if (typeSelectorDialog.ShowDialog(this) == DialogResult.OK) {