417262: set base target to Eclipse 3.6

Change-Id: Iecb5dd95783d52411249bb3cadd9a233e6f7d095
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=417262

2 files changed, 4 insertions, 4 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractAttributeEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractAttributeEditor.java
index 211763a01..38291ebdd 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractAttributeEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractAttributeEditor.java
@@ -12,7 +12,7 @@
 package org.eclipse.mylyn.tasks.ui.editors;
 
 import org.eclipse.core.runtime.Assert;
-import org.eclipse.mylyn.commons.ui.CommonUiUtil;
+import org.eclipse.jface.action.LegacyActionTools;
 import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
 import org.eclipse.mylyn.tasks.core.data.TaskAttributeMapper;
 import org.eclipse.mylyn.tasks.core.data.TaskDataModel;
@@ -153,7 +153,7 @@ public abstract class AbstractAttributeEditor {
 	 */
 	public String getLabel() {
 		String label = getAttributeMapper().getLabel(getTaskAttribute());
-		return CommonUiUtil.toLabel(label);
+		return (label != null) ? LegacyActionTools.escapeMnemonics(label) : ""; //$NON-NLS-1$
 	}
 
 	/**
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPart.java
index 937ee5666..b1c45ba8e 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPart.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPart.java
@@ -12,11 +12,11 @@
 package org.eclipse.mylyn.tasks.ui.editors;
 
 import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.LegacyActionTools;
 import org.eclipse.jface.action.ToolBarManager;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.mylyn.commons.ui.CommonImages;
-import org.eclipse.mylyn.commons.ui.CommonUiUtil;
 import org.eclipse.mylyn.commons.workbench.forms.CommonFormUtil;
 import org.eclipse.mylyn.internal.tasks.ui.editors.Messages;
 import org.eclipse.mylyn.internal.tasks.ui.editors.RichTextAttributeEditor;
@@ -80,7 +80,7 @@ public abstract class AbstractTaskEditorPart extends AbstractFormPart {
 
 	protected Section createSection(Composite parent, FormToolkit toolkit, int style) {
 		Section section = toolkit.createSection(parent, style);
-		section.setText(CommonUiUtil.toLabel(getPartName()));
+		section.setText(LegacyActionTools.escapeMnemonics(getPartName()));
 		return section;
 	}