Updated with latest from mchmmer branch

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

diff --git a/src/jalview/gui/WsJobParameters.java b/src/jalview/gui/WsJobParameters.java
index 10798f6..af52d43 100644 (file)
--- a/src/jalview/gui/WsJobParameters.java
+++ b/src/jalview/gui/WsJobParameters.java
@@ -69,14 +69,13 @@ import javax.swing.border.TitledBorder;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 
-import net.miginfocom.swing.MigLayout;
-
 import compbio.metadata.Argument;
 import compbio.metadata.Option;
 import compbio.metadata.Parameter;
 import compbio.metadata.Preset;
 import compbio.metadata.PresetManager;
 import compbio.metadata.RunnerConfig;
+import net.miginfocom.swing.MigLayout;
 
 /**
  * job parameter editing/browsing dialog box. User can browse existing settings
@@ -159,6 +158,21 @@ public class WsJobParameters extends JPanel implements ItemListener,
     this(service, null);
   }
 
+  public WsJobParameters(JFrame parent, ParamDatastoreI store,
+          WsParamSetI preset,
+          List<ArgumentI> args)
+  {
+    super();
+    jbInit();
+    this.paramStore = store;
+    this.service = null;
+    // argSetModified(false);
+    // populate parameter table
+    init(preset, args);
+    // display in new JFrame attached to parent.
+    validate();
+  }
+
   public WsJobParameters(Jws2Instance service, WsParamSetI preset)
   {
     this(null, service, preset, null);
@@ -217,10 +231,13 @@ public class WsJobParameters extends JPanel implements ItemListener,
   {
 
     frame = new JDialog(Desktop.instance, true);
+    if (service != null)
+    {
+      frame.setTitle(MessageManager.formatMessage("label.edit_params_for",
+              new String[]
+      { service.getActionText() }));
+    }
 
-    frame.setTitle(MessageManager.formatMessage("label.edit_params_for",
-            new String[]
-            { service.getActionText() }));
     Rectangle deskr = Desktop.instance.getBounds();
     Dimension pref = this.getPreferredSize();
     frame.setBounds(
@@ -541,6 +558,12 @@ public class WsJobParameters extends JPanel implements ItemListener,
                  // null;
     }
 
+    init(p, jobArgset);
+
+  }
+
+  void init(WsParamSetI p, List<ArgumentI> jobArgset)
+  {
     Hashtable exnames = new Hashtable();
     for (int i = 0, iSize = setName.getItemCount(); i < iSize; i++)
     {
@@ -594,7 +617,6 @@ public class WsJobParameters extends JPanel implements ItemListener,
       }
     }
     settingDialog = false;
-
   }
 
   @SuppressWarnings("unchecked")
@@ -967,7 +989,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
     int p = 0;
     if (args.length > 0)
     {
-      Vector<String> services = new Vector<String>();
+      Vector<String> services = new Vector<>();
       services.addElement(args[p++]);
       Jws2Discoverer.getDiscoverer().setServiceUrls(services);
     }
@@ -1340,8 +1362,8 @@ public class WsJobParameters extends JPanel implements ItemListener,
     if (e.getSource() == setName && e.getStateChange() == e.SELECTED)
     {
       final String setname = (String) setName.getSelectedItem();
-      System.out.println("Item state changed for " + setname
-              + " (handling ? " + !settingDialog + ")");
+      // System.out.println("Item state changed for " + setname
+      // + " (handling ? " + !settingDialog + ")");
       if (settingDialog)
       {
         // ignore event