Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Applied: Re: [cdt-patch] Patch for head: MultiStatus instead of Status

Applied

Mikhail Khodjaiants wrote:

------------------------------------------------------------------------

Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.launch/ChangeLog,v
retrieving revision 1.40
diff -u -r1.40 ChangeLog
--- ChangeLog	25 Sep 2003 13:34:49 -0000	1.40
+++ ChangeLog	7 Oct 2003 18:22:34 -0000
@@ -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.
	
Index: src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java,v
retrieving revision 1.16
diff -u -r1.16 AbstractCLaunchDelegate.java
--- src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java	3 Jul 2003 18:45:07 -0000	1.16
+++ src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java	7 Oct 2003 18:22:34 -0000
@@ -32,6 +32,7 @@
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 @@
	 * @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 {



Back to the top