[JBIDE-15967] app wiz: trigger envvar button visibility on domain change

jbosstools · Nov 14, 2013 · 6e5357c · 6e5357c
1 parent 5611b18
commit 6e5357c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/.../openshift/express/internal/ui/wizard/application/ApplicationConfigurationWizardPage.java b/.../openshift/express/internal/ui/wizard/application/ApplicationConfigurationWizardPage.java
@@ -598,13 +598,18 @@ private void createAdvancedGroup(Composite parent, DataBindingContext dbc) {
 				.align(SWT.FILL, SWT.CENTER).grab(true, true).span(2, 1).applyTo(sourceCodeExplanationText);
 
 		// environment variables		
-		if (pageModel.isEnvironmentVariablesSupported()) {
-			Button environmentVariablesButton = new Button(advancedComposite, SWT.NONE);
-			environmentVariablesButton.setText("Environment Variables... ");
-			GridDataFactory.fillDefaults()
-					.align(SWT.BEGINNING, SWT.CENTER).applyTo(environmentVariablesButton);
-			environmentVariablesButton.addSelectionListener(onBrowseEnvironmentVariables(dbc));
-		}
+		Button environmentVariablesButton = new Button(advancedComposite, SWT.NONE);
+		environmentVariablesButton.setText("Environment Variables... ");
+		GridDataFactory.fillDefaults()
+				.align(SWT.BEGINNING, SWT.CENTER).applyTo(environmentVariablesButton);
+		environmentVariablesButton.addSelectionListener(onBrowseEnvironmentVariables(dbc));
+		ValueBindingBuilder
+				.bind(WidgetProperties.visible().observe(environmentVariablesButton))
+				.notUpdatingParticipant()
+				.to(BeanProperties.value(
+						ApplicationConfigurationWizardPageModel.PROPERTY_ENVIRONMENT_VARIABLES_SUPPORTED)
+						.observe(pageModel))
+				.in(dbc);
 	}
 
 	protected SelectionListener onManageDomains() {

diff --git a/...shift/express/internal/ui/wizard/application/ApplicationConfigurationWizardPageModel.java b/...shift/express/internal/ui/wizard/application/ApplicationConfigurationWizardPageModel.java
@@ -57,7 +57,8 @@ public class ApplicationConfigurationWizardPageModel extends ObservableUIPojo im
 	public static final String PROPERTY_GEAR_PROFILES = "gearProfiles";
 	public static final String PROPERTY_DEFAULT_SOURCECODE = "defaultSourcecode";
 	public static final String PROPERTY_INITIAL_GITURL = "initialGitUrl";
-	public static final String PROPERTY_ENVIRONMENT_VARIABLES = "EnvironmentVariables";
+	public static final String PROPERTY_ENVIRONMENT_VARIABLES = "environmentVariables";
+	public static final String PROPERTY_ENVIRONMENT_VARIABLES_SUPPORTED = "environmentVariablesSupported";
 
 	private final OpenShiftApplicationWizardModel wizardModel;
 
@@ -493,6 +494,7 @@ public IDomain getDomain() throws OpenShiftException {
 
 	public void setDomain(IDomain domain) throws OpenShiftException {
 		firePropertyChange(PROPERTY_DOMAIN, wizardModel.getDomain(), wizardModel.setDomain(domain));
+		setEnvironmentVariablesSupported(isEnvironmentVariablesSupported());
 	}
 
 	public List<IDomain> getDomains() throws OpenShiftException {
@@ -550,8 +552,12 @@ public void setEnvironmentVariables(Map<String, String> environmentVariables) {
 
 	}
 
+	public void setEnvironmentVariablesSupported(boolean supported) {
+		firePropertyChange(PROPERTY_ENVIRONMENT_VARIABLES_SUPPORTED, null, isEnvironmentVariablesSupported());
+	}
+
 	public boolean isEnvironmentVariablesSupported() {
-		return wizardModel.getDomain() != null
-				&& wizardModel.getDomain().canCreateApplicationWithEnvironmentVariables();
+		return getDomain() != null
+				&& getDomain().canCreateApplicationWithEnvironmentVariables();
 	}
 }