From 796466c5a3838c0e98cb881c9321bd46b3c2d742 Mon Sep 17 00:00:00 2001 From: Noopur Gupta Date: Thu, 4 May 2017 13:50:52 +0530 Subject: Fixed bug 516076: GVT47 : Non-externalized strings in Launch mode drop down list Change-Id: Ib0b746c8bbb8266a26116b6d50280cd1854476b2 Signed-off-by: Noopur Gupta --- .../core/org/eclipse/debug/internal/core/DebugCoreMessages.java | 3 ++- .../org/eclipse/debug/internal/core/DebugCoreMessages.properties | 3 ++- .../eclipse/debug/internal/core/groups/GroupLaunchElement.java | 4 ++-- .../ui/groups/GroupLaunchConfigurationSelectionDialog.java | 8 +++++--- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.java index bad512a5d..6b402a8b2 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2014 IBM Corporation and others. + * Copyright (c) 2000, 2017 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -43,6 +43,7 @@ public class DebugCoreMessages extends NLS { public static String GroupLaunchConfigurationDelegate_None; public static String GroupLaunchConfigurationDelegate_Wait_until_terminated; public static String GroupLaunchConfigurationDelegate_Waiting_for_termination; + public static String GroupLaunchElement_inherit_launch_mode; public static String GroupLaunchElement_outputRegexp; public static String LaunchConfiguration_0; public static String LaunchConfiguration_11; diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.properties b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.properties index aa28a244a..b2a918a61 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.properties +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2014 IBM Corporation and others. +# Copyright (c) 2000, 2017 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -37,6 +37,7 @@ GroupLaunchConfigurationDelegate_mode_run=run GroupLaunchConfigurationDelegate_None=None GroupLaunchConfigurationDelegate_Wait_until_terminated=Wait until terminated GroupLaunchConfigurationDelegate_Waiting_for_termination=Waiting for termination of ''{0}'' +GroupLaunchElement_inherit_launch_mode=inherit GroupLaunchElement_outputRegexp=Wait for console output (regexp) SystemPropertyResolver_0=System property not specified InputStreamMonitor_label=Input Stream Monitor diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/groups/GroupLaunchElement.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/groups/GroupLaunchElement.java index 5a409b8c8..4c3eed666 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/groups/GroupLaunchElement.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/groups/GroupLaunchElement.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2016 QNX Software Systems and others. + * Copyright (c) 2009, 2017 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -21,7 +21,7 @@ import org.eclipse.debug.internal.core.DebugCoreMessages; * @since 3.11 */ public class GroupLaunchElement { - public static final String MODE_INHERIT = "inherit"; //$NON-NLS-1$ + public static final String MODE_INHERIT = DebugCoreMessages.GroupLaunchElement_inherit_launch_mode; /** * Describes the possible post-launch actions for each diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/GroupLaunchConfigurationSelectionDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/GroupLaunchConfigurationSelectionDialog.java index a45644f85..ee4eb6843 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/GroupLaunchConfigurationSelectionDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/GroupLaunchConfigurationSelectionDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2016 QNX Software Systems and others. + * Copyright (c) 2009, 2017 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -164,8 +164,10 @@ class GroupLaunchConfigurationSelectionDialog extends TitleAreaDialog implements continue; } - if (!modes.containsKey(launchGroup.getMode())) { - modes.put(launchGroup.getMode(), launchGroup); + String label = launchGroup.getLabel(); + label = DebugUIPlugin.removeAccelerators(label); + if (!modes.containsKey(label)) { + modes.put(label, launchGroup); } } -- cgit v1.2.3