Merge pull request #337 from docprofsky/clean-addr

Combine address generator functions

Author: JLLeitschuh

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

@@ -76,18 +76,18 @@ public String getDeployAddress() {
      * number.
      */
     public String computePublishAddress() {
-        if (publishAddress == null || publishAddress.isEmpty()) {
-            return "roborio-" + teamNumber + "-frc.local";
-        } else {
-            return publishAddress;
-        }
+        return computeFRCAddress(publishAddress);
     }
 
     public String computeDeployAddress() {
-        if (deployAddress == null || deployAddress.isEmpty()) {
+        return computeFRCAddress(deployAddress);
+    }
+
+    private String computeFRCAddress(String address) {
+        if (address == null || address.isEmpty()) {
             return "roborio-" + teamNumber + "-frc.local";
         } else {
-            return publishAddress;
+            return address;
         }
     }