X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FMsaWSClient.java;h=319252a08de4630d5d8f7b2a92a394bd749dbc08;hb=ad1f4306281b0894fa42394b9a68da834cf14af6;hp=b7230595f95f80244f812ae1b318d3f382932bf0;hpb=fee1b781ca14aadea5d112fc554fe14879c787c5;p=jalview.git

diff --git a/src/jalview/ws/jws2/MsaWSClient.java b/src/jalview/ws/jws2/MsaWSClient.java
index b723059..319252a 100644
--- a/src/jalview/ws/jws2/MsaWSClient.java
+++ b/src/jalview/ws/jws2/MsaWSClient.java
@@ -107,10 +107,12 @@ public class MsaWSClient extends Jws2Client
     if (!(sh.service instanceof MsaWS))
     {
       // redundant at mo - but may change
-      JvOptionPane.showMessageDialog(Desktop.desktop, MessageManager
-              .formatMessage("label.service_called_is_not_msa_service",
-                      new String[] { sh.serviceType }), MessageManager
-              .getString("label.internal_jalview_error"),
+      JvOptionPane.showMessageDialog(Desktop.getDesktopPane(),
+              MessageManager.formatMessage(
+                      "label.service_called_is_not_msa_service",
+                      new String[]
+                      { sh.serviceType }),
+              MessageManager.getString("label.internal_jalview_error"),
               JvOptionPane.WARNING_MESSAGE);
 
       return;
@@ -118,10 +120,10 @@ public class MsaWSClient extends Jws2Client
     server = (MsaWS) sh.service;
     if ((wsInfo = setWebService(sh, false)) == null)
     {
-      JvOptionPane.showMessageDialog(Desktop.desktop, MessageManager
-              .formatMessage("label.msa_service_is_unknown",
-                      new String[] { sh.serviceType }), MessageManager
-              .getString("label.internal_jalview_error"),
+      JvOptionPane.showMessageDialog(Desktop.getDesktopPane(), MessageManager
+              .formatMessage("label.msa_service_is_unknown", new String[]
+              { sh.serviceType }),
+              MessageManager.getString("label.internal_jalview_error"),
               JvOptionPane.WARNING_MESSAGE);
 
       return;
@@ -150,9 +152,8 @@ public class MsaWSClient extends Jws2Client
     String jobtitle = WebServiceName.toLowerCase();
     if (jobtitle.endsWith("alignment"))
     {
-      if (submitGaps
-              && (!jobtitle.endsWith("realignment") || jobtitle
-                      .indexOf("profile") == -1))
+      if (submitGaps && (!jobtitle.endsWith("realignment")
+              || jobtitle.indexOf("profile") == -1))
       {
         int pos = jobtitle.indexOf("alignment");
         jobtitle = WebServiceName.substring(0, pos) + "re-alignment of "
@@ -169,9 +170,9 @@ public class MsaWSClient extends Jws2Client
               + "alignment of " + altitle;
     }
 
-    MsaWSThread msathread = new MsaWSThread(server, preset, paramset,
-            WsURL, wsInfo, alignFrame, WebServiceName, jobtitle, msa,
-            submitGaps, preserveOrder, seqdataset);
+    MsaWSThread msathread = new MsaWSThread(server, preset, paramset, WsURL,
+            wsInfo, alignFrame, WebServiceName, jobtitle, msa, submitGaps,
+            preserveOrder, seqdataset);
     if (msathread.hasValidInput())
     {
       wsInfo.setthisService(msathread);
@@ -180,19 +181,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";
@@ -247,8 +243,9 @@ public class MsaWSClient extends Jws2Client
       if (submitGaps == true)
       {
         action = "Realign ";
-        msawsmenu = new JMenu(MessageManager.formatMessage(
-                "label.realign_with_params", new String[] { svcname }));
+        msawsmenu = new JMenu(MessageManager
+                .formatMessage("label.realign_with_params", new String[]
+                { svcname }));
         msawsmenu.setToolTipText(MessageManager
                 .getString("label.align_sequences_to_existing_alignment"));
         rmsawsmenu.add(msawsmenu);
@@ -256,11 +253,11 @@ public class MsaWSClient extends Jws2Client
       final boolean withGaps = submitGaps;
 
       JMenuItem method = new JMenuItem(MessageManager.formatMessage(
-              "label.calcname_with_default_settings",
-              new String[] { calcName }));
-      method.setToolTipText(MessageManager
-              .formatMessage("label.action_with_default_settings",
-                      new String[] { action }));
+              "label.calcname_with_default_settings", new String[]
+              { calcName }));
+      method.setToolTipText(MessageManager.formatMessage(
+              "label.action_with_default_settings", new String[]
+              { action }));
 
       method.addActionListener(new ActionListener()
       {
@@ -272,8 +269,9 @@ public class MsaWSClient extends Jws2Client
           if (msa != null)
           {
             new MsaWSClient(service, alignFrame.getTitle(), msa, withGaps,
-                    true, alignFrame.getViewport().getAlignment()
-                            .getDataset(), alignFrame);
+                    true,
+                    alignFrame.getViewport().getAlignment().getDataset(),
+                    alignFrame);
           }
 
         }
@@ -285,8 +283,8 @@ public class MsaWSClient extends Jws2Client
         // arguments
         method = new JMenuItem(
                 MessageManager.getString("label.edit_settings_and_run"));
-        method.setToolTipText(MessageManager
-                .getString("label.view_and_change_parameters_before_alignment"));
+        method.setToolTipText(MessageManager.getString(
+                "label.view_and_change_parameters_before_alignment"));
 
         method.addActionListener(new ActionListener()
         {
@@ -296,9 +294,9 @@ public class MsaWSClient extends Jws2Client
             AlignmentView msa = alignFrame.gatherSequencesForAlignment();
             if (msa != null)
             {
-              new MsaWSClient(service, null, null, true, alignFrame
-                      .getTitle(), msa, withGaps, true, alignFrame
-                      .getViewport().getAlignment().getDataset(),
+              new MsaWSClient(service, null, null, true,
+                      alignFrame.getTitle(), msa, withGaps, true,
+                      alignFrame.getViewport().getAlignment().getDataset(),
                       alignFrame);
             }
 
@@ -308,10 +306,9 @@ public class MsaWSClient extends Jws2Client
         List<WsParamSetI> presets = service.getParamStore().getPresets();
         if (presets != null && presets.size() > 0)
         {
-          JMenu presetlist = new JMenu(
-                  MessageManager.formatMessage(
-                          "label.run_with_preset_params",
-                          new String[] { calcName }));
+          JMenu presetlist = new JMenu(MessageManager.formatMessage(
+                  "label.run_with_preset_params", new String[]
+                  { calcName }));
 
           final int showToolTipFor = ToolTipManager.sharedInstance()
                   .getDismissDelay();
@@ -326,28 +323,24 @@ public class MsaWSClient extends Jws2Client
               @Override
               public void mouseEntered(MouseEvent e)
               {
-                ToolTipManager.sharedInstance().setDismissDelay(
-                        QUICK_TOOLTIP);
+                ToolTipManager.sharedInstance()
+                        .setDismissDelay(QUICK_TOOLTIP);
               }
 
               @Override
               public void mouseExited(MouseEvent e)
               {
-                ToolTipManager.sharedInstance().setDismissDelay(
-                        showToolTipFor);
+                ToolTipManager.sharedInstance()
+                        .setDismissDelay(showToolTipFor);
               }
 
             });
-            String tooltip = JvSwingUtils
-                    .wrapTooltip(
-                            true,
-                            "<strong>"
-                                    + (preset.isModifiable() ? MessageManager
-                                            .getString("label.user_preset")
-                                            : MessageManager
-                                                    .getString("label.service_preset"))
-                                    + "</strong><br/>"
-                                    + preset.getDescription());
+            String tooltip = JvSwingUtils.wrapTooltip(true, "<strong>"
+                    + (preset.isModifiable()
+                            ? MessageManager.getString("label.user_preset")
+                            : MessageManager
+                                    .getString("label.service_preset"))
+                    + "</strong><br/>" + preset.getDescription());
             methodR.setToolTipText(tooltip);
             methodR.addActionListener(new ActionListener()
             {
@@ -362,7 +355,8 @@ public class MsaWSClient extends Jws2Client
                   MsaWSClient msac = new MsaWSClient(service, preset,
                           alignFrame.getTitle(), msa, false, true,
                           alignFrame.getViewport().getAlignment()
-                                  .getDataset(), alignFrame);
+                                  .getDataset(),
+                          alignFrame);
                 }
 
               }