mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-09-10 12:03:16 +02:00
Code Issues Wiki Activity

Bug 562000 - Remove dependency to com.ibm.icu from CDT DSF PDA example

Browse source 
Switch to JRE implementations:
 * com.ibm.icu.text.MessageFormat -> java.text.MessageFormat

Signed-off-by: Mat Booth <mat.booth@gmail.com>
Change-Id: I2c7eae20e197d0871694b09ec375dacb940a942a
This commit is contained in:
Mat Booth 2021-07-28 14:32:04 +01:00
parent 80fb6372c6
commit d98c376045
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dsf/org.eclipse.cdt.examples.dsf.pda/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
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 @@ Export-Package: org.eclipse.cdt.examples.dsf.pda,
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

12
dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDABackend.java
View file

@ -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.io.OutputStream;
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.DebugPlugin;
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 @@ public class PDABackend extends AbstractDsfService {
}
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 @@ public class PDABackend extends AbstractDsfService {
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);