X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws1%2FMsaWSClient.java;h=e627699b0977a191a8b3b3d6228c49dc1b9eb3ae;hb=9f503489b06e09a6a7aec83048301938e3710863;hp=5ea553eaa7a02e0288da2334edada7f8475df527;hpb=fee1b781ca14aadea5d112fc554fe14879c787c5;p=jalview.git

diff --git a/src/jalview/ws/jws1/MsaWSClient.java b/src/jalview/ws/jws1/MsaWSClient.java
index 5ea553e..e627699 100644
--- a/src/jalview/ws/jws1/MsaWSClient.java
+++ b/src/jalview/ws/jws1/MsaWSClient.java
@@ -51,8 +51,6 @@ public class MsaWSClient extends WS1Client
    */
   ext.vamsas.MuscleWS server;
 
-  AlignFrame alignFrame;
-
   /**
    * Creates a new MsaWSClient object that uses a service given by an externally
    * retrieved ServiceHandle
@@ -78,10 +76,12 @@ public class MsaWSClient extends WS1Client
     alignFrame = _alignFrame;
     if (!sh.getAbstractName().equals("MsaWS"))
     {
-      JvOptionPane.showMessageDialog(Desktop.desktop, MessageManager
-              .formatMessage("label.service_called_is_not_msa_service",
-                      new String[] { sh.getName() }), MessageManager
-              .getString("label.internal_jalview_error"),
+      JvOptionPane.showMessageDialog(Desktop.desktop,
+              MessageManager.formatMessage(
+                      "label.service_called_is_not_msa_service",
+                      new String[]
+                      { sh.getName() }),
+              MessageManager.getString("label.internal_jalview_error"),
               JvOptionPane.WARNING_MESSAGE);
 
       return;
@@ -90,9 +90,9 @@ public class MsaWSClient extends WS1Client
     if ((wsInfo = setWebService(sh)) == null)
     {
       JvOptionPane.showMessageDialog(Desktop.desktop, MessageManager
-              .formatMessage("label.msa_service_is_unknown",
-                      new String[] { sh.getName() }), MessageManager
-              .getString("label.internal_jalview_error"),
+              .formatMessage("label.msa_service_is_unknown", new String[]
+              { sh.getName() }),
+              MessageManager.getString("label.internal_jalview_error"),
               JvOptionPane.WARNING_MESSAGE);
 
       return;
@@ -120,9 +120,8 @@ public class MsaWSClient extends WS1Client
     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 "
@@ -213,9 +212,10 @@ public class MsaWSClient extends WS1Client
       public void actionPerformed(ActionEvent e)
       {
         AlignmentView msa = alignFrame.gatherSequencesForAlignment();
-        new jalview.ws.jws1.MsaWSClient(serviceHandle, alignFrame
-                .getTitle(), msa, false, true, alignFrame.getViewport()
-                .getAlignment().getDataset(), alignFrame);
+        new jalview.ws.jws1.MsaWSClient(serviceHandle,
+                alignFrame.getTitle(), msa, false, true,
+                alignFrame.getViewport().getAlignment().getDataset(),
+                alignFrame);
 
       }
 
@@ -224,8 +224,8 @@ public class MsaWSClient extends WS1Client
     if (canSubmitGaps())
     {
       // We know that ClustalWS can accept partial alignments for refinement.
-      final JMenuItem methodR = new JMenuItem(serviceHandle.getName()
-              + " Realign");
+      final JMenuItem methodR = new JMenuItem(
+              serviceHandle.getName() + " Realign");
       methodR.setToolTipText(WsURL);
       methodR.addActionListener(new ActionListener()
       {
@@ -233,9 +233,10 @@ public class MsaWSClient extends WS1Client
         public void actionPerformed(ActionEvent e)
         {
           AlignmentView msa = alignFrame.gatherSequencesForAlignment();
-          new jalview.ws.jws1.MsaWSClient(serviceHandle, alignFrame
-                  .getTitle(), msa, true, true, alignFrame.getViewport()
-                  .getAlignment().getDataset(), alignFrame);
+          new jalview.ws.jws1.MsaWSClient(serviceHandle,
+                  alignFrame.getTitle(), msa, true, true,
+                  alignFrame.getViewport().getAlignment().getDataset(),
+                  alignFrame);
 
         }