NEW - bug 211641: [api] supporting attaching of files for remote tasks

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

5 files changed, 26 insertions, 1 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTextViewer.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTextViewer.java
index f0f108248..473148e1a 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTextViewer.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTextViewer.java
@@ -22,6 +22,7 @@ import org.eclipse.swt.widgets.Menu;
  */
 public class RepositoryTextViewer extends SourceViewer {
 
+	@Deprecated
 	private final MenuManager menuManager;
 
 	private TaskRepository repository;
@@ -64,10 +65,12 @@ public class RepositoryTextViewer extends SourceViewer {
 		super.handleDispose();
 	}
 
+	@Deprecated
 	public MenuManager getMenuManager() {
 		return menuManager;
 	}
 
+	@Deprecated
 	public void setMenu(Menu menu) {
 		if (getTextWidget() != null && !getTextWidget().isDisposed()) {
 			getTextWidget().setMenu(menu);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorAttachmentPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorAttachmentPart.java
index c16c15548..e8ad3c0e1 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorAttachmentPart.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorAttachmentPart.java
@@ -381,7 +381,9 @@ public class TaskEditorAttachmentPart extends AbstractTaskEditorPart {
 
 	@Override
 	public void dispose() {
-		menuManager.dispose();
+		if (menuManager != null) {
+			menuManager.dispose();
+		}
 		super.dispose();
 	}
 
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 4b5817d24..7fdc9a110 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
@@ -23,6 +23,7 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.ControlContribution;
 import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.jface.resource.JFaceResources;
@@ -128,6 +129,8 @@ import org.eclipse.ui.forms.widgets.ScrolledForm;
 // TODO EDITOR outline
 public abstract class AbstractTaskEditorPage extends FormPage implements ISelectionProvider, ISelectionChangedListener {
 
+	private static final String ID_POPUP_MENU = "org.eclipse.mylyn.tasks.ui.editor.menu.page";
+
 	private class SubmitTaskJobListener extends SubmitJobListener {
 
 		private final boolean attachContext;
@@ -286,6 +289,8 @@ public abstract class AbstractTaskEditorPage extends FormPage implements ISelect
 
 	private FormToolkit toolkit;
 
+	private MenuManager menuManager;
+
 	public AbstractTaskEditorPage(TaskEditor editor, String connectorKind) {
 		super(editor, "id", "label");
 		Assert.isNotNull(connectorKind);
@@ -470,6 +475,12 @@ public abstract class AbstractTaskEditorPage extends FormPage implements ISelect
 		if (summaryPart != null) {
 			lastFocusControl = summaryPart.getControl();
 		}
+
+		menuManager = new MenuManager();
+		menuManager.setRemoveAllWhenShown(true);
+		getEditorSite().registerContextMenu(ID_POPUP_MENU, menuManager, this, true);
+
+		editorComposite.setMenu(menuManager.createContextMenu(editorComposite));
 	}
 
 	private void createSummarySection(Composite composite) {
@@ -481,6 +492,9 @@ public abstract class AbstractTaskEditorPage extends FormPage implements ISelect
 
 	@Override
 	public void dispose() {
+		if (menuManager != null) {
+			menuManager.dispose();
+		}
 		TasksUi.getTaskListManager().getTaskList().removeChangeListener(taskListChangeListener);
 		super.dispose();
 	}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java
index 03a265909..286c6cd9c 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java
@@ -223,6 +223,7 @@ public class TaskEditor extends SharedHeaderFormEditor {
 		updateHeaderToolBar();
 	}
 
+	@Deprecated
 	protected void configureContextMenuManager(MenuManager manager) {
 		configureContextMenuManager(manager, null);
 	}
@@ -232,6 +233,7 @@ public class TaskEditor extends SharedHeaderFormEditor {
 	 * 
 	 * @Since 2.3
 	 */
+	@Deprecated
 	public void configureContextMenuManager(MenuManager manager, TextViewer textViewer) {
 		if (manager == null) {
 			return;
@@ -252,6 +254,7 @@ public class TaskEditor extends SharedHeaderFormEditor {
 		}
 	}
 
+	@Deprecated
 	protected void contextMenuAboutToShow(IMenuManager manager) {
 		TaskEditorActionContributor contributor = getActionBarContributor();
 		// IFormPage page = getActivePageInstance();
@@ -525,6 +528,7 @@ public class TaskEditor extends SharedHeaderFormEditor {
 	/**
 	 * @since 3.0
 	 */
+	@SuppressWarnings("deprecation")
 	public void updateHeaderToolBar() {
 		Form form = getHeaderForm().getForm().getForm();
 		IToolBarManager toolBarManager = form.getToolBarManager();
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditorInput.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditorInput.java
index c38e023ce..16a59da1b 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditorInput.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditorInput.java
@@ -89,6 +89,8 @@ public class TaskEditorInput implements IEditorInput, IPersistableElement {
 	public Object getAdapter(Class adapter) {
 		if (adapter == IEditorInput.class) {
 			return this;
+		} else if (adapter == AbstractTask.class) {
+			return task;
 		}
 		return null;
 	}