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

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

diff --git a/src/jalview/gui/WsJobParameters.java b/src/jalview/gui/WsJobParameters.java
index 07e3a9b..c1b09b7 100644 (file)
--- a/src/jalview/gui/WsJobParameters.java
+++ b/src/jalview/gui/WsJobParameters.java
@@ -26,6 +26,7 @@ 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;
@@ -428,7 +429,10 @@ public class WsJobParameters extends JPanel implements ItemListener,
     dialogpanel.add(startjob);
     dialogpanel.add(canceljob);
     // JAL-1580: setMaximumSize() doesn't work, so just size for the worst case:
-    setPreferredSize(new Dimension(540, Desktop.instance.getHeight()));
+    // check for null is for JUnit usage
+    final int windowHeight = Desktop.instance == null ? 540
+            : Desktop.instance.getHeight();
+    setPreferredSize(new Dimension(540, windowHeight));
     add(dialogpanel, BorderLayout.SOUTH);
     validate();
   }
@@ -949,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)
     {
@@ -1018,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());
@@ -1038,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)
                 {
@@ -1056,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();
@@ -1306,7 +1309,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
    */
   protected void updateWebServiceMenus()
   {
-    for (AlignFrame alignFrame : Desktop.getAlignframes())
+    for (AlignFrame alignFrame : Desktop.getAlignFrames())
     {
       alignFrame.BuildWebServiceMenu();
     }