From: Ben Soares Date: Wed, 15 May 2024 16:59:45 +0000 (+0100) Subject: JAL-4409 extra schemes now opening correctly in macos X-Git-Tag: Release_2_11_4_0~28^2~27 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=a16971f697502190b324dbe321320dab6450a30b;p=jalview.git JAL-4409 extra schemes now opening correctly in macos --- diff --git a/getdown/lib/getdown-core.jar b/getdown/lib/getdown-core.jar index 2a4159a..a934f39 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 ad2e6dc..6e97e11 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 09c29ae..f49ff16 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 3141249..d23735d 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 @@ -1969,7 +1969,7 @@ public class Application for (int i = 0; i < filenames.length; i++) { String filename = filenames[i]; // skip any other locator files in a multiple file list - if (filename.startsWith("jalview://") || filename.startsWith("jalviews://")) { + if (HttpUtils.isJalviewSchemeUri(filename)) { setJalviewUri(filename); } else if (! filename.toLowerCase(Locale.ROOT).endsWith("."+Application.LOCATOR_FILE_EXTENSION)) { addStartupFile(filename); diff --git a/j11lib/getdown-core.jar b/j11lib/getdown-core.jar index 2a4159a..a934f39 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 2a4159a..a934f39 100644 Binary files a/j8lib/getdown-core.jar and b/j8lib/getdown-core.jar differ