diff options
| author | Manju Mathew | 2013-09-10 14:42:19 +0000 |
|---|---|---|
| committer | Dani Megert | 2013-09-10 14:42:19 +0000 |
| commit | f55c09735a2269acc67bed1a6b441138a4501794 (patch) | |
| tree | 3dd6d2052e694e39246285702f5eb7613c09162f | |
| parent | 9fe47a4ae03f3e28b7ced0985e1a160853459044 (diff) | |
| download | eclipse.jdt.ui-f55c09735a2269acc67bed1a6b441138a4501794.tar.gz eclipse.jdt.ui-f55c09735a2269acc67bed1a6b441138a4501794.tar.xz eclipse.jdt.ui-f55c09735a2269acc67bed1a6b441138a4501794.zip | |
Fixed bug 416401: [preferences] Incorrect enablement of 'Inline finally blocks' preference optionI20130911-2000I20130910-2000
| -rw-r--r-- | org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ComplianceConfigurationBlock.java | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ComplianceConfigurationBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ComplianceConfigurationBlock.java index 4302e5d98b..dd85deac42 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ComplianceConfigurationBlock.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ComplianceConfigurationBlock.java @@ -561,6 +561,7 @@ public class ComplianceConfigurationBlock extends OptionsConfigurationBlock { updateControls(); updateComplianceEnableState(); validateComplianceStatus(); + updateInlineJSREnableState(); } } } @@ -732,21 +733,25 @@ public class ComplianceConfigurationBlock extends OptionsConfigurationBlock { boolean enabled= JavaModelUtil.isVersionLessThan(target, VERSION_1_5); Button checkBox= getCheckBox(PREF_CODEGEN_INLINE_JSR_BYTECODE); + boolean wasCheckBoxEnabled= checkBox.isEnabled(); checkBox.setEnabled(enabled); if (!enabled) { String val= getValue(PREF_CODEGEN_INLINE_JSR_BYTECODE); - fRememberedUserCompliance[IDX_INLINE_JSR_BYTECODE]= val; + if (wasCheckBoxEnabled) + fRememberedUserCompliance[IDX_INLINE_JSR_BYTECODE]= val; if (!ENABLED.equals(val)) { setValue(PREF_CODEGEN_INLINE_JSR_BYTECODE, ENABLED); updateCheckBox(checkBox); } } else { - String val= fRememberedUserCompliance[IDX_INLINE_JSR_BYTECODE]; - if (!ENABLED.equals(val)) { - setValue(PREF_CODEGEN_INLINE_JSR_BYTECODE, val); - updateCheckBox(checkBox); + if (!wasCheckBoxEnabled) { + String val= fRememberedUserCompliance[IDX_INLINE_JSR_BYTECODE]; + if (!ENABLED.equals(val)) { + setValue(PREF_CODEGEN_INLINE_JSR_BYTECODE, val); + updateCheckBox(checkBox); + } } } } |