Author: rob.stryker(a)jboss.com Date: 2011-01-11 11:08:17 -0500 (Tue, 11 Jan 2011) New Revision: 28097 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java Log: JBIDE-8082 - npe and wizard finishing Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java 2011-01-11 15:43:17 UTC (rev 28096) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java 2011-01-11 16:08:17 UTC (rev 28097) @@ -17,6 +17,8 @@ import org.eclipse.jface.wizard.WizardPage; import org.eclipse.rse.core.model.IHost; import org.eclipse.swt.SWT; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.layout.FormLayout; @@ -181,11 +183,25 @@ handleSelection(e.widget); } }; - + ModifyListener modListener = new ModifyListener() { + public void modifyText(ModifyEvent e) { + verifyPageComplete(); + } + }; fillRuntimeTypeCombo(); refreshServerWidgets(); + verifyPageComplete(); createRSE.addSelectionListener(listener); createServer.addSelectionListener(listener); + autoScanCheck.addSelectionListener(listener); + hardCodeServerDetails.addSelectionListener(listener); + deployOnlyRadio.addSelectionListener(listener); + remoteDetailsLoc.addModifyListener(modListener); + serverHomeText.addModifyListener(modListener); + serverConfigText.addModifyListener(modListener); + deployFolderText.addModifyListener(modListener); + autoLocalRuntimeCombo.addModifyListener(modListener); + localRuntimeCombo.addModifyListener(modListener); setControl(c2); } @@ -223,8 +239,25 @@ if( w == createServer ) { refreshServerWidgets(); } + verifyPageComplete(); } + private void verifyPageComplete() { + boolean complete = true; + if( createServer.getSelection()) { + if( deployOnlyRadio.getSelection()) { + complete = !deployFolderText.getText().equals(""); + } else if( autoScanCheck.getSelection()) { + int index = autoLocalRuntimeCombo.getSelectionIndex(); + complete = index != -1 && !remoteDetailsLoc.getText().equals(""); + } else if( hardCodeServerDetails.getSelection()) { + int index = localRuntimeCombo.getSelectionIndex(); + complete = index != -1 && !serverHomeText.getText().equals("") && !serverConfigText.getText().equals(""); + } + } + setPageComplete(complete); + } + private void refreshServerWidgets() { if( initialHost != null ) { createRSE.setEnabled(false); Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2011-01-11 15:43:17 UTC (rev 28096) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2011-01-11 16:08:17 UTC (rev 28097) @@ -79,7 +79,8 @@ @Override public boolean canFinish() { - return mainPage.isPageComplete(); + //return mainPage.isPageComplete(); + return super.canFinish(); } @Override