Author: adietish Date: 2011-12-06 06:19:21 -0500 (Tue, 06 Dec 2011) New Revision: 36993 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/AdapterWizardPageModel.java Log: [JBIDE-10171] "enable project" is now only checkable for as7 applications 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 11:17:35 UTC (rev 36992) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-12-06 11:19:21 UTC (rev 36993) @@ -66,12 +66,13 @@ private IServerType serverTypeToCreate; private IObservableValue serverAdapterCheckboxObservable; - + private IObservableValue enableProjectChecboxIsEnabled; + public AdapterWizardPage(ImportProjectWizard wizard, ImportProjectWizardModel model) { super( "Import Project", "Select the project to enable, the Git clone destination, the branch to clone" - + " and configure your server adapter ", + + " and configure your server adapter ", "Server Adapter", wizard); this.model = new AdapterWizardPageModel(model); @@ -102,17 +103,19 @@ .align(SWT.LEFT, SWT.CENTER).align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(mergeGroup); GridLayoutFactory.fillDefaults().margins(6, 6).numColumns(3).applyTo(mergeGroup); - Button mergeEnabledButton = new Button(mergeGroup, SWT.CHECK); - mergeEnabledButton.setText("Enable existing project"); + Button enableProjectButton = new Button(mergeGroup, SWT.CHECK); + enableProjectButton.setText("Enable existing project"); GridDataFactory.fillDefaults() - .align(SWT.LEFT, SWT.CENTER).applyTo(mergeEnabledButton); + .align(SWT.LEFT, SWT.CENTER).applyTo(enableProjectButton); IObservableValue enableProjectObservable = BeanProperties.value(AdapterWizardPageModel.PROPERTY_ENABLE_PROJECT).observe(model); ValueBindingBuilder - .bind(WidgetProperties.selection().observe(mergeEnabledButton)) + .bind(WidgetProperties.selection().observe(enableProjectButton)) .to(enableProjectObservable) .in(dbc); + this.enableProjectChecboxIsEnabled = WidgetProperties.enabled().observe(enableProjectButton); + Text enabledProjectText = new Text(mergeGroup, SWT.BORDER); enabledProjectText.setEditable(false); GridDataFactory @@ -137,11 +140,12 @@ .bind(WidgetProperties.text().observe(enabledProjectText)) .to(enabledProjectNameObservable) .in(dbc); - ValueBindingBuilder .bind(enableProjectObservable) .to(WidgetProperties.enabled().observe(enabledProjectText)) .in(dbc); + dbc.addValidationStatusProvider( + new EnableProjectValidator(enableProjectObservable, enabledProjectNameObservable)); Button browseProjectsButton = new Button(mergeGroup, SWT.NONE); browseProjectsButton.setText("Browse"); @@ -154,10 +158,7 @@ .in(dbc); enableProjectObservable.setValue(false); - - dbc.addValidationStatusProvider(new EnableProjectValidator(enableProjectObservable, - enabledProjectNameObservable)); - + return mergeGroup; } @@ -405,6 +406,9 @@ } protected void onPageActivated(DataBindingContext dbc) { + // allow to enable a proj only for as7 openshift applications + enableProjectChecboxIsEnabled.setValue(model.isJBossAS7Application()); + model.resetRepositoryPath(); serverTypeToCreate = getServerTypeToCreate(); model.getWizardModel().setProperty(AdapterWizardPageModel.SERVER_TYPE, serverTypeToCreate); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java 2011-12-06 11:17:35 UTC (rev 36992) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java 2011-12-06 11:19:21 UTC (rev 36993) @@ -164,6 +164,14 @@ return application.getApplicationUrl(); } + public boolean isJBossAS7Application() { + IApplication application = wizardModel.getApplication(); + if (application == null) { + return false; + } + return ICartridge.JBOSSAS_7.equals(application.getCartridge()); + } + public void setApplicationUrl(String applicationUrl) { firePropertyChange(PROPERTY_APPLICATION_URL, null, applicationUrl); }