From 8db32cb918c7ad1a706ae25038cc4a86ae471303 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 20 Oct 2021 18:11:05 +0100 Subject: [PATCH] Bug 561998 - Remove dependency to com.ibm.icu from CDT DSF GDB UI Switch to JRE implementations: * com.ibm.icu.text.MessageFormat -> java.text.MessageFormat Signed-off-by: Mat Booth Change-Id: Ib21c4c31cdc28bf70df2688a403afcf25a81cadc --- dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/META-INF/MANIFEST.MF | 1 - .../cdt/dsf/gdb/internal/ui/launching/LaunchUIMessages.java | 3 +-- .../cdt/dsf/gdb/internal/ui/launching/ProcessPrompter.java | 6 ++---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/META-INF/MANIFEST.MF b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/META-INF/MANIFEST.MF index bb1175f48fb..1180f39097a 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/META-INF/MANIFEST.MF +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/META-INF/MANIFEST.MF @@ -51,5 +51,4 @@ Export-Package: org.eclipse.cdt.dsf.gdb.internal.ui;x-friends:="org.eclipse.cdt. org.eclipse.cdt.dsf.gdb.internal.ui.viewmodel.breakpoints;x-internal:=true, org.eclipse.cdt.dsf.gdb.internal.ui.viewmodel.commands;x-internal:=true, org.eclipse.cdt.dsf.gdb.internal.ui.viewmodel.launch;x-internal:=true -Import-Package: com.ibm.icu.text Automatic-Module-Name: org.eclipse.cdt.dsf.gdb.ui diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/LaunchUIMessages.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/LaunchUIMessages.java index da7d91e0d97..05cf4442cde 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/LaunchUIMessages.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/LaunchUIMessages.java @@ -13,11 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.internal.ui.launching; +import java.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; -import com.ibm.icu.text.MessageFormat; - public class LaunchUIMessages { private static final String BUNDLE_NAME = "org.eclipse.cdt.dsf.gdb.internal.ui.launching.LaunchUIMessages";//$NON-NLS-1$ diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/ProcessPrompter.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/ProcessPrompter.java index 770db858d63..2bd1434b324 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/ProcessPrompter.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/ProcessPrompter.java @@ -36,8 +36,6 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.dialogs.ISelectionStatusValidator; -import com.ibm.icu.text.MessageFormat; - public class ProcessPrompter implements IStatusHandler { public static class PrompterInfo { @@ -181,8 +179,8 @@ public class ProcessPrompter implements IStatusHandler { for (Object sel : selection) { String pid = Integer.toString(((IProcessExtendedInfo) sel).getPid(), 10); if (prompterInfo.debuggedProcesses.contains(pid)) { - return new Status(IStatus.ERROR, GdbUIPlugin.getUniqueIdentifier(), MessageFormat - .format(LaunchUIMessages.getString("ProcessPrompter.ErrProcessConected"), pid)); //$NON-NLS-1$ + return new Status(IStatus.ERROR, GdbUIPlugin.getUniqueIdentifier(), + LaunchUIMessages.getFormattedString("ProcessPrompter.ErrProcessConected", pid)); //$NON-NLS-1$ } } return new Status(IStatus.OK, GdbUIPlugin.getUniqueIdentifier(), ""); //$NON-NLS-1$