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-2089 patch broken merge to master for Release 2.10.0b1
[jalview.git]
/
src
/
jalview
/
gui
/
WsJobParameters.java
diff --git
a/src/jalview/gui/WsJobParameters.java
b/src/jalview/gui/WsJobParameters.java
index
186c38c
..
c4d215e
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.
*
@@
-219,8
+219,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(
@@
-428,7
+427,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();
}
@@
-436,7
+438,7
@@
public class WsJobParameters extends JPanel implements ItemListener,
protected void revert_actionPerformed(ActionEvent e)
{
reInitDialog(lastParmSet);
protected void revert_actionPerformed(ActionEvent e)
{
reInitDialog(lastParmSet);
-
+ updateWebServiceMenus();
}
protected void update_actionPerformed(ActionEvent e)
}
protected void update_actionPerformed(ActionEvent e)
@@
-465,6
+467,7
@@
public class WsJobParameters extends JPanel implements ItemListener,
_deleteUserPreset(lastParmSet);
}
reInitDialog(null); // service default
_deleteUserPreset(lastParmSet);
}
reInitDialog(null); // service default
+ updateWebServiceMenus();
}
protected void create_actionPerformed(ActionEvent e)
}
protected void create_actionPerformed(ActionEvent e)
@@
-477,6
+480,7
@@
public class WsJobParameters extends JPanel implements ItemListener,
isUserPreset = true;
reInitDialog(curname);
initArgSetModified();
isUserPreset = true;
reInitDialog(curname);
initArgSetModified();
+ updateWebServiceMenus();
}
else
{
}
else
{
@@
-954,7
+958,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
{
@@
-1096,8
+1100,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());
@@
-1296,7
+1300,18
@@
public class WsJobParameters extends JPanel implements ItemListener,
SetNamePanel.validate();
validate();
settingDialog = false;
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;
}
String curSetName = null;