diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF b/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF index 29e7d2fcf2f..6370711374b 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF @@ -48,5 +48,4 @@ Export-Package: org.eclipse.cdt.dsf.gdb, org.eclipse.cdt.dsf.mi.service.command.commands, org.eclipse.cdt.dsf.mi.service.command.events, org.eclipse.cdt.dsf.mi.service.command.output -Import-Package: com.ibm.icu.text Automatic-Module-Name: org.eclipse.cdt.dsf.gdb diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/memory/GdbMemoryBlockRetrieval.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/memory/GdbMemoryBlockRetrieval.java index 65e543e8dbf..f15500caea2 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/memory/GdbMemoryBlockRetrieval.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/memory/GdbMemoryBlockRetrieval.java @@ -18,6 +18,7 @@ package org.eclipse.cdt.dsf.gdb.internal.memory; import java.math.BigInteger; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; import java.util.concurrent.ExecutionException; @@ -60,8 +61,6 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import com.ibm.icu.text.MessageFormat; - /** * A specialization of the DSF memory block retrieval implementation supporting * memory spaces. The memory space support is provisional, thus this class is @@ -371,7 +370,7 @@ public class GdbMemoryBlockRetrieval extends DsfMemoryBlockRetrieval implements if (service instanceof IMemorySpaces2) { final IMemorySpaces2 memSpaceService = (IMemorySpaces2) service; - Query query = new Query() { + Query query = new Query<>() { @Override protected void execute(final DataRequestMonitor drm) { memSpaceService.decodeExpression(dmc, expression, drm); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/InferiorRuntimeProcess.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/InferiorRuntimeProcess.java index 2651b8df4cc..0f3ede5943f 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/InferiorRuntimeProcess.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/InferiorRuntimeProcess.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.launching; +import java.text.MessageFormat; import java.util.Map; import org.eclipse.cdt.dsf.gdb.IGdbDebugConstants; @@ -23,8 +24,6 @@ import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.model.IProcess; import org.eclipse.debug.core.model.RuntimeProcess; -import com.ibm.icu.text.MessageFormat; - /** * A process for the inferior to know it belongs to a DSF-GDB session. * This class also adds the exit code of the inferior to the console. diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchMessages.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchMessages.java index aa2b39be682..ef64de05266 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchMessages.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchMessages.java @@ -15,11 +15,10 @@ *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.launching; +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.dsf.gdb.launching.LaunchMessages";//$NON-NLS-1$ diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBPatternMatchingExpressions.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBPatternMatchingExpressions.java index 40da8bd16e1..f67c9d3450a 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBPatternMatchingExpressions.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBPatternMatchingExpressions.java @@ -16,6 +16,7 @@ *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.service; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -57,8 +58,6 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.osgi.framework.BundleContext; -import com.ibm.icu.text.MessageFormat; - /** * Expressions service added as a layer above the standard Expressions service. * This layer allows to support expression-groups and glob-pattern matching. diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java index 98e43c98481..eed8286d8e0 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java @@ -16,6 +16,7 @@ *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.service; +import java.text.MessageFormat; import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; @@ -72,8 +73,6 @@ import org.eclipse.debug.core.ILaunch; import org.eclipse.launchbar.core.target.ILaunchTarget; import org.eclipse.launchbar.core.target.launch.ITargetedLaunch; -import com.ibm.icu.text.MessageFormat; - /** * Adding support for multi-process with GDB 7.2 * 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 34837112624..1296c097c2b 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 @@ -24,6 +24,7 @@ package org.eclipse.cdt.dsf.mi.service; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -112,8 +113,6 @@ 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. @@ -659,8 +658,7 @@ public class MIBreakpointsManager extends AbstractDsfService // Install the back-end breakpoint(s) for (final String thread : threads) { - DataRequestMonitor drm = new DataRequestMonitor(getExecutor(), - installRM) { + DataRequestMonitor drm = new DataRequestMonitor<>(getExecutor(), installRM) { @Override protected void handleSuccess() { // Add the new back-end breakpoint to the map @@ -1116,8 +1114,8 @@ public class MIBreakpointsManager extends AbstractDsfService // New back-end breakpoints insertion monitor // Holds the list of new back-end breakpoint contexts of the platform breakpoint - final DataRequestMonitor> insertRM = new DataRequestMonitor>( - getExecutor(), null) { + final DataRequestMonitor> insertRM = new DataRequestMonitor<>(getExecutor(), + null) { @Override // In theory, we could have had a partial success and the original threads diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractMIControl.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractMIControl.java index a7b671b6182..14a0b056caf 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractMIControl.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractMIControl.java @@ -25,6 +25,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -82,8 +83,6 @@ import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.osgi.util.NLS; -import com.ibm.icu.text.MessageFormat; - /** * Base implementation of an MI control service. It provides basic handling * of input/output channels, and processing of the commands.