NEW - bug 242807: It should not be possible to resolve a JIRA issue without selecting a resolution

https://bugs.eclipse.org/bugs/show_bug.cgi?id=242807

2 files changed, 15 insertions, 0 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/SingleSelectionAttributeEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/SingleSelectionAttributeEditor.java
index c74462640..92fcc808d 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/SingleSelectionAttributeEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/SingleSelectionAttributeEditor.java
@@ -110,4 +110,11 @@ public class SingleSelectionAttributeEditor extends AbstractAttributeEditor {
 		attributeChanged();
 	}
 
+	void selectDefaultValue() {
+		if (combo.getSelectionIndex() == -1 && values.length > 0) {
+			combo.select(0);
+			setValue(values[0]);
+		}
+	}
+
 }
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionPart.java
index ca1b32c54..d246ffabf 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionPart.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionPart.java
@@ -75,6 +75,8 @@ public class TaskEditorActionPart extends AbstractTaskEditorPart {
 
 	private static final int RADIO_OPTION_WIDTH = 120;
 
+	private static final String KEY_ASSOCIATED_EDITOR = "associatedEditor";
+
 	private List<Button> operationButtons;
 
 	private Button submitButton;
@@ -235,6 +237,7 @@ public class TaskEditorActionPart extends AbstractTaskEditorPart {
 			}
 			editor.getControl().setLayoutData(gd);
 			editor.getControl().addFocusListener(new FocusListener(button));
+			button.setData(KEY_ASSOCIATED_EDITOR, editor);
 			getTaskEditorPage().getAttributeEditorToolkit().adapt(editor);
 		}
 	}
@@ -315,6 +318,11 @@ public class TaskEditorActionPart extends AbstractTaskEditorPart {
 			TaskOperation taskOperation = (TaskOperation) selectedButton.getData(KEY_OPERATION);
 			getTaskData().getAttributeMapper().setTaskOperation(selectedOperationAttribute, taskOperation);
 			getModel().attributeChanged(selectedOperationAttribute);
+
+			AbstractAttributeEditor editor = (AbstractAttributeEditor) selectedButton.getData(KEY_ASSOCIATED_EDITOR);
+			if (editor instanceof SingleSelectionAttributeEditor) {
+				((SingleSelectionAttributeEditor) editor).selectDefaultValue();
+			}
 		}
 	}