X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FMsaWSClient.java;h=130dd12eaddcb8e7e13eb0913aa227109063331d;hb=c794c5033adeee182b03a5ea92c0a7495a29661f;hp=7a3d9d305acfca7ad5491f70e050e7532d9750d0;hpb=2d552096087f757e4a3fcb4df97cf549b2ff8155;p=jalview.git

diff --git a/src/jalview/ws/jws2/MsaWSClient.java b/src/jalview/ws/jws2/MsaWSClient.java
index 7a3d9d3..130dd12 100644
--- a/src/jalview/ws/jws2/MsaWSClient.java
+++ b/src/jalview/ws/jws2/MsaWSClient.java
@@ -32,7 +32,6 @@ import jalview.ws.api.JalviewServiceEndpointProviderI;
 import jalview.ws.api.MultipleSequenceAlignmentI;
 import jalview.ws.api.ServiceWithParameters;
 import jalview.ws.gui.MsaWSThread;
-import jalview.ws.jws2.jabaws2.Jws2Instance;
 import jalview.ws.params.ArgumentI;
 import jalview.ws.params.WsParamSetI;
 
@@ -197,19 +196,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";
@@ -235,9 +229,10 @@ public class MsaWSClient extends Jws2Client implements WSMenuEntryProviderI
 
   @Override
   public void attachWSMenuEntry(JMenu rmsawsmenu,
-          final Jws2Instance service, final AlignFrame alignFrame)
+          final ServiceWithParameters service, final AlignFrame alignFrame)
   {
-    if (registerAAConWSInstance(rmsawsmenu, service, alignFrame))
+    if (Jws2ClientFactory.registerAAConWSInstance(rmsawsmenu,
+                    service, alignFrame))
     {
       // Alignment dependent analysis calculation WS gui
       return;