git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2507 fix test: knockon from capitalisation on secondary structure from stockholm...
[jalview.git]
/
src
/
jalview
/
gui
/
WsJobParameters.java
diff --git
a/src/jalview/gui/WsJobParameters.java
b/src/jalview/gui/WsJobParameters.java
index
00d9c79
..
17c0760
100644
(file)
--- 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.
*
*
* 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.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.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",
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(
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()
{
frame.validate();
javax.swing.SwingUtilities.invokeLater(new Runnable()
{
+ @Override
public void run()
{
// jobPanel.setDividerLocation(0.25);
public void run()
{
// jobPanel.setDividerLocation(0.25);
@@
-273,6
+272,7
@@
public class WsJobParameters extends JPanel implements ItemListener,
new ActionListener()
{
new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
update_actionPerformed(e);
public void actionPerformed(ActionEvent e)
{
update_actionPerformed(e);
@@
-284,6
+284,7
@@
public class WsJobParameters extends JPanel implements ItemListener,
new ActionListener()
{
new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
delete_actionPerformed(e);
public void actionPerformed(ActionEvent e)
{
delete_actionPerformed(e);
@@
-295,6
+296,7
@@
public class WsJobParameters extends JPanel implements ItemListener,
new ActionListener()
{
new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
create_actionPerformed(e);
public void actionPerformed(ActionEvent e)
{
create_actionPerformed(e);
@@
-306,6
+308,7
@@
public class WsJobParameters extends JPanel implements ItemListener,
new ActionListener()
{
new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
revert_actionPerformed(e);
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()
{
MessageManager.getString("label.start_job_current_settings"),
new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
startjob_actionPerformed(e);
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()
{
MessageManager.getString("label.cancel_job_close_dialog"),
new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
canceljob_actionPerformed(e);
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:
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();
}
add(dialogpanel, BorderLayout.SOUTH);
validate();
}
@@
-734,6
+742,7
@@
public class WsJobParameters extends JPanel implements ItemListener,
validate();
}
validate();
}
+ @Override
public void argSetModified(Object modifiedElement, boolean b)
{
if (settingDialog)
public void argSetModified(Object modifiedElement, boolean b)
{
if (settingDialog)
@@
-825,6
+834,7
@@
public class WsJobParameters extends JPanel implements ItemListener,
settingDialog = stn;
}
settingDialog = stn;
}
+ @Override
public void refreshParamLayout()
{
// optsAndparams.setPreferredSize(null);
public void refreshParamLayout()
{
// optsAndparams.setPreferredSize(null);
@@
-956,7
+966,7
@@
public class WsJobParameters extends JPanel implements ItemListener,
{
Vector<String> services = new Vector<String>();
services.addElement(args[p++]);
{
Vector<String> services = new Vector<String>();
services.addElement(args[p++]);
- Jws2Discoverer.setServiceUrls(services);
+ Jws2Discoverer.getDiscoverer().setServiceUrls(services);
}
try
{
}
try
{
@@
-1098,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(
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());
JPanel cont = new JPanel(new BorderLayout());
pgui.validate();
cont.setPreferredSize(pgui.getPreferredSize());
@@
-1111,40
+1121,47
@@
public class WsJobParameters extends JPanel implements ItemListener,
jf.addWindowListener(new WindowListener()
{
jf.addWindowListener(new WindowListener()
{
+ @Override
public void windowActivated(WindowEvent e)
{
// TODO Auto-generated method stub
}
public void windowActivated(WindowEvent e)
{
// TODO Auto-generated method stub
}
+ @Override
public void windowClosed(WindowEvent e)
{
}
public void windowClosed(WindowEvent e)
{
}
+ @Override
public void windowClosing(WindowEvent e)
{
thr.interrupt();
}
public void windowClosing(WindowEvent e)
{
thr.interrupt();
}
+ @Override
public void windowDeactivated(WindowEvent e)
{
// TODO Auto-generated method stub
}
public void windowDeactivated(WindowEvent e)
{
// TODO Auto-generated method stub
}
+ @Override
public void windowDeiconified(WindowEvent e)
{
// TODO Auto-generated method stub
}
public void windowDeiconified(WindowEvent e)
{
// TODO Auto-generated method stub
}
+ @Override
public void windowIconified(WindowEvent e)
{
// TODO Auto-generated method stub
}
public void windowIconified(WindowEvent e)
{
// TODO Auto-generated method stub
}
+ @Override
public void windowOpened(WindowEvent e)
{
// TODO Auto-generated method stub
public void windowOpened(WindowEvent e)
{
// TODO Auto-generated method stub
@@
-1306,7
+1323,7
@@
public class WsJobParameters extends JPanel implements ItemListener,
*/
protected void updateWebServiceMenus()
{
*/
protected void updateWebServiceMenus()
{
- for (AlignFrame alignFrame : Desktop.getAlignframes())
+ for (AlignFrame alignFrame : Desktop.getAlignFrames())
{
alignFrame.BuildWebServiceMenu();
}
{
alignFrame.BuildWebServiceMenu();
}
@@
-1314,6
+1331,7
@@
public class WsJobParameters extends JPanel implements ItemListener,
String curSetName = null;
String curSetName = null;
+ @Override
public void itemStateChanged(ItemEvent e)
{
if (e.getSource() == setName && e.getStateChange() == e.SELECTED)
public void itemStateChanged(ItemEvent e)
{
if (e.getSource() == setName && e.getStateChange() == e.SELECTED)
@@
-1332,6
+1350,7
@@
public class WsJobParameters extends JPanel implements ItemListener,
}
javax.swing.SwingUtilities.invokeLater(new Runnable()
{
}
javax.swing.SwingUtilities.invokeLater(new Runnable()
{
+ @Override
public void run()
{
doPreferenceComboStateChange(setname);
public void run()
{
doPreferenceComboStateChange(setname);
@@
-1353,14
+1372,14
@@
public class WsJobParameters extends JPanel implements ItemListener,
}
settingDialog = true;
System.out.println("Prompting to save " + lsetname);
}
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",
.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;
{
// revert the combobox to the current item
settingDialog = true;
@@
-1412,6
+1431,7
@@
public class WsJobParameters extends JPanel implements ItemListener,
*/
String lastDescrText = null;
*/
String lastDescrText = null;
+ @Override
public void actionPerformed(ActionEvent e)
{
if (e.getSource() instanceof Component)
public void actionPerformed(ActionEvent e)
{
if (e.getSource() instanceof Component)
@@
-1432,12
+1452,13
@@
public class WsJobParameters extends JPanel implements ItemListener,
settingDialog = false;
javax.swing.SwingUtilities.invokeLater(new Runnable()
{
settingDialog = false;
javax.swing.SwingUtilities.invokeLater(new Runnable()
{
+ @Override
public void run()
{
public void run()
{
- JOptionPane.showMessageDialog(ourframe, MessageManager
+ JvOptionPane.showMessageDialog(ourframe, MessageManager
.getString("label.invalid_name_preset_exists"),
MessageManager.getString("label.invalid_name"),
.getString("label.invalid_name_preset_exists"),
MessageManager.getString("label.invalid_name"),
- JOptionPane.WARNING_MESSAGE);
+ JvOptionPane.WARNING_MESSAGE);
}
});
}
});
@@
-1473,16
+1494,19
@@
public class WsJobParameters extends JPanel implements ItemListener,
}
}
}
}
+ @Override
public void insertUpdate(DocumentEvent e)
{
checkDescrModified();
}
public void insertUpdate(DocumentEvent e)
{
checkDescrModified();
}
+ @Override
public void removeUpdate(DocumentEvent e)
{
checkDescrModified();
}
public void removeUpdate(DocumentEvent e)
{
checkDescrModified();
}
+ @Override
public void changedUpdate(DocumentEvent e)
{
checkDescrModified();
public void changedUpdate(DocumentEvent e)
{
checkDescrModified();