Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/dsf
diff options
context:
space:
mode:
Diffstat (limited to 'dsf')
-rw-r--r--dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF2
-rw-r--r--dsf/org.eclipse.cdt.examples.dsf-feature/feature.xml2
-rw-r--r--dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml2
-rw-r--r--dsf/org.eclipse.cdt.examples.dsf.pda/META-INF/MANIFEST.MF3
-rw-r--r--dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDABackend.java12
-rw-r--r--dsf/pom.xml2
6 files changed, 10 insertions, 13 deletions
diff --git a/dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF b/dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF
index c05a3032ad3..303edf8b4dd 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF
+++ b/dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.cdt.dsf.ui;singleton:=true
-Bundle-Version: 2.6.200.qualifier
+Bundle-Version: 2.6.300.qualifier
Bundle-Activator: org.eclipse.cdt.dsf.internal.ui.DsfUIPlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui;bundle-version="3.5.0",
diff --git a/dsf/org.eclipse.cdt.examples.dsf-feature/feature.xml b/dsf/org.eclipse.cdt.examples.dsf-feature/feature.xml
index ee0a77c7315..ce945864e7e 100644
--- a/dsf/org.eclipse.cdt.examples.dsf-feature/feature.xml
+++ b/dsf/org.eclipse.cdt.examples.dsf-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.cdt.examples.dsf"
label="%featureName"
- version="10.4.0.qualifier"
+ version="10.5.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.cdt.examples.dsf"
license-feature="org.eclipse.license"
diff --git a/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml b/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml
index 47104a0685d..37ac7d115aa 100644
--- a/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml
+++ b/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.cdt</groupId>
<artifactId>cdt-parent</artifactId>
- <version>10.4.0-SNAPSHOT</version>
+ <version>10.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
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 fcc75ead7b4..23d1922391e 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 @@ 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
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 58d75e81b0c..8cf80829270 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.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);
diff --git a/dsf/pom.xml b/dsf/pom.xml
index c921a53123b..378d01da90f 100644
--- a/dsf/pom.xml
+++ b/dsf/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.cdt</groupId>
<artifactId>cdt-parent</artifactId>
- <version>10.4.0-SNAPSHOT</version>
+ <version>10.5.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.cdt.dsf-parent</artifactId>

Back to the top