Attachment #67482 for bug #186727

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 186727
Collapse All | Expand All




		final StatusInfo statusInfo = new StatusInfo(statusAdapter);

		if (!PlatformUI.isWorkbenchRunning()) {
			// we are shutting down, so just log
			WorkbenchPlugin.log(statusInfo.getStatus().getStatus());
			return;
		}

				Display.getDefault().asyncExec(new Runnable() {
					public void run() {
						dialog = new StatusDialog(ProgressManagerUtil
								.getDefaultParent(), statusInfo, IStatus.INFO
								| IStatus.WARNING | IStatus.ERROR, modal);
								| IStatus.ERROR, modal);
						dialog.open();
						dialog.getShell().addDisposeListener(disposeListener);
					}

			dialog.getShell().removeDisposeListener(disposeListener);
			dialog.close();
			dialog = new StatusDialog(ProgressManagerUtil.getDefaultParent(),
					statusInfo, IStatus.INFO | IStatus.WARNING | IStatus.ERROR,
					modal);

			dialog.open();
			dialog.getShell().addDisposeListener(disposeListener);

Lines 11-16 Link Here

(-)Eclipse UI/org/eclipse/ui/statushandlers/WorkbenchErrorHandler.java (+13 lines)
11		11
12	package org.eclipse.ui.statushandlers;	12	package org.eclipse.ui.statushandlers;
13		13
		14	import org.eclipse.core.runtime.IStatus;
		15	import org.eclipse.core.runtime.Status;
14	import org.eclipse.ui.application.WorkbenchAdvisor;	16	import org.eclipse.ui.application.WorkbenchAdvisor;
15	import org.eclipse.ui.internal.WorkbenchPlugin;	17	import org.eclipse.ui.internal.WorkbenchPlugin;
16	import org.eclipse.ui.internal.statushandlers.StatusNotificationManager;	18	import org.eclipse.ui.internal.statushandlers.StatusNotificationManager;
Lines 33-38 Link Here
33	public void handle(final StatusAdapter statusAdapter, int style) {	35	public void handle(final StatusAdapter statusAdapter, int style) {
34	if (((style & StatusManager.SHOW) == StatusManager.SHOW)	36	if (((style & StatusManager.SHOW) == StatusManager.SHOW)
35	\|\| ((style & StatusManager.BLOCK) == StatusManager.BLOCK)) {	37	\|\| ((style & StatusManager.BLOCK) == StatusManager.BLOCK)) {
		38
		39	// INFO status is set in the adapter when the passed adapter has OK
		40	// or CANCEL status
		41	if (statusAdapter.getStatus().getSeverity() == IStatus.OK
		42	\|\| statusAdapter.getStatus().getSeverity() == IStatus.CANCEL) {
		43	IStatus status = statusAdapter.getStatus();
		44	statusAdapter.setStatus(new Status(IStatus.INFO, status
		45	.getPlugin(), status.getMessage(), status
		46	.getException()));
		47	}
		48
36	boolean modal = ((style & StatusManager.BLOCK) == StatusManager.BLOCK);	49	boolean modal = ((style & StatusManager.BLOCK) == StatusManager.BLOCK);
37	StatusNotificationManager.getInstance().addError(statusAdapter,	50	StatusNotificationManager.getInstance().addError(statusAdapter,
38	modal);	51	modal);

Return to bug 186727

Lines 90-96 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/statushandlers/StatusNotificationManager.java (-6 / +5 lines)
90	final StatusInfo statusInfo = new StatusInfo(statusAdapter);	90	final StatusInfo statusInfo = new StatusInfo(statusAdapter);
91		91
92	if (!PlatformUI.isWorkbenchRunning()) {	92	if (!PlatformUI.isWorkbenchRunning()) {
93	// we are shuttting down, so just log	93	// we are shutting down, so just log
94	WorkbenchPlugin.log(statusInfo.getStatus().getStatus());	94	WorkbenchPlugin.log(statusInfo.getStatus().getStatus());
95	return;	95	return;
96	}	96	}
Lines 127-135 Link Here
127	Display.getDefault().asyncExec(new Runnable() {	127	Display.getDefault().asyncExec(new Runnable() {
128	public void run() {	128	public void run() {
129	dialog = new StatusDialog(ProgressManagerUtil	129	dialog = new StatusDialog(ProgressManagerUtil
130	.getDefaultParent(), statusInfo, IStatus.OK	130	.getDefaultParent(), statusInfo, IStatus.INFO
131	\| IStatus.INFO \| IStatus.WARNING	131	\| IStatus.WARNING \| IStatus.ERROR, modal);
132	\| IStatus.ERROR, modal);
133	dialog.open();	132	dialog.open();
134	dialog.getShell().addDisposeListener(disposeListener);	133	dialog.getShell().addDisposeListener(disposeListener);
135	}	134	}
Lines 157-164 Link Here
157	dialog.getShell().removeDisposeListener(disposeListener);	156	dialog.getShell().removeDisposeListener(disposeListener);
158	dialog.close();	157	dialog.close();
159	dialog = new StatusDialog(ProgressManagerUtil.getDefaultParent(),	158	dialog = new StatusDialog(ProgressManagerUtil.getDefaultParent(),
160	statusInfo, IStatus.OK \| IStatus.INFO \| IStatus.WARNING	159	statusInfo, IStatus.INFO \| IStatus.WARNING \| IStatus.ERROR,
161	\| IStatus.ERROR, modal);	160	modal);
162		161
163	dialog.open();	162	dialog.open();
164	dialog.getShell().addDisposeListener(disposeListener);	163	dialog.getShell().addDisposeListener(disposeListener);