diff options
6 files changed, 39 insertions, 28 deletions
diff --git a/org.eclipse.core.externaltools/META-INF/MANIFEST.MF b/org.eclipse.core.externaltools/META-INF/MANIFEST.MF index 3a541d12a..029eba7f7 100644 --- a/org.eclipse.core.externaltools/META-INF/MANIFEST.MF +++ b/org.eclipse.core.externaltools/META-INF/MANIFEST.MF @@ -7,7 +7,8 @@ Bundle-Version: 1.0.100.qualifier Bundle-Activator: org.eclipse.core.externaltools.internal.ExternalToolsCore Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.debug.core;bundle-version="[3.6.0,4.0.0)", - org.eclipse.core.variables;bundle-version="[3.2.0,4.0.0)" + org.eclipse.core.variables;bundle-version="[3.2.0,4.0.0)", + org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)" Bundle-RequiredExecutionEnvironment: J2SE-1.4 Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName diff --git a/org.eclipse.debug.core/META-INF/MANIFEST.MF b/org.eclipse.debug.core/META-INF/MANIFEST.MF index fa2681a16..60d93400a 100644 --- a/org.eclipse.debug.core/META-INF/MANIFEST.MF +++ b/org.eclipse.debug.core/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Export-Package: org.eclipse.debug.core, org.eclipse.debug.internal.core.sourcelookup;x-friends:="org.eclipse.debug.ui", org.eclipse.debug.internal.core.sourcelookup.containers;x-friends:="org.eclipse.debug.ui", org.eclipse.debug.internal.core.variables;x-friends:="org.eclipse.debug.ui,org.eclipse.jdt.debug.ui" -Require-Bundle: org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)";visibility:=reexport, +Require-Bundle: org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)", org.eclipse.core.variables;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.2.0,2.0.0)", diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java index ecd58992c..62d723afe 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java @@ -2348,18 +2348,20 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe ILaunch launch = null; for (int i= 0; i < launches.length; i++) { launch = launches[i]; - try { - if (launch instanceof IDisconnect) { - IDisconnect disconnect = (IDisconnect)launch; - if (disconnect.canDisconnect()) { - disconnect.disconnect(); - } - } - if (launch.canTerminate()) { - launch.terminate(); - } - } catch (DebugException e) { - DebugPlugin.log(e); + if(launch != null) { + try { + if (launch instanceof IDisconnect) { + IDisconnect disconnect = (IDisconnect)launch; + if (disconnect.canDisconnect()) { + disconnect.disconnect(); + } + } + if (launch.canTerminate()) { + launch.terminate(); + } + } catch (DebugException e) { + DebugPlugin.log(e); + } } } diff --git a/org.eclipse.debug.examples.core/pdavm/src/org/eclipse/debug/examples/pdavm/PDAVirtualMachine.java b/org.eclipse.debug.examples.core/pdavm/src/org/eclipse/debug/examples/pdavm/PDAVirtualMachine.java index e140e1085..b3f1b0313 100644 --- a/org.eclipse.debug.examples.core/pdavm/src/org/eclipse/debug/examples/pdavm/PDAVirtualMachine.java +++ b/org.eclipse.debug.examples.core/pdavm/src/org/eclipse/debug/examples/pdavm/PDAVirtualMachine.java @@ -378,15 +378,20 @@ public class PDAVirtualMachine { FileReader fileReader = new FileReader(inputFile); StringWriter stringWriter = new StringWriter(); List code = new LinkedList(); - int c = fileReader.read(); - while (c != -1) { - if (c == '\n') { - code.add(stringWriter.toString().trim()); - stringWriter = new StringWriter(); - } else { - stringWriter.write(c); - } - c = fileReader.read(); + try { + int c = fileReader.read(); + while (c != -1) { + if (c == '\n') { + code.add(stringWriter.toString().trim()); + stringWriter = new StringWriter(); + } else { + stringWriter.write(c); + } + c = fileReader.read(); + } + } + finally { + fileReader.close(); } code.add(stringWriter.toString().trim()); fCode = (String[])code.toArray(new String[code.size()]); diff --git a/org.eclipse.debug.tests/META-INF/MANIFEST.MF b/org.eclipse.debug.tests/META-INF/MANIFEST.MF index 125d0cf6c..c89704cad 100644 --- a/org.eclipse.debug.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.debug.tests/META-INF/MANIFEST.MF @@ -8,9 +8,11 @@ Bundle-Localization: plugin Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.debug.ui;bundle-version="[3.6.0,4.0.0)", - org.junit;bundle-version="3.8.2", + org.junit, org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)", - org.eclipse.test.performance;bundle-version="3.6.0" + org.eclipse.test.performance;bundle-version="3.6.0", + org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)", + org.eclipse.debug.core;bundle-version="[3.6.0,4.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.4 Bundle-Vendor: %providerName diff --git a/org.eclipse.debug.ui/META-INF/MANIFEST.MF b/org.eclipse.debug.ui/META-INF/MANIFEST.MF index 83926ff65..b82eb4d65 100644 --- a/org.eclipse.debug.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.debug.ui/META-INF/MANIFEST.MF @@ -55,7 +55,7 @@ Export-Package: org.eclipse.debug.internal.ui; org.eclipse.debug.examples.ui", org.eclipse.debug.internal.ui.viewers.update;x-friends:="org.eclipse.debug.examples.ui,org.eclipse.jdt.debug.ui,org.eclipse.wst.jsdt.debug.ui", org.eclipse.debug.internal.ui.views;x-internal:=true, - org.eclipse.debug.internal.ui.views.breakpoints;x-internal:=true, + org.eclipse.debug.internal.ui.views.breakpoints;x-friends:="org.eclipse.debug.tests", org.eclipse.debug.internal.ui.views.console;x-friends:="org.eclipse.ant.ui", org.eclipse.debug.internal.ui.views.expression;x-internal:=true, org.eclipse.debug.internal.ui.views.launch;x-internal:=true, @@ -76,13 +76,14 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)", org.eclipse.ui;bundle-version="[3.5.0,4.0.0)", org.eclipse.ui.console;bundle-version="[3.4.0,4.0.0)", org.eclipse.help;bundle-version="[3.4.0,4.0.0)", - org.eclipse.debug.core;bundle-version="[3.7.0,4.0.0)";visibility:=reexport, + org.eclipse.debug.core;bundle-version="[3.7.0,4.0.0)", org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)", org.eclipse.ui.workbench.texteditor;bundle-version="[3.5.0,4.0.0)", org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)", org.eclipse.ui.editors;bundle-version="[3.5.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", - org.eclipse.core.filesystem;bundle-version="[1.2.0,2.0.0)" + org.eclipse.core.filesystem;bundle-version="[1.2.0,2.0.0)", + org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)" Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Import-Package: com.ibm.icu.text, |