Author: snjeza Date: 2011-11-12 11:43:01 -0500 (Sat, 12 Nov 2011) New Revision: 36317 Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReport.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReportEnablementDialog.java Log: JBIDE-9712 Runtime Detection Dialog during first start gets over modal dialog with request to let usage reporting. Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReport.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReport.java 2011-11-12 04:21:06 UTC (rev 36316) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReport.java 2011-11-12 16:43:01 UTC (rev 36317) @@ -133,7 +133,7 @@ public void run() { UsageReportEnablementDialog dialog = new UsageReportEnablementDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow(), + Display.getCurrent().getActiveShell(), JBossToolsUsageActivator.getDefault().getUsageBranding()); if (dialog.open() == Window.OK) { userResponse[0] = dialog.isReportEnabled(); Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReportEnablementDialog.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReportEnablementDialog.java 2011-11-12 04:21:06 UTC (rev 36316) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReportEnablementDialog.java 2011-11-12 16:43:01 UTC (rev 36317) @@ -34,12 +34,17 @@ private boolean reportEnabled; private IUsageBranding branding; - private ForceActiveShellAdapter forceActiveShellAdapter = new ForceActiveShellAdapter(); + //private ForceActiveShellAdapter forceActiveShellAdapter = new ForceActiveShellAdapter(); public UsageReportEnablementDialog(IShellProvider parentShell, IUsageBranding branding) { super(parentShell); this.branding = branding; } + + public UsageReportEnablementDialog(Shell parentShell, IUsageBranding branding) { + super(parentShell); + this.branding = branding; + } protected void buttonPressed(int buttonId) { this.reportEnabled = (buttonId == IDialogConstants.OK_ID); @@ -64,12 +69,12 @@ protected void configureShell(Shell shell) { super.configureShell(shell); shell.setText(branding.getStartupAllowReportingTitle()); - forceActiveShellAdapter.attachTo(shell); + //forceActiveShellAdapter.attachTo(shell); } @Override public boolean close() { - forceActiveShellAdapter.removeFrom(getShell()); + //forceActiveShellAdapter.removeFrom(getShell()); return super.close(); } @@ -113,27 +118,27 @@ return reportEnabled; } - private class ForceActiveShellAdapter extends ShellAdapter { - - public void shellDeactivated(ShellEvent e) { - Shell shell = getShell(); - if (shell != null - && !shell.isDisposed()) - shell.forceActive(); - } - - private void attachTo(Shell shell) { - if (shell != null - && !shell.isDisposed()) { - shell.addShellListener(this); - } - } - - private void removeFrom(Shell shell) { - if (shell != null - && !shell.isDisposed()) { - shell.removeShellListener(this); - } - } - } +// private class ForceActiveShellAdapter extends ShellAdapter { +// +// public void shellDeactivated(ShellEvent e) { +// Shell shell = getShell(); +// if (shell != null +// && !shell.isDisposed()) +// shell.forceActive(); +// } +// +// private void attachTo(Shell shell) { +// if (shell != null +// && !shell.isDisposed()) { +// shell.addShellListener(this); +// } +// } +// +// private void removeFrom(Shell shell) { +// if (shell != null +// && !shell.isDisposed()) { +// shell.removeShellListener(this); +// } +// } +// } }