JAL-3362 JAL-3066 patch out not-yet supported thenCompare in slivka ws menu builder

diff --git a/src/jalview/gui/WebServicesMenuBuilder.java b/src/jalview/gui/WebServicesMenuBuilder.java
index 2a17bf4..38ac33e 100644 (file)
--- a/src/jalview/gui/WebServicesMenuBuilder.java
+++ b/src/jalview/gui/WebServicesMenuBuilder.java
@@ -91,8 +91,9 @@ public class WebServicesMenuBuilder
   {
     operations = new ArrayList<>(operations);
     operations.sort(Comparator
-            .<Operation, String>comparing(o -> o.getHostName())
-            .<String>thenComparing(o -> o.getName()));
+                   .<Operation, String>comparing(o -> o.getHostName()));
+    // not supported in swingjs 3.3.1
+    // .<String>thenComparing(o -> o.getName()));
     String lastHost = null;
     for (final Operation op : operations)
     {

diff --git a/swingjs/SwingJS-site.zip b/swingjs/SwingJS-site.zip
index 8f842a1..9526ffb 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 f18a7e2..b43b0d7 100644 (file)
--- a/swingjs/timestamp
+++ b/swingjs/timestamp
@@ -1 +1 @@
-20210720163506 
+20211009053211 

diff --git a/swingjs/ver/3.3.1/SwingJS-site.zip b/swingjs/ver/3.3.1/SwingJS-site.zip
index f6fdabe..9526ffb 100644 (file)
Binary files a/swingjs/ver/3.3.1/SwingJS-site.zip and b/swingjs/ver/3.3.1/SwingJS-site.zip differ

diff --git a/swingjs/ver/3.3.1/timestamp b/swingjs/ver/3.3.1/timestamp
index 204bf8d..b43b0d7 100644 (file)
--- a/swingjs/ver/3.3.1/timestamp
+++ b/swingjs/ver/3.3.1/timestamp
@@ -1 +1 @@
-20210728172208 
+20211009053211 

diff --git a/swingjs/ver/3.3.1/timestamp.orig b/swingjs/ver/3.3.1/timestamp.orig
new file mode 100644 (file)
index 0000000..e7fc551
--- /dev/null
+++ b/swingjs/ver/3.3.1/timestamp.orig
@@ -0,0 +1,5 @@
+<<<<<<< HEAD
+20210728172208 
+=======
+20210720163506 
+>>>>>>> JAL-3878_web_services_overhaul