Bug 562000 - Remove dependency to com.ibm.icu from CDT DSF PDA example Switch to JRE implementations: * com.ibm.icu.text.MessageFormat -> java.text.MessageFormat Signed-off-by: Mat Booth <mat.booth@gmail.com> Change-Id: I2c7eae20e197d0871694b09ec375dacb940a942a
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/META-INF/MANIFEST.MF b/dsf/org.eclipse.cdt.examples.dsf.pda/META-INF/MANIFEST.MF index fcc75ea..23d1922 100644 --- a/dsf/org.eclipse.cdt.examples.dsf.pda/META-INF/MANIFEST.MF +++ b/dsf/org.eclipse.cdt.examples.dsf.pda/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.examples.dsf.pda;singleton:=true -Bundle-Version: 2.2.100.qualifier +Bundle-Version: 2.2.200.qualifier Bundle-Activator: org.eclipse.cdt.examples.dsf.pda.PDAPlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, @@ -21,5 +21,4 @@ org.eclipse.cdt.examples.dsf.pda.sourcelookup Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: %providerName -Import-Package: com.ibm.icu.text Automatic-Module-Name: org.eclipse.cdt.examples.dsf.pda
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDABackend.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDABackend.java index 58d75e8..8cf8082 100644 --- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDABackend.java +++ b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDABackend.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Nokia Corporation. + * Copyright (c) 2008, 2021 Nokia Corporation. * * This fProgram and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -21,6 +21,7 @@ import java.net.ServerSocket; import java.net.Socket; import java.net.UnknownHostException; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Hashtable; import java.util.List; @@ -44,8 +45,6 @@ import org.eclipse.debug.core.Launch; import org.osgi.framework.BundleContext; -import com.ibm.icu.text.MessageFormat; - /** * Service that manages the backend process: starting the process * and monitoring for its shutdown. @@ -235,8 +234,7 @@ } File exe = new File(javaVMExec); if (!exe.exists()) { - abort(MessageFormat.format("Specified java VM executable {0} does not exist.", new Object[] { javaVMExec }), - null); + abort(MessageFormat.format("Specified java VM executable {0} does not exist.", javaVMExec), null); } fBackendProcessName = javaVMExec; @@ -269,8 +267,8 @@ if (file.exists()) absolutePath = file.getLocation().toPortableString(); else - abort(MessageFormat.format("PDA program {0} does not exist.", - new Object[] { file.getFullPath().toPortableString() }), null); + abort(MessageFormat.format("PDA program {0} does not exist.", file.getFullPath().toPortableString()), + null); } commandList.add(absolutePath);