diff options
| author | David Inglis | 2003-10-09 13:08:36 +0000 |
|---|---|---|
| committer | David Inglis | 2003-10-09 13:08:36 +0000 |
| commit | a74781039e33f0f63735a9304ff6f88d66c25280 (patch) | |
| tree | 82f8c5dddb74a6b5abb7839337446e03841bf95e /launch | |
| parent | 2b2cf4e3c3c30de95b19edf3ed9ae07ccd2cf8dd (diff) | |
| download | org.eclipse.cdt-a74781039e33f0f63735a9304ff6f88d66c25280.tar.gz org.eclipse.cdt-a74781039e33f0f63735a9304ff6f88d66c25280.tar.xz org.eclipse.cdt-a74781039e33f0f63735a9304ff6f88d66c25280.zip | |
patch from Mikhail Khodjaiants
- use 'MultiStatus' instead of 'Status' in the 'abort' method.
Diffstat (limited to 'launch')
| -rw-r--r-- | launch/org.eclipse.cdt.launch/ChangeLog | 4 | ||||
| -rw-r--r-- | launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/launch/org.eclipse.cdt.launch/ChangeLog b/launch/org.eclipse.cdt.launch/ChangeLog index e1e6857880d..52ff4313145 100644 --- a/launch/org.eclipse.cdt.launch/ChangeLog +++ b/launch/org.eclipse.cdt.launch/ChangeLog @@ -1,3 +1,7 @@ +2003-10-07 Mikhail Khodjaiants + src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java: + use 'MultiStatus' instead of 'Status' in the 'abort' method. + 2003-09-22 David Inglis Add help context IDs to plugin and associate ids to each launch tab control. diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java index 112f87e745d..0a157010c6e 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java @@ -32,6 +32,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.MultiStatus; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.DebugPlugin; @@ -244,11 +245,9 @@ abstract public class AbstractCLaunchDelegate implements ILaunchConfigurationDel * @param code error code */ protected void abort(String message, Throwable exception, int code) throws CoreException { - String newMessage = message; - if (exception != null) { - newMessage = message + " : " + exception.getLocalizedMessage(); - } - throw new CoreException(new Status(IStatus.ERROR, getPluginID(), code, newMessage, exception)); + MultiStatus status = new MultiStatus(getPluginID(),code, message,exception); + status.add(new Status(IStatus.ERROR,getPluginID(),code,exception.getLocalizedMessage(),exception)); + throw new CoreException(status); } protected void cancel(String message, int code) throws CoreException { |