Author: adietish Date: 2011-12-06 16:42:34 -0500 (Tue, 06 Dec 2011) New Revision: 37019 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java Log: [JBIDE-10171] corrected initial enablement state of "new project" checkbox Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-12-06 21:42:02 UTC (rev 37018) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-12-06 21:42:34 UTC (rev 37019) @@ -66,7 +66,7 @@ private IServerType serverTypeToCreate; private IObservableValue serverAdapterCheckboxObservable; - private IObservableValue newProjectChecboxIsEnabled; + private IObservableValue newProjectCheckboxIsEnabled; public AdapterWizardPage(ImportProjectWizard wizard, ImportProjectWizardModel model) { super( @@ -119,7 +119,7 @@ .to(newProjectObservable) .in(dbc); - this.newProjectChecboxIsEnabled = WidgetProperties.enabled().observe(newProjectCheckbox); + this.newProjectCheckboxIsEnabled = WidgetProperties.enabled().observe(newProjectCheckbox); Label existingProjectLabel = new Label(projectGroup, SWT.NONE); existingProjectLabel.setText("Existing Project"); @@ -137,9 +137,8 @@ .to(newProjectNameObservable) .in(dbc); ValueBindingBuilder - .bind(newProjectObservable) - .to(WidgetProperties.enabled().observe(newProjectText)) - .converting(new InvertingBooleanConverter()) + .bind(WidgetProperties.enabled().observe(newProjectText)) + .notUpdating(newProjectObservable) .in(dbc); dbc.addValidationStatusProvider( new EnableProjectValidator(newProjectObservable, newProjectNameObservable)); @@ -150,13 +149,10 @@ .align(SWT.LEFT, SWT.CENTER).hint(100, SWT.DEFAULT).applyTo(browseProjectsButton); browseProjectsButton.addSelectionListener(onBrowseProjects()); ValueBindingBuilder - .bind(newProjectObservable) - .to(WidgetProperties.enabled().observe(browseProjectsButton)) - .converting(new InvertingBooleanConverter()) + .bind(WidgetProperties.enabled().observe(browseProjectsButton)) + .notUpdating(newProjectObservable) .in(dbc); -// model.setNewProject(false); - return projectGroup; } @@ -381,15 +377,12 @@ } private SelectionListener onCreateAdapter() { - return new SelectionListener() { + return new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { - model.getWizardModel().setProperty(AdapterWizardPageModel.CREATE_SERVER, - serverAdapterCheckbox.getSelection()); + model.getWizardModel().setProperty( + AdapterWizardPageModel.CREATE_SERVER,serverAdapterCheckbox.getSelection()); enableServerWidgets(serverAdapterCheckbox.getSelection()); } - - public void widgetDefaultSelected(SelectionEvent e) { - } }; } @@ -406,7 +399,7 @@ // allow to enable a proj only for as7 openshift applications setTitle(NLS.bind("Import OpenShift application {0}", model.getApplicationName())); - newProjectChecboxIsEnabled.setValue(model.isJBossAS7Application()); + newProjectCheckboxIsEnabled.setValue(model.isJBossAS7Application()); model.resetRepositoryPath(); serverTypeToCreate = getServerTypeToCreate(); @@ -423,7 +416,9 @@ model.loadGitUri(); model.loadApplicationUrl(); } catch (OpenShiftException e) { - OpenShiftUIActivator.log(OpenShiftUIActivator.createErrorStatus(e.getMessage(), e)); + IStatus status = OpenShiftUIActivator.createErrorStatus(e.getMessage(), e); + OpenShiftUIActivator.log(status); + return status; } return Status.OK_STATUS; }