RESOLVED - bug 239304: add Delete toolbar button to unsubmitted tasks

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

3 files changed, 35 insertions, 1 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DeleteAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DeleteAction.java
index 9b319cdfe..d639d73c8 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DeleteAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DeleteAction.java
@@ -38,12 +38,13 @@ import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds;
 /**
  * @author Mik Kersten
  */
+// TODO 3.1: rename to DeleteTaskAction
 public class DeleteAction extends Action {
 
 	public static final String ID = "org.eclipse.mylyn.tasklist.actions.delete";
 
 	public DeleteAction() {
-		setText("Delete");
+		setText("Delete Task");
 		setId(ID);
 		setImageDescriptor(WorkbenchImages.getImageDescriptor(ISharedImages.IMG_TOOL_DELETE));
 		setActionDefinitionId(IWorkbenchActionDefinitionIds.DELETE);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DeleteTaskEditorAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DeleteTaskEditorAction.java
new file mode 100644
index 000000000..00d22a664
--- /dev/null
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DeleteTaskEditorAction.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2007 Mylyn project committers and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+
+package org.eclipse.mylyn.internal.tasks.ui.actions;
+
+import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.internal.WorkbenchImages;
+
+/**
+ * @author Mik Kersten
+ */
+public class DeleteTaskEditorAction extends DeleteAction {
+
+	public DeleteTaskEditorAction() {
+		super();
+		setHoverImageDescriptor(WorkbenchImages.getImageDescriptor(ISharedImages.IMG_TOOL_DELETE));
+		setImageDescriptor(CommonImages.REMOVE);
+	}
+}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java
index 9f32d5fd1..f4486b740 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java
@@ -54,6 +54,7 @@ import org.eclipse.mylyn.internal.tasks.core.data.ITaskDataManagerListener;
 import org.eclipse.mylyn.internal.tasks.core.data.TaskDataManagerEvent;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
 import org.eclipse.mylyn.internal.tasks.ui.actions.ClearOutgoingAction;
+import org.eclipse.mylyn.internal.tasks.ui.actions.DeleteTaskEditorAction;
 import org.eclipse.mylyn.internal.tasks.ui.actions.NewSubTaskAction;
 import org.eclipse.mylyn.internal.tasks.ui.actions.SynchronizeEditorAction;
 import org.eclipse.mylyn.internal.tasks.ui.editors.EditorUtil;
@@ -376,6 +377,8 @@ public abstract class AbstractTaskEditorPage extends FormPage implements ISelect
 
 	private SynchronizeEditorAction synchronizeEditorAction;
 
+	private DeleteTaskEditorAction deleteAction;
+
 	private ITask task;
 
 	private TaskData taskData;
@@ -760,6 +763,11 @@ public abstract class AbstractTaskEditorPage extends FormPage implements ISelect
 			toolBarManager.add(repositoryLabelControl);
 		}
 
+		if (taskData != null && taskData.isNew()) {
+			deleteAction = new DeleteTaskEditorAction();
+			toolBarManager.add(deleteAction);
+		}
+
 		if (taskData == null) {
 			synchronizeEditorAction = new SynchronizeEditorAction();
 			synchronizeEditorAction.selectionChanged(new StructuredSelection(getTaskEditor()));