X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FMsaWSClient.java;h=ebd826e4015d84a2fbace1842b852e876acc9c3a;hb=035fe333749af8d09b517287b4b83c81d5f25fc7;hp=37231fd7255ad5d59acccd55309078539402a818;hpb=7ab5d6b0ba5fec1ea4a4239e79c476d841622485;p=jalview.git

diff --git a/src/jalview/ws/jws2/MsaWSClient.java b/src/jalview/ws/jws2/MsaWSClient.java
index 37231fd..ebd826e 100644
--- a/src/jalview/ws/jws2/MsaWSClient.java
+++ b/src/jalview/ws/jws2/MsaWSClient.java
@@ -20,19 +20,27 @@
  */
 package jalview.ws.jws2;
 
+import jalview.datamodel.Alignment;
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.AlignmentView;
+import jalview.datamodel.SequenceI;
+import jalview.gui.AlignFrame;
+import jalview.gui.Desktop;
+import jalview.gui.JvSwingUtils;
+import jalview.util.MessageManager;
+import jalview.ws.jws2.jabaws2.Jws2Instance;
+import jalview.ws.params.WsParamSetI;
+
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.List;
 
-import javax.swing.*;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
 
-import jalview.datamodel.*;
-import jalview.gui.*;
 import compbio.data.msa.MsaWS;
 import compbio.metadata.Argument;
-import jalview.util.MessageManager;
-import jalview.ws.jws2.jabaws2.Jws2Instance;
-import jalview.ws.params.WsParamSetI;
 
 /**
  * DOCUMENT ME!
@@ -101,10 +109,8 @@ public class MsaWSClient extends Jws2Client
       JOptionPane
               .showMessageDialog(
                       Desktop.desktop,
-                      "The Service called \n"
-                              + sh.serviceType
-                              + "\nis not a \nMultiple Sequence Alignment Service !",
-                      "Internal Jalview Error", JOptionPane.WARNING_MESSAGE);
+                      MessageManager.formatMessage("label.service_called_is_not_msa_service", new String[]{sh.serviceType}),
+                      MessageManager.getString("label.internal_jalview_error"), JOptionPane.WARNING_MESSAGE);
 
       return;
     }
@@ -112,9 +118,8 @@ public class MsaWSClient extends Jws2Client
     if ((wsInfo = setWebService(sh, false)) == null)
     {
       JOptionPane.showMessageDialog(Desktop.desktop,
-              "The Multiple Sequence Alignment Service named "
-                      + sh.serviceType + " is unknown",
-              "Internal Jalview Error", JOptionPane.WARNING_MESSAGE);
+    		  MessageManager.formatMessage("label.msa_service_is_unknown", new String[]{sh.serviceType}),
+    		  MessageManager.getString("label.internal_jalview_error"), JOptionPane.WARNING_MESSAGE);
 
       return;
     }
@@ -164,9 +169,57 @@ public class MsaWSClient extends Jws2Client
             WsURL, wsInfo, alignFrame, WebServiceName, jobtitle, msa,
             submitGaps, preserveOrder, seqdataset);
     wsInfo.setthisService(msathread);
+    if (isValidAlignment(alignFrame.getCurrentView().getAlignment()))
+    {
+
     msathread.start();
+    }
+  }
+
+  private boolean isValidAlignment(AlignmentI seqdataset)
+  {
+    String header = wsInfo.getInfoText()
+            + "\nValidating submited Alignment...";
+    wsInfo.setInfoText(header);
+    int validSeqCount = 0;
+    List<SequenceI> seqs = seqdataset.getSequences();
+    if (seqs.size() < 2)
+    {
+      wsInfo.setInfoText(header
+              + "\nA minimum of two sequences is required to perform this operation");
+      return false;
+    }
+
+    for (SequenceI seq : seqs)
+    {
+
+      if (seq.getSequenceAsString().matches(
+              "([(a-zA-Z?)(-?)(.?)]+)?[a-zA-Z]([(a-zA-Z?)(-?)(.?)]+)?"))
+      {
+        ++validSeqCount;
+      }
+      if (validSeqCount > 1)
+      {
+        wsInfo.setInfoText(header
+                + "\nAlignment sequences was successfully validated");
+        return true;
+      }
+    }
+
+    wsInfo.setInfoText(header
+            + "\nA minimum of two sequences with at least one non-gap character in each sequence is required to perform this operation");
+    return false;
   }
 
+  public static void main(String[] args)
+  {
+    System.out
+            .println("A"
+                    .matches("([(a-zA-Z?)(-?)(.?)]+)?[a-zA-Z]([(a-zA-Z?)(-?)(.?)]+)?"));
+  }
+
+
+
   protected String getServiceActionKey()
   {
     return "MsaWS";
@@ -193,6 +246,11 @@ public class MsaWSClient extends Jws2Client
   public void attachWSMenuEntry(JMenu rmsawsmenu,
           final Jws2Instance service, final AlignFrame alignFrame)
   {
+    if (registerAAConWSInstance(rmsawsmenu, service, alignFrame))
+    {
+      // Alignment dependent analysis calculation WS gui
+      return;
+    }
     setWebService(service, true); // headless
     boolean finished = true, submitGaps = false;
     JMenu msawsmenu = rmsawsmenu;
@@ -274,11 +332,10 @@ public class MsaWSClient extends Jws2Client
           for (final WsParamSetI preset : presets)
           {
             final JMenuItem methodR = new JMenuItem(preset.getName());
-            methodR.setToolTipText("<html><p>"
-                    + JvSwingUtils.wrapTooltip("<strong>"
-                            + (preset.isModifiable() ? "User Preset"
-                                    : "Service Preset") + "</strong><br/>"
-                            + preset.getDescription() + "</p>") + "</html>");
+            methodR.setToolTipText(JvSwingUtils.wrapTooltip(true, "<p><strong>"
+                            + (preset.isModifiable() ? MessageManager.getString("label.user_preset")
+                                    : MessageManager.getString("label.service_preset")) + "</strong><br/>"
+                            + preset.getDescription() + "</p>"));
             methodR.addActionListener(new ActionListener()
             {
               public void actionPerformed(ActionEvent e)