X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FWsJobParameters.java;h=d9a0dda3f8d584c15fb5d66c9ff432d307a2cea2;hb=cb8e52fbbc5f725e3f7f48c672cdddb0690bd978;hp=b70b9854acea2647dfdc643326792796ba79189b;hpb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;p=jalview.git diff --git a/src/jalview/gui/WsJobParameters.java b/src/jalview/gui/WsJobParameters.java index b70b985..d9a0dda 100644 --- a/src/jalview/gui/WsJobParameters.java +++ b/src/jalview/gui/WsJobParameters.java @@ -1,38 +1,27 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) - * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * * Jalview is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - * + * as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. + * * Jalview is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty * of MERCHANTABILITY or FITNESS FOR A PARTICULAR * PURPOSE. See the GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with Jalview. If not, see . + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.gui; -import jalview.gui.OptsAndParamsPage.OptionBox; -import jalview.gui.OptsAndParamsPage.ParamBox; -import jalview.ws.jws2.JabaParamStore; -import jalview.ws.jws2.JabaPreset; -import jalview.ws.jws2.Jws2Discoverer; -import jalview.ws.jws2.Jws2Discoverer.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.ValueConstrainI; -import jalview.ws.params.WsParamSetI; - import java.awt.BorderLayout; import java.awt.Component; -import java.awt.Container; import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; @@ -42,40 +31,28 @@ import java.awt.GridLayout; import java.awt.Rectangle; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.HierarchyBoundsListener; +import java.awt.event.HierarchyEvent; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; import java.awt.event.WindowEvent; import java.awt.event.WindowListener; import java.net.URL; -import java.util.ArrayList; import java.util.Hashtable; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Vector; import javax.swing.JButton; -import javax.swing.JCheckBox; import javax.swing.JComboBox; -import javax.swing.JComponent; import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JLabel; -import javax.swing.JMenuItem; -import javax.swing.JOptionPane; import javax.swing.JPanel; -import javax.swing.JPopupMenu; import javax.swing.JScrollPane; -import javax.swing.JSlider; import javax.swing.JSplitPane; -import javax.swing.JTabbedPane; import javax.swing.JTextArea; -import javax.swing.JTextField; import javax.swing.border.TitledBorder; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; @@ -85,7 +62,20 @@ import compbio.metadata.Parameter; import compbio.metadata.Preset; import compbio.metadata.PresetManager; import compbio.metadata.RunnerConfig; -import compbio.metadata.ValueConstrain.Type; +import jalview.bin.Console; +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; +import net.miginfocom.swing.MigLayout; /** * job parameter editing/browsing dialog box. User can browse existing settings @@ -126,21 +116,16 @@ public class WsJobParameters extends JPanel implements ItemListener, */ JPanel paramList = new JPanel(); - - JPanel SetNamePanel = new JPanel(); JPanel setDetails = new JPanel(); JSplitPane settingsPanel = new JSplitPane(); - JSplitPane jobPanel = new JSplitPane(); - + JPanel jobPanel = new JPanel(); JScrollPane jobOptionsPane = new JScrollPane(); - JPanel jobParameters = new JPanel(); - JButton createpref = new JButton(); JButton deletepref = new JButton(); @@ -159,7 +144,7 @@ public class WsJobParameters extends JPanel implements ItemListener, JScrollPane paramPane = new JScrollPane(); - + // ScrollablePanel optsAndparams = new ScrollablePanel(); JPanel optsAndparams = new JPanel(); RunnerConfig serviceOptions; @@ -200,7 +185,8 @@ public class WsJobParameters extends JPanel implements ItemListener, * @param jobArgset */ public WsJobParameters(JFrame parent, ParamDatastoreI paramStorei, - Jws2Instance service, WsParamSetI preset, List jobArgset) + Jws2Instance service, WsParamSetI preset, + List jobArgset) { super(); jbInit(); @@ -231,25 +217,30 @@ public class WsJobParameters extends JPanel implements ItemListener, frame = new JDialog(Desktop.instance, true); - frame.setTitle("Edit parameters for " + 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(new Rectangle((int) (deskr.getCenterX() - pref.width/2), - (int) (deskr.getCenterY() - pref.height/2), pref.width, pref.height)); + frame.setBounds( + new Rectangle((int) (deskr.getCenterX() - pref.width / 2), + (int) (deskr.getCenterY() - pref.height / 2), + pref.width, pref.height)); frame.setContentPane(this); - + // should perhaps recover defaults from user prefs. frame.validate(); javax.swing.SwingUtilities.invokeLater(new Runnable() { - public void run() - { - jobPanel.setDividerLocation(0.25); + @Override + public void run() + { + // jobPanel.setDividerLocation(0.25); - } - }); - frame.setVisible(true); + } + }); + frame.setVisible(true); if (response > 0) { @@ -260,64 +251,96 @@ public class WsJobParameters extends JPanel implements ItemListener, private void jbInit() { - updatepref = JvSwingUtils.makeButton("Update", - "Update this existing user parameter set.", + this.addHierarchyBoundsListener(new HierarchyBoundsListener() + { + + @Override + public void ancestorResized(HierarchyEvent arg0) + { + refreshParamLayout(); + } + + @Override + public void ancestorMoved(HierarchyEvent arg0) + { + // TODO Auto-generated method stub + + } + }); + updatepref = JvSwingUtils.makeButton( + MessageManager.getString("action.update"), + MessageManager.getString("label.update_user_parameter_set"), new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { update_actionPerformed(e); } }); - deletepref = JvSwingUtils.makeButton("Delete", - "Delete the currently selected user parameter set.", + deletepref = JvSwingUtils.makeButton( + MessageManager.getString("action.delete"), + MessageManager.getString("label.delete_user_parameter_set"), new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { delete_actionPerformed(e); } }); - createpref = JvSwingUtils.makeButton("Create", - "Create a new parameter set with the current settings.", + createpref = JvSwingUtils.makeButton( + MessageManager.getString("action.create"), + MessageManager.getString("label.create_user_parameter_set"), new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { create_actionPerformed(e); } }); - revertpref = JvSwingUtils.makeButton("Revert", - "Undo all changes to the current parameter set", + revertpref = JvSwingUtils.makeButton( + MessageManager.getString("action.revert"), + MessageManager + .getString("label.revert_changes_user_parameter_set"), new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { revert_actionPerformed(e); } }); - startjob = JvSwingUtils.makeButton("Start Job", - "Start Job with current settings.", new ActionListener() + startjob = JvSwingUtils.makeButton( + MessageManager.getString("action.start_job"), + MessageManager.getString("label.start_job_current_settings"), + new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { startjob_actionPerformed(e); } }); - canceljob = JvSwingUtils.makeButton("Cancel Job", - "Close this dialog and cancel job.", new ActionListener() + canceljob = JvSwingUtils.makeButton( + MessageManager.getString("action.cancel_job"), + MessageManager.getString("label.cancel_job_close_dialog"), + new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { canceljob_actionPerformed(e); } }); - setDetails.setBorder(new TitledBorder("Details")); + setDetails.setBorder( + new TitledBorder(MessageManager.getString("label.details"))); setDetails.setLayout(new BorderLayout()); setDescr.setColumns(40); setDescr.setWrapStyleWord(true); @@ -325,9 +348,9 @@ public class WsJobParameters extends JPanel implements ItemListener, setDescr.setBackground(getBackground()); setDescr.setEditable(true); setDescr.getDocument().addDocumentListener(this); - setDescr.setToolTipText("Click to edit the notes for this parameter set."); + setDescr.setToolTipText( + MessageManager.getString("label.edit_notes_parameter_set")); JScrollPane setDescrView = new JScrollPane(); - // setDescrView.setPreferredSize(new Dimension(350, 200)); setDescrView.getViewport().setView(setDescr); setName.setEditable(true); setName.addItemListener(this); @@ -336,12 +359,13 @@ public class WsJobParameters extends JPanel implements ItemListener, GridBagLayout gbl = new GridBagLayout(); SetNamePanel.setLayout(gbl); - JLabel setNameLabel = new JLabel("Current parameter set name :"); + JLabel setNameLabel = new JLabel( + MessageManager.getString("label.current_parameter_set_name")); setNameLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); - + setNameInfo.add(setNameLabel); setNameInfo.add(setName); - + // initial button visibility updatepref.setVisible(false); deletepref.setVisible(false); @@ -352,13 +376,13 @@ public class WsJobParameters extends JPanel implements ItemListener, ((FlowLayout) setsavebuts.getLayout()).setHgap(10); ((FlowLayout) setsavebuts.getLayout()).setVgap(0); JPanel spacer = new JPanel(); - spacer.setPreferredSize(new Dimension(2,30)); + spacer.setPreferredSize(new Dimension(2, 30)); setsavebuts.add(spacer); setsavebuts.add(deletepref); setsavebuts.add(revertpref); setsavebuts.add(createpref); setsavebuts.add(updatepref); -// setsavebuts.setSize(new Dimension(150, 30)); + // setsavebuts.setSize(new Dimension(150, 30)); JPanel buttonArea = new JPanel(new GridLayout(1, 1)); buttonArea.add(setsavebuts); SetNamePanel.add(setNameInfo); @@ -373,25 +397,36 @@ public class WsJobParameters extends JPanel implements ItemListener, gbl.setConstraints(buttonArea, gbc); setDetails.add(setDescrView, BorderLayout.CENTER); - jobParameters.setBorder(new TitledBorder("Parameters")); - paramPane.setPreferredSize(new Dimension(360, 400)); - jobOptions.setBorder(new TitledBorder("Options")); - - paramList.setBorder(new TitledBorder("Parameters")); - - JPanel bjo=new JPanel(new BorderLayout()),bjp=new JPanel(new BorderLayout()); + // paramPane.setPreferredSize(new Dimension(360, 400)); + // paramPane.setPreferredSize(null); + jobOptions.setBorder( + new TitledBorder(MessageManager.getString("label.options"))); + jobOptions.setOpaque(true); + paramList.setBorder( + new TitledBorder(MessageManager.getString("label.parameters"))); + paramList.setOpaque(true); + JPanel bjo = new JPanel(new BorderLayout()), + bjp = new JPanel(new BorderLayout()); bjo.add(jobOptions, BorderLayout.CENTER); bjp.add(paramList, BorderLayout.CENTER); - optsAndparams.setLayout(new BorderLayout()); - - optsAndparams.add(bjo, BorderLayout.CENTER); - optsAndparams.add(bjp, BorderLayout.SOUTH); - paramPane.setViewportView(optsAndparams); - + bjp.setOpaque(true); + bjo.setOpaque(true); + // optsAndparams.setScrollableWidth(ScrollableSizeHint.FIT); + // optsAndparams.setScrollableHeight(ScrollableSizeHint.NONE); + // optsAndparams.setLayout(new BorderLayout()); + optsAndparams.setLayout(new BorderLayout()); + optsAndparams.add(jobOptions, BorderLayout.NORTH); + optsAndparams.add(paramList, BorderLayout.CENTER); + JPanel jp = new JPanel(new BorderLayout()); + jp.add(optsAndparams, BorderLayout.CENTER); + paramPane.getViewport().setView(jp); + paramPane.setBorder(null); setLayout(new BorderLayout()); - jobPanel.setLeftComponent(setDetails); - jobPanel.setRightComponent(paramPane); - jobPanel.setOrientation(JSplitPane.VERTICAL_SPLIT); + jobPanel.setPreferredSize(null); + jobPanel.setLayout(new BorderLayout()); + jobPanel.add(setDetails, BorderLayout.NORTH); + jobPanel.add(paramPane, BorderLayout.CENTER); + // jobPanel.setOrientation(JSplitPane.VERTICAL_SPLIT); add(SetNamePanel, BorderLayout.NORTH); add(jobPanel, BorderLayout.CENTER); @@ -399,13 +434,19 @@ public class WsJobParameters extends JPanel implements ItemListener, JPanel dialogpanel = new JPanel(); dialogpanel.add(startjob); 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 ? 540 + : Desktop.instance.getHeight(); + setPreferredSize(new Dimension(540, windowHeight)); add(dialogpanel, BorderLayout.SOUTH); + validate(); } protected void revert_actionPerformed(ActionEvent e) { reInitDialog(lastParmSet); - + updateWebServiceMenus(); } protected void update_actionPerformed(ActionEvent e) @@ -434,6 +475,7 @@ public class WsJobParameters extends JPanel implements ItemListener, _deleteUserPreset(lastParmSet); } reInitDialog(null); // service default + updateWebServiceMenus(); } protected void create_actionPerformed(ActionEvent e) @@ -444,7 +486,9 @@ public class WsJobParameters extends JPanel implements ItemListener, _storeCurrentPreset(curname); lastParmSet = curname; isUserPreset = true; + reInitDialog(curname); initArgSetModified(); + updateWebServiceMenus(); } else { @@ -490,8 +534,8 @@ public class WsJobParameters extends JPanel implements ItemListener, List jobArgset = null; settingDialog = true; { // instantiate the abstract proxy for Jaba objects - jobArgset = jabajobArgset == null ? null : JabaParamStore - .getJwsArgsfromJaba(jabajobArgset); + jobArgset = jabajobArgset == null ? null + : JabaParamStore.getJwsArgsfromJaba(jabajobArgset); p = jabap; // (jabap != null) ? paramStore.getPreset(jabap.getName()) : // null; } @@ -499,7 +543,7 @@ public class WsJobParameters extends JPanel implements ItemListener, Hashtable exnames = new Hashtable(); for (int i = 0, iSize = setName.getItemCount(); i < iSize; i++) { - exnames.put((String) setName.getItemAt(i), setName.getItemAt(i)); + exnames.put(setName.getItemAt(i), setName.getItemAt(i)); } servicePresets = new Hashtable(); // Add the default entry - if not present already. @@ -537,7 +581,10 @@ public class WsJobParameters extends JPanel implements ItemListener, if (jobArgset != null && jobArgset.size() > 0) { curSetName = "Supplied Settings"; + isUserPreset = false; updateTable(p, jobArgset); + setName.setSelectedItem(curSetName); + updateButtonDisplay(); } else { @@ -552,18 +599,32 @@ public class WsJobParameters extends JPanel implements ItemListener, @SuppressWarnings("unchecked") private void updateTable(WsParamSetI p, List jobArgset) { + boolean setDefaultParams = false; + if (lastParmSet == null) + { + isUserPreset = false; + // First call - so provide Service default settings + setName.setSelectedItem(lastSetName = SVC_DEF); + } + if (p == null && SVC_DEF.equals("" + setName.getSelectedItem())) + { + // indicate that service defaults should be set if available + setDefaultParams = true; + } // populate table from default parameter set. List args = paramStore.getServiceParameters(); // split to params and required arguments { + int cw = 0; + boolean optset = false; for (ArgumentI myarg : args) { // Ideally, Argument would implement isRequired ! if (myarg instanceof ParameterI) { ParameterI parm = (ParameterI) myarg; - paramList.add(opanp.addParameter(parm)); + opanp.addParameter(parm).validate(); } else { @@ -571,13 +632,13 @@ public class WsJobParameters extends JPanel implements ItemListener, { OptionI opt = (OptionI) myarg; OptionBox ob = opanp.addOption(opt); - jobOptions.add(ob, FlowLayout.LEFT); - ob.resetToDefault(); + ob.resetToDefault(setDefaultParams); if (MAX_OPTWIDTH < ob.getPreferredSize().width) { MAX_OPTWIDTH = ob.getPreferredSize().width; } - + ob.validate(); + cw += ob.getPreferredSize().width + 5; } else { @@ -605,16 +666,6 @@ public class WsJobParameters extends JPanel implements ItemListener, // TODO: check if args should be unselected prior to resetting using the // preset } - else - { - if (lastParmSet == null) - { - isUserPreset = false; - // first call - so create a dummy name - - setName.setSelectedItem(lastSetName = SVC_DEF); - } - } if (jobArgset != null) { @@ -667,7 +718,8 @@ public class WsJobParameters extends JPanel implements ItemListener, private void updateButtonDisplay() { - boolean _update = false, _create = false, _delete = false, _revert = false; + boolean _update = false, _create = false, _delete = false, + _revert = false; if (modifiedElements.size() > 0) { // set modified @@ -693,6 +745,7 @@ public class WsJobParameters extends JPanel implements ItemListener, validate(); } + @Override public void argSetModified(Object modifiedElement, boolean b) { if (settingDialog) @@ -737,8 +790,8 @@ public class WsJobParameters extends JPanel implements ItemListener, boolean stn = settingDialog; boolean renamed = false; settingDialog = true; - String nm = (curSetName != null ? curSetName : (String) setName - .getSelectedItem()); + String nm = (curSetName != null ? curSetName + : (String) setName.getSelectedItem()); // check if the name is reserved - if it is, rename it. if (isServicePreset(nm)) { @@ -784,68 +837,128 @@ public class WsJobParameters extends JPanel implements ItemListener, settingDialog = stn; } - + @Override public void refreshParamLayout() { + // optsAndparams.setPreferredSize(null); FlowLayout fl = new FlowLayout(FlowLayout.LEFT); - int sep=fl.getVgap(); - int os=0,s = jobOptions.getBorder().getBorderInsets(jobOptions).bottom+jobOptions.getBorder().getBorderInsets(jobOptions).top+2 * sep; - int w = 2 * fl.getHgap() + (MAX_OPTWIDTH > OptsAndParamsPage.PARAM_WIDTH ? MAX_OPTWIDTH : OptsAndParamsPage.PARAM_WIDTH); - jobOptions.setLayout(fl); + int sep = fl.getVgap(); + boolean fh = true; + int os = 0, + s = jobOptions.getBorder().getBorderInsets(jobOptions).bottom + + jobOptions.getBorder().getBorderInsets(jobOptions).top + + 2 * sep; + /** + * final height for viewport + */ + int finalh = s; + int panewidth = paramPane.getViewport().getSize().width - 120 + - jobOptions.getBorder().getBorderInsets(jobOptions).left + + jobOptions.getBorder().getBorderInsets(jobOptions).right; + + int w = 2 * fl.getHgap() + + (MAX_OPTWIDTH > OptsAndParamsPage.PARAM_WIDTH ? MAX_OPTWIDTH + : OptsAndParamsPage.PARAM_WIDTH); + int hgap = fl.getHgap(), cw = hgap; + if (opanp.getOptSet().size() > 0) { - + + jobOptions.setLayout(new MigLayout("", "", "")); + jobOptions.removeAll(); + for (OptionBox pbox : opanp.getOptSet().values()) { - pbox.revalidate(); - s += sep + pbox.getPreferredSize().height; + pbox.validate(); + cw += pbox.getSize().width + hgap; + if (cw + 120 > panewidth) + { + jobOptions.add(pbox, "wrap"); + // System.out.println("Wrap on "+pbox.option.getName()); + cw = hgap + pbox.getSize().width; + fh = true; + } + else + { + jobOptions.add(pbox); + } + if (fh) + { + finalh += pbox.getSize().height + fl.getVgap(); + fh = false; + } } - jobOptions.setPreferredSize(new Dimension(w, s)); - jobOptions.setLayout(new GridLayout(opanp.getOptSet().size(),1)); - os=s; + jobOptions.revalidate(); } else { jobOptions.setVisible(false); } - // Now layout the parameters assuming they occupy one column - to calculate total height of options+parameters - fl = new FlowLayout(FlowLayout.CENTER); - // helpful hint from http://stackoverflow.com/questions/2743177/top-alignment-for-flowlayout + // Now layout the parameters assuming they occupy one column - to calculate + // total height of options+parameters + fl = new FlowLayout(FlowLayout.LEFT); + // helpful hint from + // http://stackoverflow.com/questions/2743177/top-alignment-for-flowlayout fl.setAlignOnBaseline(true); if (opanp.getParamSet().size() > 0) { - paramList.setLayout(fl); - - s = 2 * sep; + paramList.removeAll(); + paramList.setLayout(new MigLayout("", "", "")); + fh = true; for (ParamBox pbox : opanp.getParamSet().values()) { pbox.validate(); - s += sep + pbox.getPreferredSize().height+pbox.getBorder().getBorderInsets(pbox).bottom; + cw += pbox.getSize().width + hgap; + if (cw + 160 > panewidth) + { + paramList.add(pbox, "wrap"); + cw = pbox.getSize().width + hgap; + fh = true; + } + else + { + paramList.add(pbox); + } + if (fh) + { + finalh += pbox.getSize().height + fl.getVgap(); + fh = false; + } + } - - paramList.setPreferredSize(new Dimension(w, s)); - os+=s+2*sep+paramList.getBorder().getBorderInsets(paramList).bottom+paramList.getBorder().getBorderInsets(paramList).top; + /* + * s = 2 * sep; for (ParamBox pbox : opanp.getParamSet().values()) { + * pbox.validate(); s += sep + + * pbox.getPreferredSize().height+pbox.getBorder + * ().getBorderInsets(pbox).bottom; } + * + * // paramList.setPreferredSize(new Dimension(w, s)); + * os+=s+2*sep+paramList + * .getBorder().getBorderInsets(paramList).bottom+paramList + * .getBorder().getBorderInsets(paramList).top; + */ + paramList.revalidate(); } else { paramList.setVisible(false); } - // TODO: waste some time trying to eliminate any unnecessary .validate calls here - paramList.validate(); - jobOptions.validate(); + // TODO: waste some time trying to eliminate any unnecessary .validate calls + // here // System.out.println("Size will be : "+w+","+os); - optsAndparams.validate(); - paramPane.getViewport().validate(); - paramPane.getVerticalScrollBar().setBlockIncrement(OptsAndParamsPage.PARAM_CLOSEDHEIGHT*2); - paramPane.validate(); - validate(); + // optsAndparams.setPreferredSize(null); + // paramPane.getViewport().setView(optsAndparams); + paramPane.getViewport().setAutoscrolls(true); + paramPane.revalidate(); + revalidate(); } /** * testing method - grab a service and parameter set and show the window * * @param args + * @j2sIgnore */ public static void main(String[] args) { @@ -854,9 +967,9 @@ public class WsJobParameters extends JPanel implements ItemListener, int p = 0; if (args.length > 0) { - Vector services = new Vector(); + Vector services = new Vector<>(); services.addElement(args[p++]); - Jws2Discoverer.setServiceUrls(services); + Jws2Discoverer.getDiscoverer().setServiceUrls(services); } try { @@ -867,8 +980,8 @@ public class WsJobParameters extends JPanel implements ItemListener, e.printStackTrace(); return; } - Jws2Discoverer.Jws2Instance lastserv = null; - for (Jws2Discoverer.Jws2Instance service : disc.getServices()) + Jws2Instance lastserv = null; + for (Jws2Instance service : disc.getServices()) { lastserv = service; if (p >= args.length || service.serviceType.equalsIgnoreCase(args[p])) @@ -911,8 +1024,8 @@ public class WsJobParameters extends JPanel implements ItemListener, } { System.out.println("Testing opts dupes for " - + lastserv.getUri() + " : " - + lastserv.getActionText() + ":" + pr.getName()); + + lastserv.getUri() + " : " + lastserv.getActionText() + + ":" + pr.getName()); List