Changeset 6363 for trunk/sources

Timestamp:

06/06/11 10:52:38 (13 years ago)

Author:

mkommend

Message:

#1538: Merged r6335 into trunk.

File:

• trunk/sources/HeuristicLab.Core.Views/3.3/TypeSelector.cs (modified) (2 diffs, 1 prop)

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

@@ -86 +86 @@
 
     public virtual void Configure(Type baseType, bool showNotInstantiableTypes, bool showGenericTypes) {
-      Configure(new List<Type>() { baseType }, showNotInstantiableTypes, showGenericTypes, true);
+      Configure(baseType, showNotInstantiableTypes, showGenericTypes, (t) => { return true; });
+    }
+
+    public virtual void Configure(Type baseType, bool showNotInstantiableTypes, bool showGenericTypes, Func<Type, bool> typeCondition) {
+      Configure(new List<Type>() { baseType }, showNotInstantiableTypes, showGenericTypes, true, typeCondition);
     }
 
     public virtual void Configure(IEnumerable<Type> baseTypes, bool showNotInstantiableTypes, bool showGenericTypes, bool assignableToAllTypes) {
+      Configure(baseTypes, showNotInstantiableTypes, showGenericTypes, assignableToAllTypes, (t) => { return true; });
+    }
+
+    public virtual void Configure(IEnumerable<Type> baseTypes, bool showNotInstantiableTypes, bool showGenericTypes, bool assignableToAllTypes, Func<Type, bool> typeCondition) {
       if (baseTypes == null) throw new ArgumentNullException();
       if (InvokeRequired)
-        Invoke(new Action<IEnumerable<Type>, bool, bool, bool>(Configure), baseTypes, showNotInstantiableTypes, showGenericTypes, assignableToAllTypes);
+        Invoke(new Action<IEnumerable<Type>, bool, bool, bool, Func<Type, bool>>(Configure), baseTypes, showNotInstantiableTypes, showGenericTypes, assignableToAllTypes, typeCondition);
       else {
         this.baseTypes = baseTypes;
@@ -120 +128 @@
 
           var types = from t in ApplicationManager.Manager.GetTypes(BaseTypes, plugin, !ShowNotInstantiableTypes, assignableToAllTypes)
+                      where typeCondition(t)
                       orderby t.Name ascending
                       select t;