X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws1%2FMsaWSClient.java;h=ef2d78d7da7e04a2072e6ee7eaaa09a003c39926;hb=1ae9824ef37ce4ed36d1da986003474b47d1ab11;hp=f2f14195c4b618622667791c513d201db9d23be9;hpb=153dd62dc91da13ae732600e6ea55ddbe15eab39;p=jalview.git
diff --git a/src/jalview/ws/jws1/MsaWSClient.java b/src/jalview/ws/jws1/MsaWSClient.java
index f2f1419..ef2d78d 100644
--- a/src/jalview/ws/jws1/MsaWSClient.java
+++ b/src/jalview/ws/jws1/MsaWSClient.java
@@ -1,19 +1,22 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.ws.jws1;
@@ -25,6 +28,7 @@ import javax.swing.*;
import ext.vamsas.*;
import jalview.datamodel.*;
import jalview.gui.*;
+import jalview.util.MessageManager;
/**
* DOCUMENT ME!
@@ -69,20 +73,18 @@ public class MsaWSClient extends WS1Client
JOptionPane
.showMessageDialog(
Desktop.desktop,
- "The Service called \n"
- + sh.getName()
- + "\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.getName()}),
+ MessageManager.getString("label.internal_jalview_error"), JOptionPane.WARNING_MESSAGE);
return;
}
if ((wsInfo = setWebService(sh)) == null)
{
- JOptionPane.showMessageDialog(Desktop.desktop,
- "The Multiple Sequence Alignment Service named "
- + sh.getName() + " is unknown",
- "Internal Jalview Error", JOptionPane.WARNING_MESSAGE);
+ JOptionPane.showMessageDialog(
+ Desktop.desktop,
+ MessageManager.formatMessage("label.msa_service_is_unknown", new String[]{sh.getName()}),
+ MessageManager.getString("label.internal_jalview_error"), JOptionPane.WARNING_MESSAGE);
return;
}
@@ -200,9 +202,9 @@ 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);
}
@@ -219,9 +221,9 @@ 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);
}