From: Mateusz Warowny <mmzwarowny@dundee.ac.uk>
Date: Wed, 22 Feb 2023 13:27:43 +0000 (+0100)
Subject: JAL-4130 Avoid using thenComparing of the Comparator interface
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=a547ca4fcced07c36e60735a79fb657fc32e6ac2;hp=cd1c597b61310db33e1050c2e130db4cab8b7641;p=jalview.git

JAL-4130 Avoid using thenComparing of the Comparator interface
---

diff --git a/src/jalview/ws2/gui/WebServicesMenuManager.java b/src/jalview/ws2/gui/WebServicesMenuManager.java
index c9b53a9..592a370 100644
--- a/src/jalview/ws2/gui/WebServicesMenuManager.java
+++ b/src/jalview/ws2/gui/WebServicesMenuManager.java
@@ -120,9 +120,13 @@ public class WebServicesMenuManager
 
   private void addOneshotEntries(List<WebService<?>> services, JMenu menu)
   {
-    services.sort(Comparator
-        .<WebService<?>, String> comparing(s -> s.getUrl().toString())
-        .thenComparing(WebService::getName));
+    // Workaround. Comparator methods not working in j2s
+    services.sort((ws1, ws2) -> {
+      var res = ws1.getUrl().toString().compareTo(ws2.getUrl().toString());
+      if (res == 0)
+        res = ws1.getName().compareTo(ws2.getName());
+      return res;
+    });
     URL lastHost = null;
     for (WebService<?> service : services)
     {
@@ -291,9 +295,12 @@ public class WebServicesMenuManager
     private void buildAlternativesMenu(List<WebService<?>> services)
     {
       var menu = alternativesMenu;
-      services.sort(Comparator
-          .<WebService<?>, String> comparing(s -> s.getUrl().toString())
-          .thenComparing(s -> s.getName()));
+      services.sort((ws1, ws2) -> {
+        var res = ws1.getUrl().toString().compareTo(ws2.getUrl().toString());
+        if (res == 0)
+          res = ws1.getName().compareTo(ws2.getName());
+        return res;
+      });
       URL lastHost = null;
       for (var service : services)
       {