From: Ben Soares <bsoares@dundee.ac.uk>
Date: Mon, 6 May 2019 23:38:52 +0000 (+0100)
Subject: JAL-3247 Allowing 'file' protocol URL with empty domain in a .jvl file
X-Git-Tag: Release_2_11_0~12^2^2~13
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=d1c8640fb18d4fad7cf630d2ccb9cf31dfc3db25;p=jalview.git

JAL-3247 Allowing 'file' protocol URL with empty domain in a .jvl file
---

diff --git a/getdown/lib/getdown-core-1.8.3-SNAPSHOT.jar b/getdown/lib/getdown-core-1.8.3-SNAPSHOT.jar
index c86afb7..9f62e34 100644
Binary files a/getdown/lib/getdown-core-1.8.3-SNAPSHOT.jar and b/getdown/lib/getdown-core-1.8.3-SNAPSHOT.jar differ
diff --git a/getdown/lib/getdown-launcher.jar b/getdown/lib/getdown-launcher.jar
index 09ae4b5..1497498 100644
Binary files a/getdown/lib/getdown-launcher.jar and b/getdown/lib/getdown-launcher.jar differ
diff --git a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
index 182b057..b6ae55d 100644
--- a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
+++ b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
@@ -1791,8 +1791,14 @@ public class Application
     }
 
     public void newAppbase (URL url) {
-      if ((url.getHost().endsWith(".jalview.org") || url.equals("jalview.org"))) {
+      if (
+              url.getHost().endsWith(".jalview.org")
+              || url.equals("jalview.org")
+              || (url.getProtocol().equals("file") && url.getHost().equals(""))
+                      ) {
         newAppbase = url;
+        log.info("Appbase set to Java Version Locator url '"+url.toString()+"'");
+        return;
       }
       log.info("Java Version Locator url '"+url.toString()+"' does not have a jalview.org domain. Ignoring");
     }
diff --git a/j11lib/getdown-core.jar b/j11lib/getdown-core.jar
index 3e811b2..9f62e34 100644
Binary files a/j11lib/getdown-core.jar and b/j11lib/getdown-core.jar differ
diff --git a/j8lib/getdown-core.jar b/j8lib/getdown-core.jar
index 3e811b2..9f62e34 100644
Binary files a/j8lib/getdown-core.jar and b/j8lib/getdown-core.jar differ