Merge pull request #306 from JLLeitschuh/fix/deploymentUI

Fixes various Deployment UI Issues

Author: JLLeitschuh

core/src/main/java/edu/wpi/grip/core/operations/networktables/NTManager.java

@@ -60,7 +60,7 @@ public void updateSettings(ProjectSettingsChangedEvent event) {
 
         NetworkTable.shutdown();
         if (projectSettings.getNetworkProtocol() == ProjectSettings.NetworkProtocol.NETWORK_TABLES) {
-            NetworkTable.setIPAddress(projectSettings.computeNetworkTablesServer());
+            NetworkTable.setIPAddress(projectSettings.computeNetworkProtocolServerAddress());
             NetworkTable.initialize();
         }
     }

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

@@ -27,9 +27,13 @@ public enum NetworkProtocol {
     @Setting(label = "FRC Team Number", description = "The team number, if used for FRC")
     private int teamNumber = 0;
 
-    @Setting(label = "NetworkTables Server", description = "The host that runs the NetworkTables server.  If not " +
-            "specified but NetworkTables is enabled, the hostname is derived from the team number.")
-    private String networkTablesServer = "";
+    @Setting(label = "NetworkTables Server Address", description = "The host that runs the Network Protocol server.  If not " +
+            "specified and Network Tables is specified as the protocol, the hostname is derived from the team number.")
+    private String networkProtocolServerAddress = "";
+
+    @Setting(label = "Deploy Address", description = "The remote host that grip should be remotely deployed to. If not " +
+            "specified and Network Tables is specified as the protocol, the hostname is derived from the team number.")
+    private String deployAddress = "";
 
     public void setNetworkProtocol(NetworkProtocol networkProtocol) {
         this.networkProtocol = checkNotNull(networkProtocol, "Network protocol cannot be null");
@@ -48,32 +52,48 @@ public int getTeamNumber() {
         return teamNumber;
     }
 
-    public void setNetworkTablesServer(String networkTablesServer) {
-        this.networkTablesServer =
-                checkNotNull(networkTablesServer, "NetworkTables server cannot be null");
+    public void setNetworkProtocolServerAddress(String networkProtocolServerAddress) {
+        this.networkProtocolServerAddress =
+                checkNotNull(networkProtocolServerAddress, "Network Protocol Server Address cannot be null");
+    }
+
+    public String getNetworkProtocolServerAddress() {
+        return networkProtocolServerAddress;
+    }
+
+    public void setDeployAddress(String deployAddress) {
+        this.deployAddress = checkNotNull(deployAddress, "Deploy Address can not be null");
     }
 
-    public String getNetworkTablesServer() {
-        return networkTablesServer;
+    public String getDeployAddress() {
+        return deployAddress;
     }
 
     /**
      * @return The address of the machine that the NetworkTables server is running on.  If
-     * {@link #setNetworkTablesServer} is specified, that is returned, otherwise this is based on the team number.
+     * {@link #setNetworkProtocolServerAddress} is specified, that is returned, otherwise this is based on the team number.
      */
-    public String computeNetworkTablesServer() {
-        if (networkTablesServer.isEmpty()) {
+    public String computeNetworkProtocolServerAddress() {
+        if (networkProtocolServerAddress.isEmpty()) {
+            return "roboio-" + teamNumber + "-frc.local";
+        } else {
+            return networkProtocolServerAddress;
+        }
+    }
+
+    public String computeDeployAddresss() {
+        if (networkProtocolServerAddress.isEmpty()) {
             return "roboio-" + teamNumber + "-frc.local";
         } else {
-            return networkTablesServer;
+            return networkProtocolServerAddress;
         }
     }
 
     @Override
     public String toString() {
         return MoreObjects.toStringHelper(this)
                 .add("networkProtocol", networkProtocol)
-                .add("networkTablesServer", networkTablesServer)
+                .add("networkProtocolServerAddress", networkProtocolServerAddress)
                 .add("teamNumber", teamNumber)
                 .toString();
     }

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

@@ -12,11 +12,9 @@
 import edu.wpi.grip.ui.util.deployment.DeployedInstanceManager;
 import javafx.application.Platform;
 import javafx.fxml.FXML;
-import javafx.scene.control.Accordion;
-import javafx.scene.control.DialogPane;
-import javafx.scene.control.ProgressBar;
-import javafx.scene.control.TextArea;
+import javafx.scene.control.*;
 import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -122,9 +120,17 @@ private void onDeploy(DeployedInstanceManager manager) {
                 })
                 .done(deployedManager -> {
                     Platform.runLater(() -> {
-                        controlsBox.getChildren().add(startStopButtonFactory.create(deployedManager));
+                        final Label startStopLabel = new Label("Start / Stop Deployed Instance: ");
+                        startStopLabel.setMaxWidth(Double.MAX_VALUE);
+                        startStopLabel.setMaxHeight(Double.MAX_VALUE);
+                        HBox.setHgrow(startStopLabel, Priority.SOMETIMES);
+                        final StartStoppableButton startStoppableButton = startStopButtonFactory.create(deployedManager);
+                        startStopLabel.setLabelFor(startStoppableButton);
+                        controlsBox.getChildren().addAll(startStopLabel, startStoppableButton);
                         deploymentMethods.setDisable(true);
                         progressIndicator.setProgress(-1);
+                        // Resize window to accommodate the added label
+                        getRoot().getScene().getWindow().sizeToScene();
                     });
                 });
 

ui/src/main/java/edu/wpi/grip/ui/deployment/DeploymentOptionsController.java

@@ -77,6 +77,7 @@ private void deploy() {
                     });
                 })
                 .done((t) -> {
+                    setErrorText("Success! Waiting for start.");
                     onDeployCallback.accept(t);
                     Platform.runLater(() -> {
                         deploySpinner.setVisible(false);
@@ -89,6 +90,7 @@ private void setErrorText(String text) {
         Platform.runLater(() -> {
             deployErrorText.setText(text);
             root.requestLayout();
+            root.getScene().getWindow().sizeToScene();
         });
     }
 
@@ -121,7 +123,8 @@ public InetAddress call() throws IOException {
                     if (inetAddress.isReachable(1000)) {
                         return inetAddress;
                     } else {
-                        notify("Attempt " + i + "/" + attemptCount + " failed");
+                        // i + 1 so that the attempt counter is zero based.
+                        notify("Attempt " + i + 1 + "/" + attemptCount + " failed");
                     }
                 }
                 throw new IOException("Failed to connect");

ui/src/main/java/edu/wpi/grip/ui/deployment/FRCAdvancedDeploymentOptionsController.java

@@ -2,6 +2,7 @@
 
 import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
+import edu.wpi.grip.core.Pipeline;
 import edu.wpi.grip.ui.util.deployment.DeployedInstanceManager;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
@@ -21,6 +22,7 @@ public class FRCAdvancedDeploymentOptionsController extends DeploymentOptionsCon
     private final Supplier<OutputStream> stdOut, stdErr;
 
     private TextField address;
+    private final String projectAddress;
 
     public interface Factory {
         FRCAdvancedDeploymentOptionsController create(
@@ -32,11 +34,13 @@ FRCAdvancedDeploymentOptionsController create(
 
     @Inject
     FRCAdvancedDeploymentOptionsController(DeployedInstanceManager.Factory deployedInstanceManagerFactor,
+                                           Pipeline pipeline,
                                            @Assisted Consumer<DeployedInstanceManager> onDeployCallback,
                                            @Assisted("stdOut") Supplier<OutputStream> stdOut,
                                            @Assisted("stdErr") Supplier<OutputStream> stdErr) {
         super("FRC Advanced", onDeployCallback);
         this.deployedInstanceManagerFactor = deployedInstanceManagerFactor;
+        this.projectAddress = pipeline.getProjectSettings().computeDeployAddresss();
         this.stdOut = stdOut;
         this.stdErr = stdErr;
 
@@ -45,6 +49,7 @@ FRCAdvancedDeploymentOptionsController create(
     @Override
     protected void postInit() {
         this.address = new TextField();
+        this.address.setText(projectAddress);
         this.address.setPromptText("roborio-[team number]-frc.local");
 
         this.address.textProperty().addListener((observable, oldValue, newValue) -> {

ui/src/main/java/edu/wpi/grip/ui/deployment/FRCDeploymentOptionsController.java

@@ -2,6 +2,8 @@
 
 import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
+import edu.wpi.grip.core.Pipeline;
+import edu.wpi.grip.ui.util.Spinners;
 import edu.wpi.grip.ui.util.deployment.DeployedInstanceManager;
 import javafx.scene.control.Label;
 import javafx.scene.control.Spinner;
@@ -20,6 +22,7 @@
 public class FRCDeploymentOptionsController extends DeploymentOptionsController {
 
     private Spinner<Integer> teamNumberSpinner;
+    private final int teamNumber;
     private final DeployedInstanceManager.Factory deployedInstanceManagerFactor;
     private final Supplier<OutputStream> stdOut, stdErr;
 
@@ -33,36 +36,31 @@ FRCDeploymentOptionsController create(
 
     @Inject
     FRCDeploymentOptionsController(DeployedInstanceManager.Factory deployedInstanceManagerFactor,
+                                   Pipeline pipeline,
                                    @Assisted Consumer<DeployedInstanceManager> onDeployCallback,
                                    @Assisted("stdOut") Supplier<OutputStream> stdOut,
                                    @Assisted("stdErr") Supplier<OutputStream> stdErr) {
         super("FRC", onDeployCallback);
         this.deployedInstanceManagerFactor = deployedInstanceManagerFactor;
+        this.teamNumber = pipeline.getProjectSettings().getTeamNumber();
         this.stdOut = stdOut;
         this.stdErr = stdErr;
     }
 
     @Override
-    @SuppressWarnings("PMD.IfElseStmtsMustUseBraces")
     protected void postInit() {
         final Label label = new Label("Team Number");
-        final SpinnerValueFactory.IntegerSpinnerValueFactory spinnerValueFactory = new SpinnerValueFactory.IntegerSpinnerValueFactory(0, Integer.MAX_VALUE, 190);
+        final SpinnerValueFactory.IntegerSpinnerValueFactory spinnerValueFactory =
+                new SpinnerValueFactory.IntegerSpinnerValueFactory(0, Integer.MAX_VALUE, teamNumber);
         this.teamNumberSpinner = new Spinner(spinnerValueFactory);
-        this.teamNumberSpinner.setEditable(true);
-        // Ensure the value entered is only a number
-        this.teamNumberSpinner.getEditor().textProperty().addListener((observable, oldValue, newValue) -> {
-            if ("".equals(newValue)) {
-                teamNumberSpinner.getEditor().setText(Integer.toString(0));
-            } else try {
-                int value = Integer.parseInt(newValue);
-                teamNumberSpinner.getEditor().setText(Integer.toString(value));
-            } catch (NumberFormatException e) {
-                teamNumberSpinner.getEditor().setText(oldValue);
-            }
-        });
+        Spinners.makeEditableSafely(teamNumberSpinner, Integer::valueOf);
+        label.setLabelFor(teamNumberSpinner);
+
         getOptionsGrid().addRow(0, label, this.teamNumberSpinner);
     }
 
+
+
     @Override
     protected Promise<DeployedInstanceManager, String, String> onDeploy() {
         final Deferred<DeployedInstanceManager, String, String> deferredDeploy = new DeferredObject<>();

ui/src/main/java/edu/wpi/grip/ui/pipeline/input/NumberSpinnerInputSocketController.java

@@ -7,11 +7,11 @@
 import edu.wpi.grip.core.events.SocketChangedEvent;
 import edu.wpi.grip.ui.pipeline.SocketHandleView;
 import edu.wpi.grip.ui.util.GRIPPlatform;
+import edu.wpi.grip.ui.util.Spinners;
 import javafx.beans.InvalidationListener;
 import javafx.fxml.FXML;
 import javafx.scene.control.Spinner;
 import javafx.scene.control.SpinnerValueFactory;
-import javafx.util.StringConverter;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
@@ -55,12 +55,9 @@ public interface Factory {
     public void initialize() {
         super.initialize();
         final Spinner<Double> spinner = new Spinner<>(this.valueFactory);
-        spinner.setEditable(true);
+        Spinners.makeEditableSafely(spinner, Double::valueOf);
         spinner.disableProperty().bind(this.getHandle().connectedProperty());
-        spinner.focusedProperty().addListener((s, ov, nv) -> {// Code found at http://stackoverflow.com/questions/32340476/manually-typing-in-text-in-javafx-spinner-is-not-updating-the-value-unless-user
-            if (nv) return;
-            commitEditorText(spinner);
-        });
+
         this.setContent(spinner);
     }
 
@@ -80,17 +77,4 @@ public void updateSpinnerFromSocket(SocketChangedEvent event) {
         }
     }
 
-    // Code found at http://stackoverflow.com/questions/32340476/manually-typing-in-text-in-javafx-spinner-is-not-updating-the-value-unless-user
-    private <T> void commitEditorText(Spinner<T> spinner) {
-        if (!spinner.isEditable()) return;
-        String text = spinner.getEditor().getText();
-        SpinnerValueFactory<T> valueFactory = spinner.getValueFactory();
-        if (valueFactory != null) {
-            StringConverter<T> converter = valueFactory.getConverter();
-            if (converter != null) {
-                T value = converter.fromString(text);
-                valueFactory.setValue(value);
-            }
-        }
-    }
 }

ui/src/main/java/edu/wpi/grip/ui/util/Spinners.java

@@ -0,0 +1,61 @@
+package edu.wpi.grip.ui.util;
+
+
+import javafx.scene.control.Spinner;
+import javafx.scene.control.SpinnerValueFactory;
+import javafx.util.StringConverter;
+
+import java.util.function.Function;
+
+/**
+ * Utility methods to set up spinners in a safe way.
+ */
+public final class Spinners {
+
+    private Spinners() {
+        /* no-op */
+    }
+
+    /**
+     * Makes the spinner editable.
+     * Ensures that the values will be committed when focus is lost.
+     * Ensures that the only values that the spinner can accept are parable into whatever number type they represent.
+     * @param <T> The number type of the spinner
+     */
+    @SuppressWarnings("PMD.IfElseStmtsMustUseBraces")
+    public static <T extends Number> void makeEditableSafely(Spinner<T> spinner, Function<String, T> parseToNumber) {
+        spinner.setEditable(true);
+        spinner.focusedProperty().addListener((s, ov, nv) -> {
+            if (nv) return;
+            commitEditorText(spinner);
+        });
+        // Ensure the value entered is only a number
+        spinner.getEditor().textProperty().addListener((observable, oldValue, newValue) -> {
+            if ("".equals(newValue)) {
+                spinner.getEditor().setText("0");
+            } else try {
+                T value = parseToNumber.apply(newValue);
+                spinner.getEditor().setText(value.toString());
+            } catch (NumberFormatException e) {
+                spinner.getEditor().setText(oldValue);
+            }
+        });
+    }
+
+    /**
+     *
+     * @see <a href="http://stackoverflow.com/questions/32340476/manually-typing-in-text-in-javafx-spinner-is-not-updating-the-value-unless-user">Stack Overflow Post</a>
+     */
+    private static <T> void commitEditorText(Spinner<T> spinner) {
+        if (!spinner.isEditable()) return;
+        String text = spinner.getEditor().getText();
+        SpinnerValueFactory<T> valueFactory = spinner.getValueFactory();
+        if (valueFactory != null) {
+            StringConverter<T> converter = valueFactory.getConverter();
+            if (converter != null) {
+                T value = converter.fromString(text);
+                valueFactory.setValue(value);
+            }
+        }
+    }
+}