JAL-1807 explicit imports (jalview.ws.*)

[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 b688978..7d0a7e2 100644 (file)
--- a/src/jalview/ws/jws1/SeqSearchWSClient.java
+++ b/src/jalview/ws/jws1/SeqSearchWSClient.java
@@ -20,6 +20,14 @@
  */
 package jalview.ws.jws1;
 
+import jalview.bin.Cache;
+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 +36,13 @@ 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.SeqSearchServiceLocator;
+import ext.vamsas.SeqSearchServiceSoapBindingStub;
+import ext.vamsas.ServiceHandle;
 
 /**
  * DOCUMENT ME!
@@ -67,8 +76,8 @@ public class SeqSearchWSClient extends WS1Client
    */
 
   public SeqSearchWSClient(ext.vamsas.ServiceHandle sh, String altitle,
-          jalview.datamodel.AlignmentView msa, String db,
-          Alignment seqdataset, AlignFrame _alignFrame)
+          AlignmentView msa, String db, Alignment seqdataset,
+          AlignFrame _alignFrame)
   {
     super();
     alignFrame = _alignFrame;
@@ -160,7 +169,7 @@ public class SeqSearchWSClient extends WS1Client
 
     try
     {
-      this.server = (SeqSearchI) loc.getSeqSearchService(new java.net.URL(
+      this.server = loc.getSeqSearchService(new java.net.URL(
               WsURL));
       ((SeqSearchServiceSoapBindingStub) this.server).setTimeout(60000); // One
       // minute
@@ -252,11 +261,10 @@ public class SeqSearchWSClient extends WS1Client
     String dbs[] = null;
     try
     {
-      dbs = new jalview.ws.jws1.SeqSearchWSClient(sh)
-              .getSupportedDatabases();
+      dbs = new SeqSearchWSClient(sh).getSupportedDatabases();
     } catch (Exception e)
     {
-      jalview.bin.Cache.log.warn(
+      Cache.log.warn(
               "Database list request failed, so disabling SeqSearch Service client "
                       + sh.getName() + " at " + sh.getEndpointURL(), e);
       return;
@@ -272,8 +280,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 SeqSearchWSClient(sh, af.getTitle(), msa, null, af
+                .getViewport().getAlignment().getDataset(), af);
       }
     });
     // add entry for each database the service supports
@@ -294,7 +302,7 @@ public class SeqSearchWSClient extends WS1Client
         public void actionPerformed(ActionEvent e)
         {
           AlignmentView msa = af.gatherSeqOrMsaForSecStrPrediction();
-          new jalview.ws.jws1.SeqSearchWSClient(sh, af.getTitle(), msa,
+          new SeqSearchWSClient(sh, af.getTitle(), msa,
                   searchdb, af.getViewport().getAlignment().getDataset(),
                   af);
         }