X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws1%2FSeqSearchWSClient.java;h=d731cedbe71bf5a3fd615f71a504ee49bf2b2266;hb=8073a17f5bbbec8cf01b8711cb5db256effcb05c;hp=7d3976db3ee459549e231f0844b3c8a31c3ce226;hpb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;p=jalview.git
diff --git a/src/jalview/ws/jws1/SeqSearchWSClient.java b/src/jalview/ws/jws1/SeqSearchWSClient.java
index 7d3976d..d731ced 100644
--- a/src/jalview/ws/jws1/SeqSearchWSClient.java
+++ b/src/jalview/ws/jws1/SeqSearchWSClient.java
@@ -1,23 +1,32 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1)
- * Copyright (C) 2014 The Jalview Authors
+ * 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;
+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;
@@ -26,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!
@@ -73,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;
@@ -206,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(), ",| ");