branch develop updated (f2dfaf8 -> f0e9fb4)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git from f2dfaf8 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 7d365bc Can't open links with file ou http protocol in method SwingUtil.openLink (Fixes #4112) new f0e9fb4 Increase size of ConfigUI The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit f0e9fb444ffe9255d9518a2210ab155e59c2de82 Author: Tony CHEMIT <dev@tchemit.fr> Date: Sun Jan 1 15:27:26 2017 +0100 Increase size of ConfigUI 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) Summary of changes: jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/SwingUtil.java | 7 ++++--- .../src/main/java/org/nuiton/jaxx/widgets/about/AboutUI.jaxx | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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>.
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 f0e9fb444ffe9255d9518a2210ab155e59c2de82 Author: Tony CHEMIT <dev@tchemit.fr> Date: Sun Jan 1 15:27:26 2017 +0100 Increase size of ConfigUI --- .../src/main/java/org/nuiton/jaxx/widgets/about/AboutUI.jaxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jaxx-widgets-about/src/main/java/org/nuiton/jaxx/widgets/about/AboutUI.jaxx b/jaxx-widgets-about/src/main/java/org/nuiton/jaxx/widgets/about/AboutUI.jaxx index 7a227d1..5296805 100644 --- a/jaxx-widgets-about/src/main/java/org/nuiton/jaxx/widgets/about/AboutUI.jaxx +++ b/jaxx-widgets-about/src/main/java/org/nuiton/jaxx/widgets/about/AboutUI.jaxx @@ -31,7 +31,7 @@ <script><![CDATA[ public void display() { - setSize((int)(getOwner().getWidth() * 0.7), (int)(getOwner().getHeight() * 0.7)); + setSize((int)(getOwner().getWidth() * 0.9), (int)(getOwner().getHeight() * 0.9)); SwingUtil.center(getOwner(), this); setVisible(true); } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm