X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws1%2FSeqSearchWSClient.java;h=3783f23749f56f4f60736ead7cd067fb21d35457;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;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..3783f23 100644
--- a/src/jalview/ws/jws1/SeqSearchWSClient.java
+++ b/src/jalview/ws/jws1/SeqSearchWSClient.java
@@ -1,22 +1,32 @@
 /*
- * 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.9)
+ * Copyright (C) 2015 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 <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.ws.jws1;
 
+import jalview.datamodel.Alignment;
+import jalview.datamodel.AlignmentView;
+import jalview.gui.AlignFrame;
+import jalview.gui.Desktop;
+import jalview.gui.WebserviceInfo;
+import jalview.util.MessageManager;
+
 import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -25,11 +35,14 @@ import java.util.Hashtable;
 import java.util.StringTokenizer;
 import java.util.Vector;
 
-import javax.swing.*;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
 
-import ext.vamsas.*;
-import jalview.datamodel.*;
-import jalview.gui.*;
+import ext.vamsas.SeqSearchI;
+import ext.vamsas.SeqSearchServiceLocator;
+import ext.vamsas.SeqSearchServiceSoapBindingStub;
+import ext.vamsas.ServiceHandle;
 
 /**
  * DOCUMENT ME!
@@ -72,19 +85,22 @@ public class SeqSearchWSClient extends WS1Client
     // name to service client name
     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);
+      JOptionPane.showMessageDialog(Desktop.desktop, MessageManager
+              .formatMessage(
+                      "label.service_called_is_not_seq_search_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 Sequence Search Service named " + sh.getName()
-                      + " is unknown", "Internal Jalview Error",
+      JOptionPane.showMessageDialog(Desktop.desktop, MessageManager
+              .formatMessage("label.seq_search_service_is_unknown",
+                      new String[] { sh.getName() }), MessageManager
+              .getString("label.internal_jalview_error"),
               JOptionPane.WARNING_MESSAGE);
 
       return;
@@ -205,13 +221,14 @@ public class SeqSearchWSClient extends WS1Client
     }
     if (!locateWebService())
     {
-      throw new Exception("Cannot contact service endpoint at " + WsURL);
+      throw new Exception(MessageManager.formatMessage(
+              "exception.cannot_contact_service_endpoint_at",
+              new String[] { WsURL }));
     }
     String database = server.getDatabase();
     if (database == null)
     {
-      dbParamsForEndpoint.put(WsURL, new String[]
-      {});
+      dbParamsForEndpoint.put(WsURL, new String[] {});
       return null;
     }
     StringTokenizer en = new StringTokenizer(database.trim(), ",| ");
@@ -249,7 +266,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 +286,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