diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/JavaModelUtil.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/JavaModelUtil.java index 866a7dea306..f8e394aa59e 100644 --- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/JavaModelUtil.java +++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/JavaModelUtil.java @@ -770,8 +770,10 @@ public static void setComplianceOptions(Map map, String complian JavaCore.setComplianceOptions(compliance, map); } + /** + * @param compliance currently unused + */ public static void setDefaultClassfileOptions(Map map, String compliance) { - map.put(JavaCore.COMPILER_CODEGEN_INLINE_JSR_BYTECODE, is50OrHigher(compliance) ? JavaCore.ENABLED : JavaCore.DISABLED); map.put(JavaCore.COMPILER_LOCAL_VARIABLE_ATTR, JavaCore.GENERATE); map.put(JavaCore.COMPILER_LINE_NUMBER_ATTR, JavaCore.GENERATE); map.put(JavaCore.COMPILER_SOURCE_FILE_ATTR, JavaCore.GENERATE); 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 e084acca408..1232c4bf1c6 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 @@ -17,7 +17,6 @@ import static org.eclipse.jdt.core.JavaCore.DISABLED; import static org.eclipse.jdt.core.JavaCore.DO_NOT_GENERATE; import static org.eclipse.jdt.core.JavaCore.ENABLED; -import static org.eclipse.jdt.core.JavaCore.ERROR; import static org.eclipse.jdt.core.JavaCore.GENERATE; import static org.eclipse.jdt.core.JavaCore.IGNORE; import static org.eclipse.jdt.core.JavaCore.INFO; @@ -111,8 +110,6 @@ public class ComplianceConfigurationBlock extends OptionsConfigurationBlock { private static final Key INTR_DEFAULT_COMPLIANCE= getLocalKey("internal.default.compliance"); //$NON-NLS-1$ // Preference store keys, see JavaCore.getOptions - private static final Key PREF_PB_ASSERT_AS_IDENTIFIER= getJDTCoreKey(JavaCore.COMPILER_PB_ASSERT_IDENTIFIER); - private static final Key PREF_PB_ENUM_AS_IDENTIFIER= getJDTCoreKey(JavaCore.COMPILER_PB_ENUM_IDENTIFIER); private static final Key PREF_SOURCE_COMPATIBILITY= getJDTCoreKey(JavaCore.COMPILER_SOURCE); private static final Key PREF_CODEGEN_TARGET_PLATFORM= getJDTCoreKey(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM); private static final Key PREF_COMPLIANCE= getJDTCoreKey(JavaCore.COMPILER_COMPLIANCE); @@ -122,15 +119,11 @@ public class ComplianceConfigurationBlock extends OptionsConfigurationBlock { /* see also BuildPathSupport#PREFS_COMPLIANCE */ private static final Key[] PREFS_COMPLIANCE= new Key[] { PREF_COMPLIANCE, - PREF_PB_ASSERT_AS_IDENTIFIER, PREF_PB_ENUM_AS_IDENTIFIER, PREF_SOURCE_COMPATIBILITY, PREF_CODEGEN_TARGET_PLATFORM}; private static final Key[] PREFS_COMPLIANCE_11_OR_HIGHER= new Key[] { PREF_COMPLIANCE, - PREF_PB_ASSERT_AS_IDENTIFIER, PREF_PB_ENUM_AS_IDENTIFIER, PREF_SOURCE_COMPATIBILITY, PREF_CODEGEN_TARGET_PLATFORM, PREF_ENABLE_PREVIEW, PREF_PB_REPORT_PREVIEW}; - private static final Key PREF_CODEGEN_INLINE_JSR_BYTECODE= getJDTCoreKey(JavaCore.COMPILER_CODEGEN_INLINE_JSR_BYTECODE); - private static final Key PREF_LOCAL_VARIABLE_ATTR= getJDTCoreKey(JavaCore.COMPILER_LOCAL_VARIABLE_ATTR); private static final Key PREF_LINE_NUMBER_ATTR= getJDTCoreKey(JavaCore.COMPILER_LINE_NUMBER_ATTR); private static final Key PREF_SOURCE_FILE_ATTR= getJDTCoreKey(JavaCore.COMPILER_SOURCE_FILE_ATTR); @@ -152,12 +145,9 @@ public class ComplianceConfigurationBlock extends OptionsConfigurationBlock { * Remembered user compliance (stored when {@link #INTR_DEFAULT_COMPLIANCE} is switched to * {@link #DEFAULT_CONF}). Elements are identified by IDX_* constants. * - * @see #IDX_ASSERT_AS_IDENTIFIER - * @see #IDX_ENUM_AS_IDENTIFIER * @see #IDX_SOURCE_COMPATIBILITY * @see #IDX_CODEGEN_TARGET_PLATFORM * @see #IDX_COMPLIANCE - * @see #IDX_INLINE_JSR_BYTECODE * @see #IDX_METHOD_PARAMETERS_ATTR * @see #IDX_RELEASE * @see #IDX_ENABLE_PREVIEW @@ -169,12 +159,9 @@ public class ComplianceConfigurationBlock extends OptionsConfigurationBlock { * Stored compliance settings that were active when the page was first shown. May be * null. Elements are identified by IDX_* constants. * - * @see #IDX_ASSERT_AS_IDENTIFIER - * @see #IDX_ENUM_AS_IDENTIFIER * @see #IDX_SOURCE_COMPATIBILITY * @see #IDX_CODEGEN_TARGET_PLATFORM * @see #IDX_COMPLIANCE - * @see #IDX_INLINE_JSR_BYTECODE * @see #IDX_METHOD_PARAMETERS_ATTR * @see #IDX_RELEASE * @see #IDX_ENABLE_PREVIEW @@ -182,16 +169,13 @@ public class ComplianceConfigurationBlock extends OptionsConfigurationBlock { */ private String[] fOriginalStoredCompliance; - private static final int IDX_ASSERT_AS_IDENTIFIER= 0; - private static final int IDX_ENUM_AS_IDENTIFIER= 1; - private static final int IDX_SOURCE_COMPATIBILITY= 2; - private static final int IDX_CODEGEN_TARGET_PLATFORM= 3; - private static final int IDX_COMPLIANCE= 4; - private static final int IDX_INLINE_JSR_BYTECODE= 5; - private static final int IDX_METHOD_PARAMETERS_ATTR= 6; - private static final int IDX_RELEASE= 7; - private static final int IDX_ENABLE_PREVIEW= 8; - private static final int IDX_REPORT_PREVIEW= 9; + private static final int IDX_SOURCE_COMPATIBILITY= 0; + private static final int IDX_CODEGEN_TARGET_PLATFORM= 1; + private static final int IDX_COMPLIANCE= 2; + private static final int IDX_METHOD_PARAMETERS_ATTR= 3; + private static final int IDX_RELEASE= 4; + private static final int IDX_ENABLE_PREVIEW= 5; + private static final int IDX_REPORT_PREVIEW= 6; private IStatus fComplianceStatus; @@ -215,12 +199,9 @@ public ComplianceConfigurationBlock(IStatusChangeListener context, IProject proj fComplianceStatus= new StatusInfo(); fRememberedUserCompliance= new String[] { // caution: order depends on IDX_* constants - getValue(PREF_PB_ASSERT_AS_IDENTIFIER), - getValue(PREF_PB_ENUM_AS_IDENTIFIER), getValue(PREF_SOURCE_COMPATIBILITY), getValue(PREF_CODEGEN_TARGET_PLATFORM), getValue(PREF_COMPLIANCE), - getValue(PREF_CODEGEN_INLINE_JSR_BYTECODE), getValue(PREF_CODEGEN_METHOD_PARAMETERS_ATTR), getValue(PREF_RELEASE), getValue(PREF_ENABLE_PREVIEW), @@ -230,9 +211,9 @@ public ComplianceConfigurationBlock(IStatusChangeListener context, IProject proj public static Key[] getKeys(boolean projectSpecific) { Key[] keys= new Key[] { - PREF_LOCAL_VARIABLE_ATTR, PREF_LINE_NUMBER_ATTR, PREF_SOURCE_FILE_ATTR, PREF_CODEGEN_UNUSED_LOCAL, PREF_CODEGEN_INLINE_JSR_BYTECODE, INTR_DEFAULT_COMPLIANCE, + PREF_LOCAL_VARIABLE_ATTR, PREF_LINE_NUMBER_ATTR, PREF_SOURCE_FILE_ATTR, PREF_CODEGEN_UNUSED_LOCAL, INTR_DEFAULT_COMPLIANCE, PREF_COMPLIANCE, PREF_SOURCE_COMPATIBILITY, - PREF_CODEGEN_TARGET_PLATFORM, PREF_PB_ASSERT_AS_IDENTIFIER, PREF_PB_ENUM_AS_IDENTIFIER, PREF_CODEGEN_METHOD_PARAMETERS_ATTR, PREF_RELEASE, + PREF_CODEGEN_TARGET_PLATFORM, PREF_CODEGEN_METHOD_PARAMETERS_ATTR, PREF_RELEASE, PREF_ENABLE_PREVIEW, PREF_PB_REPORT_PREVIEW }; @@ -380,21 +361,6 @@ public void widgetSelected(SelectionEvent e) { label= PreferencesMessages.ComplianceConfigurationBlock_source_compatibility_label; addComboBox(group, label, PREF_SOURCE_COMPATIBILITY, sourceVersions, sourceLabels, indent); - String[] errorWarningInfoIgnore= new String[] { ERROR, WARNING, INFO, IGNORE }; - - String[] errorWarningInfoIgnoreLabels= new String[] { - PreferencesMessages.ComplianceConfigurationBlock_error, - PreferencesMessages.ComplianceConfigurationBlock_warning, - PreferencesMessages.ComplianceConfigurationBlock_info, - PreferencesMessages.ComplianceConfigurationBlock_ignore - }; - - label= PreferencesMessages.ComplianceConfigurationBlock_pb_assert_as_identifier_label; - addComboBox(group, label, PREF_PB_ASSERT_AS_IDENTIFIER, errorWarningInfoIgnore, errorWarningInfoIgnoreLabels, indent); - - label= PreferencesMessages.ComplianceConfigurationBlock_pb_enum_as_identifier_label; - addComboBox(group, label, PREF_PB_ENUM_AS_IDENTIFIER, errorWarningInfoIgnore, errorWarningInfoIgnoreLabels, indent); - allChildren= group.getChildren(); fComplianceChildControls.addAll(Arrays.asList(allChildren)); fComplianceChildControls.removeAll(Arrays.asList(otherChildren)); @@ -410,7 +376,6 @@ public void widgetSelected(SelectionEvent e) { group.setLayout(layout); String[] generateValues= new String[] { GENERATE, DO_NOT_GENERATE }; - String[] enableDisableValues= new String[] { ENABLED, DISABLED }; label= PreferencesMessages.ComplianceConfigurationBlock_variable_attr_label; addCheckBox(group, label, PREF_LOCAL_VARIABLE_ATTR, generateValues, 0); @@ -424,9 +389,6 @@ public void widgetSelected(SelectionEvent e) { label= PreferencesMessages.ComplianceConfigurationBlock_codegen_unused_local_label; addCheckBox(group, label, PREF_CODEGEN_UNUSED_LOCAL, new String[] { PRESERVE, OPTIMIZE_OUT }, 0); - label= PreferencesMessages.ComplianceConfigurationBlock_codegen_inline_jsr_bytecode_label; - addCheckBox(group, label, PREF_CODEGEN_INLINE_JSR_BYTECODE, enableDisableValues, 0); - label= PreferencesMessages.ComplianceConfigurationBlock_codegen_method_parameters_attr; addCheckBox(group, label, PREF_CODEGEN_METHOD_PARAMETERS_ATTR, generateValues, 0); @@ -559,17 +521,11 @@ protected void validateSettings(Key changedKey, String oldValue, String newValue } } else if (PREF_SOURCE_COMPATIBILITY.equals(changedKey)) { updatePreviewFeaturesState(); - updateAssertEnumAsIdentifierEnableState(); fComplianceStatus= validateCompliance(); } else if (PREF_CODEGEN_TARGET_PLATFORM.equals(changedKey)) { updateControls(); - updateInlineJSREnableState(); updateStoreMethodParamNamesEnableState(); updatePreviewFeaturesState(); - updateAssertEnumAsIdentifierEnableState(); - fComplianceStatus= validateCompliance(); - } else if (PREF_PB_ENUM_AS_IDENTIFIER.equals(changedKey) || - PREF_PB_ASSERT_AS_IDENTIFIER.equals(changedKey)) { fComplianceStatus= validateCompliance(); } else if (PREF_ENABLE_PREVIEW.equals(changedKey)) { fComplianceStatus= validateCompliance(); @@ -585,8 +541,6 @@ protected void validateSettings(Key changedKey, String oldValue, String newValue updateComplianceEnableState(); updatePreviewFeaturesState(); updatePreviewControls(); - updateAssertEnumAsIdentifierEnableState(); - updateInlineJSREnableState(); updateStoreMethodParamNamesEnableState(); fComplianceStatus= validateCompliance(); updateComplianceReleaseSettings(); @@ -599,12 +553,9 @@ protected void validateSettings(Key changedKey, String oldValue, String newValue public void refreshComplianceSettings() { if (fOriginalStoredCompliance == null) { fOriginalStoredCompliance= new String[] { // caution: order depends on IDX_* constants - getOriginalStoredValue(PREF_PB_ASSERT_AS_IDENTIFIER), - getOriginalStoredValue(PREF_PB_ENUM_AS_IDENTIFIER), getOriginalStoredValue(PREF_SOURCE_COMPATIBILITY), getOriginalStoredValue(PREF_CODEGEN_TARGET_PLATFORM), getOriginalStoredValue(PREF_COMPLIANCE), - getOriginalStoredValue(PREF_CODEGEN_INLINE_JSR_BYTECODE), getOriginalStoredValue(PREF_CODEGEN_METHOD_PARAMETERS_ATTR), getOriginalStoredValue(PREF_RELEASE), getOriginalStoredValue(PREF_ENABLE_PREVIEW), @@ -613,12 +564,9 @@ public void refreshComplianceSettings() { } else { String[] storedCompliance= new String[] { - getOriginalStoredValue(PREF_PB_ASSERT_AS_IDENTIFIER), - getOriginalStoredValue(PREF_PB_ENUM_AS_IDENTIFIER), getOriginalStoredValue(PREF_SOURCE_COMPATIBILITY), getOriginalStoredValue(PREF_CODEGEN_TARGET_PLATFORM), getOriginalStoredValue(PREF_COMPLIANCE), - getOriginalStoredValue(PREF_CODEGEN_INLINE_JSR_BYTECODE), getOriginalStoredValue(PREF_CODEGEN_METHOD_PARAMETERS_ATTR), getOriginalStoredValue(PREF_RELEASE), getOriginalStoredValue(PREF_ENABLE_PREVIEW), @@ -629,12 +577,9 @@ public void refreshComplianceSettings() { fOriginalStoredCompliance= storedCompliance; - setValue(PREF_PB_ASSERT_AS_IDENTIFIER, storedCompliance[IDX_ASSERT_AS_IDENTIFIER]); - setValue(PREF_PB_ENUM_AS_IDENTIFIER, storedCompliance[IDX_ENUM_AS_IDENTIFIER]); setValue(PREF_SOURCE_COMPATIBILITY, storedCompliance[IDX_SOURCE_COMPATIBILITY]); setValue(PREF_CODEGEN_TARGET_PLATFORM, storedCompliance[IDX_CODEGEN_TARGET_PLATFORM]); setValue(PREF_COMPLIANCE, storedCompliance[IDX_COMPLIANCE]); - setValue(PREF_CODEGEN_INLINE_JSR_BYTECODE, storedCompliance[IDX_INLINE_JSR_BYTECODE]); setValue(PREF_CODEGEN_METHOD_PARAMETERS_ATTR, storedCompliance[IDX_METHOD_PARAMETERS_ATTR]); setValue(PREF_RELEASE, storedCompliance[IDX_RELEASE]); setValue(PREF_ENABLE_PREVIEW, storedCompliance[IDX_ENABLE_PREVIEW]); @@ -645,8 +590,6 @@ public void refreshComplianceSettings() { updateControls(); updateComplianceEnableState(); validateComplianceStatus(); - updateInlineJSREnableState(); - updateAssertEnumAsIdentifierEnableState(); updatePreviewFeaturesState(); updateStoreMethodParamNamesEnableState(); } @@ -982,16 +925,6 @@ private void updatePreviewControls() { } } - private void updateAssertEnumAsIdentifierEnableState() { - if (checkValue(INTR_DEFAULT_COMPLIANCE, USER_CONF)) { - final boolean isLessThan14= false; - updateRememberedComplianceOption(PREF_PB_ASSERT_AS_IDENTIFIER, IDX_ASSERT_AS_IDENTIFIER, isLessThan14, ERROR); - - final boolean isLessThan15= false; - updateRememberedComplianceOption(PREF_PB_ENUM_AS_IDENTIFIER, IDX_ENUM_AS_IDENTIFIER, isLessThan15, ERROR); - } - } - private void updateRememberedComplianceOption(Key prefKey, int idx, boolean enabled, String defaultComboValue) { if (prefKey.getName().equals(PREF_ENABLE_PREVIEW.getName())) { Button checkBox= getCheckBox(prefKey); @@ -1040,32 +973,6 @@ private void updateRememberedComplianceOption(Key prefKey, int idx, boolean enab } - private void updateInlineJSREnableState() { - final boolean lessThan15= false; - Button checkBox= getCheckBox(PREF_CODEGEN_INLINE_JSR_BYTECODE); - boolean wasCheckBoxEnabled= checkBox.isEnabled(); - checkBox.setEnabled(lessThan15); - - if (!lessThan15) { - String val= getValue(PREF_CODEGEN_INLINE_JSR_BYTECODE); - if (wasCheckBoxEnabled) - fRememberedUserCompliance[IDX_INLINE_JSR_BYTECODE]= val; - - if (!ENABLED.equals(val)) { - setValue(PREF_CODEGEN_INLINE_JSR_BYTECODE, ENABLED); - updateCheckBox(checkBox); - } - } else { - if (!wasCheckBoxEnabled) { - String val= fRememberedUserCompliance[IDX_INLINE_JSR_BYTECODE]; - if (!ENABLED.equals(val)) { - setValue(PREF_CODEGEN_INLINE_JSR_BYTECODE, val); - updateCheckBox(checkBox); - } - } - } - } - private void updateStoreMethodParamNamesEnableState() { String target= getValue(PREF_CODEGEN_TARGET_PLATFORM); boolean enabled= JavaModelUtil.is1d8OrHigher(target); @@ -1102,7 +1009,7 @@ private void updateStoreMethodParamNamesEnableState() { * @param oldComplianceLevel the previous compliance level */ private void updateComplianceDefaultSettings(boolean rememberOld, String oldComplianceLevel) { - String enablePreview, reportPreview, assertAsId, enumAsId, source, target; + String enablePreview, reportPreview, source, target; boolean isDefault= checkValue(INTR_DEFAULT_COMPLIANCE, DEFAULT_CONF); boolean isFollowEE= checkValue(INTR_COMPLIANCE_FOLLOWS_EE, DEFAULT_CONF); String complianceLevel= getValue(PREF_COMPLIANCE); @@ -1116,8 +1023,6 @@ private void updateComplianceDefaultSettings(boolean rememberOld, String oldComp fRememberedUserCompliance[IDX_ENABLE_PREVIEW]= getValue(PREF_ENABLE_PREVIEW); fRememberedUserCompliance[IDX_REPORT_PREVIEW]= getValue(PREF_PB_REPORT_PREVIEW); - fRememberedUserCompliance[IDX_ASSERT_AS_IDENTIFIER]= getValue(PREF_PB_ASSERT_AS_IDENTIFIER); - fRememberedUserCompliance[IDX_ENUM_AS_IDENTIFIER]= getValue(PREF_PB_ENUM_AS_IDENTIFIER); fRememberedUserCompliance[IDX_SOURCE_COMPATIBILITY]= getValue(PREF_SOURCE_COMPATIBILITY); fRememberedUserCompliance[IDX_CODEGEN_TARGET_PLATFORM]= getValue(PREF_CODEGEN_TARGET_PLATFORM); fRememberedUserCompliance[IDX_RELEASE]= getValue(PREF_RELEASE); @@ -1132,16 +1037,11 @@ private void updateComplianceDefaultSettings(boolean rememberOld, String oldComp enablePreview= eeOptions.get(PREF_ENABLE_PREVIEW.getName()); reportPreview= eeOptions.get(PREF_PB_REPORT_PREVIEW.getName()); - assertAsId= eeOptions.get(PREF_PB_ASSERT_AS_IDENTIFIER.getName()); - enumAsId= eeOptions.get(PREF_PB_ENUM_AS_IDENTIFIER.getName()); source= eeOptions.get(PREF_SOURCE_COMPATIBILITY.getName()); target= eeOptions.get(PREF_CODEGEN_TARGET_PLATFORM.getName()); setValue(PREF_COMPLIANCE, eeOptions.get(PREF_COMPLIANCE.getName())); - String inlineJSR= eeOptions.get(PREF_CODEGEN_INLINE_JSR_BYTECODE.getName()); - if (inlineJSR != null) { - setValue(PREF_CODEGEN_INLINE_JSR_BYTECODE, inlineJSR); - } + String release= eeOptions.get(PREF_RELEASE.getName()); if (release == null) { setValue(PREF_RELEASE, DISABLED); @@ -1153,8 +1053,6 @@ private void updateComplianceDefaultSettings(boolean rememberOld, String oldComp reportPreview= getValue(PREF_PB_REPORT_PREVIEW); source= getValue(PREF_COMPLIANCE); target= getValue(PREF_COMPLIANCE); - assertAsId= getValue(PREF_PB_ASSERT_AS_IDENTIFIER); - enumAsId= getValue(PREF_PB_ENUM_AS_IDENTIFIER); } else { HashMap options= new HashMap<>(); JavaModelUtil.setComplianceOptions(options, complianceLevel); @@ -1163,13 +1061,9 @@ private void updateComplianceDefaultSettings(boolean rememberOld, String oldComp reportPreview= options.get(JavaCore.COMPILER_PB_REPORT_PREVIEW_FEATURES); source= options.get(JavaCore.COMPILER_SOURCE); target= options.get(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM); - assertAsId= options.get(JavaCore.COMPILER_PB_ASSERT_IDENTIFIER); - enumAsId= options.get(JavaCore.COMPILER_PB_ENUM_IDENTIFIER); } else { enablePreview= DISABLED; reportPreview= WARNING; - assertAsId= ERROR; - enumAsId= ERROR; source= JavaCore.getAllJavaSourceVersionsSupportedByCompiler().first(); target= JavaCore.getAllJavaSourceVersionsSupportedByCompiler().first(); } @@ -1178,14 +1072,10 @@ private void updateComplianceDefaultSettings(boolean rememberOld, String oldComp if (rememberOld && complianceLevel.equals(fRememberedUserCompliance[IDX_COMPLIANCE])) { enablePreview= fRememberedUserCompliance[IDX_ENABLE_PREVIEW]; reportPreview= fRememberedUserCompliance[IDX_REPORT_PREVIEW]; - assertAsId= fRememberedUserCompliance[IDX_ASSERT_AS_IDENTIFIER]; - enumAsId= fRememberedUserCompliance[IDX_ENUM_AS_IDENTIFIER]; source= fRememberedUserCompliance[IDX_SOURCE_COMPATIBILITY]; target= fRememberedUserCompliance[IDX_CODEGEN_TARGET_PLATFORM]; } else { - updateInlineJSREnableState(); updatePreviewFeaturesState(); - updateAssertEnumAsIdentifierEnableState(); updateStoreMethodParamNamesEnableState(); return; } @@ -1198,14 +1088,10 @@ private void updateComplianceDefaultSettings(boolean rememberOld, String oldComp } setValue(PREF_ENABLE_PREVIEW, enablePreview); setValue(PREF_PB_REPORT_PREVIEW, reportPreview); - setValue(PREF_PB_ASSERT_AS_IDENTIFIER, assertAsId); - setValue(PREF_PB_ENUM_AS_IDENTIFIER, enumAsId); setValue(PREF_SOURCE_COMPATIBILITY, source); setValue(PREF_CODEGEN_TARGET_PLATFORM, target); updateControls(); - updateInlineJSREnableState(); updatePreviewFeaturesState(); - updateAssertEnumAsIdentifierEnableState(); updateStoreMethodParamNamesEnableState(); } @@ -1231,9 +1117,7 @@ private String getCurrentCompliance() { boolean isDefault= complianceLevel.equals(defaultOptions.get(JavaCore.COMPILER_COMPLIANCE)) && getValue(PREF_SOURCE_COMPATIBILITY).equals(defaultOptions.get(JavaCore.COMPILER_SOURCE)) - && getValue(PREF_CODEGEN_TARGET_PLATFORM).equals(defaultOptions.get(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM)) - && getValue(PREF_PB_ASSERT_AS_IDENTIFIER).equals(defaultOptions.get(JavaCore.COMPILER_PB_ASSERT_IDENTIFIER)) - && getValue(PREF_PB_ENUM_AS_IDENTIFIER).equals(defaultOptions.get(JavaCore.COMPILER_PB_ENUM_IDENTIFIER)); + && getValue(PREF_CODEGEN_TARGET_PLATFORM).equals(defaultOptions.get(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM)); if (JavaCore.compareJavaVersions(complianceLevel, JavaCore.VERSION_10) > 0) { isDefault= isDefault && getValue(PREF_ENABLE_PREVIEW).equals(defaultOptions.get(JavaCore.COMPILER_PB_ENABLE_PREVIEW_FEATURES)) @@ -1317,8 +1201,6 @@ private void setDefaultCompilerComplianceValues() { JavaModelUtil.setComplianceOptions(complianceOptions, complianceLevel); String releaseVal= complianceOptions.get(PREF_RELEASE.getName()); setDefaultValue(PREF_COMPLIANCE, complianceOptions.get(PREF_COMPLIANCE.getName())); - setDefaultValue(PREF_PB_ASSERT_AS_IDENTIFIER, complianceOptions.get(PREF_PB_ASSERT_AS_IDENTIFIER.getName())); - setDefaultValue(PREF_PB_ENUM_AS_IDENTIFIER, complianceOptions.get(PREF_PB_ENUM_AS_IDENTIFIER.getName())); setDefaultValue(PREF_SOURCE_COMPATIBILITY, complianceOptions.get(PREF_SOURCE_COMPATIBILITY.getName())); setDefaultValue(PREF_CODEGEN_TARGET_PLATFORM, complianceOptions.get(PREF_CODEGEN_TARGET_PLATFORM.getName())); setDefaultValue(PREF_RELEASE, releaseVal != null ? releaseVal : DISABLED); @@ -1347,8 +1229,6 @@ private static final boolean isOriginalDefaultCompliance(String complianceLevel) boolean isDefault= equals(JavaCore.COMPILER_COMPLIANCE, bundleDefaults, options) && equals(JavaCore.COMPILER_SOURCE, bundleDefaults, options) && equals(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, bundleDefaults, options) - && equals(JavaCore.COMPILER_PB_ASSERT_IDENTIFIER, bundleDefaults, options) - && equals(JavaCore.COMPILER_PB_ENUM_IDENTIFIER, bundleDefaults, options) && equals(JavaCore.COMPILER_RELEASE, bundleDefaults, options); if (JavaCore.compareJavaVersions(complianceLevel, JavaCore.VERSION_10) > 0) { isDefault= isDefault diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.java index 0f6ebf27b78..cf697128cc9 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.java @@ -543,7 +543,6 @@ private PreferencesMessages() { public static String ComplianceConfigurationBlock_line_number_attr_label; public static String ComplianceConfigurationBlock_source_file_attr_label; public static String ComplianceConfigurationBlock_codegen_unused_local_label; - public static String ComplianceConfigurationBlock_codegen_inline_jsr_bytecode_label; public static String ComplianceConfigurationBlock_codegen_method_parameters_attr; public static String ComplianceConfigurationBlock_compiler_compliance_label; public static String ComplianceConfigurationBlock_default_settings_label; @@ -551,8 +550,6 @@ private PreferencesMessages() { public static String ComplianceConfigurationBlock_enable_preview_severity_label; public static String ComplianceConfigurationBlock_source_compatibility_label; public static String ComplianceConfigurationBlock_codegen_targetplatform_label; - public static String ComplianceConfigurationBlock_pb_assert_as_identifier_label; - public static String ComplianceConfigurationBlock_pb_enum_as_identifier_label; public static String ComplianceConfigurationBlock_compliance_follows_EE_label; public static String ComplianceConfigurationBlock_compliance_follows_EE_with_EE_label; public static String ComplianceConfigurationBlock_compliance_group_label; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties index 6ecb2d448f6..5c2ba3a84bc 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties @@ -605,7 +605,6 @@ ComplianceConfigurationBlock_line_number_attr_label=Add &line number attributes ComplianceConfigurationBlock_source_file_attr_label=Add source &file name to generated class file (used by the debugger) ComplianceConfigurationBlock_src_greater_compliance=Source compatibility must be equal or less than compliance level. ComplianceConfigurationBlock_codegen_unused_local_label=Pr&eserve unused (never read) local variables -ComplianceConfigurationBlock_codegen_inline_jsr_bytecode_label=Inline finally blo&cks (larger class files, but improved performance) ComplianceConfigurationBlock_codegen_method_parameters_attr=&Store information about method parameters (usable via reflection) ComplianceConfigurationBlock_compiler_compliance_label=Comp&iler compliance level: ComplianceConfigurationBlock_default_settings_label=Use defaul&t compliance settings @@ -613,8 +612,6 @@ ComplianceConfigurationBlock_enable_preview_label=Enable &preview features for J ComplianceConfigurationBlock_enable_preview_severity_label=Preview features with se&verity level: ComplianceConfigurationBlock_source_compatibility_label=Source co&mpatibility: ComplianceConfigurationBlock_codegen_targetplatform_label=Ge&nerated .class files compatibility: -ComplianceConfigurationBlock_pb_assert_as_identifier_label=Disallow identifie&rs called 'assert': -ComplianceConfigurationBlock_pb_enum_as_identifier_label=Disallo&w identifiers called 'enum': ComplianceConfigurationBlock_compliance_follows_EE_label=&Use compliance from execution environment on the 'Java Build Path' ComplianceConfigurationBlock_compliance_follows_EE_with_EE_label=&Use compliance from execution environment ''{0}'' on the ''Java Build Path'' ComplianceConfigurationBlock_compliance_group_label=JDK Compliance diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathSupport.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathSupport.java index dec4fe716b6..2edccf2c1b8 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathSupport.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathSupport.java @@ -57,7 +57,6 @@ public class BuildPathSupport { /* see also ComplianceConfigurationBlock#PREFS_COMPLIANCE */ private static final String[] PREFS_COMPLIANCE= new String[] { - JavaCore.COMPILER_PB_ASSERT_IDENTIFIER, JavaCore.COMPILER_PB_ENUM_IDENTIFIER, JavaCore.COMPILER_SOURCE, JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaCore.COMPILER_COMPLIANCE, JavaCore.COMPILER_RELEASE, JavaCore.COMPILER_PB_ENABLE_PREVIEW_FEATURES, JavaCore.COMPILER_PB_REPORT_PREVIEW_FEATURES @@ -378,15 +377,9 @@ public static void setEEComplianceOptions(IJavaProject javaProject, String eeID, JavaModelUtil.setDefaultClassfileOptions(options, newProjectCompliance); // complete compliance options } - String option= JavaCore.COMPILER_CODEGEN_INLINE_JSR_BYTECODE; - String inlineJSR= eeOptions.get(option); - if (inlineJSR != null) { - options.put(option, inlineJSR); - } - // enable '--release' option for Java 7 or higher String compliance= eeOptions.get(JavaCore.COMPILER_COMPLIANCE); - boolean release= compliance != null && JavaCore.compareJavaVersions(compliance, JavaCore.VERSION_1_7) >= 0; + boolean release= compliance != null; options.put(JavaCore.COMPILER_RELEASE, release ? JavaCore.ENABLED : JavaCore.DISABLED); javaProject.setOptions(options);