X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws1%2FSeqSearchWSClient.java;h=3a4bbd452e7edf860c7ee02e44a03a71b435fa51;hb=2b34ad8d6c224117ca2a3199c237fd74d8137da6;hp=fe279cf39ca10ed18a27a0ab8c76ce5d111043a9;hpb=add30afdc46a14e61ccf55881fa91b9ca9abfe80;p=jalview.git
diff --git a/src/jalview/ws/jws1/SeqSearchWSClient.java b/src/jalview/ws/jws1/SeqSearchWSClient.java
index fe279cf..3a4bbd4 100644
--- a/src/jalview/ws/jws1/SeqSearchWSClient.java
+++ b/src/jalview/ws/jws1/SeqSearchWSClient.java
@@ -1,19 +1,22 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 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;
@@ -30,6 +33,7 @@ import javax.swing.*;
import ext.vamsas.*;
import jalview.datamodel.*;
import jalview.gui.*;
+import jalview.util.MessageManager;
/**
* DOCUMENT ME!
@@ -73,9 +77,8 @@ public class SeqSearchWSClient extends WS1Client
if (!sh.getAbstractName().equals(this.getServiceActionKey()))
{
JOptionPane.showMessageDialog(Desktop.desktop,
- "The Service called \n" + sh.getName()
- + "\nis not a \nSequence Search Service !",
- "Internal Jalview Error", JOptionPane.WARNING_MESSAGE);
+ MessageManager.formatMessage("label.service_called_is_not_seq_search_service", new String[]{sh.getName()}),
+ MessageManager.getString("label.internal_jalview_error"), JOptionPane.WARNING_MESSAGE);
return;
}
@@ -83,8 +86,8 @@ public class SeqSearchWSClient extends WS1Client
if ((wsInfo = setWebService(sh)) == null)
{
JOptionPane.showMessageDialog(Desktop.desktop,
- "The Sequence Search Service named " + sh.getName()
- + " is unknown", "Internal Jalview Error",
+ MessageManager.formatMessage("label.seq_search_service_is_unknown", new String[]{sh.getName()}),
+ MessageManager.getString("label.internal_jalview_error"),
JOptionPane.WARNING_MESSAGE);
return;
@@ -249,7 +252,8 @@ public class SeqSearchWSClient extends WS1Client
String dbs[] = null;
try
{
- dbs = new jalview.ws.jws1.SeqSearchWSClient(sh).getSupportedDatabases();
+ dbs = new jalview.ws.jws1.SeqSearchWSClient(sh)
+ .getSupportedDatabases();
} catch (Exception e)
{
jalview.bin.Cache.log.warn(
@@ -268,8 +272,8 @@ public class SeqSearchWSClient extends WS1Client
// use same input gatherer as for secondary structure prediction
// we could actually parameterise the gatherer method here...
AlignmentView msa = af.gatherSeqOrMsaForSecStrPrediction();
- new jalview.ws.jws1.SeqSearchWSClient(sh, af.getTitle(), msa, null, af
- .getViewport().getAlignment().getDataset(), af);
+ new jalview.ws.jws1.SeqSearchWSClient(sh, af.getTitle(), msa, null,
+ af.getViewport().getAlignment().getDataset(), af);
}
});
// add entry for each database the service supports