From: BobHanson Date: Thu, 28 May 2020 20:54:28 +0000 (-0500) Subject: SwingJS upgrade X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b74d8e3bf9374714658367494c652eeff906efef;p=jalview.git SwingJS upgrade --- diff --git a/src/jalview/util/StringUtils.java b/src/jalview/util/StringUtils.java index 2cbbfbf..60db43b 100644 --- a/src/jalview/util/StringUtils.java +++ b/src/jalview/util/StringUtils.java @@ -462,8 +462,8 @@ public class StringUtils for (int i = 0; i < j; i++) { int c = s.charAt(i); - if (!(c >= '0' && c <= '9') && !(c >= 'a' && c <= 'f') - && !(c >= 'A' && c <= 'F')) + if (!(c >= '0' && c <= '9' || c >= 'a' && c <= 'f' + || c >= 'A' && c <= 'F')) { return false; } diff --git a/swingjs/SwingJS-site.zip b/swingjs/SwingJS-site.zip index 94c78ea..6f01f77 100644 Binary files a/swingjs/SwingJS-site.zip and b/swingjs/SwingJS-site.zip differ diff --git a/swingjs/net.sf.j2s.core-j11.jar b/swingjs/net.sf.j2s.core-j11.jar index 683e1fa..928a835 100644 Binary files a/swingjs/net.sf.j2s.core-j11.jar and b/swingjs/net.sf.j2s.core-j11.jar differ diff --git a/swingjs/timestamp b/swingjs/timestamp index 1d92f60..161db5a 100644 --- a/swingjs/timestamp +++ b/swingjs/timestamp @@ -1 +1 @@ -20200527175654 +20200528154821 diff --git a/swingjs/ver/3.2.9-j11/SwingJS-site.zip b/swingjs/ver/3.2.9-j11/SwingJS-site.zip index 94c78ea..5563c76 100644 Binary files a/swingjs/ver/3.2.9-j11/SwingJS-site.zip and b/swingjs/ver/3.2.9-j11/SwingJS-site.zip differ diff --git a/swingjs/ver/3.2.9-j11/net.sf.j2s.core-j11.jar b/swingjs/ver/3.2.9-j11/net.sf.j2s.core-j11.jar index 683e1fa..928a835 100644 Binary files a/swingjs/ver/3.2.9-j11/net.sf.j2s.core-j11.jar and b/swingjs/ver/3.2.9-j11/net.sf.j2s.core-j11.jar differ diff --git a/swingjs/ver/3.2.9-j11/timestamp b/swingjs/ver/3.2.9-j11/timestamp index 1d92f60..71722a8 100644 --- a/swingjs/ver/3.2.9-j11/timestamp +++ b/swingjs/ver/3.2.9-j11/timestamp @@ -1 +1 @@ -20200527175654 +20200528154316 diff --git a/swingjs/ver/3.2.9/SwingJS-site.zip b/swingjs/ver/3.2.9/SwingJS-site.zip index 94c78ea..6f01f77 100644 Binary files a/swingjs/ver/3.2.9/SwingJS-site.zip and b/swingjs/ver/3.2.9/SwingJS-site.zip differ diff --git a/swingjs/ver/3.2.9/timestamp b/swingjs/ver/3.2.9/timestamp index 8192bae..161db5a 100644 --- a/swingjs/ver/3.2.9/timestamp +++ b/swingjs/ver/3.2.9/timestamp @@ -1 +1 @@ -20200524153112 +20200528154821