diff options
Diffstat (limited to 'debug')
33 files changed, 80 insertions, 113 deletions
diff --git a/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF index dcc27bc7970..4b165ab9e48 100644 --- a/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.debug.core; singleton:=true -Bundle-Version: 8.4.0.qualifier +Bundle-Version: 8.4.100.qualifier Bundle-Activator: org.eclipse.cdt.debug.core.CDebugCorePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -47,5 +47,4 @@ Require-Bundle: org.eclipse.cdt.core;bundle-version="[5.0.0,7.0.0)", org.eclipse.launchbar.core;bundle-version="2.0.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.ibm.icu.text Automatic-Module-Name: org.eclipse.cdt.debug.core diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugUtils.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugUtils.java index 1702cec334d..8541f7b11ea 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugUtils.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugUtils.java @@ -21,6 +21,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.nio.charset.Charset; import java.nio.charset.CharsetDecoder; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -64,8 +65,6 @@ import org.eclipse.debug.core.model.IBreakpoint; import org.osgi.service.prefs.BackingStoreException; import org.w3c.dom.Document; -import com.ibm.icu.text.MessageFormat; - /** * Utility methods. */ @@ -442,7 +441,7 @@ public class CDebugUtils { if (lineNumber > 0) { label.append(' '); label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.0"), //$NON-NLS-1$ - (Object[]) new String[] { Integer.toString(lineNumber) })); + Integer.toString(lineNumber))); } return label; } @@ -452,7 +451,7 @@ public class CDebugUtils { try { label.append(' '); label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.1"), //$NON-NLS-1$ - (Object[]) new String[] { breakpoint.getAddress() })); + breakpoint.getAddress())); } catch (NumberFormatException e) { } return label; @@ -464,7 +463,7 @@ public class CDebugUtils { if (function != null && function.trim().length() > 0) { label.append(' '); label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.2"), //$NON-NLS-1$ - (Object[]) new String[] { function.trim() })); + function.trim())); } return label; } @@ -477,7 +476,7 @@ public class CDebugUtils { if (printfStr != null && printfStr.length() > 0) { buffer.append(' '); buffer.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.printfString"), //$NON-NLS-1$ - (Object[]) new String[] { printfStr })); + printfStr)); } } @@ -486,7 +485,7 @@ public class CDebugUtils { if (ignoreCount > 0) { label.append(' '); label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.3"), //$NON-NLS-1$ - (Object[]) new String[] { Integer.toString(ignoreCount) })); + Integer.toString(ignoreCount))); } return label; } @@ -496,7 +495,7 @@ public class CDebugUtils { if (condition != null && condition.length() > 0) { buffer.append(' '); buffer.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.4"), //$NON-NLS-1$ - (Object[]) new String[] { condition })); + condition)); } } @@ -505,7 +504,7 @@ public class CDebugUtils { if (expression != null && expression.length() > 0) { label.append(' '); label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.5"), //$NON-NLS-1$ - (Object[]) new String[] { expression })); + expression)); } } @@ -514,7 +513,7 @@ public class CDebugUtils { if (memorySpace != null && memorySpace.length() > 0) { label.append(' '); label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.6"), //$NON-NLS-1$ - (Object[]) new String[] { memorySpace })); + memorySpace)); } } @@ -523,7 +522,7 @@ public class CDebugUtils { if (range.length() > 0 && !range.equals("0")) { //$NON-NLS-1$ label.append(' '); label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.7"), //$NON-NLS-1$ - (Object[]) new String[] { range })); + range)); } } @@ -557,7 +556,7 @@ public class CDebugUtils { if (typeString.length() > 0) { label.append(' '); label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.8"), //$NON-NLS-1$ - (Object[]) new String[] { typeString })); + typeString)); } } return label; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/DebugCoreMessages.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/DebugCoreMessages.java index 8de8801dbe3..44cddcfec68 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/DebugCoreMessages.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/DebugCoreMessages.java @@ -13,11 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.debug.core; +import java.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; -import com.ibm.icu.text.MessageFormat; - public class DebugCoreMessages { private static final String BUNDLE_NAME = "org.eclipse.cdt.debug.core.DebugCoreMessages";//$NON-NLS-1$ @@ -28,7 +27,7 @@ public class DebugCoreMessages { } static String getFormattedString(String key, String arg) { - return MessageFormat.format(getString(key), new Object[] { arg }); + return MessageFormat.format(getString(key), arg); } static String getFormattedString(String key, String[] args) { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/BreakpointProblems.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/BreakpointProblems.java index 035cc5cd504..528b24c3fee 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/BreakpointProblems.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/BreakpointProblems.java @@ -14,6 +14,8 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.breakpoints; +import java.text.MessageFormat; + import org.eclipse.cdt.core.ProblemMarkerInfo; import org.eclipse.cdt.core.model.ICModelMarker; import org.eclipse.cdt.debug.core.CDebugCorePlugin; @@ -23,8 +25,6 @@ import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; -import com.ibm.icu.text.MessageFormat; - public class BreakpointProblems { /** @@ -44,7 +44,7 @@ public class BreakpointProblems { public static IMarker reportBreakpointMoved(ICBreakpoint breakpoint, int oldLineNumber, int newLineNumber, String contextName, String contextID) throws CoreException { String message = MessageFormat.format(BreakpointMessages.getString("BreakpointProblems_Moved"), //$NON-NLS-1$ - new Object[] { Integer.valueOf(oldLineNumber), Integer.valueOf(newLineNumber) }); + Integer.valueOf(oldLineNumber), Integer.valueOf(newLineNumber)); IMarker marker = BreakpointProblems.reportBreakpointProblem(breakpoint, message, IMarker.SEVERITY_INFO, MOVED, true, false, contextName, contextID); return marker; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressBreakpoint.java index f3659f1c020..e9f47e168ae 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressBreakpoint.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.breakpoints; +import java.text.MessageFormat; import java.util.Map; import org.eclipse.cdt.debug.core.CDebugUtils; @@ -20,8 +21,6 @@ import org.eclipse.cdt.debug.core.model.ICAddressBreakpoint; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; -import com.ibm.icu.text.MessageFormat; - /** * A breakpoint that suspend the execution when a particular address is reached. */ @@ -51,6 +50,6 @@ public class CAddressBreakpoint extends AbstractLineBreakpoint implements ICAddr @Override protected String getMarkerMessage() throws CoreException { return MessageFormat.format(BreakpointMessages.getString("CAddressBreakpoint.0"), //$NON-NLS-1$ - (Object[]) new String[] { CDebugUtils.getBreakpointText(this, false) }); + CDebugUtils.getBreakpointText(this, false)); } } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressDynamicPrintf.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressDynamicPrintf.java index ab2c3768250..59ef33a73a8 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressDynamicPrintf.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressDynamicPrintf.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.breakpoints; +import java.text.MessageFormat; import java.util.Map; import org.eclipse.cdt.debug.core.CDebugUtils; @@ -20,8 +21,6 @@ import org.eclipse.cdt.debug.core.model.ICAddressBreakpoint; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; -import com.ibm.icu.text.MessageFormat; - /** * A DynamicPrintf that prints a message when a particular address is reached. * @@ -47,6 +46,6 @@ public class CAddressDynamicPrintf extends AbstractDynamicPrintf implements ICAd @Override protected String getMarkerMessage() throws CoreException { return MessageFormat.format(BreakpointMessages.getString("CAddressDynamicPrintf.0"), //$NON-NLS-1$ - (Object[]) new String[] { CDebugUtils.getBreakpointText(this, false) }); + CDebugUtils.getBreakpointText(this, false)); } } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressTracepoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressTracepoint.java index 6a76e638999..f43b18c28dd 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressTracepoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressTracepoint.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.breakpoints; +import java.text.MessageFormat; import java.util.Map; import org.eclipse.cdt.debug.core.CDebugUtils; @@ -20,8 +21,6 @@ import org.eclipse.cdt.debug.core.model.ICAddressBreakpoint; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; -import com.ibm.icu.text.MessageFormat; - /** * A tracepoint that collects data when a particular address is reached. * @@ -53,6 +52,6 @@ public class CAddressTracepoint extends AbstractTracepoint implements ICAddressB @Override protected String getMarkerMessage() throws CoreException { return MessageFormat.format(BreakpointMessages.getString("CAddressTracepoint.0"), //$NON-NLS-1$ - (Object[]) new String[] { CDebugUtils.getBreakpointText(this, false) }); + CDebugUtils.getBreakpointText(this, false)); } } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpoint.java index 1a1af9adb0e..39b1fe4a100 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpoint.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.breakpoints; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -44,8 +45,6 @@ import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.IDebugEventSetListener; import org.eclipse.debug.core.model.Breakpoint; -import com.ibm.icu.text.MessageFormat; - /** * The base class for all C/C++ specific breakpoints. */ @@ -237,12 +236,11 @@ public abstract class CBreakpoint extends Breakpoint StringBuilder sb = new StringBuilder(); int ignoreCount = getIgnoreCount(); if (ignoreCount > 0) { - sb.append( - MessageFormat.format(BreakpointMessages.getString("CBreakpoint.1"), new Object[] { ignoreCount })); //$NON-NLS-1$ + sb.append(MessageFormat.format(BreakpointMessages.getString("CBreakpoint.1"), ignoreCount)); //$NON-NLS-1$ } String condition = getCondition(); if (condition != null && condition.length() > 0) { - sb.append(MessageFormat.format(BreakpointMessages.getString("CBreakpoint.2"), new Object[] { condition })); //$NON-NLS-1$ + sb.append(MessageFormat.format(BreakpointMessages.getString("CBreakpoint.2"), condition)); //$NON-NLS-1$ } return sb.toString(); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionBreakpoint.java index 84e379fb7ed..55e1f222953 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionBreakpoint.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.breakpoints; +import java.text.MessageFormat; import java.util.Map; import org.eclipse.cdt.debug.core.CDebugUtils; @@ -20,8 +21,6 @@ import org.eclipse.cdt.debug.core.model.ICFunctionBreakpoint; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; -import com.ibm.icu.text.MessageFormat; - /** * A breakpoint that suspends the execution when a function is entered. */ @@ -54,6 +53,6 @@ public class CFunctionBreakpoint extends AbstractLineBreakpoint implements ICFun @Override protected String getMarkerMessage() throws CoreException { return MessageFormat.format(BreakpointMessages.getString("CFunctionBreakpoint.0"), //$NON-NLS-1$ - (Object[]) new String[] { CDebugUtils.getBreakpointText(this, false) }); + CDebugUtils.getBreakpointText(this, false)); } } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionDynamicPrintf.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionDynamicPrintf.java index 1a8b346e943..257e1238729 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionDynamicPrintf.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionDynamicPrintf.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.breakpoints; +import java.text.MessageFormat; import java.util.Map; import org.eclipse.cdt.debug.core.CDebugUtils; @@ -20,8 +21,6 @@ import org.eclipse.cdt.debug.core.model.ICFunctionBreakpoint; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; -import com.ibm.icu.text.MessageFormat; - /** * A DynamicPrintf that collects data when a function is entered. * @@ -47,6 +46,6 @@ public class CFunctionDynamicPrintf extends AbstractDynamicPrintf implements ICF @Override protected String getMarkerMessage() throws CoreException { return MessageFormat.format(BreakpointMessages.getString("CFunctionDynamicPrintf.0"), //$NON-NLS-1$ - (Object[]) new String[] { CDebugUtils.getBreakpointText(this, false) }); + CDebugUtils.getBreakpointText(this, false)); } } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionTracepoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionTracepoint.java index 0cc8b35a279..ecbcb9f327c 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionTracepoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionTracepoint.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.breakpoints; +import java.text.MessageFormat; import java.util.Map; import org.eclipse.cdt.debug.core.CDebugUtils; @@ -20,8 +21,6 @@ import org.eclipse.cdt.debug.core.model.ICFunctionBreakpoint; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; -import com.ibm.icu.text.MessageFormat; - /** * A tracepoint that collects data when a function is entered. * @@ -53,6 +52,6 @@ public class CFunctionTracepoint extends AbstractTracepoint implements ICFunctio @Override protected String getMarkerMessage() throws CoreException { return MessageFormat.format(BreakpointMessages.getString("CFunctionTracepoint.0"), //$NON-NLS-1$ - (Object[]) new String[] { CDebugUtils.getBreakpointText(this, false) }); + CDebugUtils.getBreakpointText(this, false)); } } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineBreakpoint.java index 011feb78272..7938b922b44 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineBreakpoint.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.breakpoints; +import java.text.MessageFormat; import java.util.Map; import org.eclipse.cdt.debug.core.CDebugUtils; @@ -22,8 +23,6 @@ import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; -import com.ibm.icu.text.MessageFormat; - /** * A breakpoint that suspends the execution when a particular line of code is * reached. @@ -69,10 +68,10 @@ public class CLineBreakpoint extends AbstractLineBreakpoint { if (bp_line != bp_request_line || (bp_file == null && bp_reqest_file != null) || (bp_file != null && !bp_file.equals(bp_reqest_file))) { return MessageFormat.format(BreakpointMessages.getString("CLineBreakpoint.1"), //$NON-NLS-1$ - (Object[]) new String[] { CDebugUtils.getBreakpointText(this, false) }); + CDebugUtils.getBreakpointText(this, false)); } else { return MessageFormat.format(BreakpointMessages.getString("CLineBreakpoint.0"), //$NON-NLS-1$ - (Object[]) new String[] { CDebugUtils.getBreakpointText(this, false) }); + CDebugUtils.getBreakpointText(this, false)); } } } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineDynamicPrintf.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineDynamicPrintf.java index 583f1b193ea..36f8fa1544e 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineDynamicPrintf.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineDynamicPrintf.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.breakpoints; +import java.text.MessageFormat; import java.util.Map; import org.eclipse.cdt.debug.core.CDebugUtils; @@ -22,8 +23,6 @@ import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; -import com.ibm.icu.text.MessageFormat; - /** * A DynamicPrintf that prints a string when a particular line of code is reached. * @@ -61,10 +60,10 @@ public class CLineDynamicPrintf extends AbstractDynamicPrintf { if (bp_line != bp_request_line || (bp_file == null && bp_reqest_file != null) || (bp_file != null && !bp_file.equals(bp_reqest_file))) { return MessageFormat.format(BreakpointMessages.getString("CLineDynamicPrintf.1"), //$NON-NLS-1$ - (Object[]) new String[] { CDebugUtils.getBreakpointText(this, false) }); + CDebugUtils.getBreakpointText(this, false)); } else { return MessageFormat.format(BreakpointMessages.getString("CLineDynamicPrintf.0"), //$NON-NLS-1$ - (Object[]) new String[] { CDebugUtils.getBreakpointText(this, false) }); + CDebugUtils.getBreakpointText(this, false)); } } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineTracepoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineTracepoint.java index 5c2bfb8ddd7..88b02ddf4e5 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineTracepoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineTracepoint.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.breakpoints; +import java.text.MessageFormat; import java.util.Map; import org.eclipse.cdt.debug.core.CDebugUtils; @@ -22,8 +23,6 @@ import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; -import com.ibm.icu.text.MessageFormat; - /** * A tracepoint that collects data when a particular line of code is reached. * @@ -66,7 +65,7 @@ public class CLineTracepoint extends AbstractTracepoint implements ICLineBreakpo @Override protected String getMarkerMessage() throws CoreException { return MessageFormat.format(BreakpointMessages.getString("CLineTracepoint.0"), //$NON-NLS-1$ - (Object[]) new String[] { CDebugUtils.getBreakpointText(this, false) }); + CDebugUtils.getBreakpointText(this, false)); } @Override diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CWatchpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CWatchpoint.java index c475621c429..f90509fd80f 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CWatchpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CWatchpoint.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.debug.internal.core.breakpoints; import java.math.BigInteger; +import java.text.MessageFormat; import java.util.Map; import org.eclipse.cdt.debug.core.CDebugUtils; @@ -23,8 +24,6 @@ import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; -import com.ibm.icu.text.MessageFormat; - /** * A watchpoint specific to the C/C++ debug model. */ @@ -84,7 +83,7 @@ public class CWatchpoint extends CBreakpoint implements ICWatchpoint2 { format = BreakpointMessages.getString("CWatchpoint.1"); //$NON-NLS-1$ else if (isWriteType() && isReadType()) format = BreakpointMessages.getString("CWatchpoint.2"); //$NON-NLS-1$ - return MessageFormat.format(format, new Object[] { CDebugUtils.getBreakpointText(this, false) }); + return MessageFormat.format(format, CDebugUtils.getBreakpointText(this, false)); } /* (non-Javadoc) diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLocator.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLocator.java index 862fd925185..1215c53cf66 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLocator.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLocator.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.debug.internal.core.sourcelookup; import java.io.IOException; import java.io.StringReader; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; @@ -56,8 +57,6 @@ import org.w3c.dom.NodeList; import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import com.ibm.icu.text.MessageFormat; - /** * Default source locator. */ @@ -348,8 +347,8 @@ public class CSourceLocator implements ICSourceLocator, IPersistableSourceLocato try { clazz = bundle.loadClass(className); } catch (ClassNotFoundException e) { - CDebugCorePlugin.log(MessageFormat.format( - "Unable to restore source location - class not found {0}", new Object[] { className })); //$NON-NLS-1$ + CDebugCorePlugin.log(MessageFormat + .format("Unable to restore source location - class not found {0}", className)); //$NON-NLS-1$ continue; } ICSourceLocation location = null; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/MapEntrySourceContainer.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/MapEntrySourceContainer.java index 1fa73a87f51..76c6d28ff44 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/MapEntrySourceContainer.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/MapEntrySourceContainer.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.debug.internal.core.sourcelookup; import java.io.File; import java.io.IOException; +import java.text.MessageFormat; import java.util.ArrayList; import org.eclipse.cdt.core.model.CoreModel; @@ -33,8 +34,6 @@ import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector; import org.eclipse.debug.core.sourcelookup.containers.AbstractSourceContainer; import org.eclipse.debug.core.sourcelookup.containers.LocalFileStorage; -import com.ibm.icu.text.MessageFormat; - /** * The source container that maps a backend path to the local filesystem path. */ @@ -200,7 +199,7 @@ public class MapEntrySourceContainer extends AbstractSourceContainer { @Override public String getName() { - return MessageFormat.format("{0} - {1}", new Object[] { getBackendPathStr(), getLocalPath().toOSString() }); //$NON-NLS-1$ + return MessageFormat.format("{0} - {1}", getBackendPathStr(), getLocalPath().toOSString()); //$NON-NLS-1$ } @Override diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/SourceUtils.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/SourceUtils.java index 83690389960..5ada3274269 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/SourceUtils.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/SourceUtils.java @@ -17,6 +17,7 @@ package org.eclipse.cdt.debug.internal.core.sourcelookup; import java.io.File; import java.io.IOException; import java.io.StringReader; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.HashSet; import java.util.LinkedList; @@ -62,8 +63,6 @@ import org.w3c.dom.NodeList; import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import com.ibm.icu.text.MessageFormat; - public class SourceUtils { private static final String NAME_COMMON_SOURCE_LOCATIONS = "commonSourceLocations"; //$NON-NLS-1$ private static final String NAME_SOURCE_LOCATION = "sourceLocation"; //$NON-NLS-1$ @@ -151,7 +150,7 @@ public class SourceUtils { } catch (ClassNotFoundException e) { CDebugCorePlugin .log(MessageFormat.format("Unable to restore source location - class not found {0}", //$NON-NLS-1$ - (Object[]) new String[] { className })); + className)); continue; } ICSourceLocation location = null; diff --git a/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF index 24487a50110..3821d26d36e 100644 --- a/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF @@ -61,5 +61,4 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.16.0,4.0.0)", org.eclipse.launchbar.ui;bundle-version="2.0.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.ibm.icu.text Automatic-Module-Name: org.eclipse.cdt.debug.ui diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java index 50f266f578a..b0394099517 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java @@ -20,6 +20,7 @@ package org.eclipse.cdt.debug.internal.ui; import java.io.File; import java.net.URI; +import java.text.MessageFormat; import java.util.HashMap; import org.eclipse.cdt.core.IAddress; @@ -97,8 +98,6 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.ide.IDE; import org.eclipse.ui.part.FileEditorInput; -import com.ibm.icu.text.MessageFormat; - /** * @see IDebugModelPresentation */ diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIUtils.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIUtils.java index 1f4a34ff3e7..ed89429c0bb 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIUtils.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIUtils.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.debug.internal.ui; import java.net.URI; +import java.text.MessageFormat; import java.util.Iterator; import org.eclipse.cdt.debug.core.model.ICBreakpoint; @@ -66,8 +67,6 @@ import org.eclipse.ui.progress.UIJob; import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.ui.texteditor.SimpleMarkerAnnotation; -import com.ibm.icu.text.MessageFormat; - /** * Utility methods for C/C++ Debug UI. */ @@ -129,7 +128,7 @@ public class CDebugUIUtils { StringBuilder label = new StringBuilder(); if (value instanceof ICDebugElementStatus && !((ICDebugElementStatus) value).isOK()) { label.append(MessageFormat.format(CDebugUIMessages.getString("CDTDebugModelPresentation.4"), //$NON-NLS-1$ - (Object[]) new String[] { ((ICDebugElementStatus) value).getMessage() })); + ((ICDebugElementStatus) value).getMessage())); } else if (value instanceof ICValue) { ICType type = null; try { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RegisterGroupDialog.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RegisterGroupDialog.java index 31e8a8b2818..57e22af43a9 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RegisterGroupDialog.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RegisterGroupDialog.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.ui.actions; +import java.text.MessageFormat; import java.util.Arrays; import java.util.List; @@ -40,8 +41,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PlatformUI; -import com.ibm.icu.text.MessageFormat; - /** * This dialog is used to add/edit user-defined register groups. */ @@ -61,7 +60,7 @@ public class RegisterGroupDialog extends TitleAreaDialog { public String getText(Object element) { if (element instanceof IRegisterDescriptor) { IRegisterDescriptor rd = (IRegisterDescriptor) element; - return MessageFormat.format("{0} - {1}", new Object[] { rd.getName(), rd.getGroupName() }); //$NON-NLS-1$ + return MessageFormat.format("{0} - {1}", rd.getName(), rd.getGroupName()); //$NON-NLS-1$ } return super.getText(element); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/LaunchMessages.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/LaunchMessages.java index b1ad4ec1d2b..dbcc2eaa455 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/LaunchMessages.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/LaunchMessages.java @@ -13,11 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.ui.launch; +import java.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; -import com.ibm.icu.text.MessageFormat; - public class LaunchMessages { private static final String BUNDLE_NAME = "org.eclipse.cdt.debug.internal.ui.launch.LaunchMessages";//$NON-NLS-1$ private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME); @@ -26,7 +25,7 @@ public class LaunchMessages { } public static String getFormattedString(String key, String arg) { - return MessageFormat.format(getString(key), new Object[] { arg }); + return MessageFormat.format(getString(key), arg); } public static String getFormattedString(String key, String[] args) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/SignalPropertyPage.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/SignalPropertyPage.java index 7835a949a60..d0915a6715d 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/SignalPropertyPage.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/SignalPropertyPage.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.ui.propertypages; +import java.text.MessageFormat; + import org.eclipse.cdt.debug.core.CDIDebugModel; import org.eclipse.cdt.debug.core.CDebugUtils; import org.eclipse.cdt.debug.core.model.ICSignal; @@ -33,8 +35,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.ui.dialogs.PropertyPage; -import com.ibm.icu.text.MessageFormat; - /** * The property page for a signal. */ @@ -60,7 +60,7 @@ public class SignalPropertyPage extends PropertyPage { String description = getSignal().getDescription(); Label label = new Label(composite, SWT.WRAP); label.setText(MessageFormat.format(PropertyPageMessages.getString("SignalPropertyPage.0"), //$NON-NLS-1$ - new Object[] { description })); + description)); GridData data = new GridData( GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER); data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesContentProvider.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesContentProvider.java index 0898e7d8ac6..3c21bd389b6 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesContentProvider.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesContentProvider.java @@ -14,6 +14,7 @@ package org.eclipse.cdt.debug.internal.ui.views.executables; +import java.text.DateFormat; import java.util.Date; import java.util.List; @@ -31,8 +32,6 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerCell; import org.eclipse.ui.progress.WorkbenchJob; -import com.ibm.icu.text.DateFormat; - class ExecutablesContentProvider extends ColumnLabelProvider implements ITreeContentProvider, IExecutablesChangeListener { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/SourceFilesLabelProvider.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/SourceFilesLabelProvider.java index c3581dfa31c..e8cf86d07b5 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/SourceFilesLabelProvider.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/SourceFilesLabelProvider.java @@ -14,6 +14,7 @@ package org.eclipse.cdt.debug.internal.ui.views.executables; +import java.text.DateFormat; import java.util.Date; import java.util.List; @@ -33,8 +34,6 @@ import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.widgets.Display; -import com.ibm.icu.text.DateFormat; - public class SourceFilesLabelProvider extends TreeColumnViewerLabelProvider implements IExecutablesChangeListener { private SourceFilesViewer viewer; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ExternalToolAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ExternalToolAction.java index b664c08d21a..46844ab3781 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ExternalToolAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ExternalToolAction.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.debug.ui.breakpointactions; import java.io.ByteArrayOutputStream; import java.io.StringReader; +import java.text.MessageFormat; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -45,8 +46,6 @@ import org.w3c.dom.Element; import org.xml.sax.InputSource; import org.xml.sax.helpers.DefaultHandler; -import com.ibm.icu.text.MessageFormat; - public class ExternalToolAction extends AbstractBreakpointAction { private String externalToolName = ""; //$NON-NLS-1$ @@ -87,7 +86,7 @@ public class ExternalToolAction extends AbstractBreakpointAction { } if (!launched) { String errorMsg = MessageFormat.format(Messages.getString("ExternalToolAction.error.0"), //$NON-NLS-1$ - new Object[] { externalToolName }); + externalToolName); errorStatus = new Status(IStatus.ERROR, CDIDebugModel.getPluginIdentifier(), ICDebugInternalConstants.STATUS_CODE_ERROR, errorMsg, null); } @@ -101,7 +100,7 @@ public class ExternalToolAction extends AbstractBreakpointAction { if (errorStatus != null) { String errorMsg = MessageFormat.format(Messages.getString("ExternalToolAction.error.1"), //$NON-NLS-1$ - new Object[] { externalToolName }); + externalToolName); MultiStatus ms = new MultiStatus(CDIDebugModel.getPluginIdentifier(), ICDebugInternalConstants.STATUS_CODE_ERROR, errorMsg, null); ms.add(errorStatus); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/LogAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/LogAction.java index 092ccd34e06..de31ebc5f22 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/LogAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/LogAction.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.debug.ui.breakpointactions; import java.io.ByteArrayOutputStream; import java.io.StringReader; +import java.text.MessageFormat; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -42,8 +43,6 @@ import org.w3c.dom.Element; import org.xml.sax.InputSource; import org.xml.sax.helpers.DefaultHandler; -import com.ibm.icu.text.MessageFormat; - public class LogAction extends AbstractBreakpointAction { private String message = ""; //$NON-NLS-1$ @@ -76,7 +75,7 @@ public class LogAction extends AbstractBreakpointAction { stream.close(); } catch (Exception e) { String errorMsg = MessageFormat.format(Messages.getString("LogAction.error.0"), //$NON-NLS-1$ - new Object[] { getSummary() }); + getSummary()); result = new Status(IStatus.ERROR, CDIDebugModel.getPluginIdentifier(), ICDebugInternalConstants.STATUS_CODE_ERROR, errorMsg, e); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ResumeAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ResumeAction.java index 47d3323abdf..4533b79a938 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ResumeAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ResumeAction.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.debug.ui.breakpointactions; import java.io.ByteArrayOutputStream; import java.io.StringReader; +import java.text.MessageFormat; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -41,8 +42,6 @@ import org.w3c.dom.Element; import org.xml.sax.InputSource; import org.xml.sax.helpers.DefaultHandler; -import com.ibm.icu.text.MessageFormat; - public class ResumeAction extends AbstractBreakpointAction { final static int INCRIMENT_MSEC = 100; @@ -62,7 +61,7 @@ public class ResumeAction extends AbstractBreakpointAction { long currentTime = System.currentTimeMillis(); while (!monitor.isCanceled() && currentTime < endTime) { monitor.setTaskName(MessageFormat.format(Messages.getString("ResumeAction.SummaryResumeTime"), //$NON-NLS-1$ - new Object[] { Long.valueOf((endTime - currentTime) / 1000) })); //) + Long.valueOf((endTime - currentTime) / 1000))); //) monitor.worked(1); Thread.sleep(INCRIMENT_MSEC); currentTime = System.currentTimeMillis(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/SoundAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/SoundAction.java index 5f0963b84ec..fa7a4a391de 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/SoundAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/SoundAction.java @@ -17,6 +17,7 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.io.StringReader; +import java.text.MessageFormat; import javax.sound.sampled.AudioFormat; import javax.sound.sampled.AudioInputStream; @@ -46,8 +47,6 @@ import org.w3c.dom.Element; import org.xml.sax.InputSource; import org.xml.sax.helpers.DefaultHandler; -import com.ibm.icu.text.MessageFormat; - public class SoundAction extends AbstractBreakpointAction { static public void playSoundFile(final File soundFile) { @@ -104,7 +103,7 @@ public class SoundAction extends AbstractBreakpointAction { public IStatus execute(IBreakpoint breakpoint, IAdaptable context, IProgressMonitor monitor) { if (soundFile == null || !soundFile.exists()) { String errorMsg = MessageFormat.format(Messages.getString("SoundAction.error.0"), //$NON-NLS-1$ - new Object[] { getSummary() }); + getSummary()); return new Status(IStatus.ERROR, CDIDebugModel.getPluginIdentifier(), ICDebugInternalConstants.STATUS_CODE_ERROR, errorMsg, null); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/CEventBreakpointsLabelProviderFactory.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/CEventBreakpointsLabelProviderFactory.java index 857dd821cd7..9f5667ea4f6 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/CEventBreakpointsLabelProviderFactory.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/CEventBreakpointsLabelProviderFactory.java @@ -15,6 +15,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.ui.breakpoints; +import java.text.MessageFormat; import java.util.Arrays; import org.eclipse.cdt.debug.core.DebugCoreMessages; @@ -30,8 +31,6 @@ import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.swt.graphics.Image; -import com.ibm.icu.text.MessageFormat; - /** * Factory for event breakpoint label provider */ @@ -103,7 +102,7 @@ public class CEventBreakpointsLabelProviderFactory implements IAdapterFactory { if (ignoreCount > 0) { label.append(' '); label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.3"), //$NON-NLS-1$ - new Object[] { Integer.toString(ignoreCount) })); + Integer.toString(ignoreCount))); } return label; } @@ -112,8 +111,7 @@ public class CEventBreakpointsLabelProviderFactory implements IAdapterFactory { String condition = breakpoint.getCondition(); if (condition != null && condition.length() > 0) { buffer.append(' '); - buffer.append( - MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.4"), new Object[] { condition })); //$NON-NLS-1$ + buffer.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.4"), condition)); //$NON-NLS-1$ } } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/disassembly/rulers/RulerColumnRegistry.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/disassembly/rulers/RulerColumnRegistry.java index a0868d93233..8af95916248 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/disassembly/rulers/RulerColumnRegistry.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/disassembly/rulers/RulerColumnRegistry.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.ui.disassembly.rulers; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -41,8 +42,6 @@ import org.eclipse.ui.internal.texteditor.rulers.RulerColumnMessages; import org.eclipse.ui.internal.texteditor.rulers.RulerColumnPlacementConstraint; import org.eclipse.ui.texteditor.ConfigurationElementSorter; -import com.ibm.icu.text.MessageFormat; - /** * A registry for all extensions to the * <code>rulerColumns</code> extension point. @@ -268,25 +267,25 @@ public final class RulerColumnRegistry { private void noteInvalidExtension(IConfigurationElement element, InvalidRegistryObjectException x) { String message = MessageFormat.format(RulerColumnMessages.RulerColumnRegistry_invalid_msg, - new Object[] { ExtensionPointHelper.findId(element) }); + ExtensionPointHelper.findId(element)); warnUser(message, x); } private void noteUnknownTarget(RulerColumnDescriptor desc, String referencedId) { String message = MessageFormat.format(RulerColumnMessages.RulerColumnRegistry_unresolved_placement_msg, - new Object[] { QUALIFIED_EXTENSION_POINT, referencedId, desc.getName(), desc.getContributor() }); + QUALIFIED_EXTENSION_POINT, referencedId, desc.getName(), desc.getContributor()); warnUser(message, null); } private void noteCycle(RulerColumnDescriptor desc, RulerColumnDescriptor target) { String message = MessageFormat.format(RulerColumnMessages.RulerColumnRegistry_cyclic_placement_msg, - new Object[] { QUALIFIED_EXTENSION_POINT, target.getName(), desc.getName(), desc.getContributor() }); + QUALIFIED_EXTENSION_POINT, target.getName(), desc.getName(), desc.getContributor()); warnUser(message, null); } private void noteDuplicateId(RulerColumnDescriptor desc) { String message = MessageFormat.format(RulerColumnMessages.RulerColumnRegistry_duplicate_id_msg, - new Object[] { QUALIFIED_EXTENSION_POINT, desc.getId(), desc.getContributor() }); + QUALIFIED_EXTENSION_POINT, desc.getId(), desc.getContributor()); warnUser(message, null); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/OldDefaultSourceLocator.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/OldDefaultSourceLocator.java index 29775459fdd..6aa370a7e19 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/OldDefaultSourceLocator.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/OldDefaultSourceLocator.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.debug.ui.sourcelookup; import java.io.IOException; import java.io.StringReader; +import java.text.MessageFormat; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -41,8 +42,6 @@ import org.w3c.dom.Element; import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import com.ibm.icu.text.MessageFormat; - /** * Old default source locator. We keep it for migration purposes. */ @@ -129,7 +128,7 @@ public class OldDefaultSourceLocator implements IPersistableSourceLocator, IAdap return; if (project == null || !project.exists() || !project.isOpen()) abort(MessageFormat.format(SourceLookupMessages.getString("OldDefaultSourceLocator.4"), //$NON-NLS-1$ - new Object[] { projectName }), null); + projectName), null); IPersistableSourceLocator psl = getPersistableSourceLocator(); if (psl != null) psl.initializeFromMemento(data); |