From 92ef95ddeb6e861f5d9c83e5bcaafd93777a7c67 Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Thu, 13 Feb 2014 14:40:57 -0500 Subject: [PATCH] Bug 341731 - Use String.format instead of Message.format Change-Id: I11aab806dcb279ba7916d98dfc1202e9143ba77d Signed-off-by: Marc Khouzam --- .../src/org/eclipse/cdt/dsf/mi/service/MIExpressions.java | 4 +--- .../src/org/eclipse/cdt/dsf/mi/service/Messages.properties | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIExpressions.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIExpressions.java index d307f4183f6..7b66008ffac 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIExpressions.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIExpressions.java @@ -77,8 +77,6 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.osgi.framework.BundleContext; -import com.ibm.icu.text.MessageFormat; - /** * This class implements a debugger expression evaluator as a DSF service. The * primary interface that clients of this class should use is IExpressions. @@ -861,7 +859,7 @@ public class MIExpressions extends AbstractDsfService implements IMIExpressions, String alias = expr; String methodName = fThreadToTopMethodName.get(threadDmc); if (methodName != null) { - alias = MessageFormat.format(Messages.MIExpressions_ReturnValueAlias, + alias = String.format(Messages.MIExpressions_ReturnValueAlias, methodName + "()"); //$NON-NLS-1$ } 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 index 526b7f35780..9277f866fb8 100644 --- 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 @@ -14,4 +14,4 @@ Breakpoint_attribute_problem=Breakpoint attribute problem: {0} Breakpoint_installation_failed=installation failed MIExpressions_NotAvailableBecauseChildOfDynamicVarobj=N/A (child of pretty-printed object) -MIExpressions_ReturnValueAlias={0} returned +MIExpressions_ReturnValueAlias=%s returned