Merge pull request #318 from ThomasJClark/project-settings-fix

Fix some issues with ProjectSettings

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.computeNetworkProtocolServerAddress());
+            NetworkTable.setIPAddress(projectSettings.computePublishAddress());
             NetworkTable.initialize();
         }
     }

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

@@ -27,12 +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 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 = "NetworkTables Server Address", description = "The host that runs the Network Protocol server. " +
+            "If not specified and NetworkTables is specified as the protocol, the hostname is derived from the team " +
+            "number.")
+    private String publishAddress = "";
 
-    @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.")
+    @Setting(label = "Deploy Address", description = "The remote host that grip should be remotely deployed to. If " +
+            "not specified, the hostname is derived from the team number.")
     private String deployAddress = "";
 
     public void setNetworkProtocol(NetworkProtocol networkProtocol) {
@@ -52,13 +53,13 @@ public int getTeamNumber() {
         return teamNumber;
     }
 
-    public void setNetworkProtocolServerAddress(String networkProtocolServerAddress) {
-        this.networkProtocolServerAddress =
-                checkNotNull(networkProtocolServerAddress, "Network Protocol Server Address cannot be null");
+    public void setPublishAddress(String publishAddress) {
+        this.publishAddress =
+                checkNotNull(publishAddress, "Network Protocol Server Address cannot be null");
     }
 
-    public String getNetworkProtocolServerAddress() {
-        return networkProtocolServerAddress;
+    public String getPublishAddress() {
+        return publishAddress;
     }
 
     public void setDeployAddress(String deployAddress) {
@@ -71,29 +72,31 @@ public String getDeployAddress() {
 
     /**
      * @return The address of the machine that the NetworkTables server is running on.  If
-     * {@link #setNetworkProtocolServerAddress} is specified, that is returned, otherwise this is based on the team number.
+     * {@link #setPublishAddress} is specified, that is returned, otherwise this is based on the team
+     * number.
      */
-    public String computeNetworkProtocolServerAddress() {
-        if (networkProtocolServerAddress.isEmpty()) {
-            return "roboio-" + teamNumber + "-frc.local";
+    public String computePublishAddress() {
+        if (publishAddress == null || publishAddress.isEmpty()) {
+            return "roborio-" + teamNumber + "-frc.local";
         } else {
-            return networkProtocolServerAddress;
+            return publishAddress;
         }
     }
 
-    public String computeDeployAddresss() {
-        if (networkProtocolServerAddress.isEmpty()) {
-            return "roboio-" + teamNumber + "-frc.local";
+    public String computeDeployAddress() {
+        if (deployAddress == null || deployAddress.isEmpty()) {
+            return "roborio-" + teamNumber + "-frc.local";
         } else {
-            return networkProtocolServerAddress;
+            return publishAddress;
         }
     }
 
     @Override
     public String toString() {
         return MoreObjects.toStringHelper(this)
                 .add("networkProtocol", networkProtocol)
-                .add("networkProtocolServerAddress", networkProtocolServerAddress)
+                .add("publishAddress", publishAddress)
+                .add("deployAddress", deployAddress)
                 .add("teamNumber", teamNumber)
                 .toString();
     }

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

@@ -40,7 +40,7 @@ FRCAdvancedDeploymentOptionsController create(
                                            @Assisted("stdErr") Supplier<OutputStream> stdErr) {
         super("FRC Advanced", onDeployCallback);
         this.deployedInstanceManagerFactor = deployedInstanceManagerFactor;
-        this.projectAddress = pipeline.getProjectSettings().computeDeployAddresss();
+        this.projectAddress = pipeline.getProjectSettings().computeDeployAddress();
         this.stdOut = stdOut;
         this.stdErr = stdErr;