From 528612c2b215b01ee19757545c11b0439330a4ba Mon Sep 17 00:00:00 2001 From: Vivian Kong Date: Fri, 7 May 2010 18:09:31 +0000 Subject: [PATCH] Bug 312092 - TVT36:TCT174: FRA - Duplicate mnemonic for Browse (same string used twice in same panel) --- .../cdt/dsf/gdb/internal/ui/launching/CMainTab.java | 3 ++- .../cdt/dsf/gdb/launching/LaunchMessages.properties | 3 ++- .../launch/internal/ui/LaunchMessages.properties | 3 ++- .../org/eclipse/cdt/launch/ui/CAbstractMainTab.java | 13 ++++++++++++- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/CMainTab.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/CMainTab.java index f4f8307cf92..2253f502ac8 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/CMainTab.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/CMainTab.java @@ -9,6 +9,7 @@ * QNX Software Systems - initial API and implementation * Ken Ryall (Nokia) - bug 178731 * Ericsson - Support for tracepoint post-mortem debugging + * IBM Corporation *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.internal.ui.launching; @@ -213,7 +214,7 @@ public class CMainTab extends CAbstractMainTab { }); Button browseForCoreButton; - browseForCoreButton = createPushButton(coreComp, LaunchMessages.getString("Launch.common.Browse_2"), null); //$NON-NLS-1$ + browseForCoreButton = createPushButton(coreComp, LaunchMessages.getString("Launch.common.Browse_3"), null); //$NON-NLS-1$ browseForCoreButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent evt) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchMessages.properties b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchMessages.properties index 10ab61c6060..94bfbddcad9 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchMessages.properties +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2008, 2009 QNX Software Systems and others. +# Copyright (c) 2008, 2010 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 @@ -161,6 +161,7 @@ Launch.common.BinariesColon=Binaries: Launch.common.QualifierColon=Qualifier: Launch.common.Browse_1=&Browse... Launch.common.Browse_2=B&rowse... +Launch.common.Browse_3=Bro&wse... Launch.common.Project_does_not_exist=Project does not exist LocalCDILaunchDelegate.0=Launching Local C/C++ Application LocalCDILaunchDelegate.1=Launching debugger session diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchMessages.properties b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchMessages.properties index 26a6e5e6f03..1b1e7cb8177 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchMessages.properties +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2002, 2008 QNX Software Systems and others. +# Copyright (c) 2002, 2010 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 @@ -150,6 +150,7 @@ Launch.common.BinariesColon=Binaries: Launch.common.QualifierColon=Qualifier: Launch.common.Browse_1=&Browse... Launch.common.Browse_2=B&rowse... +Launch.common.Browse_3=Bro&wse... Launch.common.Project_does_not_exist=Project does not exist LocalCDILaunchDelegate.0=Launching Local C/C++ Application LocalCDILaunchDelegate.1=Launching debugger session diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CAbstractMainTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CAbstractMainTab.java index b357863f1c9..5d9536ba05e 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CAbstractMainTab.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CAbstractMainTab.java @@ -1,3 +1,14 @@ +/******************************************************************************* + * Copyright (c) 2010 Nokia 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Ken Ryall (Nokia) - initial API and implementation + * IBM Corporation + *******************************************************************************/ package org.eclipse.cdt.launch.ui; import java.util.ArrayList; @@ -418,7 +429,7 @@ public abstract class CAbstractMainTab extends CLaunchConfigurationTab { }); Button browseForCoreButton; - browseForCoreButton = createPushButton(coreComp, LaunchMessages.getString("Launch.common.Browse_2"), null); //$NON-NLS-1$ + browseForCoreButton = createPushButton(coreComp, LaunchMessages.getString("Launch.common.Browse_3"), null); //$NON-NLS-1$ browseForCoreButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent evt) {