X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FWsJobParameters.java;h=17c07601af6c243361d8ba99e769ecb9d937e7d1;hb=fee1b781ca14aadea5d112fc554fe14879c787c5;hp=8c889c91e86396f5afd17d3c00c6db9e9b01e2bc;hpb=754120d5f3f715b02600b1315c8926ba3e4504d7;p=jalview.git diff --git a/src/jalview/gui/WsJobParameters.java b/src/jalview/gui/WsJobParameters.java index 8c889c9..17c0760 100644 --- a/src/jalview/gui/WsJobParameters.java +++ b/src/jalview/gui/WsJobParameters.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -61,7 +61,6 @@ import javax.swing.JComboBox; 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; @@ -219,8 +218,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( @@ -234,6 +232,7 @@ public class WsJobParameters extends JPanel implements ItemListener, frame.validate(); javax.swing.SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { // jobPanel.setDividerLocation(0.25); @@ -273,6 +272,7 @@ public class WsJobParameters extends JPanel implements ItemListener, new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { update_actionPerformed(e); @@ -284,6 +284,7 @@ public class WsJobParameters extends JPanel implements ItemListener, new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { delete_actionPerformed(e); @@ -295,6 +296,7 @@ public class WsJobParameters extends JPanel implements ItemListener, new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { create_actionPerformed(e); @@ -306,6 +308,7 @@ public class WsJobParameters extends JPanel implements ItemListener, new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { revert_actionPerformed(e); @@ -316,6 +319,7 @@ public class WsJobParameters extends JPanel implements ItemListener, MessageManager.getString("label.start_job_current_settings"), new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { startjob_actionPerformed(e); @@ -326,6 +330,7 @@ public class WsJobParameters extends JPanel implements ItemListener, MessageManager.getString("label.cancel_job_close_dialog"), new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { canceljob_actionPerformed(e); @@ -428,7 +433,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(); } @@ -436,7 +444,7 @@ public class WsJobParameters extends JPanel implements ItemListener, protected void revert_actionPerformed(ActionEvent e) { reInitDialog(lastParmSet); - + updateWebServiceMenus(); } protected void update_actionPerformed(ActionEvent e) @@ -465,6 +473,7 @@ public class WsJobParameters extends JPanel implements ItemListener, _deleteUserPreset(lastParmSet); } reInitDialog(null); // service default + updateWebServiceMenus(); } protected void create_actionPerformed(ActionEvent e) @@ -475,7 +484,9 @@ public class WsJobParameters extends JPanel implements ItemListener, _storeCurrentPreset(curname); lastParmSet = curname; isUserPreset = true; + reInitDialog(curname); initArgSetModified(); + updateWebServiceMenus(); } else { @@ -731,6 +742,7 @@ public class WsJobParameters extends JPanel implements ItemListener, validate(); } + @Override public void argSetModified(Object modifiedElement, boolean b) { if (settingDialog) @@ -822,6 +834,7 @@ public class WsJobParameters extends JPanel implements ItemListener, settingDialog = stn; } + @Override public void refreshParamLayout() { // optsAndparams.setPreferredSize(null); @@ -953,7 +966,7 @@ public class WsJobParameters extends JPanel implements ItemListener, { Vector services = new Vector(); services.addElement(args[p++]); - Jws2Discoverer.setServiceUrls(services); + Jws2Discoverer.getDiscoverer().setServiceUrls(services); } try { @@ -1095,8 +1108,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()); @@ -1108,40 +1121,47 @@ public class WsJobParameters extends JPanel implements ItemListener, 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 @@ -1295,11 +1315,23 @@ public class WsJobParameters extends JPanel implements ItemListener, SetNamePanel.validate(); validate(); settingDialog = false; + } + /** + * Rebuild the AlignFrame web service menus (after add/delete of a preset + * option). + */ + protected void updateWebServiceMenus() + { + for (AlignFrame alignFrame : Desktop.getAlignFrames()) + { + alignFrame.BuildWebServiceMenu(); + } } String curSetName = null; + @Override public void itemStateChanged(ItemEvent e) { if (e.getSource() == setName && e.getStateChange() == e.SELECTED) @@ -1318,6 +1350,7 @@ public class WsJobParameters extends JPanel implements ItemListener, } javax.swing.SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { doPreferenceComboStateChange(setname); @@ -1339,14 +1372,14 @@ public class WsJobParameters extends JPanel implements ItemListener, } settingDialog = true; System.out.println("Prompting to save " + lsetname); - if (javax.swing.JOptionPane + if (JvOptionPane .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) + JvOptionPane.OK_CANCEL_OPTION) != JvOptionPane.OK_OPTION) { // revert the combobox to the current item settingDialog = true; @@ -1398,6 +1431,7 @@ public class WsJobParameters extends JPanel implements ItemListener, */ String lastDescrText = null; + @Override public void actionPerformed(ActionEvent e) { if (e.getSource() instanceof Component) @@ -1418,12 +1452,13 @@ public class WsJobParameters extends JPanel implements ItemListener, settingDialog = false; javax.swing.SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { - JOptionPane.showMessageDialog(ourframe, MessageManager + JvOptionPane.showMessageDialog(ourframe, MessageManager .getString("label.invalid_name_preset_exists"), MessageManager.getString("label.invalid_name"), - JOptionPane.WARNING_MESSAGE); + JvOptionPane.WARNING_MESSAGE); } }); @@ -1459,16 +1494,19 @@ public class WsJobParameters extends JPanel implements ItemListener, } } + @Override public void insertUpdate(DocumentEvent e) { checkDescrModified(); } + @Override public void removeUpdate(DocumentEvent e) { checkDescrModified(); } + @Override public void changedUpdate(DocumentEvent e) { checkDescrModified();