Added Strings.ensureEndingSlash to avoid code duplication (#145)

src/main/java/fxlauncher/AbstractLauncher.java

@@ -2,11 +2,7 @@
 
 import javafx.application.Application;
 
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
+import javax.net.ssl.*;
 import javax.xml.bind.JAXB;
 import java.io.File;
 import java.io.IOException;
@@ -32,6 +28,8 @@
 import java.util.logging.SimpleFormatter;
 import java.util.stream.Collectors;
 
+import static fxlauncher.Strings.ensureEndingSlash;
+
 @SuppressWarnings("unchecked")
 public abstract class AbstractLauncher<APP>  {
     private static final Logger log = Logger.getLogger("AbstractLauncher");
@@ -185,25 +183,15 @@ protected void syncManifest() throws Exception {
 
         if (namedParams.containsKey("app")) {
             // get --app-param
-            appStr = namedParams.get("app");
+            appStr = ensureEndingSlash(namedParams.get("app"));
             log.info(String.format("Loading manifest from 'app' parameter supplied: %s", appStr));
         }
 
-        if (appStr != null && !appStr.endsWith("/")) {
-            appStr += "/";
-        }
-
         if (namedParams.containsKey("uri")) {
             // get --uri-param
-            String uriStr = namedParams.get("uri");
-            if (!uriStr.endsWith("/")) {
-                uriStr = uriStr + "/";
-            }
+            String uriStr = ensureEndingSlash(namedParams.get("uri"));
             log.info(String.format("Syncing files from 'uri' parameter supplied:  %s", uriStr));
 
-            if (!uriStr.endsWith("/")) {
-                uriStr += "/";
-            }
             URI uri = URI.create(uriStr);
 
             // load manifest from --app param if supplied, else default file at supplied uri

src/main/java/fxlauncher/FXManifest.java

@@ -13,13 +13,9 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Base64;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
+
+import static fxlauncher.Strings.ensureEndingSlash;
 
 @SuppressWarnings("unchecked")
 @XmlRootElement(name = "Application")
@@ -66,10 +62,8 @@ public String getFilename() {
 
 	public URI getFXAppURI() {
 
-		String separator = uri.getPath().endsWith("/") ? "" : "/";
-
 		// We avoid using uri.resolve() here so as to not break UNC paths. See issue #143
-		return URI.create(uri.toString() + separator + "app.xml");
+		return URI.create(ensureEndingSlash(uri.toString()) + "app.xml");
 	}
 
 	public Path getPath(Path cacheDir) {

src/main/java/fxlauncher/Strings.java

@@ -0,0 +1,10 @@
+package fxlauncher;
+
+public class Strings {
+    public static String ensureEndingSlash(String s) {
+        if (s != null && !s.endsWith("/"))
+            s += "/";
+
+        return s;
+    }
+}