Revert "Bug 544286 - Evaluate if Dialogs#initializeBounds can use asynchronous"

This reverts commit 2d19c37c8fe13c6d128fcb64823d79dc18efd07f.

Reason for revert: Installation details initially not visible


To check, select Help -> About -> Installation Details

Change-Id: I782e976968af68172113921c8862303b542d5240

2 files changed, 3 insertions, 8 deletions

diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/Dialog.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/Dialog.java
index fbae8c90db8..31cbffa91b7 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/Dialog.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/Dialog.java
@@ -710,9 +710,10 @@ public abstract class Dialog extends Window {
 			if (shell.getDisplay().getDismissalAlignment() == SWT.RIGHT) {
 				// make the default button the right-most button
 				Button defaultButton = shell.getDefaultButton();
-				if (defaultButton != null && isContained(buttonBar, defaultButton)) {
+				if (defaultButton != null
+						&& isContained(buttonBar, defaultButton)) {
 					defaultButton.moveBelow(null);
-					defaultButton.requestLayout();
+					defaultButton.getParent().layout();
 				}
 			}
 		}
diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/dialogs/DialogTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/dialogs/DialogTest.java
index 5319dbc4139..49cd240db6b 100644
--- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/dialogs/DialogTest.java
+++ b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/dialogs/DialogTest.java
@@ -19,7 +19,6 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 
 import junit.framework.TestCase;
@@ -59,11 +58,6 @@ public class DialogTest extends TestCase {
 		// open the dialog so the widgets will be realized
 		forceLayoutDialog.open();
 
-		int waitEvents = 0;
-		while (Display.getDefault().readAndDispatch() && waitEvents++ < 500) {
-			// spin the event loop
-		}
-
 		// retrieve the 'OK' and 'Cancel' buttons
 		Button okBtn = forceLayoutDialog.getButton(IDialogConstants.OK_ID);
 		Button cancelBtn = forceLayoutDialog.getButton(IDialogConstants.CANCEL_ID);