Author: snjeza Date: 2011-11-12 11:43:07 -0500 (Sat, 12 Nov 2011) New Revision: 36318 Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeScanner.java trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java Log: JBIDE-9712 Runtime Detection Dialog during first start gets over modal dialog with request to let usage reporting. Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeScanner.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeScanner.java 2011-11-12 16:43:01 UTC (rev 36317) +++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeScanner.java 2011-11-12 16:43:07 UTC (rev 36318) @@ -51,7 +51,7 @@ if (exists) { Display.getDefault().asyncExec(new Runnable() { public void run() { - Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); + Shell shell = Display.getCurrent().getActiveShell(); RuntimeUIActivator.refreshRuntimes(shell, RuntimeUIActivator.getDefault().getRuntimePaths(), null, false, 7); } }); Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java 2011-11-12 16:43:01 UTC (rev 36317) +++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java 2011-11-12 16:43:07 UTC (rev 36318) @@ -66,7 +66,7 @@ public SearchRuntimePathDialog(Shell parent, Set<RuntimePath> runtimePaths, boolean needRefresh, int heightHint) { super(parent); setShellStyle(SWT.CLOSE | SWT.MAX | SWT.TITLE | SWT.BORDER - | SWT.RESIZE | getDefaultOrientation()); + | SWT.APPLICATION_MODAL | SWT.RESIZE | getDefaultOrientation()); this.runtimePaths = runtimePaths; this.needRefresh = needRefresh; this.heightHint = heightHint;