Bug 105235 - TVT 3.1: TCT479 - mnemonic char in middle of DBCS menu label

4 files changed, 6 insertions, 10 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.java
index f3cede0db..20d2fcd0a 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.java
@@ -132,10 +132,8 @@ public class ActionMessages extends NLS {
 
 	public static String RetargetAction_2;
 	public static String RetargetAction_3;
-	public static String LaunchAsAction_0;
 	public static String ModifyWatchpointAction_0;
 	public static String ModifyWatchpointAction_1;
-	public static String LaunchShortcutsAction_0;
 	public static String LaunchShortcutsAction_1;
 	public static String FindDialog_1;
 	public static String FindDialog_3;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.properties b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.properties
index 4543fd032..27ae1816e 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.properties
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.properties
@@ -132,10 +132,8 @@ RunToLineActionDelegate_4=Run to &Line
 
 RetargetAction_2=Error
 RetargetAction_3=Operation failed
-LaunchAsAction_0={0} As
 ModifyWatchpointAction_0=Error
 ModifyWatchpointAction_1=Failed to modify watchpoint
-LaunchShortcutsAction_0={0} As
 LaunchShortcutsAction_1=(none applicable)
 FindDialog_1=&Specify an element to select (? = any character, * = any String):
 FindDialog_3=Find
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchAsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchAsAction.java
index e50a2db99..f1aeb5768 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchAsAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchAsAction.java
@@ -11,13 +11,12 @@
 package org.eclipse.debug.ui.actions;
 
 
-import java.text.MessageFormat;
 import java.util.Iterator;
 import java.util.List;
+
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.ILaunchMode;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.internal.ui.actions.ActionMessages;
 import org.eclipse.debug.internal.ui.actions.LaunchShortcutAction;
 import org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationManager;
 import org.eclipse.debug.internal.ui.launchConfigurations.LaunchGroupExtension;
@@ -77,7 +76,7 @@ public class LaunchAsAction extends Action implements IMenuCreator, IWorkbenchWi
 		super();
 		fLaunchGroupIdentifier = launchGroupIdentifier;
 		ILaunchMode launchMode = DebugPlugin.getDefault().getLaunchManager().getLaunchMode(getMode());
-		setText(MessageFormat.format(ActionMessages.LaunchAsAction_0, new String[]{launchMode.getLabel()})); 
+		setText(launchMode.getLaunchAsLabel()); 
 		setMenuCreator(this);
 	}
 	
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchShortcutsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchShortcutsAction.java
index e74838d4c..a29b7da4e 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchShortcutsAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchShortcutsAction.java
@@ -11,18 +11,19 @@
 package org.eclipse.debug.ui.actions;
 
 
-import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
+
 import org.eclipse.core.expressions.EvaluationContext;
 import org.eclipse.core.expressions.Expression;
 import org.eclipse.core.expressions.IEvaluationContext;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.ILaunchConfigurationType;
+import org.eclipse.debug.core.ILaunchMode;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.debug.internal.ui.actions.ActionMessages;
 import org.eclipse.debug.internal.ui.actions.LaunchShortcutAction;
@@ -86,8 +87,8 @@ public class LaunchShortcutsAction extends Action implements IMenuCreator, IWork
 	public LaunchShortcutsAction(String launchGroupIdentifier) {
 		super();
 		fGroup = DebugUIPlugin.getDefault().getLaunchConfigurationManager().getLaunchGroup(launchGroupIdentifier);
-		String label = DebugPlugin.getDefault().getLaunchManager().getLaunchMode(fGroup.getMode()).getLabel();
-		setText(MessageFormat.format(ActionMessages.LaunchShortcutsAction_0, new String[] { label })); 
+		ILaunchMode mode = DebugPlugin.getDefault().getLaunchManager().getLaunchMode(fGroup.getMode());
+		setText(mode.getLaunchAsLabel()); 
 		setMenuCreator(this);
 		setEnabled(existsConfigTypesForMode());
 	}