X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=getdown%2Fsrc%2Fgetdown%2Fcore%2Fsrc%2Fmain%2Fjava%2Fcom%2Fthreerings%2Fgetdown%2Fdata%2FEnvConfig.java;h=e3993d3e581cd13c9eb4ef18bb11ae6aa586b973;hb=901e1b114a875c33e91bb1be3f03d656f0d0d86a;hp=77997d203a2f759ef2264d7278654d93092788e5;hpb=d74ee697c7ac0a0ffca7854f787821a726839e4b;p=jalview.git

diff --git a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/EnvConfig.java b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/EnvConfig.java
index 77997d2..e3993d3 100644
--- a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/EnvConfig.java
+++ b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/EnvConfig.java
@@ -15,6 +15,9 @@ import java.security.cert.X509Certificate;
 import java.util.*;
 
 import com.threerings.getdown.util.StringUtil;
+
+import jalview.util.HttpUtils;
+
 import com.threerings.getdown.data.Application;
 
 /** Configuration that comes from our "environment" (command line args, sys props, etc.). */
@@ -145,10 +148,11 @@ public final class EnvConfig {
         int skipArgs = 2;
         // Look for locator file, pass to Application and remove from appArgs
         String argvLocatorFilename = argv.length > 2 ? argv[2] : null;
-        if (
-                !StringUtil.isBlank(argvLocatorFilename)
-                && argvLocatorFilename.toLowerCase(Locale.ROOT).endsWith("."+Application.LOCATOR_FILE_EXTENSION)
-                ) {
+        if (!StringUtil.isBlank(argvLocatorFilename)
+              && argvLocatorFilename.toLowerCase(Locale.ROOT).endsWith("."+Application.LOCATOR_FILE_EXTENSION)) {
+          if (HttpUtils.isJalviewSchemeUri(argvLocatorFilename)) {
+            argvLocatorFilename = HttpUtils.equivalentJalviewUrl(argvLocatorFilename);
+          }
           notes.add(Note.info("locatorFilename in args: '"+argv[2]+"'"));
           Application.setLocatorFile(argvLocatorFilename);