X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOptsAndParamsPage.java;h=4cac990e2ba91321d7f5dd8c369caefdbeebe12d;hb=af1669bc2783d70a77be1349b87cf06f6e25b878;hp=298057fcac0969cf05eeb4ef1a99a7bec2c3e05a;hpb=d7d522b7784d6ac65a008fe5f89ed7a4e7d8d2f7;p=jalview.git diff --git a/src/jalview/gui/OptsAndParamsPage.java b/src/jalview/gui/OptsAndParamsPage.java index 298057f..4cac990 100644 --- a/src/jalview/gui/OptsAndParamsPage.java +++ b/src/jalview/gui/OptsAndParamsPage.java @@ -574,23 +574,13 @@ public class OptsAndParamsPage */ private void checkIfModified() { - if (!adjusting) + Object newValue = updateSliderFromValueField(); + boolean modified = true; + if (newValue.getClass() == lastVal.getClass()) { - try - { - adjusting = true; - Object newValue = updateSliderFromValueField(); - boolean modified = true; - if (newValue.getClass() == lastVal.getClass()) - { - modified = !newValue.equals(lastVal); - } - pmdialogbox.argSetModified(this, modified); - } finally - { - adjusting = false; - } + modified = !newValue.equals(lastVal); } + pmdialogbox.argSetModified(this, modified); } @Override @@ -734,6 +724,7 @@ public class OptsAndParamsPage if (isChoiceParameter) { choicebox = buildComboBox(parm); + choicebox.addActionListener(this); controlsPanel.add(choicebox, BorderLayout.CENTER); } else @@ -765,9 +756,17 @@ public class OptsAndParamsPage } } - if (!isChoiceParameter && parm != null) + String value = parm.getValue(); + if (value != null) { - valueField.setText(parm.getValue()); + if (isChoiceParameter) + { + choicebox.setSelectedItem(value); + } + else + { + valueField.setText(value); + } } lastVal = updateSliderFromValueField(); adjusting = false;