Made the runEventLoop() function static. Removed the loopshell parameter and directly referenced shell. Updated the runEventLoop() contract for clarification.

Author: grissinibread

bundles/org.eclipse.jface/src/org/eclipse/jface/window/Window.java

@@ -200,7 +200,7 @@ public void handleException(Throwable t) {
 	/**
 	 * Window shell, or <code>null</code> if none.
 	 */
-	private Shell shell;
+	private static Shell shell;
 
 	/**
 	 * Top level SWT control, or <code>null</code> if none
@@ -796,29 +796,24 @@ public int open() {
 
 		// run the event loop if specified
 		if (block) {
-			runEventLoop(shell);
+			runEventLoop();
 		}
 
 		return returnCode;
 	}
 
 	/**
-	 * Runs the event loop for the given shell.
-	 *
-	 * @param loopShell
-	 *            the shell
+	 * Runs the event loop for shell.
+	 * <p>
+	 * This method assumes that shell is not null.
+	 * </p>
 	 */
-	private void runEventLoop(Shell loopShell) {
+	private static void runEventLoop() {
 
-		//Use the display provided by the shell if possible
 		Display display;
-		if (shell == null) {
-			display = Display.getCurrent();
-		} else {
-			display = loopShell.getDisplay();
-		}
+		display = shell.getDisplay();
 
-		while (loopShell != null && !loopShell.isDisposed()) {
+		while (!shell.isDisposed()) {
 			try {
 				if (!display.readAndDispatch()) {
 					display.sleep();