Author: xcoulon Date: 2012-02-13 15:50:48 -0500 (Mon, 13 Feb 2012) New Revision: 38667 Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CustomControlDecorationUpdater.java Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java Log: Open - "error" for "non-error" conditions in openshift https://issues.jboss.org/browse/JBIDE-10696 Fixed - app type is mandatory, but combo is not decorated https://issues.jboss.org/browse/JBIDE-10722 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-02-13 18:04:46 UTC (rev 38666) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-02-13 20:50:48 UTC (rev 38667) @@ -171,11 +171,11 @@ BeanProperties.value( ApplicationConfigurationWizardPageModel.PROPERTY_EXISTING_APPLICATIONS).observe(pageModel); - final ApplicationToSelectNameValidator existingProjectValidator = + final ApplicationToSelectNameValidator existingAppValidator = new ApplicationToSelectNameValidator( useExistingAppBtnSelection, existingAppNameTextObservable, existingAppsObservable); - dbc.addValidationStatusProvider(existingProjectValidator); - ControlDecorationSupport.create(existingProjectValidator, SWT.LEFT | SWT.TOP); + dbc.addValidationStatusProvider(existingAppValidator); + ControlDecorationSupport.create(existingAppValidator, SWT.LEFT | SWT.TOP); return existingAppSelectionGroup; } @@ -273,6 +273,9 @@ new ApplicationToCreateInputValidator( useExistingAppBtnSelection, applicationNameTextObservable, selectedCartridgeComboObservable); dbc.addValidationStatusProvider(applicationInputValidator); + //ControlDecorationSupport.create(applicationInputValidator, SWT.LEFT | SWT.TOP); + ControlDecorationSupport.create(applicationInputValidator, SWT.LEFT | SWT.TOP, null, new CustomControlDecorationUpdater()); + /* * final ApplicationToSelectNameValidator applicationNameValidator = new * ApplicationToSelectNameValidator(us applicationNameStatusObservable, @@ -761,6 +764,11 @@ if (useExistingApp) { return ValidationStatus.ok(); } + if (applicationName.isEmpty()) { + return new Status(IStatus.CANCEL, OpenShiftUIActivator.PLUGIN_ID, + "Give a name and select a type for the application you want to create."); + } + if (!applicationName.matches("\\S+")) { return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, "The application name must not contain spaces."); @@ -778,6 +786,7 @@ public IObservableList getTargets() { WritableList targets = new WritableList(); targets.add(applicationNameTextObservable); + targets.add(cartridgesComboObservable); return targets; } Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CustomControlDecorationUpdater.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CustomControlDecorationUpdater.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CustomControlDecorationUpdater.java 2012-02-13 20:50:48 UTC (rev 38667) @@ -0,0 +1,46 @@ +/** + * + */ +package org.jboss.tools.openshift.express.internal.ui.wizard; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.jface.databinding.fieldassist.ControlDecorationUpdater; +import org.eclipse.jface.fieldassist.FieldDecoration; +import org.eclipse.jface.fieldassist.FieldDecorationRegistry; +import org.eclipse.swt.graphics.Image; + +/** + * @author Xavier Coulon + * + */ +public class CustomControlDecorationUpdater extends ControlDecorationUpdater { + + /** + * {@inheritDoc} Overrides the standard behaviour: for CANCEL status, items are decorated with the REQUIRED + * decorator, not the ERROR one. + */ + @Override + protected Image getImage(IStatus status) { + if (status == null) { + return null; + } + String fieldDecorationID = null; + switch (status.getSeverity()) { + case IStatus.INFO: + fieldDecorationID = FieldDecorationRegistry.DEC_INFORMATION; + break; + case IStatus.WARNING: + fieldDecorationID = FieldDecorationRegistry.DEC_WARNING; + break; + case IStatus.ERROR: + fieldDecorationID = FieldDecorationRegistry.DEC_ERROR; + break; + case IStatus.CANCEL: + fieldDecorationID = FieldDecorationRegistry.DEC_REQUIRED; + break; + } + + FieldDecoration fieldDecoration = FieldDecorationRegistry.getDefault().getFieldDecoration(fieldDecorationID); + return fieldDecoration == null ? null : fieldDecoration.getImage(); + } +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CustomControlDecorationUpdater.java ___________________________________________________________________ Added: svn:mime-type + text/plain