JAL-2189 source formatting

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

diff --git a/src/jalview/gui/WsJobParameters.java b/src/jalview/gui/WsJobParameters.java
index ff03fef..c4d215e 100644 (file)
--- a/src/jalview/gui/WsJobParameters.java
+++ b/src/jalview/gui/WsJobParameters.java
@@ -219,8 +219,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
     frame = new JDialog(Desktop.instance, true);
 
     frame.setTitle(MessageManager.formatMessage("label.edit_params_for",
-            new String[]
-            { service.getActionText() }));
+            new String[] { service.getActionText() }));
     Rectangle deskr = Desktop.instance.getBounds();
     Dimension pref = this.getPreferredSize();
     frame.setBounds(new Rectangle(
@@ -428,7 +427,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();
   }
@@ -1098,8 +1100,8 @@ public class WsJobParameters extends JPanel implements ItemListener,
             WsJobParameters pgui = new WsJobParameters(lastserv,
                     new JabaPreset(lastserv, pr));
             JFrame jf = new JFrame(MessageManager.formatMessage(
-                    "label.ws_parameters_for", new String[]
-                    { lastserv.getActionText() }));
+                    "label.ws_parameters_for",
+                    new String[] { lastserv.getActionText() }));
             JPanel cont = new JPanel(new BorderLayout());
             pgui.validate();
             cont.setPreferredSize(pgui.getPreferredSize());