Changeset 13422 for branches/ProblemRefactoring/HeuristicLab.Core.Views/3.3/TypeSelector.cs

Timestamp:

11/30/15 15:12:34 (9 years ago)

Author:

mkommend

Message:

#2521: Adapted type discovery and type selector to allow the creation of generic programmable problems.

File:

• branches/ProblemRefactoring/HeuristicLab.Core.Views/3.3/TypeSelector.cs (modified) (4 diffs)

branches/ProblemRefactoring/HeuristicLab.Core.Views/3.3/TypeSelector.cs

@@ -257 +257 @@
     }
 
+    private Type[] genericTypeArguments = null;
     protected virtual void UpdateTypeParameters() {
       typeParametersListView.Items.Clear();
@@ -262 +263 @@
         typeParametersGroupBox.Enabled = false;
         typeParametersSplitContainer.Panel2Collapsed = true;
+        genericTypeArguments = null;
       } else {
         typeParametersGroupBox.Enabled = true;
@@ -267 +269 @@
         setTypeParameterButton.Enabled = false;
 
-        foreach (Type param in SelectedType.GetGenericArguments()) {
+
+        genericTypeArguments = SelectedType.GetGenericArguments();
+
+        foreach (Type param in genericTypeArguments) {
           if (param.IsGenericParameter) {
             ListViewItem item = new ListViewItem();
@@ -301 +306 @@
       if (typeSelectorDialog.ShowDialog(this) == DialogResult.OK) {
         Type selected = typeSelectorDialog.TypeSelector.SelectedType;
-        Type[] parameters = SelectedType.GetGenericArguments();
-        parameters[param.GenericParameterPosition] = selected;
-        SelectedType = SelectedType.GetGenericTypeDefinition().MakeGenericType(parameters);
+        genericTypeArguments[param.GenericParameterPosition] = selected;
+        if (genericTypeArguments.All(p => !p.IsGenericParameter))
+          SelectedType = SelectedType.GetGenericTypeDefinition().MakeGenericType(genericTypeArguments);
 
         typeParametersListView.SelectedItems[0].Text = param.Name + ": " + selected.GetPrettyName();