X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=getdown%2Fsrc%2Fgetdown%2Fcore%2Fsrc%2Fmain%2Fjava%2Fcom%2Fthreerings%2Fgetdown%2Fdata%2FApplication.java;h=4d75236885133fb711957c698e24c42ecb4e118e;hb=992f8de4d39d69eca640746b5126aae1d62685cc;hp=182b0575246daacf63b5c4b8621b08954a128c5a;hpb=46ba8ba2466d929d023295f38bc3572aef5467f1;p=jalview.git

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..4d75236 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
@@ -1061,10 +1061,10 @@ public class Application
           if (j > -1) {
             ext = filename.substring(j+1);
           }
-          if (startupFileExtensions.contains(ext.toLowerCase())) {
+          if (locatorFileExtension.equals(ext.toLowerCase())) {
+            // this file extension should have been dealt with in Getdown class
+          } else {
             _appargs.add(0, "-open");
-          } else if (locatorFileExtension.equals(ext.toLowerCase())) {
-            // deal with this when first encountered in Getdown!
           }
         }
 
@@ -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");
     }
@@ -1863,6 +1869,5 @@ public class Application
     protected static final String ENV_VAR_PREFIX = "%ENV.";
     protected static final Pattern ENV_VAR_PATTERN = Pattern.compile("%ENV\\.(.*?)%");
     
-    public static final List<String> startupFileExtensions = Arrays.asList(new String[] { "jvp" });
     public static final String locatorFileExtension = "jvl";
 }