*/
package jalview.gui;
-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 java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Dimension;
import javax.swing.JDialog;
import javax.swing.JFrame;
import javax.swing.JLabel;
-import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JSplitPane;
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 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
* @param jobArgset
*/
public WsJobParameters(JFrame parent, ParamDatastoreI paramStorei,
- Jws2Instance service, WsParamSetI preset, List<Argument> jobArgset)
+ Jws2Instance service, WsParamSetI preset,
+ List<Argument> jobArgset)
{
super();
jbInit();
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(
- (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()
{
+ @Override
public void run()
{
// jobPanel.setDividerLocation(0.25);
new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
update_actionPerformed(e);
new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
delete_actionPerformed(e);
new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
create_actionPerformed(e);
}
});
- revertpref = JvSwingUtils.makeButton(MessageManager
- .getString("action.revert"), MessageManager
- .getString("label.revert_changes_user_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);
MessageManager.getString("label.start_job_current_settings"),
new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
startjob_actionPerformed(e);
MessageManager.getString("label.cancel_job_close_dialog"),
new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
canceljob_actionPerformed(e);
}
});
- setDetails.setBorder(new TitledBorder(MessageManager
- .getString("label.details")));
+ setDetails.setBorder(
+ new TitledBorder(MessageManager.getString("label.details")));
setDetails.setLayout(new BorderLayout());
setDescr.setColumns(40);
setDescr.setWrapStyleWord(true);
setDescr.setBackground(getBackground());
setDescr.setEditable(true);
setDescr.getDocument().addDocumentListener(this);
- setDescr.setToolTipText(MessageManager
- .getString("label.edit_notes_parameter_set"));
+ setDescr.setToolTipText(
+ MessageManager.getString("label.edit_notes_parameter_set"));
JScrollPane setDescrView = new JScrollPane();
setDescrView.getViewport().setView(setDescr);
setName.setEditable(true);
// paramPane.setPreferredSize(new Dimension(360, 400));
// paramPane.setPreferredSize(null);
- jobOptions.setBorder(new TitledBorder(MessageManager
- .getString("label.options")));
+ jobOptions.setBorder(
+ new TitledBorder(MessageManager.getString("label.options")));
jobOptions.setOpaque(true);
- paramList.setBorder(new TitledBorder(MessageManager
- .getString("label.parameters")));
+ paramList.setBorder(
+ new TitledBorder(MessageManager.getString("label.parameters")));
paramList.setOpaque(true);
- JPanel bjo = new JPanel(new BorderLayout()), bjp = new JPanel(
- new BorderLayout());
+ JPanel bjo = new JPanel(new BorderLayout()),
+ bjp = new JPanel(new BorderLayout());
bjo.add(jobOptions, BorderLayout.CENTER);
bjp.add(paramList, BorderLayout.CENTER);
bjp.setOpaque(true);
else
{
// TODO: show warning
- System.err.println("Invalid name. Not saved.");
+ jalview.bin.Console.errPrintln("Invalid name. Not saved.");
}
}
List<ArgumentI> 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;
}
}
else
{
- System.err.println("Ignoring unknown service argument type "
+ jalview.bin.Console.errPrintln("Ignoring unknown service argument type "
+ myarg.getClass().getName());
}
}
{
if (arg instanceof OptionI)
{
- // System.out.println("Setting option "
+ // jalview.bin.Console.outPrintln("Setting option "
// + System.identityHashCode(arg) + ":" + arg.getName()
// + " with " + arg.getDefaultValue());
opanp.selectOption((OptionI) arg, arg.getValue());
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
validate();
}
+ @Override
public void argSetModified(Object modifiedElement, boolean b)
{
if (settingDialog)
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))
{
settingDialog = stn;
}
+ @Override
public void refreshParamLayout()
{
// optsAndparams.setPreferredSize(null);
FlowLayout fl = new FlowLayout(FlowLayout.LEFT);
int sep = fl.getVgap();
boolean fh = true;
- int os = 0, s = jobOptions.getBorder().getBorderInsets(jobOptions).bottom
- + jobOptions.getBorder().getBorderInsets(jobOptions).top
- + 2
- * sep;
+ int os = 0,
+ s = jobOptions.getBorder().getBorderInsets(jobOptions).bottom
+ + jobOptions.getBorder().getBorderInsets(jobOptions).top
+ + 2 * sep;
/**
* final height for viewport
*/
- jobOptions.getBorder().getBorderInsets(jobOptions).left
+ jobOptions.getBorder().getBorderInsets(jobOptions).right;
- int w = 2
- * fl.getHgap()
+ int w = 2 * fl.getHgap()
+ (MAX_OPTWIDTH > OptsAndParamsPage.PARAM_WIDTH ? MAX_OPTWIDTH
: OptsAndParamsPage.PARAM_WIDTH);
int hgap = fl.getHgap(), cw = hgap;
if (cw + 120 > panewidth)
{
jobOptions.add(pbox, "wrap");
- // System.out.println("Wrap on "+pbox.option.getName());
+ // jalview.bin.Console.outPrintln("Wrap on "+pbox.option.getName());
cw = hgap + pbox.getSize().width;
fh = true;
}
}
// TODO: waste some time trying to eliminate any unnecessary .validate calls
// here
- // System.out.println("Size will be : "+w+","+os);
+ // jalview.bin.Console.outPrintln("Size will be : "+w+","+os);
// optsAndparams.setPreferredSize(null);
// paramPane.getViewport().setView(optsAndparams);
paramPane.getViewport().setAutoscrolls(true);
* testing method - grab a service and parameter set and show the window
*
* @param args
+ * @j2sIgnore
*/
public static void main(String[] args)
{
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);
}
disc.run();
} catch (Exception e)
{
- System.err.println("Aborting. Problem discovering services.");
+ jalview.bin.Console.errPrintln("Aborting. Problem discovering services.");
e.printStackTrace();
return;
}
pr = en.next();
}
{
- System.out.println("Testing opts dupes for "
- + lastserv.getUri() + " : "
- + lastserv.getActionText() + ":" + pr.getName());
+ jalview.bin.Console.outPrintln("Testing opts dupes for "
+ + lastserv.getUri() + " : " + lastserv.getActionText()
+ + ":" + pr.getName());
List<Option> rg = lastserv.getRunnerConfig().getOptions();
for (Option o : rg)
{
Option cpy = jalview.ws.jws2.ParameterUtils.copyOption(o);
} catch (Exception e)
{
- System.err.println("Failed to copy " + o.getName());
+ jalview.bin.Console.errPrintln("Failed to copy " + o.getName());
e.printStackTrace();
} catch (Error e)
{
- System.err.println("Failed to copy " + o.getName());
+ jalview.bin.Console.errPrintln("Failed to copy " + o.getName());
e.printStackTrace();
}
}
}
{
- System.out.println("Testing param dupes:");
+ jalview.bin.Console.outPrintln("Testing param dupes:");
List<Parameter> rg = lastserv.getRunnerConfig()
.getParameters();
for (Parameter o : rg)
.copyParameter(o);
} catch (Exception e)
{
- System.err.println("Failed to copy " + o.getName());
+ jalview.bin.Console.errPrintln("Failed to copy " + o.getName());
e.printStackTrace();
} catch (Error e)
{
- System.err.println("Failed to copy " + o.getName());
+ jalview.bin.Console.errPrintln("Failed to copy " + o.getName());
e.printStackTrace();
}
}
}
{
- System.out.println("Testing param write:");
+ jalview.bin.Console.outPrintln("Testing param write:");
List<String> writeparam = null, readparam = null;
try
{
.writeParameterSet(
pr.getArguments(lastserv.getRunnerConfig()),
" ");
- System.out.println("Testing param read :");
+ jalview.bin.Console.outPrintln("Testing param read :");
List<Option> pset = jalview.ws.jws2.ParameterUtils
.processParameters(writeparam,
lastserv.getRunnerConfig(), " ");
readparam = jalview.ws.jws2.ParameterUtils
.writeParameterSet(pset, " ");
- Iterator<String> o = pr.getOptions().iterator(), s = writeparam
- .iterator(), t = readparam.iterator();
+ Iterator<String> o = pr.getOptions().iterator(),
+ s = writeparam.iterator(), t = readparam.iterator();
boolean failed = false;
while (s.hasNext() && t.hasNext())
{
String on = o.next(), sn = s.next(), st = t.next();
if (!sn.equals(st))
{
- System.out.println("Original was " + on
- + " Phase 1 wrote " + sn + "\tPhase 2 wrote "
- + st);
+ jalview.bin.Console.outPrintln(
+ "Original was " + on + " Phase 1 wrote " + sn
+ + "\tPhase 2 wrote " + st);
failed = true;
}
}
if (failed)
{
- System.out.println("Original parameters:\n"
- + pr.getOptions());
- System.out.println("Wrote parameters in first set:\n"
- + writeparam);
- System.out.println("Wrote parameters in second set:\n"
- + readparam);
+ jalview.bin.Console.outPrintln(
+ "Original parameters:\n" + pr.getOptions());
+ jalview.bin.Console.outPrintln(
+ "Wrote parameters in first set:\n" + writeparam);
+ jalview.bin.Console.outPrintln(
+ "Wrote parameters in second set:\n" + readparam);
}
} catch (Exception e)
}
WsJobParameters pgui = new WsJobParameters(lastserv,
new JabaPreset(lastserv, pr));
- JFrame jf = new JFrame(MessageManager.formatMessage(
- "label.ws_parameters_for",
- new String[] { lastserv.getActionText() }));
+ JFrame jf = new JFrame(MessageManager
+ .formatMessage("label.ws_parameters_for", new String[]
+ { lastserv.getActionText() }));
JPanel cont = new JPanel(new BorderLayout());
pgui.validate();
cont.setPreferredSize(pgui.getPreferredSize());
jf.addWindowListener(new WindowListener()
{
+ @Override
public void windowActivated(WindowEvent e)
{
// TODO Auto-generated method stub
}
+ @Override
public void windowClosed(WindowEvent e)
{
}
+ @Override
public void windowClosing(WindowEvent e)
{
thr.interrupt();
}
+ @Override
public void windowDeactivated(WindowEvent e)
{
// TODO Auto-generated method stub
}
+ @Override
public void windowDeiconified(WindowEvent e)
{
// TODO Auto-generated method stub
}
+ @Override
public void windowIconified(WindowEvent e)
{
// TODO Auto-generated method stub
}
+ @Override
public void windowOpened(WindowEvent e)
{
// TODO Auto-generated method stub
{
inter = true;
}
- ;
}
jf.dispose();
}
public boolean isServiceDefaults()
{
- return (!isModified() && (lastParmSet != null && lastParmSet
- .equals(SVC_DEF)));
+ return (!isModified()
+ && (lastParmSet != null && lastParmSet.equals(SVC_DEF)));
}
public List<ArgumentI> getJobParams()
* + storeSetName + ": ", jobParams); }
*
* private void writeParam(String nm, List<ArgumentI> params) { for (ArgumentI
- * p : params) { System.out.println(nm + ":" + System.identityHashCode(p) +
+ * p : params) { jalview.bin.Console.outPrintln(nm + ":" + System.identityHashCode(p) +
* " Name: " + p.getName() + " Value: " + p.getDefaultValue()); } }
*
* private Object[] _getUserPreset(String setName) { Object[] pset =
*/
protected void updateWebServiceMenus()
{
- for (AlignFrame alignFrame : Desktop.getAlignFrames())
+ for (AlignFrame alignFrame : Desktop.getDesktopAlignFrames())
{
alignFrame.BuildWebServiceMenu();
}
String curSetName = null;
+ @Override
public void itemStateChanged(ItemEvent e)
{
if (e.getSource() == setName && e.getStateChange() == e.SELECTED)
{
final String setname = (String) setName.getSelectedItem();
- System.out.println("Item state changed for " + setname
- + " (handling ? " + !settingDialog + ")");
+ if (Console.isDebugEnabled())
+ {
+ Console.debug("Item state changed for " + setname + " (handling ? "
+ + !settingDialog + ")");
+ }
if (settingDialog)
{
// ignore event
}
javax.swing.SwingUtilities.invokeLater(new Runnable()
{
+ @Override
public void run()
{
doPreferenceComboStateChange(setname);
return;
}
settingDialog = true;
- System.out.println("Prompting to save " + lsetname);
- if (javax.swing.JOptionPane
- .showConfirmDialog(
- this,
- "Parameter set '"
- + lsetname
- + "' is modifed, and your changes will be lost.\nReally change preset ?",
- "Warning: Unsaved Changes",
- javax.swing.JOptionPane.OK_CANCEL_OPTION) != JOptionPane.OK_OPTION)
+ jalview.bin.Console.outPrintln("Prompting to save " + lsetname);
+ if (JvOptionPane.showConfirmDialog(this, "Parameter set '" + lsetname
+ + "' is modifed, and your changes will be lost.\nReally change preset ?",
+ "Warning: Unsaved Changes",
+ JvOptionPane.OK_CANCEL_OPTION) != JvOptionPane.OK_OPTION)
{
// revert the combobox to the current item
settingDialog = true;
settingDialog = false;
// and leave.
return;
- // System.out.println("Saving for " + lsetname);
+ // jalview.bin.Console.outPrintln("Saving for " + lsetname);
// _storeCurrentPreset(lsetname);
}
*/
String lastDescrText = null;
+ @Override
public void actionPerformed(ActionEvent e)
{
if (e.getSource() instanceof Component)
settingDialog = false;
javax.swing.SwingUtilities.invokeLater(new Runnable()
{
+ @Override
public void run()
{
- JOptionPane.showMessageDialog(ourframe, MessageManager
- .getString("label.invalid_name_preset_exists"),
+ JvOptionPane.showMessageDialog(ourframe,
+ MessageManager.getString(
+ "label.invalid_name_preset_exists"),
MessageManager.getString("label.invalid_name"),
- JOptionPane.WARNING_MESSAGE);
+ JvOptionPane.WARNING_MESSAGE);
}
});
return;
}
curSetName = newname;
- System.err.println("New name for user setting " + curSetName
+ jalview.bin.Console.errPrintln("New name for user setting " + curSetName
+ " (was " + setName.getSelectedItem() + ")");
if (curSetName.equals(setName.getSelectedItem()))
{
if (!settingDialog)
{
- argSetModified(
- setDescr,
- (lastDescrText == null ? setDescr.getText().trim().length() > 0
+ argSetModified(setDescr,
+ (lastDescrText == null
+ ? setDescr.getText().trim().length() > 0
: !setDescr.getText().equals(lastDescrText)));
}
}
+ @Override
public void insertUpdate(DocumentEvent e)
{
checkDescrModified();
}
+ @Override
public void removeUpdate(DocumentEvent e)
{
checkDescrModified();
}
+ @Override
public void changedUpdate(DocumentEvent e)
{
checkDescrModified();
git://source.jalview.org / jalview.git / blobdiff