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

[jalview.git] / src / jalview / ws / rest / RestClient.java

diff --git a/src/jalview/ws/rest/RestClient.java b/src/jalview/ws/rest/RestClient.java
index f9b72e3..9032823 100644 (file)
--- a/src/jalview/ws/rest/RestClient.java
+++ b/src/jalview/ws/rest/RestClient.java
@@ -20,17 +20,6 @@
  */
 package jalview.ws.rest;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.event.MenuEvent;
-import javax.swing.event.MenuListener;
-
 import jalview.bin.Cache;
 import jalview.datamodel.AlignmentView;
 import jalview.gui.AlignFrame;
@@ -39,10 +28,25 @@ import jalview.gui.AlignmentPanel;
 import jalview.gui.Desktop;
 import jalview.gui.WebserviceInfo;
 import jalview.io.packed.DataProvider.JvDataType;
+import jalview.io.packed.JalviewDataset;
 import jalview.util.MessageManager;
 import jalview.ws.WSClient;
 import jalview.ws.WSClientI;
 import jalview.ws.WSMenuEntryProviderI;
+import jalview.ws.rest.params.Alignment;
+import jalview.ws.rest.params.JobConstant;
+import jalview.ws.rest.params.SeqGroupIndexVector;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Hashtable;
+import java.util.Vector;
+
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.event.MenuEvent;
+import javax.swing.event.MenuListener;
 
 /**
  * @author JimP
@@ -75,7 +79,7 @@ public class RestClient extends WSClient implements WSClientI,
    */
   protected AlignFrame recoverAlignFrameForView()
   {
-    return jalview.gui.Desktop.getAlignFrameFor(av);
+    return Desktop.getAlignFrameFor(av);
   }
 
   public RestClient(RestServiceDescription service2, AlignFrame alignFrame)
@@ -224,7 +228,7 @@ public class RestClient extends WSClient implements WSClientI,
   /**
    * input data context
    */
-  jalview.io.packed.JalviewDataset jds;
+  JalviewDataset jds;
 
   /**
    * informative name for results
@@ -316,7 +320,7 @@ public class RestClient extends WSClient implements WSClientI,
   {
     String action = "Analysis", description = "Sequence Harmony and Multi-Relief (Brandt et al. 2010)", name = MessageManager.getString("label.multiharmony");
     Hashtable<String, InputType> iparams = new Hashtable<String, InputType>();
-    jalview.ws.rest.params.JobConstant toolp;
+    JobConstant toolp;
     // toolp = new jalview.ws.rest.JobConstant("tool","jalview");
     // iparams.put(toolp.token, toolp);
     // toolp = new jalview.ws.rest.params.JobConstant("mbjob[method]","shmr");
@@ -329,13 +333,13 @@ public class RestClient extends WSClient implements WSClientI,
     // toolp = new jalview.ws.rest.params.JobConstant("blast","0");
     // iparams.put(toolp.token, toolp);
 
-    jalview.ws.rest.params.Alignment aliinput = new jalview.ws.rest.params.Alignment();
+    Alignment aliinput = new Alignment();
     // SHMR server has a 65K limit for content pasted into the 'ali' parameter,
     // so we always upload our files.
     aliinput.token = "ali_file";
     aliinput.writeAsFile = true;
     iparams.put(aliinput.token, aliinput);
-    jalview.ws.rest.params.SeqGroupIndexVector sgroups = new jalview.ws.rest.params.SeqGroupIndexVector();
+    SeqGroupIndexVector sgroups = new SeqGroupIndexVector();
     sgroups.setMinsize(2);
     sgroups.min = 2;// need at least two group defined to make a partition
     iparams.put("groups", sgroups);
@@ -384,7 +388,7 @@ public class RestClient extends WSClient implements WSClientI,
       try
       {
         for (RestServiceDescription descr : RestServiceDescription
-                .parseDescriptions(jalview.bin.Cache.getDefault(
+                .parseDescriptions(Cache.getDefault(
                         RSBS_SERVICES,
                         makeShmmrRestClient().service.toString())))
         {