From 25fb53e9dcb966847bb1763e51c92d80a5781df5 Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Wed, 12 May 2010 01:38:55 +0000 Subject: [PATCH] Bug 312467: Improperly externalized string --- .../dsf/mi/service/MIBreakpointsManager.java | 5 +++- .../eclipse/cdt/dsf/mi/service/Messages.java | 30 +++++++++++++++++++ .../cdt/dsf/mi/service/Messages.properties | 13 ++++++++ 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/Messages.java create mode 100644 dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/Messages.properties diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsManager.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsManager.java index 9d8533ff4b1..6e1becf3c95 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsManager.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsManager.java @@ -87,6 +87,8 @@ import org.eclipse.debug.core.IBreakpointManagerListener; import org.eclipse.debug.core.model.IBreakpoint; import org.osgi.framework.BundleContext; +import com.ibm.icu.text.MessageFormat; + /** * Breakpoint service interface. The breakpoint service tracks CDT breakpoint * objects, and based on those, it manages breakpoints in the debugger back end. @@ -596,7 +598,8 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo @Override protected void handleError() { - addBreakpointProblemMarker(breakpoint, "Breakpoint attribute problem: installation failed", IMarker.SEVERITY_WARNING); //$NON-NLS-1$ + String description = MessageFormat.format(Messages.Breakpoint_attribute_problem, new Object[] { Messages.Breakpoint_installation_failed }); + addBreakpointProblemMarker(breakpoint, description, IMarker.SEVERITY_WARNING); installRM.done(); } }; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/Messages.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/Messages.java new file mode 100644 index 00000000000..0daabfffee4 --- /dev/null +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/Messages.java @@ -0,0 +1,30 @@ +/******************************************************************************* + * Copyright (c) 2010 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Ericsson - initial API and implementation + *******************************************************************************/ +package org.eclipse.cdt.dsf.mi.service; + +import org.eclipse.osgi.util.NLS; + +/** + * Preference strings. + * @since 3.0 + */ +class Messages extends NLS { + public static String Breakpoint_attribute_problem; + public static String Breakpoint_installation_failed; + + static { + // initialize resource bundle + NLS.initializeMessages(Messages.class.getName(), Messages.class); + } + + private Messages() { + } +} diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/Messages.properties b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/Messages.properties new file mode 100644 index 00000000000..e04b5f77beb --- /dev/null +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/Messages.properties @@ -0,0 +1,13 @@ +############################################################################### +# Copyright (c) 2010 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 +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Ericsson - initial API and implementation +############################################################################### + +Breakpoint_attribute_problem=Breakpoint attribute problem: {0} +Breakpoint_installation_failed=installation failed