From 0888fe2ffedf7eed508c8a38fe9cfbb074988c79 Mon Sep 17 00:00:00 2001 From: Vivian Kong Date: Fri, 21 Aug 2009 17:34:13 +0000 Subject: [PATCH] Bug 287324 - English Debug progress messages --- .../cdt/dsf/gdb/launching/FinalLaunchSequence.java | 5 +++-- .../cdt/dsf/gdb/launching/GdbLaunchDelegate.java | 11 ++++++----- .../cdt/dsf/gdb/launching/LaunchMessages.properties | 11 ++++++++++- .../cdt/dsf/gdb/launching/ServicesLaunchSequence.java | 5 +++-- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence.java index 2006ebbf442..fd48ce727d4 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 Ericsson and others. + * Copyright (c) 2008, 2009 Ericsson 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 @@ -8,6 +8,7 @@ * Contributors: * Ericsson - initial API and implementation * Nokia - create and use backend service. + * IBM Corporation *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.launching; @@ -574,7 +575,7 @@ public class FinalLaunchSequence extends Sequence { DsfServicesTracker fTracker; public FinalLaunchSequence(DsfExecutor executor, GdbLaunch launch, SessionType sessionType, boolean attach, IProgressMonitor pm) { - super(executor, pm, "Configuring GDB", "Aborting configuring GDB"); + super(executor, pm, LaunchMessages.getString("FinalLaunchSequence.0"), LaunchMessages.getString("FinalLaunchSequence.1")); //$NON-NLS-1$ //$NON-NLS-2$ fLaunch = launch; fSessionType = sessionType; fAttach = attach; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java index 461c32026e7..9bce141e395 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 QNX Software Systems and others. + * Copyright (c) 2008, 2009 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 @@ -8,6 +8,7 @@ * Contributors: * QNX Software Systems - Initial API and implementation * Windriver and Ericsson - Updated for DSF + * IBM Corporation *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.launching; @@ -73,7 +74,7 @@ public class GdbLaunchDelegate extends LaunchConfigurationDelegate } private void launchDebugger( ILaunchConfiguration config, ILaunch launch, IProgressMonitor monitor ) throws CoreException { - monitor.beginTask("Launching debugger session", 10); + monitor.beginTask(LaunchMessages.getString("GdbLaunchDelegate.0"), 10); //$NON-NLS-1$ if ( monitor.isCanceled() ) { return; } @@ -97,11 +98,11 @@ public class GdbLaunchDelegate extends LaunchConfigurationDelegate final GdbLaunch launch = (GdbLaunch)l; if (sessionType == SessionType.REMOTE) { - monitor.subTask( "Debugging remote C/C++ application" ); + monitor.subTask( LaunchMessages.getString("GdbLaunchDelegate.1") ); //$NON-NLS-1$ } else if (sessionType == SessionType.CORE) { - monitor.subTask( "Post Mortem Debugging of C/C++ application" ); + monitor.subTask( LaunchMessages.getString("GdbLaunchDelegate.2") ); //$NON-NLS-1$ } else { - monitor.subTask( "Debugging local C/C++ application" ); + monitor.subTask( LaunchMessages.getString("GdbLaunchDelegate.3") ); //$NON-NLS-1$ } IPath exePath = new Path(""); //$NON-NLS-1$ 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 91f776db5f5..e70a4812b7e 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 QNX Software Systems and others. +# Copyright (c) 2008, 2009 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 @@ -9,6 +9,7 @@ # QNX Software Systems - Initial API and implementation # Monta Vista - Joanne Woo - Bug 87556 # Nokia - Ken Ryall - Bug 118894 +# IBM Corporation ############################################################################### AbstractCLaunchDelegate.Debugger_not_installed=CDT Debugger not installed @@ -129,6 +130,12 @@ CEnvironmentTab.Environment_variable_NAME_exists=Environment variable \" {0} \" CArgumentsTab.C/C++_Program_Arguments=Program arguments: CArgumentsTab.Arguments=Arguments CArgumentsTab.Variables=Variables... +FinalLaunchSequence.0=Configuring GDB +FinalLaunchSequence.1=Aborting configuring GDB +GdbLaunchDelegate.0=Launching debugger session +GdbLaunchDelegate.1=Debugging remote C/C++ application +GdbLaunchDelegate.2=Post Mortem Debugging of C/C++ application +GdbLaunchDelegate.3=Debugging local C/C++ application WorkingDirectoryBlock.4=Select a &workspace relative working directory: WorkingDirectoryBlock.7=Select a working directory for the launch configuration: @@ -159,3 +166,5 @@ LocalCDILaunchDelegate.7=Core file does not exist or is not readable. LocalCDILaunchDelegate.8=Error starting process. LocalCDILaunchDelegate.9=Eclipse runtime does not support working directory. LocalCDILaunchDelegate.10=Failed to set program arguments, environment or working directory. +ServicesLaunchSequence_0=Initializing debugger services +ServicesLaunchSequence_1=Aborting debugger services initialization diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/ServicesLaunchSequence.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/ServicesLaunchSequence.java index 160fd5150b5..e57a2366bc9 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/ServicesLaunchSequence.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/ServicesLaunchSequence.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2008 Wind River Systems and others. + * Copyright (c) 2006, 2009 Wind River 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 @@ -8,6 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation * Nokia - created GDBBackend service. Sep. 2008 + * IBM Corporation *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.launching; @@ -120,7 +121,7 @@ public class ServicesLaunchSequence extends Sequence { CSourceLookup fSourceLookup; public ServicesLaunchSequence(DsfSession session, GdbLaunch launch, IProgressMonitor pm) { - super(session.getExecutor(), pm, "Initializing debugger services", "Aborting debugger services initialization"); + super(session.getExecutor(), pm, LaunchMessages.getString("ServicesLaunchSequence_0"), LaunchMessages.getString("ServicesLaunchSequence_1")); //$NON-NLS-1$ //$NON-NLS-2$ fSession = session; fLaunch = launch; }