Uncheck "Stop previous version" when not promoting in deploy preferences panel (#1504)

* Bind observables in a correct way
* Restore buttons to be private

Author: chanseokoh

plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui.test/META-INF/MANIFEST.MF

@@ -15,6 +15,7 @@ Import-Package: com.google.cloud.tools.eclipse.appengine.facets,
  com.google.common.base;version="[20.0.0,21.0.0)",
  org.eclipse.core.expressions,
  org.eclipse.jface.viewers,
+ org.eclipse.swtbot.swt.finder.widgets,
  org.eclipse.wst.common.project.facet.core,
  org.mockito;provider=google;version="1.10.19",
  org.mockito.runners;provider=google;version="1.10.19",

plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui.test/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/StandardDeployPreferencesPanelTest.java

@@ -17,6 +17,7 @@
 package com.google.cloud.tools.eclipse.appengine.deploy.ui;
 
 import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -44,8 +45,10 @@
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -117,6 +120,61 @@ public void testValidationMessageWhenSignedIn() {
     assertThat(status.getMessage(), is("Select an account."));
   }
 
+  private static Button getButtonWithText(Composite parent, String text) {
+    for (Control control : parent.getChildren()) {
+      if (control instanceof Button) {
+        Button button = (Button) control;
+        if (button.getText().equals(text)) {
+          return button;
+        }
+      }
+    }
+    return null;
+  }
+
+  // https://github.com/GoogleCloudPlatform/google-cloud-eclipse/issues/1229
+  @Test
+  public void testUncheckStopPreviousVersionButtonWhenDisabled() {
+    StandardDeployPreferencesPanel panel = new StandardDeployPreferencesPanel(
+        parent, project, loginService, layoutChangedHandler, true, projectRepository);
+
+    Button promoteButton =
+        getButtonWithText(panel, "Promote the deployed version to receive all traffic");
+    Button stopButton = getButtonWithText(panel, "Stop previous version");
+    SWTBotCheckBox promote = new SWTBotCheckBox(promoteButton);
+    SWTBotCheckBox stop = new SWTBotCheckBox(stopButton);
+
+    // Initially, everything is checked and enabled.
+    assertTrue(promoteButton.getSelection());
+    assertTrue(stopButton.getSelection());
+    assertTrue(stopButton.getEnabled());
+
+    promote.click();
+    assertFalse(promoteButton.getSelection());
+    assertFalse(stopButton.getSelection());
+    assertFalse(stopButton.getEnabled());
+
+    promote.click();
+    assertTrue(promoteButton.getSelection());
+    assertTrue(stopButton.getSelection());
+    assertTrue(stopButton.getEnabled());
+
+    stop.click();
+    assertTrue(promoteButton.getSelection());
+    assertFalse(stopButton.getSelection());
+    assertTrue(stopButton.getEnabled());
+
+    promote.click();
+    assertFalse(promoteButton.getSelection());
+    assertFalse(stopButton.getSelection());
+    assertFalse(stopButton.getEnabled());
+
+    promote.click();
+    assertTrue(promoteButton.getSelection());
+    assertFalse(stopButton.getSelection());
+    assertTrue(stopButton.getEnabled());
+  }
+
   @Test
   public void testProjectSavedInPreferencesSelected() throws ProjectRepositoryException {
     IEclipsePreferences node =
@@ -170,5 +228,4 @@ private IStatus getAccountSelectorValidationStatus(StandardDeployPreferencesPane
     }
     return status;
   }
-
 }

plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/StandardDeployPreferencesPanel.java

@@ -45,6 +45,7 @@
 import org.eclipse.core.databinding.conversion.Converter;
 import org.eclipse.core.databinding.observable.Observables;
 import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.ComputedValue;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.core.databinding.validation.IValidator;
@@ -213,24 +214,53 @@ private void setupProjectVersionDataBinding(DataBindingContext context) {
   }
 
   private void setupAutoPromoteDataBinding(DataBindingContext context) {
-    ISWTObservableValue promoteButton = WidgetProperties.selection().observe(autoPromoteButton);
-    ISWTObservableValue stopPreviousVersion =
+    ISWTObservableValue promoteButton =
+        WidgetProperties.selection().observe(autoPromoteButton);
+    final ISWTObservableValue stopPreviousVersion =
         WidgetProperties.selection().observe(stopPreviousVersionButton);
-    ISWTObservableValue stopPreviousVersionEnablement =
+    final ISWTObservableValue stopPreviousVersionEnablement =
         WidgetProperties.enabled().observe(stopPreviousVersionButton);
 
-    // use an intermediary value to control the enabled state of stopPreviousVersionButton
-    // based on the promote checkbox's state
-    WritableValue enablement = new WritableValue();
-    context.bindValue(promoteButton, enablement);
-    context.bindValue(stopPreviousVersionEnablement, enablement);
+    context.bindValue(stopPreviousVersionEnablement, promoteButton);
 
     IObservableValue promoteModel = PojoProperties.value("autoPromote").observe(model);
     IObservableValue stopPreviousVersionModel =
         PojoProperties.value("stopPreviousVersion").observe(model);
 
     context.bindValue(promoteButton, promoteModel);
-    context.bindValue(stopPreviousVersion, stopPreviousVersionModel);
+
+    // Intermediary model necessary for "Restore Defaults" to work.
+    final IObservableValue currentStopPreviousVersionChoice = new WritableValue();
+    context.bindValue(currentStopPreviousVersionChoice, stopPreviousVersionModel);
+
+    // One-way update: button selection <-- latest user choice
+    // Update the button (to match the user choice), if enabled; if not, force unchecking.
+    context.bindValue(stopPreviousVersion, new ComputedValue() {
+      @Override
+      protected Object calculate() {
+        boolean buttonEnabled = (boolean) stopPreviousVersionEnablement.getValue();
+        boolean currentValue = (boolean) currentStopPreviousVersionChoice.getValue();
+        if (!buttonEnabled) {
+          return Boolean.FALSE;  // Force unchecking the stop previous button if it is disabled.
+        }
+        return currentValue;  // Otherwise, check the button according to the latest user choice.
+      }
+    }, new UpdateValueStrategy(UpdateValueStrategy.POLICY_NEVER), null);
+
+    // One-way update: button selection --> latest user choice
+    // Update the user choice (to match the button selection), only when the button is enabled.
+    context.bindValue(new ComputedValue() {
+      @Override
+      protected Object calculate() {
+        boolean buttonEnabled = (boolean) stopPreviousVersionEnablement.getValue();
+        boolean buttonValue = (boolean) stopPreviousVersion.getValue();
+        boolean currentValue = (boolean) currentStopPreviousVersionChoice.getValue();
+        if (buttonEnabled) {
+          return buttonValue;  // Remember the button state as the latest choice if it is enabled.
+        }
+        return currentValue;  // Otherwise, retain the latest (current) user choice.
+      }
+    }, stopPreviousVersionModel, null, new UpdateValueStrategy(UpdateValueStrategy.POLICY_NEVER));
   }
 
   private void setupBucketDataBinding(DataBindingContext context) {