This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit 7d365bcf055ffdd52e783563dee7d78b5ae4c9ff Author: Tony CHEMIT <dev@tchemit.fr> Date: Sun Jan 1 15:27:17 2017 +0100 Can't open links with file ou http protocol in method SwingUtil.openLink (Fixes #4112) --- jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/SwingUtil.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/SwingUtil.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/SwingUtil.java index 2f9b320..b99a9d3 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/SwingUtil.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/SwingUtil.java @@ -21,6 +21,7 @@ */ package org.nuiton.jaxx.runtime; +import com.google.common.collect.ImmutableSet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.jxlayer.JXLayer; @@ -1043,6 +1044,8 @@ public class SwingUtil extends JAXXUtil { return new EnumTableCellRenderer<>(renderer, enumClass); } + private static final ImmutableSet<String> OPEN_PROTOCOLS = ImmutableSet.of("mailto", "http", "https", "ftp", "file"); + /** * Open a link coming from a {@link HyperlinkEvent}. * @@ -1057,9 +1060,7 @@ public class SwingUtil extends JAXXUtil { if (Desktop.isDesktopSupported()) { try { URL u = he.getURL(); - if (u.getProtocol().equalsIgnoreCase("mailto") || - u.getProtocol().equalsIgnoreCase("http") || - u.getProtocol().equalsIgnoreCase("ftp")) { + if (OPEN_PROTOCOLS.contains(u.getProtocol().toLowerCase())) { Desktop.getDesktop().browse(u.toURI()); } } catch (IOException | URISyntaxException e) { -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.