RESOLVED - bug 296760: prepend bug prefix to text that is generated by copy details

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

3 files changed, 13 insertions, 10 deletions

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 9e859b8f4..85446b3e0 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
@@ -96,6 +96,7 @@ public class CopyTaskDetailsAction extends BaseSelectionListenerAction {
 			if (object instanceof ITask) {
 				ITask task = (ITask) object;
 				if (task.getTaskKey() != null) {
+					sb.append(TasksUiInternal.getTaskPrefix(task));
 					sb.append(task.getTaskKey());
 					sb.append(": "); //$NON-NLS-1$
 				}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryCompletionProcessor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryCompletionProcessor.java
index 8603fabcd..1d626b4bd 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryCompletionProcessor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryCompletionProcessor.java
@@ -38,7 +38,6 @@ import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
 import org.eclipse.mylyn.internal.tasks.ui.actions.CopyTaskDetailsAction;
 import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
 import org.eclipse.mylyn.internal.tasks.ui.workingsets.TaskWorkingSetUpdater;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
 import org.eclipse.mylyn.tasks.core.ITask;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.ui.TaskElementLabelProvider;
@@ -128,14 +127,14 @@ public class RepositoryCompletionProcessor implements IContentAssistProcessor {
 			}
 
 			if (includeTaskPrefix) {
-				return getTaskPrefix(task) + text;
+				return TasksUiInternal.getTaskPrefix(task) + text;
 			} else {
 				return text;
 			}
 		}
 
 		private boolean containsPrefix(ITask task) {
-			String searchTest = getTaskPrefix(task) + " " + labelProvider.getText(task); //$NON-NLS-1$
+			String searchTest = TasksUiInternal.getTaskPrefix(task) + " " + labelProvider.getText(task); //$NON-NLS-1$
 			String[] tokens = searchTest.split("\\s"); //$NON-NLS-1$
 			for (String token : tokens) {
 				if (token.toLowerCase().startsWith(prefix)) {
@@ -316,11 +315,4 @@ public class RepositoryCompletionProcessor implements IContentAssistProcessor {
 		return null;
 	}
 
-	private String getTaskPrefix(ITask task) {
-		AbstractRepositoryConnector connector = TasksUiPlugin.getConnector(task.getConnectorKind());
-		String prefix = connector.getTaskIdPrefix();
-		// FIXME work around for Trac "#" prefix
-		return (prefix.length() > 1) ? prefix + " " : prefix; //$NON-NLS-1$
-	}
-
 }
\ No newline at end of file
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiInternal.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiInternal.java
index 2f7642328..196d83689 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiInternal.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiInternal.java
@@ -1105,4 +1105,14 @@ public class TasksUiInternal {
 		return 0;
 	}
 
+	public static String getTaskPrefix(ITask task) {
+		AbstractRepositoryConnector connector = TasksUiPlugin.getConnector(task.getConnectorKind());
+		if (connector != null) {
+			String prefix = connector.getTaskIdPrefix();
+			// work around short prefixes which are not separated by space, e.g. "#" for Trac
+			return (prefix.length() > 1) ? prefix + " " : prefix; //$NON-NLS-1$
+		}
+		return ""; //$NON-NLS-1$
+	}
+
 }