Merge commit 'alpha/update_2_12_for_2_11_2_series_merge^2' into HEAD

[jalview.git] / src / jalview / ws / jws2 / MsaWSClient.java

diff --git a/src/jalview/ws/jws2/MsaWSClient.java b/src/jalview/ws/jws2/MsaWSClient.java
index 3123078..7d7f8ec 100644 (file)
--- a/src/jalview/ws/jws2/MsaWSClient.java
+++ b/src/jalview/ws/jws2/MsaWSClient.java
@@ -40,11 +40,13 @@ import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.List;
+import java.util.Locale;
 
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 import javax.swing.ToolTipManager;
 
+
 /**
  * MsaWSClient
  * 
@@ -145,6 +147,7 @@ public class MsaWSClient extends Jws2Client implements WSMenuEntryProviderI
   
       startMsaWSClient(altitle, msa, submitGaps, preserveOrder, seqdataset);
     });
+
   }
 
   public MsaWSClient()
@@ -163,7 +166,7 @@ public class MsaWSClient extends Jws2Client implements WSMenuEntryProviderI
 
     wsInfo.setProgressText(((submitGaps) ? "Re-alignment" : "Alignment")
             + " of " + altitle + "\nJob details\n");
-    String jobtitle = WebServiceName.toLowerCase();
+    String jobtitle = WebServiceName.toLowerCase(Locale.ROOT);
     if (jobtitle.endsWith("alignment"))
     {
       if (submitGaps && (!jobtitle.endsWith("realignment")
@@ -228,10 +231,9 @@ public class MsaWSClient extends Jws2Client implements WSMenuEntryProviderI
 
   @Override
   public void attachWSMenuEntry(JMenu rmsawsmenu,
-          final ServiceWithParameters service, final AlignFrame alignFrame)
+          final Jws2Instance service, final AlignFrame alignFrame)
   {
-    if (Jws2ClientFactory.registerAAConWSInstance(rmsawsmenu,
-                    service, alignFrame))
+    if (registerAAConWSInstance(rmsawsmenu, service, alignFrame))
     {
       // Alignment dependent analysis calculation WS gui
       return;