JAL-1645 Version-Rel Version 2.9 Year-Rel 2015 Licensing glob

[jalview.git] / src / jalview / ws / jws1 / SeqSearchWSClient.java

diff --git a/src/jalview/ws/jws1/SeqSearchWSClient.java b/src/jalview/ws/jws1/SeqSearchWSClient.java
index 5ffe36e..3783f23 100644 (file)
--- a/src/jalview/ws/jws1/SeqSearchWSClient.java
+++ b/src/jalview/ws/jws1/SeqSearchWSClient.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
+ * Copyright (C) 2015 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -20,6 +20,13 @@
  */
 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;
@@ -28,12 +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 jalview.util.MessageManager;
+import ext.vamsas.SeqSearchI;
+import ext.vamsas.SeqSearchServiceLocator;
+import ext.vamsas.SeqSearchServiceSoapBindingStub;
+import ext.vamsas.ServiceHandle;
 
 /**
  * DOCUMENT ME!
@@ -76,18 +85,22 @@ public class SeqSearchWSClient extends WS1Client
     // name to service client name
     if (!sh.getAbstractName().equals(this.getServiceActionKey()))
     {
-      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);
+      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,
-                 MessageManager.formatMessage("label.seq_search_service_is_unknown", new String[]{sh.getName()}),
-              MessageManager.getString("label.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;
@@ -208,13 +221,14 @@ public class SeqSearchWSClient extends WS1Client
     }
     if (!locateWebService())
     {
-      throw new Exception(MessageManager.formatMessage("exception.cannot_contact_service_endpoint_at", new String[]{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(), ",| ");