X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FMsaWSClient.java;fp=src%2Fjalview%2Fws%2Fjws2%2FMsaWSClient.java;h=e44381cebda4710ebc6c9da7c2b922528336e84e;hb=4898f0ae429e0c61ddba72ca46be89b34bb4df8b;hp=8eb49da723988e8f70f419abe81882c566bb9b88;hpb=5a6ac5b535856903629234ad43a71319a91ebee5;p=jalview.git

diff --git a/src/jalview/ws/jws2/MsaWSClient.java b/src/jalview/ws/jws2/MsaWSClient.java
index 8eb49da..e44381c 100644
--- a/src/jalview/ws/jws2/MsaWSClient.java
+++ b/src/jalview/ws/jws2/MsaWSClient.java
@@ -120,7 +120,7 @@ public class MsaWSClient extends Jws2Client implements WSMenuEntryProviderI
                     .getEndpoint() instanceof MultipleSequenceAlignmentI))
     {
       // redundant at mo - but may change
-      JvOptionPane.showMessageDialog(Desktop.desktop,
+      JvOptionPane.showMessageDialog(Desktop.getDesktopPane(),
               MessageManager.formatMessage(
                       "label.service_called_is_not_msa_service",
                       new String[]
@@ -135,7 +135,7 @@ public class MsaWSClient extends Jws2Client implements WSMenuEntryProviderI
             .getEndpoint();
     if ((wsInfo = setWebService(sh, false)) == null)
     {
-      JvOptionPane.showMessageDialog(Desktop.desktop, MessageManager
+      JvOptionPane.showMessageDialog(Desktop.getDesktopPane(), MessageManager
               .formatMessage("label.msa_service_is_unknown", new String[]
               { sh.getName() }),
               MessageManager.getString("label.internal_jalview_error"),
@@ -196,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";