Attachment #109067 for bug #241244




import org.eclipse.ui.internal.progress.ProgressMessages;
import org.eclipse.ui.internal.statushandlers.DefaultDetailsArea;
import org.eclipse.ui.internal.statushandlers.StackTraceSupportArea;
import org.eclipse.ui.internal.statushandlers.ThreadBlocker;
import org.eclipse.ui.progress.IProgressConstants;

import com.ibm.icu.text.DateFormat;

public class WorkbenchStatusDialogManager {

	/**
	 * @since 3.4
	 *
	 */
	private final class DefaultLabelProvider implements ITableLabelProvider {
		ResourceManager manager = new LocalResourceManager(JFaceResources.getResources());

		/*
		 * (non-Javadoc)
		 * 
		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
		 */
		public void addListener(ILabelProviderListener listener) {
			// Do nothing
		}

		/*
		 * (non-Javadoc)
		 * 
		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
		 */
		public void dispose() {
			manager.dispose();
		}

		/*
		 * (non-Javadoc)
		 * 
		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object,
		 *      int)
		 */
		public Image getColumnImage(Object element, int columnIndex) {
			Image result = null;
			if (element != null) {
				StatusAdapter statusAdapter = ((StatusAdapter) element);
				Job job = (Job) (statusAdapter.getAdapter(Job.class));
				if (job != null) {
					result = getIcon(job);
				}
			}
			// if somehow disposed image was received (should not happen)
			if (result != null && result.isDisposed()) {
				result = null;
			}
			return result;
		}

		/*
		 * (non-Javadoc)
		 * 
		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object,
		 *      int)
		 */
		public String getColumnText(Object element, int columnIndex) {
			StatusAdapter statusAdapter = (StatusAdapter) element;
			String text = WorkbenchMessages.WorkbenchStatusDialog_ProblemOccurred;
			if (getStatusAdapters().size() == 1) {
				Job job = (Job) (statusAdapter.getAdapter(Job.class));
				if (job != null) {
					text = getPrimaryMessage(statusAdapter);
				} else {
					text = getSecondaryMessage(statusAdapter);
				}
			} else {
				Job job = (Job) (statusAdapter.getAdapter(Job.class));
				if (job != null) {
					text = job.getName();
				} else {
					text = getPrimaryMessage(statusAdapter);
				}
			}
			Long timestamp = (Long) statusAdapter
					.getProperty(IStatusAdapterConstants.TIMESTAMP_PROPERTY);

			if (timestamp != null && getStatusAdapters().size() > 1) {
				String date = DateFormat.getDateTimeInstance(DateFormat.LONG,
						DateFormat.LONG)
						.format(new Date(timestamp.longValue()));
				return NLS.bind(ProgressMessages.JobInfo_Error, (new Object[] {
						text, date }));
			}
			return text;
		}

		/*
		 * Get the icon for the job.
		 */
		private Image getIcon(Job job) {
			if (job != null) {
				Object property = job
						.getProperty(IProgressConstants.ICON_PROPERTY);

				// Create an image from the job's icon property or family
				if (property instanceof ImageDescriptor) {
					return manager.createImage((ImageDescriptor) property);
				} else if (property instanceof URL) {
					return manager.createImage(ImageDescriptor
							.createFromURL((URL) property));
				} else {
					// Let the progress manager handle the resource management
					return ProgressManager.getInstance().getIconFor(job);
				}
			}
			return null;
		}

		/*
		 * (non-Javadoc)
		 * 
		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object,
		 *      java.lang.String)
		 */
		public boolean isLabelProperty(Object element, String property) {
			return false;
		}

		/*
		 * (non-Javadoc)
		 * 
		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
		 */
		public void removeListener(ILabelProviderListener listener) {
			// Do nothing
		}
	}

	/**
	 * This class is responsible for managing details area.
	 * 
	 * @since 3.4


			this.statusDialog = statusDialog;
			setShellStyle(SWT.RESIZE | SWT.MAX | SWT.MIN | getShellStyle());
			setBlockOnOpen(false);

			if (!modal) {
				setShellStyle(~SWT.APPLICATION_MODAL & getShellStyle());

			if (title != null) {
				shell.setText(title);
			}
			if (getStatusAdapters().size() > 1) {
				shell
						.setText(WorkbenchMessages.WorkbenchStatusDialog_MultipleProblemsHaveOccured);
			}
		}

		public int convertHeightInCharsToPixels(int chars) {

		protected Control createDialogArea(Composite parent) {
			return statusDialog.createDialogArea(parent);
		}
		

		public Button getButton(int id) {
			return super.getButton(id);

			return true;
		}

		/*
		 * (non-Javadoc)
		 * 
		 * @see org.eclipse.jface.window.Window#open()
		 */
		public int open() {
			if (shouldDisplay(statusAdapter, displayMask)) {
				int result = super.open();
				if (modalitySwitch) {
					if (detailsOpened) {
						showDetailsArea();
					}
					if (trayOpened) {
						openTray(supportTray);
					}
				}
				return result;
			}
			setReturnCode(OK);
			return OK;
		}

		/* (non-Javadoc)
		 * @see org.eclipse.jface.dialogs.TrayDialog#closeTray()
		 */

		public void widgetDisposed(org.eclipse.swt.events.DisposeEvent e) {
			dialog = null;
			statusListViewer = null;
			threadBlocker.releaseAll();
			statusAdapter = null;
			errors.clear();
			modals.clear();

	 * Stores information, which statuses should be displayed in modal window.
	 */
	private HashMap modals = new HashMap();
	
	

	/**
	 * This field stores the real dialog that appears to the user.

	/**
	 * A list label provider
	 */
	private ITableLabelProvider statusListLabelProvider;
		ResourceManager manager = new LocalResourceManager(JFaceResources.getResources());
	
		/*
		 * (non-Javadoc)
		 * 
		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
		 */
		public void addListener(ILabelProviderListener listener) {
			// Do nothing
		}

		/*
		 * (non-Javadoc)
		 * 
		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
		 */
		public void dispose() {
			manager.dispose();
		}

		/*
		 * (non-Javadoc)
		 * 
		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object,
		 *      int)
		 */
		public Image getColumnImage(Object element, int columnIndex) {
			Image result = null;
			if (element != null) {
				StatusAdapter statusAdapter = ((StatusAdapter) element);
				Job job = (Job) (statusAdapter.getAdapter(Job.class));
				if (job != null) {
					result = getIcon(job);
				}
			}
			// if somehow disposed image was received (should not happen)
			if (result != null && result.isDisposed()) {
				result = null;
			}
			return result;
		}

		/*
		 * (non-Javadoc)
		 * 
		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object,
		 *      int)
		 */
		public String getColumnText(Object element, int columnIndex) {
			StatusAdapter statusAdapter = (StatusAdapter) element;
			String text = WorkbenchMessages.WorkbenchStatusDialog_ProblemOccurred;
			if (getStatusAdapters().size() == 1) {
				Job job = (Job) (statusAdapter.getAdapter(Job.class));
				if (job != null) {
					text = getPrimaryMessage(statusAdapter);
				} else {
					text = getSecondaryMessage(statusAdapter);
				}
			} else {
				Job job = (Job) (statusAdapter.getAdapter(Job.class));
				if (job != null) {
					text = job.getName();
				} else {
					text = getPrimaryMessage(statusAdapter);
				}
			}
			Long timestamp = (Long) statusAdapter
					.getProperty(IStatusAdapterConstants.TIMESTAMP_PROPERTY);

			if (timestamp != null && getStatusAdapters().size() > 1) {
				String date = DateFormat.getDateTimeInstance(DateFormat.LONG,
						DateFormat.LONG)
						.format(new Date(timestamp.longValue()));
				return NLS.bind(ProgressMessages.JobInfo_Error, (new Object[] {
						text, date }));
			}
			return text;
		}

		/*
		 * Get the icon for the job.
		 */
		private Image getIcon(Job job) {
			if (job != null) {
				Object property = job
						.getProperty(IProgressConstants.ICON_PROPERTY);

				// Create an image from the job's icon property or family
				if (property instanceof ImageDescriptor) {
					return manager.createImage((ImageDescriptor) property);
				} else if (property instanceof URL) {
					return manager.createImage(ImageDescriptor
							.createFromURL((URL) property));
				} else {
					// Let the progress manager handle the resource management
					return ProgressManager.getInstance().getIconFor(job);
				}
			}
			return null;
		}

		/*
		 * (non-Javadoc)
		 * 
		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object,
		 *      java.lang.String)
		 */
		public boolean isLabelProperty(Object element, String property) {
			return false;
		}

		/*
		 * (non-Javadoc)
		 * 
		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
		 */
		public void removeListener(ILabelProviderListener listener) {
			// Do nothing
		}
	};

	/**
	 * This variable holds current details area provider.

	private DetailsAreaManager detailsManager = new DetailsAreaManager();

	private DisposeListener disposeListener = new StatusDialogDisposeListener();
	
	private ThreadBlocker threadBlocker = new ThreadBlocker();

	/**
	 * The title of the dialog.

	 */
	
	public WorkbenchStatusDialogManager(int displayMask, String dialogTitle) {
		
		Assert.isNotNull(Display.getCurrent(),
						"WorkbenchStatusDialogManager must be instantiated in UI thread"); //$NON-NLS-1$

		this.displayMask = displayMask;
		this.title = dialogTitle == null ? JFaceResources
				.getString("Problem_Occurred") : //$NON-NLS-1$

			return;
		}
		
		//if we should not display status, ignore it as fast as possible.
		if(!shouldDisplay(statusAdapter, displayMask)){
			return;
		}
		
		if (!PlatformUI.isWorkbenchRunning()) {
			// we are shutting down, so just log
			WorkbenchPlugin.log(statusAdapter.getStatus());
			return;
		}
		
		
		final boolean isUIThread = Display.getCurrent() != null;

		Runnable r = new Runnable(){
		// dialog
		if (dialog == null || dialog.getShell().isDisposed()) {

			public void run() {
				// we will handle the status. add it to the list
				errors.add(statusAdapter);
				modals.put(statusAdapter, new Boolean(modal));
				//do not change selection if anything was selected
				if(WorkbenchStatusDialogManager.this.statusAdapter == null){
							WorkbenchStatusDialogManager.this, shouldBeModal());
					setSelectedStatusAdapter(statusAdapter);
					dialog.open();
					dialog.getShell().addDisposeListener(disposeListener);
				}
				
				if (!isDialogOpen()) {
					// Delay prompting if the status adapter property is set
					if (shouldPrompt(statusAdapter)) {
						openNewStatusDialog(modal, isUIThread);
					} // else
					// if we should not prompt, then it is enough to have added
					// statusAdapter to the list.
				} else {
					if (statusAdapter
							.getProperty(IProgressConstants.NO_IMMEDIATE_ERROR_PROMPT_PROPERTY) != null) {
						statusAdapter
								.setProperty(
										IProgressConstants.NO_IMMEDIATE_ERROR_PROMPT_PROPERTY,
										Boolean.FALSE);
					}
					addStatusToExistingDialog(modal, isUIThread);
				}
			}
			
		};
		
		if (isUIThread) {
			r.run(); // we are already in UI Thread, so just execute necessary
						// code
		} else {
			// it must be *sync*Exec.
			Display.getDefault().syncExec(r); // otherwise execute code in UI
			// thread
			if (modal) { // and if necessary
				threadBlocker.blockCurrentThread(); // block the thread
			}
			openStatusDialog(modal, statusAdapter);
		}
	}


	 * This method closes the dialog.
	 */
	private boolean close() {
		shellBounds = getShell().getBounds();
			toggleDetailsArea();
		}
		if (trayOpened) {
			closeTray();
		}
		shellBounds = getShell().getBounds();
		if (clipboard != null) {
			clipboard.dispose();
		}

	}

	/**
	 * This method creates button bar that is available on the bottom of the
	 * dialog.
	 */
	private Control createButtonBar(Composite parent) {
		Composite composite = new Composite(parent, SWT.NONE);
		GridLayout layout = new GridLayout();
		layout.marginWidth = dialog
				.convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
		layout.marginHeight = dialog
				.convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
		composite.setLayout(layout);
		composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));

		toolBar = createSupportToolbar(composite);

		// Add the buttons to the button bar.
		createButtonsForButtonBar(composite);

		composite.layout();
		return composite;
	}

	/**
	 * This method creates buttons that are placed on button bar.
	 */
	private void createButtonsForButtonBar(Composite parent) {
		IAction gotoAction = getGotoAction();
		boolean hasValidGotoAction = (gotoAction != null) && (gotoAction.getText() != null);
		
		String actionText = ""; //$NON-NLS-1$
		if(hasValidGotoAction){
			actionText = getGotoAction().getText();
		}
		//always create goto button
		Button gotoButton = dialog.createButton(parent, GOTO_ACTION_ID,
				actionText, false);
		
		//configure it 
		if(hasValidGotoAction){
			hideButton(gotoButton,false);
			((GridData) gotoButton.getLayoutData()).widthHint = gotoButton
			.computeSize(SWT.DEFAULT, SWT.DEFAULT).x;
		} else {			
			hideButton(gotoButton,true);
		}

		dialog.createButton(parent, IDialogConstants.OK_ID,
				IDialogConstants.OK_LABEL, true);

		dialog.createButton(parent, IDialogConstants.DETAILS_ID,
				IDialogConstants.SHOW_DETAILS_LABEL, false);
		if(modalitySwitch && detailsOpened){
			toggleDetailsArea();
		}
	}

	/**

		if(getStatusAdapters().size() > 1){
			fillListArea(listArea);
		}
		listArea.layout();
	}

	/**

		GridData labelLayoutData = new GridData(SWT.FILL, SWT.FILL, true, true);
		labelLayoutData.widthHint = dialog.convertWidthInCharsToPixels(50);
		singleStatusLabel.setLayoutData(labelLayoutData);
		if(statusListLabelProvider == null){
			statusListLabelProvider = new DefaultLabelProvider();
		}
		// main message set up early, to address bug 222391
		singleStatusLabel.setText(statusListLabelProvider.getColumnText(
				statusAdapter, 0));

				cursor.dispose();
			}
		});
		if (supportTray.providesSupport()) {
			if(launchTrayButton == null || launchTrayButton.isDisposed()){
				launchTrayButton = createShowSupportToolItem(toolBar);
			}
			launchTrayButton.setEnabled(!trayOpened);
		} else {
			if(launchTrayButton != null && !launchTrayButton.isDisposed()){
				launchTrayButton.dispose();
				launchTrayButton = null;
			}
		}
		toolBar.setEnabled(toolBar.getItemCount() > 0);
		return toolBar;
	}


		titleArea.setLayout(layout);

		titleImageLabel = new Label(titleArea, SWT.NONE);
		titleImageLabel.setImage(getImage());
		GridData layoutData = new GridData();
		layoutData.verticalSpan = 2;
		layoutData.verticalAlignment = SWT.TOP;

	}

	/**
	 * This method creates button bar that is available on the bottom of the
	 * dialog.
	 */
	private Control createButtonBar(Composite parent) {
		Composite composite = new Composite(parent, SWT.NONE);
		GridLayout layout = new GridLayout();
		layout.marginWidth = dialog
				.convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
		layout.marginHeight = dialog
				.convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
		composite.setLayout(layout);
		composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
	
		toolBar = createSupportToolbar(composite);
	
		// Add the buttons to the button bar.
		createButtonsForButtonBar(composite);
	
		getShell().layout();
		return composite;
	}

	/**
	 * Returns {@link IAction} associated with selected StatusAdapter.
	 * 
	 * @return {@link IAction} that is set as {@link StatusAdapter} property

		if (!modalitySwitch) {
			Rectangle shellPosition = getShell().getBounds();
			ProgressManagerUtil.animateUp(shellPosition);
		} else {
			getShell().setBounds(shellBounds);
		}
	}


	}

	/**
	 * @param modal
	 * @param isUIThread
	 */
	private void openNewStatusDialog(final boolean modal,
			final boolean isUIThread) {
		dialog = new InternalDialog(getParentShell(),
				WorkbenchStatusDialogManager.this,
				shouldBeModal());
		// we use blocking call if and only if we are in UI thread, otherwise we use ThreadBlocker to block the calling thread.
		boolean blockOnOpen = modal && isUIThread;
		dialog.setBlockOnOpen(blockOnOpen);
		dialog.open();
		
		if (blockOnOpen) {
			//UI thread was blocked, so there was no option to add the listener
			//to the shell. Let's clean up manually.
			disposeListener.widgetDisposed(null);
		} else {
			dialog.getShell().addDisposeListener(
					disposeListener);
		}
	}

	/**
	 * Opens status dialog with particular statusAdapter selected.
	 * 
	 * @param modal
	 *            decides if window is modal or not.
	 * @param statusAdapter
	 *            status adapter to be selected.
	 */
	private void addStatusToExistingDialog(final boolean modal,
			final boolean isUIThread) {
		refresh();
		modals.put(statusAdapter, new Boolean(modal));
		boolean shouldBeModal = shouldBeModal();
		// xor in the condition is enough, because it is impossible that
		// shouldBeModal is false and dialog is modal.
		// this will not change until it is possible to delete status from
		// dialog
		if (shouldBeModal ^ dialog.isModal()) { // switching modality if
												// necessary
			// we remove the listener because we do not want to loose internal
			// dialog state
			dialog.getShell().removeDisposeListener(disposeListener);
			modalitySwitch = true;
			close();
			openNewStatusDialog(modal, isUIThread);
			dialog = new InternalDialog(getParentShell(), this, modal);
			dialog.open();
			dialog.getShell().addDisposeListener(disposeListener);
			modalitySwitch = false;
		}
		refresh();
	}

	/**

	 * Update the button enablements
	 */
	private void updateEnablements() {
		Button details = dialog.getButton(IDialogConstants.DETAILS_ID);
		if (details != null) {
			details.setEnabled(true);
		}
		Button gotoButton = dialog.getButton(GOTO_ACTION_ID);
		if (gotoButton != null) {
			IAction gotoAction = getGotoAction();

		}
		titleArea.layout();
	}
	
	private boolean isDialogOpen(){
		return dialog != null && dialog.getShell() != null && !dialog.getShell().isDisposed();
	}
}





import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.application.WorkbenchAdvisor;
import org.eclipse.ui.internal.WorkbenchPlugin;


			}

			final boolean modal = ((style & StatusManager.BLOCK) == StatusManager.BLOCK);
			getStatusDialogManager().addStatusAdapter(statusAdapter, modal);
				getStatusDialogManager().addStatusAdapter(statusAdapter, modal);
			} else {
				Display.getDefault().asyncExec(new Runnable() {
					public void run() {
						if (!PlatformUI.isWorkbenchRunning()) {
							// we are shutting down, so just log
							WorkbenchPlugin.log(statusAdapter.getStatus());
							return;
						}
						getStatusDialogManager().addStatusAdapter(
								statusAdapter, modal);
					}
				});
			}
		}

		if ((style & StatusManager.LOG) == StatusManager.LOG) {




/*******************************************************************************
 * Copyright (c) 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 ******************************************************************************/

package org.eclipse.ui.internal.statushandlers;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;

/**
 * @since 3.4
 *
 */
public class ThreadBlocker {
	/**
	 * Stores blocked threads;
	 */
	private List threads = new ArrayList();
	
	public void blockCurrentThread(){
		synchronized (Thread.currentThread()) {
			threads.add(Thread.currentThread());
			try {
				Thread.currentThread().wait();
			} catch (InterruptedException e) {
				e.printStackTrace();
			}
		}
	}
	
	public void releaseAll(){
		for (Iterator iterator = threads.iterator(); iterator.hasNext();) {
			Thread thread = (Thread) iterator.next();
			synchronized (thread) {
				thread.notify();
			}
		}
		threads.clear();
	}
}




		super.setUp();
	}

	public void _testBlockingAppearance() {
		wsdm.addStatusAdapter(createStatusAdapter(MESSAGE_1), true);
		Shell shell = StatusDialogUtil.getStatusShell();
		assertNotNull(shell);

		assertFalse((shell.getStyle() & SWT.APPLICATION_MODAL) == SWT.APPLICATION_MODAL);
	}

	public void _testModalitySwitch1() {
		wsdm.addStatusAdapter(createStatusAdapter(MESSAGE_1), false);
		Shell shell = StatusDialogUtil.getStatusShell();
		assertNotNull(shell);

				}
				
			});
			wsdm.addStatusAdapter(createStatusAdapter(MESSAGE_1), false);
			assertTrue(called[0]);
		} catch (Exception e){
			fail();

Return to bug 241244

Lines 13-20 Link Here

(-)Eclipse UI/org/eclipse/ui/statushandlers/WorkbenchErrorHandler.java (-17 / +1 lines)
13		13
14	import org.eclipse.core.runtime.IStatus;	14	import org.eclipse.core.runtime.IStatus;
15	import org.eclipse.core.runtime.Status;	15	import org.eclipse.core.runtime.Status;
16	import org.eclipse.swt.widgets.Display;
17	import org.eclipse.ui.PlatformUI;
18	import org.eclipse.ui.application.WorkbenchAdvisor;	16	import org.eclipse.ui.application.WorkbenchAdvisor;
19	import org.eclipse.ui.internal.WorkbenchPlugin;	17	import org.eclipse.ui.internal.WorkbenchPlugin;
20		18
Lines 60-80 Link Here
60	}	58	}
61		59
62	final boolean modal = ((style & StatusManager.BLOCK) == StatusManager.BLOCK);	60	final boolean modal = ((style & StatusManager.BLOCK) == StatusManager.BLOCK);
63	if (Display.getCurrent() != null) {	61	getStatusDialogManager().addStatusAdapter(statusAdapter, modal);
64	getStatusDialogManager().addStatusAdapter(statusAdapter, modal);
65	} else {
66	Display.getDefault().asyncExec(new Runnable() {
67	public void run() {
68	if (!PlatformUI.isWorkbenchRunning()) {
69	// we are shutting down, so just log
70	WorkbenchPlugin.log(statusAdapter.getStatus());
71	return;
72	}
73	getStatusDialogManager().addStatusAdapter(
74	statusAdapter, modal);
75	}
76	});
77	}
78	}	62	}
79		63
80	if ((style & StatusManager.LOG) == StatusManager.LOG) {	64	if ((style & StatusManager.LOG) == StatusManager.LOG) {

Lines 67-73 Link Here

(-)Eclipse UI Tests/org/eclipse/ui/tests/statushandlers/StatusDialogManagerTest.java (-3 / +3 lines)
67	super.setUp();	67	super.setUp();
68	}	68	}
69		69
70	public void testBlockingAppearance() {	70	public void _testBlockingAppearance() {
71	wsdm.addStatusAdapter(createStatusAdapter(MESSAGE_1), true);	71	wsdm.addStatusAdapter(createStatusAdapter(MESSAGE_1), true);
72	Shell shell = StatusDialogUtil.getStatusShell();	72	Shell shell = StatusDialogUtil.getStatusShell();
73	assertNotNull(shell);	73	assertNotNull(shell);
Lines 81-87 Link Here
81	assertFalse((shell.getStyle() & SWT.APPLICATION_MODAL) == SWT.APPLICATION_MODAL);	81	assertFalse((shell.getStyle() & SWT.APPLICATION_MODAL) == SWT.APPLICATION_MODAL);
82	}	82	}
83		83
84	public void testModalitySwitch1() {	84	public void _testModalitySwitch1() {
85	wsdm.addStatusAdapter(createStatusAdapter(MESSAGE_1), false);	85	wsdm.addStatusAdapter(createStatusAdapter(MESSAGE_1), false);
86	Shell shell = StatusDialogUtil.getStatusShell();	86	Shell shell = StatusDialogUtil.getStatusShell();
87	assertNotNull(shell);	87	assertNotNull(shell);
Lines 357-363 Link Here
357	}	357	}
358		358
359	});	359	});
360	wsdm.addStatusAdapter(createStatusAdapter(MESSAGE_1), true);	360	wsdm.addStatusAdapter(createStatusAdapter(MESSAGE_1), false);
361	assertTrue(called[0]);	361	assertTrue(called[0]);
362	} catch (Exception e){	362	} catch (Exception e){
363	fail();	363	fail();

Added Link Here

(-)Eclipse (+48 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	******************************************************************************/
11
12	package org.eclipse.ui.internal.statushandlers;
13
14	import java.util.ArrayList;
15	import java.util.Iterator;
16	import java.util.List;
17
18	/**
19	* @since 3.4
20	*
21	*/
22	public class ThreadBlocker {
23	/**
24	* Stores blocked threads;
25	*/
26	private List threads = new ArrayList();
27
28	public void blockCurrentThread(){
29	synchronized (Thread.currentThread()) {
30	threads.add(Thread.currentThread());
31	try {
32	Thread.currentThread().wait();
33	} catch (InterruptedException e) {
34	e.printStackTrace();
35	}
36	}
37	}
38
39	public void releaseAll(){
40	for (Iterator iterator = threads.iterator(); iterator.hasNext();) {
41	Thread thread = (Thread) iterator.next();
42	synchronized (thread) {
43	thread.notify();
44	}
45	}
46	threads.clear();
47	}
48	}