From 80fb6372c62f353ee5ca24d0b245fa177ed964bc Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 28 Jul 2021 10:07:56 +0100 Subject: [PATCH] Bug 562001 - Remove dependency to com.ibm.icu from CDT Launch Switch to JRE implementations: * com.ibm.icu.text.MessageFormat -> java.text.MessageFormat * com.ibm.icu.text.DateFormat -> java.text.DateFormat Signed-off-by: Mat Booth Change-Id: I449fab36fdd45b1cd26eac216f6867a37462ae93 --- launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF | 3 +-- .../org/eclipse/cdt/launch/AbstractCLaunchDelegate.java | 7 +++---- .../src/org/eclipse/cdt/launch/LaunchUtils.java | 5 ++--- .../cdt/launch/internal/LocalRunLaunchDelegate.java | 5 ++--- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF b/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF index c6667667825..a7584fa691f 100644 --- a/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF +++ b/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.launch; singleton:=true -Bundle-Version: 10.3.0.qualifier +Bundle-Version: 10.3.100.qualifier Bundle-Activator: org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -30,5 +30,4 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)", org.eclipse.launchbar.core;bundle-version="2.1.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.ibm.icu.text Automatic-Module-Name: org.eclipse.cdt.launch diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java index eb3edd1682e..fb68ed6d8b5 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2020 QNX Software Systems and others. + * Copyright (c) 2005, 2021 QNX Software Systems and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -22,6 +22,8 @@ package org.eclipse.cdt.launch; import java.io.File; import java.io.FileNotFoundException; +import java.text.DateFormat; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; @@ -78,9 +80,6 @@ import org.eclipse.debug.core.model.LaunchConfigurationDelegate; import org.eclipse.debug.ui.RefreshTab; import org.eclipse.osgi.util.NLS; -import com.ibm.icu.text.DateFormat; -import com.ibm.icu.text.MessageFormat; - /** * AbstractCLaunchDelegate is the launch delegate used by most CDI based debuggers. * It has been superseded by AbstractCLaunchDelegate2 which is used by most DSF based diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/LaunchUtils.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/LaunchUtils.java index 53afc404862..cbf5db85086 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/LaunchUtils.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/LaunchUtils.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2016 QNX Software Systems and others. + * Copyright (c) 2004, 2021 QNX Software Systems and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -18,6 +18,7 @@ package org.eclipse.cdt.launch; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; +import java.text.MessageFormat; import java.util.HashSet; import java.util.Set; @@ -57,8 +58,6 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.activities.IActivityManager; import org.eclipse.ui.activities.IWorkbenchActivitySupport; -import com.ibm.icu.text.MessageFormat; - /** * Utility methods. */ diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalRunLaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalRunLaunchDelegate.java index 3cb097e99cb..62f8f3f9e52 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalRunLaunchDelegate.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalRunLaunchDelegate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2015 QNX Software Systems and others. + * Copyright (c) 2005, 2021 QNX Software Systems and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -17,6 +17,7 @@ package org.eclipse.cdt.launch.internal; import java.io.File; import java.io.IOException; +import java.text.DateFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; @@ -55,8 +56,6 @@ import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.debug.core.ILaunchManager; -import com.ibm.icu.text.DateFormat; - /** * The launch delegate for Run mode. */