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
Merge branch 'Release_2_8_2_Branch' into JAL-1483_featureBasedTreeCalc
[jalview.git]
/
src
/
jalview
/
gui
/
OptsAndParamsPage.java
diff --git
a/src/jalview/gui/OptsAndParamsPage.java
b/src/jalview/gui/OptsAndParamsPage.java
index
06a11d4
..
847c26a
100644
(file)
--- a/
src/jalview/gui/OptsAndParamsPage.java
+++ b/
src/jalview/gui/OptsAndParamsPage.java
@@
-113,7
+113,7
@@
public class OptsAndParamsPage
enabled.setToolTipText("<html>"
+ JvSwingUtils
enabled.setToolTipText("<html>"
+ JvSwingUtils
- .wrapTooltip(((desc == null || desc.trim().length()==0) ? "see further details by right-clicking"
+ .wrapTooltip(((desc == null || desc.trim().length() == 0) ? "see further details by right-clicking"
: desc)
+ "<br><img src=\"" + linkImageURL + "\"/>")
+ "</html>");
: desc)
+ "<br><img src=\"" + linkImageURL + "\"/>")
+ "</html>");
@@
-121,7
+121,7
@@
public class OptsAndParamsPage
}
else
{
}
else
{
- if (desc != null && desc.trim().length()>0)
+ if (desc != null && desc.trim().length() > 0)
{
enabled.setToolTipText("<html>"
+ JvSwingUtils.wrapTooltip(opt.getDescription())
{
enabled.setToolTipText("<html>"
+ JvSwingUtils.wrapTooltip(opt.getDescription())
@@
-239,11
+239,11
@@
public class OptsAndParamsPage
}
}
-
public void resetToDefault(boolean setDefaultParams)
{
enabled.setSelected(false);
public void resetToDefault(boolean setDefaultParams)
{
enabled.setSelected(false);
- if (option.isRequired() || (setDefaultParams && option.getValue()!=null))
+ if (option.isRequired()
+ || (setDefaultParams && option.getValue() != null))
{
// Apply default value
selectOption(option, option.getValue());
{
// Apply default value
selectOption(option, option.getValue());
@@
-263,7
+263,7
@@
public class OptsAndParamsPage
initVal = (initEnabled) ? (String) val.getSelectedItem() : null;
}
}
initVal = (initEnabled) ? (String) val.getSelectedItem() : null;
}
}
-
+
}
public class ParamBox extends JPanel implements ChangeListener,
}
public class ParamBox extends JPanel implements ChangeListener,
@@
-681,7
+681,7
@@
public class OptsAndParamsPage
{
slider.getModel().setRangeProperties(iVal, 1,
validator.getMin().intValue(),
{
slider.getModel().setRangeProperties(iVal, 1,
validator.getMin().intValue(),
- validator.getMax().intValue()+1, true);
+ validator.getMax().intValue() + 1, true);
}
else
{
}
else
{
@@
-723,7
+723,8
@@
public class OptsAndParamsPage
{
slider.getModel().setRangeProperties((int) (fVal * 1000f), 1,
(int) (validator.getMin().floatValue() * 1000f),
{
slider.getModel().setRangeProperties((int) (fVal * 1000f), 1,
(int) (validator.getMin().floatValue() * 1000f),
- 1+(int) (validator.getMax().floatValue() * 1000f), true);
+ 1 + (int) (validator.getMax().floatValue() * 1000f),
+ true);
}
else
{
}
else
{
@@
-774,7
+775,9
@@
public class OptsAndParamsPage
{
JPopupMenu mnu = new JPopupMenu();
{
JPopupMenu mnu = new JPopupMenu();
- JMenuItem mitem = new JMenuItem(MessageManager.formatMessage("label.view_params", new String[]{finfo}));
+ JMenuItem mitem = new JMenuItem(MessageManager.formatMessage(
+ "label.view_params", new String[]
+ { finfo }));
mitem.addActionListener(new ActionListener()
{
mitem.addActionListener(new ActionListener()
{