From 69448337e522efd520f73f020fd2f55581d9fd36 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 15 Oct 2021 18:33:04 +0100 Subject: [PATCH] Bug 561994 - Remove dependency to com.ibm.icu from CDT Debug Core Switch to JRE implementations: * com.ibm.icu.text.MessageFormat -> java.text.MessageFormat Signed-off-by: Mat Booth Change-Id: I52901be237302d3f862ea3e261e44939b4b52bab --- debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF | 3 +-- .../src/org/eclipse/cdt/debug/core/CDebugUtils.java | 3 +-- .../src/org/eclipse/cdt/debug/core/DebugCoreMessages.java | 3 +-- .../debug/internal/core/breakpoints/BreakpointProblems.java | 4 ++-- .../debug/internal/core/breakpoints/CAddressBreakpoint.java | 3 +-- .../internal/core/breakpoints/CAddressDynamicPrintf.java | 3 +-- .../debug/internal/core/breakpoints/CAddressTracepoint.java | 3 +-- .../cdt/debug/internal/core/breakpoints/CBreakpoint.java | 3 +-- .../debug/internal/core/breakpoints/CFunctionBreakpoint.java | 3 +-- .../internal/core/breakpoints/CFunctionDynamicPrintf.java | 3 +-- .../debug/internal/core/breakpoints/CFunctionTracepoint.java | 3 +-- .../cdt/debug/internal/core/breakpoints/CLineBreakpoint.java | 3 +-- .../debug/internal/core/breakpoints/CLineDynamicPrintf.java | 3 +-- .../cdt/debug/internal/core/breakpoints/CLineTracepoint.java | 3 +-- .../cdt/debug/internal/core/breakpoints/CWatchpoint.java | 3 +-- .../cdt/debug/internal/core/sourcelookup/CSourceLocator.java | 3 +-- .../internal/core/sourcelookup/MapEntrySourceContainer.java | 3 +-- .../cdt/debug/internal/core/sourcelookup/SourceUtils.java | 3 +-- 18 files changed, 19 insertions(+), 36 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 c7eca1d8a6b..e1f3c60f4dc 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.7.0.qualifier +Bundle-Version: 8.7.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="[7.0.0,8.0.0)", org.eclipse.launchbar.core;bundle-version="2.0.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 -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 f7b45fbd549..74768b88cbf 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. */ 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..640c01d1cdb 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$ 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..85db4a54f73 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 { /** 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..d0877778ae7 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. */ 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..2849ae91ce2 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. * 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..1d28b044bd2 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. * 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..aac23e870b5 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. */ 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..2389c2bf425 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. */ 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..5f6969bed64 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. * 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..4885a75346f 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. * 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..194d0f018b0 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. 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..217a2637e28 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. * 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..03a7bcd856e 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. * 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..bc6c0f12e42 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. */ 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..57d0f388db8 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. */ 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..50a9c4ea17c 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. */ 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..e168b2dc024 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$