Author: adietish Date: 2011-01-17 08:47:39 -0500 (Mon, 17 Jan 2011) New Revision: 28296 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/WizardUtils.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java Log: [JBIDE-8126] close manage keys dialog on double click on a key Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-01-17 13:15:06 UTC (rev 28295) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-01-17 13:47:39 UTC (rev 28296) @@ -1,5 +1,8 @@ 2011-01-17 André Dietisheim <André Dietisheim@adietisheim-thinkpad> + * src/org/jboss/tools/internal/deltacloud/ui/utils/WizardUtils.java (nextPageOrFinish): + * src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java (onKeyDoubleclick): + [JBIDE-8126] close manage keys dialog on double click on a key * src/org/jboss/tools/deltacloud/ui/views/cloudelements/InstanceViewLabelAndContentProvider.java: * src/org/jboss/tools/deltacloud/ui/views/cloudelements/ImageViewLabelAndContentProvider.java: * src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementViewLabelAndContentProvider.java: Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/WizardUtils.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/WizardUtils.java 2011-01-17 13:15:06 UTC (rev 28295) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/WizardUtils.java 2011-01-17 13:47:39 UTC (rev 28296) @@ -18,7 +18,9 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.core.runtime.jobs.JobChangeAdapter; import org.eclipse.jface.operation.IRunnableWithProgress; +import org.eclipse.jface.wizard.IWizard; import org.eclipse.jface.wizard.IWizardContainer; +import org.eclipse.jface.wizard.IWizardPage; /** * @author André Dietisheim @@ -62,4 +64,19 @@ } }); } + + /** + * Flips to the next wizard page or finishes the current wizard. + * + * @param wizardPage the wizard page this call is executed in + */ + public static void nextPageOrFinish(IWizardPage wizardPage) { + IWizard wizard = wizardPage.getWizard(); + if (wizardPage.canFlipToNextPage()) { + IWizardPage nextPage = wizard.getNextPage(wizardPage); + wizard.getContainer().showPage(nextPage); + } else if (wizard.canFinish()) { + wizard.getContainer().getShell().close(); + } + } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java 2011-01-17 13:15:06 UTC (rev 28295) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java 2011-01-17 13:47:39 UTC (rev 28296) @@ -42,9 +42,11 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.DirectoryDialog; import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.List; +import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import org.jboss.tools.common.log.StatusFactory; @@ -266,6 +268,9 @@ BeanProperties.value(ManageKeysPageModel.PROP_SELECTED_KEY).observe(model), new UpdateValueStrategy().setConverter(new Id2KeyConverter()), new UpdateValueStrategy().setConverter(new Key2IdConverter())); + + keyList.addListener(SWT.MouseDoubleClick, onKeyDoubleclick()); + return keyList; } @@ -293,6 +298,16 @@ }; } + private Listener onKeyDoubleclick() { + return new Listener() { + + @Override + public void handleEvent(Event event) { + WizardUtils.nextPageOrFinish(ManageKeysPage.this); + } + }; + } + private void refreshKeys() { Job job = new AbstractCloudElementJob("Get keys", model.getCloud(), CLOUDELEMENT.KEYS) {