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 'features/JAL-4071_visibleFeaturesCounter' into features/JAL-3417_sdppre...
[jalview.git]
/
src
/
jalview
/
gui
/
OptsAndParamsPage.java
diff --git
a/src/jalview/gui/OptsAndParamsPage.java
b/src/jalview/gui/OptsAndParamsPage.java
index
53b0305
..
e0427cc
100644
(file)
--- a/
src/jalview/gui/OptsAndParamsPage.java
+++ b/
src/jalview/gui/OptsAndParamsPage.java
@@
-574,9
+574,8
@@
public class OptsAndParamsPage
if (!adjusting)
{
float value = slider.getSliderValue();
if (!adjusting)
{
float value = slider.getSliderValue();
- valueField.setText(
- integ ? Integer.toString((int) value)
- : Float.toString(value));
+ valueField.setText(integ ? Integer.toString((int) value)
+ : Float.toString(value));
checkIfModified();
}
}
checkIfModified();
}
}
@@
-622,14
+621,15
@@
public class OptsAndParamsPage
{
}
});
{
}
});
- valueField.addFocusListener(new FocusAdapter() {
+ valueField.addFocusListener(new FocusAdapter()
+ {
@Override
public void focusLost(FocusEvent e)
{
actionPerformed(null);
}
@Override
public void focusLost(FocusEvent e)
{
actionPerformed(null);
}
-
+
});
valueField.setPreferredSize(new Dimension(60, 25));
valueField.setText(parm.getValue());
});
valueField.setPreferredSize(new Dimension(60, 25));
valueField.setText(parm.getValue());
@@
-701,8
+701,7
@@
public class OptsAndParamsPage
{
valueField.setText(valueField.getText().trim());
iVal = Integer.valueOf(valueField.getText());
{
valueField.setText(valueField.getText().trim());
iVal = Integer.valueOf(valueField.getText());
- if (minValue != null
- && minValue.intValue() > iVal)
+ if (minValue != null && minValue.intValue() > iVal)
{
iVal = minValue.intValue();
// TODO: provide visual indication that hard limit was reached for
{
iVal = minValue.intValue();
// TODO: provide visual indication that hard limit was reached for
@@
-733,8
+732,7
@@
public class OptsAndParamsPage
{
valueField.setText(valueField.getText().trim());
fVal = Float.valueOf(valueField.getText());
{
valueField.setText(valueField.getText().trim());
fVal = Float.valueOf(valueField.getText());
- if (minValue != null
- && minValue.floatValue() > fVal)
+ if (minValue != null && minValue.floatValue() > fVal)
{
fVal = minValue.floatValue();
// TODO: provide visual indication that hard limit was reached for
{
fVal = minValue.floatValue();
// TODO: provide visual indication that hard limit was reached for
@@
-742,8
+740,7
@@
public class OptsAndParamsPage
// update value field to reflect any bound checking we performed.
valueField.setText("" + fVal);
}
// update value field to reflect any bound checking we performed.
valueField.setText("" + fVal);
}
- if (maxValue != null
- && maxValue.floatValue() < fVal)
+ if (maxValue != null && maxValue.floatValue() < fVal)
{
fVal = maxValue.floatValue();
// TODO: provide visual indication that hard limit was reached for
{
fVal = maxValue.floatValue();
// TODO: provide visual indication that hard limit was reached for