Merge branch 'Jalview-JS/develop' into merge_js_develop

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

diff --git a/src/jalview/gui/WsJobParameters.java b/src/jalview/gui/WsJobParameters.java
index f2c4e96..719b7d9 100644 (file)
--- a/src/jalview/gui/WsJobParameters.java
+++ b/src/jalview/gui/WsJobParameters.java
@@ -23,7 +23,7 @@ package jalview.gui;
 import jalview.gui.OptsAndParamsPage.OptionBox;
 import jalview.gui.OptsAndParamsPage.ParamBox;
 import jalview.util.MessageManager;
-import jalview.ws.jws2.jabaws2.Jws2Instance;
+import jalview.ws.api.UIinfo;
 import jalview.ws.params.ArgumentI;
 import jalview.ws.params.OptionI;
 import jalview.ws.params.ParamDatastoreI;
@@ -131,7 +131,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
 
   JDialog frame = null;
 
-  Jws2Instance service;
+  UIinfo service;
 
   /*
    * list of service presets in the gui
@@ -170,7 +170,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
    * @param preset
    * @param jobArgset
    */
-  public WsJobParameters(ParamDatastoreI paramStorei, Jws2Instance service,
+  public WsJobParameters(ParamDatastoreI paramStorei, UIinfo service,
           WsParamSetI preset, List<ArgumentI> jobArgset)
   {
     super();
@@ -198,15 +198,17 @@ public class WsJobParameters extends JPanel implements ItemListener,
   public boolean showRunDialog()
   {
 
-    frame = new JDialog(Desktop.instance, true);
+    frame = new JDialog(Desktop.getInstance(), true);
     if (service != null)
     {
       frame.setTitle(MessageManager.formatMessage("label.edit_params_for",
               new String[]
       { service.getActionText() }));
     }
-
-    Rectangle deskr = Desktop.instance.getBounds();
+    frame.setTitle(MessageManager.formatMessage("label.edit_params_for",
+            new String[]
+            { service.getActionText() }));
+    Rectangle deskr = Desktop.getInstance().getBounds();
     Dimension pref = this.getPreferredSize();
     frame.setBounds(
             new Rectangle((int) (deskr.getCenterX() - pref.width / 2),
@@ -415,9 +417,9 @@ public class WsJobParameters extends JPanel implements ItemListener,
     dialogpanel.add(canceljob);
     // JAL-1580: setMaximumSize() doesn't work, so just size for the worst case:
     // check for null is for JUnit usage
-    final int windowHeight = Desktop.instance == null ? DEFAULT_HEIGHT
-            : Desktop.instance.getHeight();
-    // setPreferredSize(new Dimension(PREFERRED_WIDTH, windowHeight));
+    final int windowHeight = Desktop.getInstance() == null ? DEFAULT_HEIGHT
+            : Desktop.getInstance().getHeight();
+    setPreferredSize(new Dimension(540, windowHeight));
     add(dialogpanel, BorderLayout.SOUTH);
     validate();
   }
@@ -906,7 +908,6 @@ public class WsJobParameters extends JPanel implements ItemListener,
     paramPane.revalidate();
     revalidate();
   }
-
   public boolean isServiceDefaults()
   {
     return (!isModified()
@@ -1039,13 +1040,13 @@ public class WsJobParameters extends JPanel implements ItemListener,
    */
   protected void updateWebServiceMenus()
   {
-    if (Desktop.instance == null)
+    if (Desktop.getInstance() == null)
     {
       return;
     }
     for (AlignFrame alignFrame : Desktop.getAlignFrames())
     {
-      alignFrame.BuildWebServiceMenu();
+      alignFrame.buildWebServicesMenu();
     }
   }