JAL-1807 explicit imports (jalview.gui)

[jalview.git] / src / jalview / gui / WsJobParameters.java

diff --git a/src/jalview/gui/WsJobParameters.java b/src/jalview/gui/WsJobParameters.java
index a3a61b7..c1b09b7 100644 (file)
--- a/src/jalview/gui/WsJobParameters.java
+++ b/src/jalview/gui/WsJobParameters.java
@@ -20,6 +20,20 @@
  */
 package jalview.gui;
 
+import jalview.gui.OptsAndParamsPage.OptionBox;
+import jalview.gui.OptsAndParamsPage.ParamBox;
+import jalview.util.MessageManager;
+import jalview.ws.jws2.JabaParamStore;
+import jalview.ws.jws2.JabaPreset;
+import jalview.ws.jws2.Jws2Discoverer;
+import jalview.ws.jws2.ParameterUtils;
+import jalview.ws.jws2.jabaws2.Jws2Instance;
+import jalview.ws.params.ArgumentI;
+import jalview.ws.params.OptionI;
+import jalview.ws.params.ParamDatastoreI;
+import jalview.ws.params.ParameterI;
+import jalview.ws.params.WsParamSetI;
+
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Dimension;
@@ -66,19 +80,6 @@ import compbio.metadata.Preset;
 import compbio.metadata.PresetManager;
 import compbio.metadata.RunnerConfig;
 
-import jalview.gui.OptsAndParamsPage.OptionBox;
-import jalview.gui.OptsAndParamsPage.ParamBox;
-import jalview.util.MessageManager;
-import jalview.ws.jws2.JabaParamStore;
-import jalview.ws.jws2.JabaPreset;
-import jalview.ws.jws2.Jws2Discoverer;
-import jalview.ws.jws2.jabaws2.Jws2Instance;
-import jalview.ws.params.ArgumentI;
-import jalview.ws.params.OptionI;
-import jalview.ws.params.ParamDatastoreI;
-import jalview.ws.params.ParameterI;
-import jalview.ws.params.WsParamSetI;
-
 /**
  * job parameter editing/browsing dialog box. User can browse existing settings
  * (user + presets + Defaults), and any changes to parameters creates a modified
@@ -952,8 +953,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
    */
   public static void main(String[] args)
   {
-    jalview.ws.jws2.Jws2Discoverer disc = jalview.ws.jws2.Jws2Discoverer
-            .getDiscoverer();
+    Jws2Discoverer disc = Jws2Discoverer.getDiscoverer();
     int p = 0;
     if (args.length > 0)
     {
@@ -1021,7 +1021,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
               {
                 try
                 {
-                  Option cpy = jalview.ws.jws2.ParameterUtils.copyOption(o);
+                  Option cpy = ParameterUtils.copyOption(o);
                 } catch (Exception e)
                 {
                   System.err.println("Failed to copy " + o.getName());
@@ -1041,7 +1041,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
               {
                 try
                 {
-                  Parameter cpy = jalview.ws.jws2.ParameterUtils
+                  Parameter cpy = ParameterUtils
                           .copyParameter(o);
                 } catch (Exception e)
                 {
@@ -1059,15 +1059,15 @@ public class WsJobParameters extends JPanel implements ItemListener,
               List<String> writeparam = null, readparam = null;
               try
               {
-                writeparam = jalview.ws.jws2.ParameterUtils
+                writeparam = ParameterUtils
                         .writeParameterSet(
                                 pr.getArguments(lastserv.getRunnerConfig()),
                                 " ");
                 System.out.println("Testing param read :");
-                List<Option> pset = jalview.ws.jws2.ParameterUtils
+                List<Option> pset = ParameterUtils
                         .processParameters(writeparam,
                                 lastserv.getRunnerConfig(), " ");
-                readparam = jalview.ws.jws2.ParameterUtils
+                readparam = ParameterUtils
                         .writeParameterSet(pset, " ");
                 Iterator<String> o = pr.getOptions().iterator(), s = writeparam
                         .iterator(), t = readparam.iterator();