Merge branch 'improvement/JAL-4409_implement_extra_schemes_in_getdown' into develop

[jalview.git] / getdown / src / getdown / core / src / main / java / com / threerings / getdown / data / EnvConfig.java

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..862c18e 100644 (file)
--- 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,9 @@ 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)) {
+          argvLocatorFilename = HttpUtils.equivalentJalviewUrl(argvLocatorFilename);
           notes.add(Note.info("locatorFilename in args: '"+argv[2]+"'"));
           Application.setLocatorFile(argvLocatorFilename);