Merge branch 'alpha/JAL-3362_Jalview_212_alpha' into alpha/merge_212_JalviewJS_2112

[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 a545d5d..130dd12 100644 (file)
--- a/src/jalview/ws/jws2/MsaWSClient.java
+++ b/src/jalview/ws/jws2/MsaWSClient.java
@@ -27,9 +27,11 @@ import jalview.gui.Desktop;
 import jalview.gui.JvOptionPane;
 import jalview.gui.JvSwingUtils;
 import jalview.util.MessageManager;
+import jalview.ws.WSMenuEntryProviderI;
+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;
 
@@ -44,12 +46,18 @@ import javax.swing.JMenuItem;
 import javax.swing.ToolTipManager;
 
 /**
- * DOCUMENT ME!
+ * MsaWSClient
  * 
- * @author $author$
+ * Instantiates web service menu items for multiple alignment services, and
+ * holds logic for constructing a web service thread.
+ * 
+ * TODO remove dependency on Jws2Client methods for creating AACon service UI
+ * elements.
+ * 
+ * @author Jim Procter et al
  * @version $Revision$
  */
-public class MsaWSClient extends Jws2Client
+public class MsaWSClient extends Jws2Client implements WSMenuEntryProviderI
 {
   /**
    * server is a proxy class implementing the core methods for submitting,
@@ -58,7 +66,7 @@ public class MsaWSClient extends Jws2Client
    */
   MultipleSequenceAlignmentI server;
 
-  public MsaWSClient(Jws2Instance sh, String altitle,
+  public MsaWSClient(ServiceWithParameters sh, String altitle,
           jalview.datamodel.AlignmentView msa, boolean submitGaps,
           boolean preserveOrder, AlignmentI seqdataset,
           AlignFrame _alignFrame)
@@ -68,7 +76,8 @@ public class MsaWSClient extends Jws2Client
     // TODO Auto-generated constructor stub
   }
 
-  public MsaWSClient(Jws2Instance sh, WsParamSetI preset, String altitle,
+  public MsaWSClient(ServiceWithParameters sh, WsParamSetI preset,
+          String altitle,
           jalview.datamodel.AlignmentView msa, boolean submitGaps,
           boolean preserveOrder, AlignmentI seqdataset,
           AlignFrame _alignFrame)
@@ -94,7 +103,7 @@ public class MsaWSClient extends Jws2Client
    *          DOCUMENT ME!
    */
 
-  public MsaWSClient(Jws2Instance sh, WsParamSetI preset,
+  public MsaWSClient(ServiceWithParameters sh, WsParamSetI preset,
           List<ArgumentI> arguments, boolean editParams, String altitle,
           jalview.datamodel.AlignmentView msa, boolean submitGaps,
           boolean preserveOrder, AlignmentI seqdataset,
@@ -106,7 +115,9 @@ public class MsaWSClient extends Jws2Client
       return;
     }
 
-    if (!(sh.getEndpoint() instanceof MultipleSequenceAlignmentI))
+    if (!(sh instanceof JalviewServiceEndpointProviderI
+            && ((JalviewServiceEndpointProviderI) sh)
+                    .getEndpoint() instanceof MultipleSequenceAlignmentI))
     {
       // redundant at mo - but may change
       JvOptionPane.showMessageDialog(Desktop.desktop,
@@ -120,7 +131,8 @@ public class MsaWSClient extends Jws2Client
       return;
     }
     serviceHandle = sh;
-    server = (MultipleSequenceAlignmentI) sh.getEndpoint();
+    server = (MultipleSequenceAlignmentI) ((JalviewServiceEndpointProviderI) sh)
+            .getEndpoint();
     if ((wsInfo = setWebService(sh, false)) == null)
     {
       JvOptionPane.showMessageDialog(Desktop.desktop, MessageManager
@@ -184,19 +196,14 @@ public class MsaWSClient extends Jws2Client
     }
     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";
@@ -222,16 +229,28 @@ public class MsaWSClient extends Jws2Client
 
   @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;
     }
+    serviceHandle = service;
     setWebService(service, true); // headless
+    attachWSMenuEntry(rmsawsmenu, alignFrame);
+  }
+
+  @Override
+  public void attachWSMenuEntry(JMenu wsmenu, AlignFrame alignFrame)
+  {
     boolean finished = true, submitGaps = false;
-    JMenu msawsmenu = rmsawsmenu;
+    /**
+     * temp variables holding msa service submenu or root service menu
+     */
+    JMenu msawsmenu = wsmenu;
+    JMenu rmsawsmenu = wsmenu;
     String svcname = WebServiceName;
     if (svcname.endsWith("WS"))
     {
@@ -244,7 +263,8 @@ public class MsaWSClient extends Jws2Client
       rmsawsmenu.add(msawsmenu);
       calcName = "";
     }
-    boolean hasparams = service.hasParameters();
+    boolean hasparams = serviceHandle.hasParameters();
+    ServiceWithParameters service = (ServiceWithParameters) serviceHandle;
     do
     {
       String action = "Align ";