Merge branch 'Jalview-JS/JAL-3253-applet' of https://source.jalview.org/git/jalview...

diff --git a/src/jalview/bin/AppletParams.java b/src/jalview/bin/AppletParams.java
index 01c910d..a6d862f 100644 (file)
--- a/src/jalview/bin/AppletParams.java
+++ b/src/jalview/bin/AppletParams.java
@@ -128,7 +128,7 @@ public class AppletParams extends HashMap<String, String>
         String key = getAttr(arg, "name");
         String value = getAttr(arg, "value");
         String name = key;
-        switch (name)
+        switch (name.toLowerCase())
         {
         case "alignpdbfiles":
           break;
@@ -243,7 +243,7 @@ public class AppletParams extends HashMap<String, String>
           name = "upperCase";
           break;
         case "userdefinedcolour":
-          name = "userDefinedColour";
+          name = "colour";
           break;
         case "widthscale":
           name = "widthScale";

diff --git a/swingjs/SwingJS-site.zip b/swingjs/SwingJS-site.zip
index 06439f9..7ab3156 100644 (file)
Binary files a/swingjs/SwingJS-site.zip and b/swingjs/SwingJS-site.zip differ

diff --git a/swingjs/timestamp b/swingjs/timestamp
index c1e80a5..578a12e 100644 (file)
--- a/swingjs/timestamp
+++ b/swingjs/timestamp
@@ -1 +1 @@
-20190512064208 
+20190515094824 

diff --git a/swingjs/ver/3.2.4/SwingJS-site.zip b/swingjs/ver/3.2.4/SwingJS-site.zip
index 06439f9..7ab3156 100644 (file)
Binary files a/swingjs/ver/3.2.4/SwingJS-site.zip and b/swingjs/ver/3.2.4/SwingJS-site.zip differ

diff --git a/swingjs/ver/3.2.4/timestamp b/swingjs/ver/3.2.4/timestamp
index c1e80a5..578a12e 100644 (file)
--- a/swingjs/ver/3.2.4/timestamp
+++ b/swingjs/ver/3.2.4/timestamp
@@ -1 +1 @@
-20190512064208 
+20190515094824