REOPENED - bug 292503: Working sets that start with "@" don't show in the working sets popup

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

3 files changed, 12 insertions, 13 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskHistoryDropDown.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskHistoryDropDown.java
index 4205c89a7..1fadf55e4 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskHistoryDropDown.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskHistoryDropDown.java
@@ -22,6 +22,7 @@ import org.eclipse.jface.action.ActionContributionItem;
 import org.eclipse.jface.action.IContributionItem;
 import org.eclipse.jface.action.Separator;
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.mylyn.internal.provisional.commons.ui.CommonUiUtil;
 import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
 import org.eclipse.mylyn.internal.tasks.core.TaskActivationHistory;
 import org.eclipse.mylyn.internal.tasks.ui.actions.ActivateTaskDialogAction;
@@ -108,7 +109,7 @@ public class TaskHistoryDropDown extends CompoundContributionItem {
 			if (taskDescription.length() > MAX_LABEL_LENGTH) {
 				taskDescription = taskDescription.subSequence(0, MAX_LABEL_LENGTH - 3) + "..."; //$NON-NLS-1$
 			}
-			taskDescription = TasksUiInternal.cleanTextForAction(taskDescription);
+			taskDescription = CommonUiUtil.toMenuLabel(taskDescription);
 			setText(taskDescription);
 			setEnabled(true);
 			setToolTipText(task.getSummary());
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ToggleWorkingSetAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ToggleWorkingSetAction.java
index 2d70aa23f..5a49c0db9 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ToggleWorkingSetAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ToggleWorkingSetAction.java
@@ -20,6 +20,7 @@ import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.bindings.keys.IKeyLookup;
 import org.eclipse.jface.bindings.keys.KeyLookupFactory;
+import org.eclipse.mylyn.internal.provisional.commons.ui.CommonUiUtil;
 import org.eclipse.mylyn.internal.tasks.ui.workingsets.TaskWorkingSetUpdater;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.ui.IWorkingSet;
@@ -31,11 +32,12 @@ public class ToggleWorkingSetAction extends Action {
 
 	private final IWorkingSet workingSet;
 
-	public ToggleWorkingSetAction(IWorkingSet set) {
-		super(set.getLabel(), IAction.AS_CHECK_BOX);
-		setImageDescriptor(set.getImageDescriptor());
-		this.workingSet = set;
-		setChecked(TaskWorkingSetUpdater.isWorkingSetEnabled(set));
+	public ToggleWorkingSetAction(IWorkingSet workingSet) {
+		super("", IAction.AS_CHECK_BOX); //$NON-NLS-1$
+		this.workingSet = workingSet;
+		setText(CommonUiUtil.toMenuLabel(workingSet.getLabel()));
+		setImageDescriptor(workingSet.getImageDescriptor());
+		setChecked(TaskWorkingSetUpdater.isWorkingSetEnabled(workingSet));
 	}
 
 	@Override
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 efea2bb1d..2f7642328 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
@@ -1030,15 +1030,11 @@ public class TasksUiInternal {
 	 * Cleans text for use as the text of an action to ensure that it is displayed properly.
 	 * 
 	 * @return the cleaned text
+	 * @deprecated use {@link CommonUiUtil#toMenuLabel(String)} instead
 	 */
+	@Deprecated
 	public static String cleanTextForAction(String label) {
-		// a tab at the end of the text will make sure that the @ will not create a weird space in the action text
-		// bug 287347: @ at start of task name cause a weird space in activation history menu
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=287347
-		if (label.contains("@")) { //$NON-NLS-1$
-			label += "\t"; //$NON-NLS-1$
-		}
-		return CommonUiUtil.toLabel(label);
+		return CommonUiUtil.toMenuLabel(label);
 	}
 
 	public static void executeCommand(IServiceLocator serviceLocator, String commandId, String title, Object object,