From: Ben Soares <b.soares@dundee.ac.uk>
Date: Thu, 16 May 2024 23:57:29 +0000 (+0100)
Subject: JAL-4409 Added remote JVL files for Linux/Windows
X-Git-Tag: Release_2_11_4_0~28^2~22
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=901e1b114a875c33e91bb1be3f03d656f0d0d86a;p=jalview.git

JAL-4409 Added remote JVL files for Linux/Windows
---

diff --git a/getdown/lib/getdown-core.jar b/getdown/lib/getdown-core.jar
index ec5ed62..bf6cfe2 100644
Binary files a/getdown/lib/getdown-core.jar and b/getdown/lib/getdown-core.jar differ
diff --git a/getdown/lib/getdown-launcher-local.jar b/getdown/lib/getdown-launcher-local.jar
index fd0b206..fae4504 100644
Binary files a/getdown/lib/getdown-launcher-local.jar and b/getdown/lib/getdown-launcher-local.jar differ
diff --git a/getdown/lib/getdown-launcher.jar b/getdown/lib/getdown-launcher.jar
index 1c7f42f..334be09 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 202c30d..f063a18 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
@@ -11,8 +11,6 @@ import java.net.MalformedURLException;
 import java.net.Proxy;
 import java.net.SocketAddress;
 import java.net.InetSocketAddress;
-//#####import java.net.URI;
-//#####import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.net.URLConnection;
@@ -1937,7 +1935,6 @@ public class Application
     }
     
     public static void setStartupFilesFromParameters(List<String> parameters) {
-      log.info("##### Filenames = '"+parameters.toString()+"'");
       // multiple files *might* be passed in as space separated quoted filenames
       String q = "\"";
       for (String p: parameters) {
@@ -1958,11 +1955,9 @@ public class Application
 
           // check for locator file.  Only allow one locator file to be double clicked (if multiple files opened, ignore locator files)
           if (filename.toLowerCase(Locale.ROOT).endsWith("."+Application.LOCATOR_FILE_EXTENSION)) {
-            log.info("##### SETTING LOCATORFILENAME '"+ filename +"'");
             setLocatorFile(filename);
           } else {
             // skip any other locator files in a multiple file list
-            log.info("##### ADDING FILENAME '"+ filename +"'");
             addStartupFile(filename);
           }
         }
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);
           
diff --git a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/util/Config.java b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/util/Config.java
index 8bff8ef..6681c35 100644
--- a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/util/Config.java
+++ b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/util/Config.java
@@ -239,9 +239,7 @@ public class Config
             // comment in column 0)
             if (!opts.strictComments && Boolean.parseBoolean((String)data.get("strict_comments"))) {
                 opts.strictComments = true;
-                System.err.println("##### About to reset reader");
                 source.reset();
-                System.err.println("##### Reset reader");
                 return parseConfig(source, opts);
             }
 
diff --git a/j11lib/getdown-core.jar b/j11lib/getdown-core.jar
index ec5ed62..bf6cfe2 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 ec5ed62..bf6cfe2 100644
Binary files a/j8lib/getdown-core.jar and b/j8lib/getdown-core.jar differ