Author: adietish
Date: 2011-12-06 18:10:10 -0500 (Tue, 06 Dec 2011)
New Revision: 37029
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 checkbox behaviour (was inverted). checking "create new
project" should disable button and project text - corrected validator
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
23:06:17 UTC (rev 37028)
+++
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-12-06
23:10:10 UTC (rev 37029)
@@ -142,7 +142,7 @@
.converting(new InvertingBooleanConverter())
.in(dbc);
dbc.addValidationStatusProvider(
- new EnableProjectValidator(newProjectObservable, newProjectNameObservable));
+ new NewProjectValidator(newProjectObservable, newProjectNameObservable));
Button browseProjectsButton = new Button(projectGroup, SWT.NONE);
browseProjectsButton.setText("Browse");
@@ -451,15 +451,15 @@
* A multi validator that validates the state of the project that shall be
* (OpenShift) enabled
*/
- private class EnableProjectValidator extends MultiValidator {
+ private class NewProjectValidator extends MultiValidator {
- private IObservableValue enableProjectObservable;
- private IObservableValue enabledProjectNameObservable;
+ private IObservableValue newProjectObservable;
+ private IObservableValue newProjectNameObservable;
- public EnableProjectValidator(IObservableValue enableProjectObservable,
- IObservableValue enabledProjectNameObservable) {
- this.enableProjectObservable = enableProjectObservable;
- this.enabledProjectNameObservable = enabledProjectNameObservable;
+ public NewProjectValidator(IObservableValue newProjectObservable,
+ IObservableValue newProjectNameObservable) {
+ this.newProjectObservable = newProjectObservable;
+ this.newProjectNameObservable = newProjectNameObservable;
}
@Override
@@ -470,13 +470,12 @@
* is tracking what observables are read to know when he has to
* recalculate it's state.
*/
- if (Boolean.FALSE.equals(enableProjectObservable.getValue())) {
+ if (Boolean.TRUE.equals(newProjectObservable.getValue())) {
return ValidationStatus.ok();
- }
-
- if (enabledProjectNameObservable != null
- && enabledProjectNameObservable.getValue() != null
- && (!((String) enabledProjectNameObservable.getValue()).isEmpty())) {
+ }
+
+ if (newProjectNameObservable.getValue() != null
+ && (!((String) newProjectNameObservable.getValue()).isEmpty())) {
return ValidationStatus.ok();
} else {
return ValidationStatus.error(
Show replies by date