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 'develop' into efficiency/JAL-2034_JAL-1421
[jalview.git]
/
src
/
jalview
/
gui
/
OptsAndParamsPage.java
diff --git
a/src/jalview/gui/OptsAndParamsPage.java
b/src/jalview/gui/OptsAndParamsPage.java
index
c591feb
..
801cb1f
100644
(file)
--- a/
src/jalview/gui/OptsAndParamsPage.java
+++ b/
src/jalview/gui/OptsAndParamsPage.java
@@
-130,9
+130,9
@@
public class OptsAndParamsPage
add(enabled, BorderLayout.NORTH);
for (Object str : opt.getPossibleValues())
{
add(enabled, BorderLayout.NORTH);
for (Object str : opt.getPossibleValues())
{
- val.addItem((String) str);
+ val.addItem(str);
}
}
- val.setSelectedItem((String) opt.getValue());
+ val.setSelectedItem(opt.getValue());
if (opt.getPossibleValues().size() > 1)
{
setLayout(new GridLayout(1, 2));
if (opt.getPossibleValues().size() > 1)
{
setLayout(new GridLayout(1, 2));
@@
-145,6
+145,7
@@
public class OptsAndParamsPage
setInitialValue();
}
setInitialValue();
}
+ @Override
public void actionPerformed(ActionEvent e)
{
if (e.getSource() != enabled)
public void actionPerformed(ActionEvent e)
{
if (e.getSource() != enabled)
@@
-206,6
+207,7
@@
public class OptsAndParamsPage
return opt;
}
return opt;
}
+ @Override
public void mouseClicked(MouseEvent e)
{
if (e.isPopupTrigger())
public void mouseClicked(MouseEvent e)
{
if (e.isPopupTrigger())
@@
-214,24
+216,28
@@
public class OptsAndParamsPage
}
}
}
}
+ @Override
public void mouseEntered(MouseEvent e)
{
// TODO Auto-generated method stub
}
public void mouseEntered(MouseEvent e)
{
// TODO Auto-generated method stub
}
+ @Override
public void mouseExited(MouseEvent e)
{
// TODO Auto-generated method stub
}
public void mouseExited(MouseEvent e)
{
// TODO Auto-generated method stub
}
+ @Override
public void mousePressed(MouseEvent e)
{
// TODO Auto-generated method stub
}
public void mousePressed(MouseEvent e)
{
// TODO Auto-generated method stub
}
+ @Override
public void mouseReleased(MouseEvent e)
{
// TODO Auto-generated method stub
public void mouseReleased(MouseEvent e)
{
// TODO Auto-generated method stub
@@
-412,6
+418,7
@@
public class OptsAndParamsPage
showDesc.addActionListener(new ActionListener()
{
showDesc.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
descisvisible = !descisvisible;
public void actionPerformed(ActionEvent e)
{
descisvisible = !descisvisible;
@@
-451,6
+458,7
@@
public class OptsAndParamsPage
validate();
}
validate();
}
+ @Override
public void actionPerformed(ActionEvent e)
{
if (adjusting)
public void actionPerformed(ActionEvent e)
{
if (adjusting)
@@
-526,6
+534,7
@@
public class OptsAndParamsPage
lastVal = null;
}
lastVal = null;
}
+ @Override
public void mouseClicked(MouseEvent e)
{
if (e.isPopupTrigger())
public void mouseClicked(MouseEvent e)
{
if (e.isPopupTrigger())
@@
-534,37
+543,42
@@
public class OptsAndParamsPage
}
}
}
}
+ @Override
public void mouseEntered(MouseEvent e)
{
// TODO Auto-generated method stub
}
public void mouseEntered(MouseEvent e)
{
// TODO Auto-generated method stub
}
+ @Override
public void mouseExited(MouseEvent e)
{
// TODO Auto-generated method stub
}
public void mouseExited(MouseEvent e)
{
// TODO Auto-generated method stub
}
+ @Override
public void mousePressed(MouseEvent e)
{
// TODO Auto-generated method stub
}
public void mousePressed(MouseEvent e)
{
// TODO Auto-generated method stub
}
+ @Override
public void mouseReleased(MouseEvent e)
{
// TODO Auto-generated method stub
}
public void mouseReleased(MouseEvent e)
{
// TODO Auto-generated method stub
}
+ @Override
public void stateChanged(ChangeEvent e)
{
if (!adjusting)
{
valueField.setText(""
public void stateChanged(ChangeEvent e)
{
if (!adjusting)
{
valueField.setText(""
- + ((integ) ? ("" + (int) slider.getValue())
- : ("" + (float) (slider.getValue() / 1000f))));
+ + ((integ) ? ("" + slider.getValue())
+ : ("" + slider.getValue() / 1000f)));
checkIfModified();
}
checkIfModified();
}