Do more property binding in FXML instead of the controller

Ideally we should do as little view stuff as possible in the controller
class because of MVC or something.

Author: ThomasJClark

core/src/main/java/edu/wpi/grip/core/settings/ProjectSettings.java

@@ -106,7 +106,7 @@ public String getDeployJvmOptions() {
     }
 
     public void setDeployJvmOptions(String deployJvmOptions) {
-        this.deployJvmOptions = deployJvmOptions;
+        if (deployJvmOptions != null) this.deployJvmOptions = deployJvmOptions;
     }
 
     private String computeFRCAddress(int teamNumber) {

ui/src/main/java/edu/wpi/grip/ui/DeployController.java

@@ -12,7 +12,6 @@
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 import net.schmizz.sshj.SSHClient;
@@ -55,22 +54,19 @@ public class DeployController {
     @FXML private TextField deployDir;
     @FXML private ProgressIndicator progress;
     @FXML private Label command;
-    @FXML private Button deployButton;
     @FXML private Label status;
     @FXML private TextArea console;
+    @FXML private BooleanProperty deploying;
 
     @Inject private EventBus eventBus;
     @Inject private Project project;
     @Inject private Pipeline pipeline;
-
     @Inject private Logger logger;
-    private final BooleanProperty deploying = new SimpleBooleanProperty(this, "deploying", false);
+
     private Optional<Thread> deployThread = Optional.empty();
 
     @FXML
     public void initialize() {
-        deployButton.disableProperty().bind(deploying);
-        progress.disableProperty().bind(deploying.not());
         deploying.addListener((o, b, d) -> progress.setProgress(d ? ProgressIndicator.INDETERMINATE_PROGRESS : 0));
         command.textProperty().bind(Bindings.concat(javaHome.textProperty(), "/bin/java ", jvmArgs.textProperty(),
                 " -jar '", deployDir.textProperty(), "/", GRIP_JAR, "' '", deployDir.textProperty(), "/", PROJECT_FILE, "'"));

ui/src/main/resources/edu/wpi/grip/ui/Deploy.fxml

@@ -11,6 +11,10 @@
 <VBox styleClass="deploy-pane" maxWidth="Infinity" xmlns:fx="http://javafx.com/fxml/1"
       onKeyPressed="if (event.code == javafx.scene.input.KeyCode.ENTER) { controller.onDeploy() }"
       xmlns="http://javafx.com/javafx/null" fx:controller="edu.wpi.grip.ui.DeployController">
+    <fx:define>
+        <SimpleBooleanProperty fx:id="deploying"/>
+    </fx:define>
+
     <GridPane maxHeight="Infinity">
         <columnConstraints>
             <ColumnConstraints hgrow="NEVER" halignment="RIGHT"/>
@@ -59,6 +63,7 @@
         <buttons>
             <Button fx:id="deployButton" defaultButton="true" onMouseClicked="#onDeploy" text="Deploy"
                     ButtonBar.buttonData="APPLY">
+                <fx:script>deployButton.disableProperty().bind(deploying)</fx:script>
                 <graphic>
                     <ImageView styleClass="menu-graphic">
                         <fitWidth>
@@ -78,7 +83,9 @@
     </ButtonBar>
 
     <StackPane>
-        <ProgressBar fx:id="progress" maxWidth="Infinity" progress="0"/>
+        <ProgressBar fx:id="progress" maxWidth="Infinity" progress="0">
+            <fx:script>progress.disableProperty().bind(deploying.not())</fx:script>
+        </ProgressBar>
         <Label fx:id="status"/>
     </StackPane>