RESOLVED - bug 152211: allow local tasks to be promoted to repository tasks

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

3 files changed, 20 insertions, 7 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/plugin.xml b/org.eclipse.mylyn.tasks.ui/plugin.xml
index e00d7eb70..2beaf1a28 100644
--- a/org.eclipse.mylyn.tasks.ui/plugin.xml
+++ b/org.eclipse.mylyn.tasks.ui/plugin.xml
@@ -362,16 +362,18 @@
         menubarPath="org.eclipse.mylyn.tasks.ui.menu.operations/clone"
         tooltip="Clone Task">
      <enablement>
-        <and>
+<!--        <and> -->
            <objectClass
                  name="org.eclipse.mylyn.tasks.core.AbstractTask">
            </objectClass>
+<!--
            <not>
               <objectClass
                     name="org.eclipse.mylyn.internal.tasks.core.LocalTask">
               </objectClass>
            </not>
         </and>
+-->
      </enablement>
   </action>
          
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CloneTaskAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CloneTaskAction.java
index 6f01822df..000eab789 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CloneTaskAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CloneTaskAction.java
@@ -11,6 +11,7 @@ package org.eclipse.mylyn.internal.tasks.ui.actions;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.mylyn.internal.tasks.core.LocalTask;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
 import org.eclipse.mylyn.monitor.core.StatusHandler;
 import org.eclipse.mylyn.tasks.core.AbstractTask;
@@ -61,8 +62,8 @@ public class CloneTaskAction extends BaseSelectionListenerAction implements IVie
 			for (Object selectedObject : getStructuredSelection().toList()) {
 				if (selectedObject instanceof AbstractTask) {
 					AbstractTask task = (AbstractTask) selectedObject;
-
-					String description = "Clone of " + CopyTaskDetailsAction.getTextForTask(task);
+					
+					String description = "Cloned from: " + CopyTaskDetailsAction.getTextForTask(task);
 
 					final TaskSelection taskSelection;
 					RepositoryTaskData taskData = TasksUiPlugin.getTaskDataManager().getNewTaskData(
@@ -72,7 +73,16 @@ public class CloneTaskAction extends BaseSelectionListenerAction implements IVie
 						taskSelection.getTaskData().setDescription(description + "\n\n> " + taskData.getDescription());
 					} else {
 						taskSelection = new TaskSelection(task);
-						taskSelection.getTaskData().setDescription(description);
+						if (task instanceof LocalTask) {
+							String notes = task.getNotes();
+							if (!"".equals(notes)) {
+								taskSelection.getTaskData().setDescription(description + "\n\n" + notes);
+							} else {
+								taskSelection.getTaskData().setDescription(description);
+							}
+						} else {
+							taskSelection.getTaskData().setDescription(description);
+						}
 					}
 
 					Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CopyTaskDetailsAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CopyTaskDetailsAction.java
index 3c5b48a55..8ce576258 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CopyTaskDetailsAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CopyTaskDetailsAction.java
@@ -69,8 +69,10 @@ public class CopyTaskDetailsAction extends BaseSelectionListenerAction {
 				task = (AbstractTask) object;
 			}
 			if (task != null) {
-				text += task.getTaskKey() + ": ";
-
+				if (task.getTaskKey() != null) {
+					text += task.getTaskKey() + ": ";
+				}
+				
 				text += task.getSummary();
 				if (task.hasValidUrl()) {
 					text += "\n" + task.getUrl();
@@ -84,7 +86,6 @@ public class CopyTaskDetailsAction extends BaseSelectionListenerAction {
 			AbstractTaskContainer element = (AbstractTaskContainer) object;
 			text = element.getSummary();
 		} else if (object instanceof RepositoryTaskSelection) {
-
 			RepositoryTaskSelection selection = (RepositoryTaskSelection) object;
 			text += selection.getId() + ": " + selection.getBugSummary();
 			AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(