Add JVM arguments deploy option

ThomasJClark · ThomasJClark · commit daa79f03a5d0 · 2016-01-29T15:12:51.000-05:00
The deploy dialog has been slightly rearranged to make room for it.  It
now also includes a preview of the exact command that will be executed.
diff --git a/core/src/main/java/edu/wpi/grip/core/settings/ProjectSettings.java b/core/src/main/java/edu/wpi/grip/core/settings/ProjectSettings.java
@@ -31,6 +31,9 @@ public class ProjectSettings implements Cloneable {
     @Setting(label = "Deploy Java home", description = "Where Java is installed on the robot.")
     private String deployJavaHome = "/usr/local/frc/JRE/";
 
+    @Setting(label = "Deploy JVM options", description = "Command line options passed to the roboRIO JVM")
+    private String deployJvmOptions = "-Xmx50m";
+
     /**
      * Set the FRC team number.  If the deploy address and NetworkTables server address haven't been manually
      * overridden, this also changes them to the mDNS hostname of the team's roboRIO.
@@ -98,6 +101,14 @@ public void setDeployJavaHome(String deployJavaHome) {
         if (deployJavaHome != null) this.deployJavaHome = deployJavaHome;
     }
 
+    public String getDeployJvmOptions() {
+        return deployJvmOptions;
+    }
+
+    public void setDeployJvmOptions(String deployJvmOptions) {
+        this.deployJvmOptions = deployJvmOptions;
+    }
+
     private String computeFRCAddress(int teamNumber) {
         return "roborio-" + teamNumber + "-frc.local";
     }
@@ -109,6 +120,7 @@ public String toString() {
                 .add("deployDir", deployDir)
                 .add("deployUser", deployUser)
                 .add("deployJavaHome", deployJavaHome)
+                .add("deployJvmOptions", deployJvmOptions)
                 .add("publishAddress", publishAddress)
                 .add("teamNumber", teamNumber)
                 .toString();
diff --git a/ui/src/main/java/edu/wpi/grip/ui/DeployController.java b/ui/src/main/java/edu/wpi/grip/ui/DeployController.java
@@ -10,6 +10,7 @@
 import edu.wpi.grip.core.settings.ProjectSettings;
 import edu.wpi.grip.ui.util.StringInMemoryFile;
 import javafx.application.Platform;
+import javafx.beans.binding.Bindings;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.fxml.FXML;
@@ -50,27 +51,31 @@ public class DeployController {
     @FXML private TextField user;
     @FXML private TextField password;
     @FXML private TextField javaHome;
+    @FXML private TextField jvmArgs;
     @FXML private TextField deployDir;
     @FXML private ProgressIndicator progress;
+    @FXML private Label command;
     @FXML private Button deployButton;
     @FXML private Label status;
     @FXML private TextArea console;
 
     @Inject private EventBus eventBus;
     @Inject private Project project;
     @Inject private Pipeline pipeline;
-    @Inject private Logger logger;
 
+    @Inject private Logger logger;
     private final BooleanProperty deploying = new SimpleBooleanProperty(this, "deploying", false);
     private Optional<Thread> deployThread = Optional.empty();
 
     @FXML
     public void initialize() {
-        loadSettings(pipeline.getProjectSettings());
-
         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, "'"));
+
+        loadSettings(pipeline.getProjectSettings());
     }
 
     @Subscribe
@@ -85,6 +90,7 @@ private void loadSettings(ProjectSettings settings) {
         address.setText(settings.getDeployAddress());
         user.setText(settings.getDeployUser());
         javaHome.setText(settings.getDeployJavaHome());
+        jvmArgs.setText(settings.getDeployJvmOptions());
         deployDir.setText(settings.getDeployDir());
     }
 
@@ -95,6 +101,7 @@ private void saveSettings() {
         settings.setDeployAddress(address.getText());
         settings.setDeployUser(user.getText());
         settings.setDeployJavaHome(javaHome.getText());
+        settings.setDeployJvmOptions(jvmArgs.getText());
         settings.setDeployDir(deployDir.getText());
         eventBus.post(new ProjectSettingsChangedEvent(settings));
     }
@@ -107,8 +114,7 @@ public void onDeploy() {
         console.clear();
 
         // Start the deploy in a new thread, so the GUI doesn't freeze
-        deployThread = Optional.of(new Thread(() ->
-                deploy(address.getText(), user.getText(), password.getText(), javaHome.getText(), deployDir.getText())));
+        deployThread = Optional.of(new Thread(this::deploy));
         deployThread.get().setDaemon(true);
         deployThread.get().start();
     }
@@ -124,13 +130,13 @@ public void onStop() {
      * Upload and run the GRIP project using the current deploy settings.  This is run in a separate thread, and it
      * periodically updates the GUI to inform the user of the current status of the deployment.
      */
-    private void deploy(String address, String user, String password, String javaHome, String deployDir) {
-        setStatusAsync("Connecting to " + address, false);
+    private void deploy() {
+        setStatusAsync("Connecting to " + address.getText(), false);
 
         try (SSHClient ssh = new SSHClient()) {
             ssh.addHostKeyVerifier((hostname, port, key) -> true);
-            ssh.connect(address);
-            ssh.authPassword(user, password);
+            ssh.connect(address.getText());
+            ssh.authPassword(user.getText(), password.getText());
 
             // Update the progress bar and status text while uploading files
             SCPFileTransfer scp = ssh.newSCPFileTransfer();
@@ -151,8 +157,8 @@ public StreamCopier.Listener file(String name, long size) {
             project.save(projectWriter);
 
             // Upload the GRIP core JAR and the serialized project to the robot
-            scp.upload(new StringInMemoryFile(PROJECT_FILE, projectWriter.toString()), deployDir + "/");
-            scp.upload(new FileSystemFile(LOCAL_GRIP_JAR), deployDir + "/" + GRIP_JAR);
+            scp.upload(new StringInMemoryFile(PROJECT_FILE, projectWriter.toString()), deployDir.getText() + "/");
+            scp.upload(new FileSystemFile(LOCAL_GRIP_JAR), deployDir.getText() + "/" + GRIP_JAR);
 
             // Stop the pipeline before running it remotely, so the two instances of GRIP don't try to publish to the
             // same NetworkTables keys.
@@ -162,8 +168,9 @@ public StreamCopier.Listener file(String name, long size) {
             setStatusAsync("Running GRIP", false);
             Session session = ssh.startSession();
             session.allocateDefaultPTY();
-            Session.Command cmd = session.exec(javaHome + "/bin/java -jar " + deployDir + "/" + GRIP_JAR + "' '"
-                    + deployDir + "/" + PROJECT_FILE + "'");
+
+            logger.info("Executing " + command.getText());
+            Session.Command cmd = session.exec(command.getText());
 
             LineReader inputReader = new LineReader(new InputStreamReader(cmd.getInputStream()));
             while (isNotCanceled()) {
@@ -175,7 +182,7 @@ public StreamCopier.Listener file(String name, long size) {
                 Platform.runLater(() -> console.setText(console.getText() + line + "\n"));
             }
         } catch (UnknownHostException e) {
-            setStatusAsync("Unknown host: " + address, true);
+            setStatusAsync("Unknown host: " + address.getText(), true);
         } catch (UserAuthException e) {
             setStatusAsync("Invalid username or password (should be \"lvuser\" and blank for roboRIO)", true);
         } catch (InterruptedIOException e) {
diff --git a/ui/src/main/resources/edu/wpi/grip/ui/Deploy.fxml b/ui/src/main/resources/edu/wpi/grip/ui/Deploy.fxml
@@ -1,18 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?language javascript ?>
+<?language javascript?>
 
 <?import edu.wpi.grip.ui.util.DPIUtility?>
-<?import edu.wpi.grip.ui.DeployController?>
+<?import javafx.beans.property.SimpleBooleanProperty?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.image.Image?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.*?>
 <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">
     <GridPane maxHeight="Infinity">
         <columnConstraints>
-            <ColumnConstraints hgrow="NEVER"/>
+            <ColumnConstraints hgrow="NEVER" halignment="RIGHT"/>
+            <ColumnConstraints hgrow="ALWAYS"/>
+            <ColumnConstraints hgrow="NEVER">
+                <prefWidth>
+                    <DPIUtility fx:constant="FONT_SIZE"/>
+                </prefWidth>
+            </ColumnConstraints>
+            <ColumnConstraints hgrow="NEVER" halignment="RIGHT"/>
             <ColumnConstraints hgrow="ALWAYS"/>
         </columnConstraints>
 
@@ -21,23 +29,32 @@
                    GridPane.rowIndex="0"/>
 
         <Label disable="${deployButton.disabled}" text="User" GridPane.columnIndex="0" GridPane.rowIndex="1"/>
-        <TextField disable="${deployButton.disabled}" fx:id="user" promptText="User" GridPane.columnIndex="1"
+        <TextField disable="${deployButton.disabled}" fx:id="user" promptText="Username" GridPane.columnIndex="1"
                    GridPane.rowIndex="1"/>
 
         <Label disable="${deployButton.disabled}" text="Password" GridPane.columnIndex="0" GridPane.rowIndex="2"/>
         <PasswordField disable="${deployButton.disabled}" fx:id="password" promptText="Password"
                        GridPane.columnIndex="1" GridPane.rowIndex="2"/>
 
-        <Label disable="${deployButton.disabled}" text="Java Home" GridPane.columnIndex="0" GridPane.rowIndex="3"/>
+        <Label disable="${deployButton.disabled}" text="Deploy Directory" GridPane.columnIndex="3"
+               GridPane.rowIndex="0"/>
+        <TextField disable="${deployButton.disabled}" fx:id="deployDir" promptText="Deploy Directory"
+                   GridPane.columnIndex="4" GridPane.rowIndex="0"/>
+
+        <Label disable="${deployButton.disabled}" text="Java Home" GridPane.columnIndex="3" GridPane.rowIndex="1"/>
         <TextField disable="${deployButton.disabled}" fx:id="javaHome" promptText="Java Home"
-                   GridPane.columnIndex="1" GridPane.rowIndex="3"/>
+                   GridPane.columnIndex="4" GridPane.rowIndex="1"/>
 
-        <Label disable="${deployButton.disabled}" text="Deploy Directory" GridPane.columnIndex="0"
-               GridPane.rowIndex="4"/>
-        <TextField disable="${deployButton.disabled}" fx:id="deployDir" promptText="Deploy Directory"
-                   GridPane.columnIndex="1" GridPane.rowIndex="4"/>
+        <Label disable="${deployButton.disabled}" text="JVM Arguments" GridPane.columnIndex="3" GridPane.rowIndex="2"/>
+        <TextField disable="${deployButton.disabled}" fx:id="jvmArgs" promptText="JVM Arguments"
+                   GridPane.columnIndex="4" GridPane.rowIndex="2"/>
+
+        <Label disable="${deployButton.disabled}" text="Command" GridPane.columnIndex="0" GridPane.rowIndex="3"/>
+        <Label fx:id="command" disable="${deployButton.disabled}" GridPane.columnIndex="1" GridPane.columnSpan="4"
+               GridPane.rowIndex="3" style="-fx-font-family: monospace"/>
     </GridPane>
 
+
     <ButtonBar>
         <buttons>
             <Button fx:id="deployButton" defaultButton="true" onMouseClicked="#onDeploy" text="Deploy"
@@ -65,5 +82,5 @@
         <Label fx:id="status"/>
     </StackPane>
 
-    <TextArea fx:id="console" editable="false" styleClass="console" prefRowCount="24" prefColumnCount="80"/>
+    <TextArea fx:id="console" editable="false" styleClass="console" prefRowCount="24" prefColumnCount="100"/>
 </VBox>
diff --git a/ui/src/main/resources/edu/wpi/grip/ui/GRIP.css b/ui/src/main/resources/edu/wpi/grip/ui/GRIP.css
@@ -189,7 +189,7 @@ VBox.sockets {
     -fx-background-color: grey;
 }
 
-.property-sheet .property-pane, .deploy-pane GridPane {
+.property-sheet .property-pane {
     -fx-hgap: 4em;
     -fx-vgap: 1em;
     -fx-padding: 0;
@@ -207,6 +207,12 @@ VBox.sockets {
     -fx-spacing: 1em;
 }
 
+.deploy-pane GridPane {
+    -fx-hgap: 1em;
+    -fx-vgap: 1em;
+    -fx-padding: 0;
+}
+
 .deploy-pane StackPane {
     -fx-pref-height: 2em;
 }

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ VBox.sockets {`
`189`	`189`	`-fx-background-color: grey;`
`190`	`190`	`}`
`191`	`191`
`192`		`-.property-sheet .property-pane, .deploy-pane GridPane {`
	`192`	`+.property-sheet .property-pane {`
`193`	`193`	`-fx-hgap: 4em;`
`194`	`194`	`-fx-vgap: 1em;`
`195`	`195`	`-fx-padding: 0;`
`@@ -207,6 +207,12 @@ VBox.sockets {`
`207`	`207`	`-fx-spacing: 1em;`
`208`	`208`	`}`
`209`	`209`
	`210`	`+.deploy-pane GridPane {`
	`211`	`+ -fx-hgap: 1em;`
	`212`	`+ -fx-vgap: 1em;`
	`213`	`+ -fx-padding: 0;`
	`214`	`+}`
	`215`	`+`
`210`	`216`	`.deploy-pane StackPane {`
`211`	`217`	`-fx-pref-height: 2em;`
`212`	`218`	`}`