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

requestLayout"

This reverts commit d53766b589f0bcb0693c31c4a1da442f9206340e.

2 files changed, 7 insertions, 10 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 37f95c4341e..1a7d7efdf19 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
@@ -713,9 +713,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.getParent().requestLayout();
+					defaultButton.getParent().layout();
 				}
 			}
 		}
diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/dialogs/DialogTest.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/dialogs/DialogTest.java
index 712e126a160..0bc0070daec 100644
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/dialogs/DialogTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/dialogs/DialogTest.java
@@ -13,17 +13,16 @@
  ******************************************************************************/
 package org.eclipse.jface.tests.dialogs;
 
+import junit.framework.TestCase;
+
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 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;
-
 public class DialogTest extends TestCase {
 
 	/**
@@ -59,14 +58,11 @@ public class DialogTest extends TestCase {
 		forceLayoutDialog.setBlockOnOpen(false);
 		// 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);
+		Button cancelBtn = forceLayoutDialog
+				.getButton(IDialogConstants.CANCEL_ID);
 
 		// retrieve the X coordinates of the two buttons
 		int okX = okBtn.getBounds().x;