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 73666e5e105..b57a2d8a49e 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.1.1.qualifier +Bundle-Version: 2.1.100.qualifier Bundle-Activator: org.eclipse.cdt.examples.dsf.pda.PDAPlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/PDAPlugin.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/PDAPlugin.java index 3fb7c98cdb5..d545b74d59f 100644 --- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/PDAPlugin.java +++ b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/PDAPlugin.java @@ -16,8 +16,6 @@ package org.eclipse.cdt.examples.dsf.pda; import java.io.File; -import java.io.IOException; -import java.net.URL; import java.util.MissingResourceException; import java.util.ResourceBundle; import java.util.concurrent.ExecutionException; @@ -153,13 +151,18 @@ public class PDAPlugin extends Plugin { * IPath in the plugin directory, or null if none. */ public static File getFileInPlugin(IPath path) { - try { - URL installURL = new URL(getDefault().getDescriptor().getInstallURL(), path.toString()); - URL localURL = Platform.asLocalURL(installURL); - return new File(localURL.getFile()); - } catch (IOException ioe) { - return null; + if (true) { + throw new RuntimeException( + "The commented out code below has not worked in many years with a NullPointerException. Now the API that was returning null has been removed, see Bug 475944"); } + return null; + // try { + // URL installURL = new URL(getDefault().getDescriptor().getInstallURL(), path.toString()); + // URL localURL = Platform.asLocalURL(installURL); + // return new File(localURL.getFile()); + // } catch (IOException ioe) { + // return null; + // } } /** 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 b9426f7698f..91ab830cb01 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 @@ -38,7 +38,6 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.debug.core.DebugPlugin; @@ -243,11 +242,15 @@ public class PDABackend extends AbstractDsfService { commandList.add(javaVMExec); commandList.add("-cp"); - try { - commandList.add(File.pathSeparator + PDAPlugin.getFileInPlugin(new Path("bin")) + File.pathSeparator - + new File(Platform.asLocalURL(PDAPlugin.getDefault().getDescriptor().getInstallURL()).getFile())); - } catch (IOException e) { + if (true) { + throw new RuntimeException( + "The commented out code below has not worked in many years with a NullPointerException. Now the API that was returning null has been removed, see Bug 475944"); } + // try { + // commandList.add(File.pathSeparator + PDAPlugin.getFileInPlugin(new Path("bin")) + File.pathSeparator + // + new File(Platform.asLocalURL(PDAPlugin.getDefault().getDescriptor().getInstallURL()).getFile())); + // } catch (IOException e) { + // } commandList.add("org.eclipse.cdt.examples.pdavm.PDAVirtualMachine");