Merge branch 'develop' into update_212_Dec_merge_with_21125_chamges

[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 8eb49da..40583ab 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
  * 
@@ -110,41 +112,41 @@ public class MsaWSClient extends Jws2Client implements WSMenuEntryProviderI
           AlignFrame _alignFrame)
   {
     super(_alignFrame, preset, arguments);
-    if (!processParams(sh, editParams))
-    {
-      return;
-    }
-
-    if (!(sh instanceof JalviewServiceEndpointProviderI
-            && ((JalviewServiceEndpointProviderI) sh)
-                    .getEndpoint() instanceof MultipleSequenceAlignmentI))
-    {
-      // redundant at mo - but may change
-      JvOptionPane.showMessageDialog(Desktop.desktop,
-              MessageManager.formatMessage(
-                      "label.service_called_is_not_msa_service",
-                      new String[]
-                      { sh.getName() }),
-              MessageManager.getString("label.internal_jalview_error"),
-              JvOptionPane.WARNING_MESSAGE);
-
-      return;
-    }
-    serviceHandle = sh;
-    server = (MultipleSequenceAlignmentI) ((JalviewServiceEndpointProviderI) sh)
-            .getEndpoint();
-    if ((wsInfo = setWebService(sh, false)) == null)
-    {
-      JvOptionPane.showMessageDialog(Desktop.desktop, MessageManager
-              .formatMessage("label.msa_service_is_unknown", new String[]
-              { sh.getName() }),
-              MessageManager.getString("label.internal_jalview_error"),
-              JvOptionPane.WARNING_MESSAGE);
-
-      return;
-    }
-
-    startMsaWSClient(altitle, msa, submitGaps, preserveOrder, seqdataset);
+    processParams(sh, editParams).thenAccept((startJob) -> {
+      if (!startJob)
+        return;
+      
+      if (!(sh instanceof JalviewServiceEndpointProviderI
+              && ((JalviewServiceEndpointProviderI) sh)
+                      .getEndpoint() instanceof MultipleSequenceAlignmentI))
+      {
+        // redundant at mo - but may change
+        JvOptionPane.showMessageDialog(Desktop.getDesktopPane(),
+                MessageManager.formatMessage(
+                        "label.service_called_is_not_msa_service",
+                        new String[]
+                        { sh.getName() }),
+                MessageManager.getString("label.internal_jalview_error"),
+                JvOptionPane.WARNING_MESSAGE);
+  
+        return;
+      }
+      serviceHandle = sh;
+      server = (MultipleSequenceAlignmentI) ((JalviewServiceEndpointProviderI) sh)
+              .getEndpoint();
+      if ((wsInfo = setWebService(sh, false)) == null)
+      {
+        JvOptionPane.showMessageDialog(Desktop.getDesktopPane(), MessageManager
+                .formatMessage("label.msa_service_is_unknown", new String[]
+                { sh.getName() }),
+                MessageManager.getString("label.internal_jalview_error"),
+                JvOptionPane.WARNING_MESSAGE);
+  
+        return;
+      }
+  
+      startMsaWSClient(altitle, msa, submitGaps, preserveOrder, seqdataset);
+    });
 
   }
 
@@ -164,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")
@@ -196,19 +198,14 @@ public class MsaWSClient extends Jws2Client implements WSMenuEntryProviderI
     }
     else
     {
+      wsInfo.setVisible(false);
       JvOptionPane.showMessageDialog(alignFrame,
               MessageManager.getString("info.invalid_msa_input_mininfo"),
               MessageManager.getString("info.invalid_msa_notenough"),
               JvOptionPane.INFORMATION_MESSAGE);
-      wsInfo.setVisible(false);
     }
   }
 
-  public static void main(String[] args)
-  {
-    System.out.println("A".matches("(-*[a-zA-Z]-*){1}[a-zA-Z-]*"));
-  }
-
   protected String getServiceActionKey()
   {
     return "MsaWS";
@@ -239,7 +236,7 @@ public class MsaWSClient extends Jws2Client implements WSMenuEntryProviderI
     if (Jws2ClientFactory.registerAAConWSInstance(rmsawsmenu,
                     service, alignFrame))
     {
-      // Alignment dependent analysis calculation WS gui
+           // Alignment dependent analysis calculation WS gui
       return;
     }
     serviceHandle = service;