X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOptsAndParamsPage.java;fp=src%2Fjalview%2Fgui%2FOptsAndParamsPage.java;h=53b0305561cf0ad0f4e559d7b7e4d47fe08ad7b4;hb=e09a3103605a8b6ca54b824b7bb6a75c5f35957a;hp=ba575ae5abcd1152201808f7976bd82c90f838d9;hpb=297a2f15d6c6c718cdb81ce03b87e845e065ae64;p=jalview.git diff --git a/src/jalview/gui/OptsAndParamsPage.java b/src/jalview/gui/OptsAndParamsPage.java index ba575ae..53b0305 100644 --- a/src/jalview/gui/OptsAndParamsPage.java +++ b/src/jalview/gui/OptsAndParamsPage.java @@ -93,7 +93,7 @@ public class OptsAndParamsPage JLabel optlabel = new JLabel(); - JComboBox val = new JComboBox(); + JComboBox val = new JComboBox<>(); public OptionBox(OptionI opt) { @@ -127,7 +127,7 @@ public class OptsAndParamsPage } } add(enabled, BorderLayout.NORTH); - for (Object str : opt.getPossibleValues()) + for (String str : opt.getPossibleValues()) { val.addItem(str); } @@ -589,7 +589,7 @@ public class OptsAndParamsPage { if (choice) { - choicebox = new JComboBox(); + choicebox = new JComboBox<>(); choicebox.addActionListener(this); controlPanel.add(choicebox, BorderLayout.CENTER); } @@ -632,7 +632,9 @@ public class OptsAndParamsPage }); valueField.setPreferredSize(new Dimension(60, 25)); + valueField.setText(parm.getValue()); slider = makeSlider(parm.getValidValue()); + updateSliderFromValueField(); slider.addChangeListener(this); controlPanel.add(slider, BorderLayout.WEST);