@@ -465,33 +267,6 @@ // } /** - * Returns true iff the positions contain the position. - * @param positions the positions, must be ordered by offset but may overlap - * @param position the position - * @return true iff the positions contain the position - */ - private boolean contain(List positions, Position position) { - return indexOf(positions, position) != -1; - } - - /** - * Returns index of the position in the positions, -1 if not found. - * @param positions the positions, must be ordered by offset but may overlap - * @param position the position - * @return the index - */ - private int indexOf(List positions, Position position) { - int index= computeIndexAtOffset(positions, position.getOffset()); - int size= positions.size(); - while (index < size) { - if (positions.get(index) == position) - return index; - index++; - } - return -1; - } - - /** * Insert the given position in fPositions, s.t. the offsets remain in linear order. * * @param position The position for insertion @@ -522,27 +297,6 @@ return j; } - /** - * Returns the index of the first position with an offset equal or greater than the given offset. - * - * @param positions the positions, must be ordered by offset and must not overlap - * @param offset the offset - * @return the index of the last position with an offset equal or greater than the given offset - */ - private int computeIndexAtOffset(List positions, int offset) { - int i= -1; - int j= positions.size(); - while (j - i > 1) { - int k= (i + j) >> 1; - Position position= positions.get(k); - if (position.getOffset() >= offset) - j= k; - else - i= k; - } - return j; - } - /* * @see org.eclipse.jface.text.ITextPresentationListener#applyTextPresentation(org.eclipse.jface.text.TextPresentation) */ @@ -608,6 +362,7 @@ * NOTE: Also called from background thread. *

- * NOTE: Allowed to be used by {@link SemanticHighlightingReconciler} only. - *

modAll= s -> CheckboxPreference.addModifyAll(s, fImages); fTree.builder(FormatterMessages.FormatterModifyDialog_newLines_tree_new_lines, "section-newlines") //$NON-NLS-1$ - .node(fTree.builder(FormatterMessages.FormatterModifyDialog_newLines_tree_between_empty_braces, "-declarations", modAll) //$NON-NLS-1$ - .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_empty_block, DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_IN_EMPTY_BLOCK) - .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_empty_class_body, DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_IN_EMPTY_TYPE_DECLARATION) - .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_empty_anonymous_class_body, DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_IN_EMPTY_ANONYMOUS_TYPE_DECLARATION) - .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_empty_method_body, DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_IN_EMPTY_METHOD_BODY) - .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_empty_enum_declaration, DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_IN_EMPTY_ENUM_DECLARATION) - .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_empty_enum_constant, DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_IN_EMPTY_ENUM_CONSTANT) - .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_empty_annotation_decl, DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_IN_EMPTY_ANNOTATION_DECLARATION)) + .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_empty_statement, DefaultCodeFormatterConstants.FORMATTER_PUT_EMPTY_STATEMENT_ON_NEW_LINE) + .gap() + .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_after_opening_brace_of_array_initializer, + DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_OPENING_BRACE_IN_ARRAY_INITIALIZER) + .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_before_closing_brace_of_array_initializer, + DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CLOSING_BRACE_IN_ARRAY_INITIALIZER) + .gap() + .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_end_of_file, DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AT_END_OF_FILE_IF_MISSING) .node(fTree.builder(FormatterMessages.FormatterModifyDialog_newLines_tree_control_statements, "-controlstatements", modAll) //$NON-NLS-1$ .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_before_else_statements, DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT) .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_before_catch_statements, DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT) @@ -1118,8 +1129,7 @@ pref.addDependant(child, valueAcceptor(DefaultCodeFormatterConstants.FALSE)); }) .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_keep_else_on_same_line, DefaultCodeFormatterConstants.FORMATTER_KEEP_ELSE_STATEMENT_ON_SAME_LINE) - .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_keep_else_if_on_one_line, DefaultCodeFormatterConstants.FORMATTER_COMPACT_ELSE_IF) - .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_keep_guardian_clause_on_one_line, DefaultCodeFormatterConstants.FORMATTER_KEEP_GUARDIAN_CLAUSE_ON_ONE_LINE)) + .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_keep_else_if_on_one_line, DefaultCodeFormatterConstants.FORMATTER_COMPACT_ELSE_IF)) .node(fTree.builder(FormatterMessages.FormatterModifyDialog_newLines_tree_simple_loops, "-simpleloops", modAll) //$NON-NLS-1$ .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_keep_simple_for_body_on_one_line, DefaultCodeFormatterConstants.FORMATTER_KEEP_SIMPLE_FOR_BODY_ON_SAME_LINE) .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_keep_simple_while_body_on_one_line, DefaultCodeFormatterConstants.FORMATTER_KEEP_SIMPLE_WHILE_BODY_ON_SAME_LINE) @@ -1133,13 +1143,7 @@ .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_local_variables, DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_LOCAL_VARIABLE) .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_paramters, DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PARAMETER) .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_type_annotations, DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_TYPE_ANNOTATION)) - .gap() - .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_empty_statement, DefaultCodeFormatterConstants.FORMATTER_PUT_EMPTY_STATEMENT_ON_NEW_LINE) - .gap() - .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_after_opening_brace_of_array_initializer, DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_OPENING_BRACE_IN_ARRAY_INITIALIZER) - .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_before_closing_brace_of_array_initializer, DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CLOSING_BRACE_IN_ARRAY_INITIALIZER) - .gap() - .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_end_of_file, DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AT_END_OF_FILE_IF_MISSING) + .node(createKeepOnOneLineSection()) .build(null, (parent, label, key) -> { String[] values= CheckboxPreference.DO_NOT_INSERT_INSERT; if (parent.getKey().endsWith("-ifelse") || parent.getKey().endsWith("-simpleloops") //$NON-NLS-1$ //$NON-NLS-2$ @@ -1150,6 +1154,60 @@ }); } + private SimpleTreeBuilder createKeepOnOneLineSection() { + String[] oneLineOptions= { + DefaultCodeFormatterConstants.ONE_LINE_NEVER, + DefaultCodeFormatterConstants.ONE_LINE_IF_EMPTY, + DefaultCodeFormatterConstants.ONE_LINE_IF_SINGLE_ITEM, + DefaultCodeFormatterConstants.ONE_LINE_ALWAYS, + DefaultCodeFormatterConstants.ONE_LINE_PRESERVE, + }; + String[] oneLineLabels= { + FormatterMessages.FormatterModifyDialog_newLines_val_one_line_never, + FormatterMessages.FormatterModifyDialog_newLines_val_one_line_if_empty, + FormatterMessages.FormatterModifyDialog_newLines_val_one_line_if_single_item, + FormatterMessages.FormatterModifyDialog_newLines_val_one_line_always, + FormatterMessages.FormatterModifyDialog_newLines_val_one_line_preserve, + }; + PreferenceBuilder prefBuilder= (parent, label, key) -> { + String[] values= oneLineOptions; + String[] items= oneLineLabels; + if (DefaultCodeFormatterConstants.FORMATTER_KEEP_CODE_BLOCK_ON_ONE_LINE.equals(key)) { + values= Arrays.copyOf(values, 2); + items= Arrays.copyOf(items, 2); + } + return fTree.addComboPref(parent, label, key, values, items); + }; + SectionBuilder sectionBuilder= fTree + .builder(FormatterMessages.FormatterModifyDialog_newLines_tree_keep_braced_code_on_one_line, "-keepononeline", s -> ComboPreference.addModifyAll(s, fImages)) //$NON-NLS-1$ + .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_keep_loop_body_block_on_one_line, DefaultCodeFormatterConstants.FORMATTER_KEEP_LOOP_BODY_BLOCK_ON_ONE_LINE) + .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_keep_if_then_body_block_on_one_line, DefaultCodeFormatterConstants.FORMATTER_KEEP_IF_THEN_BODY_BLOCK_ON_ONE_LINE, pref -> { + CheckboxPreference guardianPref= fTree.addCheckbox(pref, FormatterMessages.FormatterModifyDialog_newLines_pref_keep_guardian_clause_on_one_line, + DefaultCodeFormatterConstants.FORMATTER_KEEP_GUARDIAN_CLAUSE_ON_ONE_LINE, CheckboxPreference.FALSE_TRUE); + pref.addDependant(guardianPref, valueAcceptor(oneLineOptions[0], oneLineOptions[1], oneLineOptions[4])); + }) + .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_keep_lambda_body_block_on_one_line, DefaultCodeFormatterConstants.FORMATTER_KEEP_LAMBDA_BODY_BLOCK_ON_ONE_LINE) + .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_keep_code_block_on_one_line, DefaultCodeFormatterConstants.FORMATTER_KEEP_CODE_BLOCK_ON_ONE_LINE) + .gap() + .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_keep_method_body_on_one_line, DefaultCodeFormatterConstants.FORMATTER_KEEP_METHOD_BODY_ON_ONE_LINE, pref -> { + CheckboxPreference getterSetterPref= fTree.addCheckbox(pref, FormatterMessages.FormatterModifyDialog_newLines_pref_keep_simple_getter_setter_on_one_line, + DefaultCodeFormatterConstants.FORMATTER_KEEP_SIMPLE_GETTER_SETTER_ON_ONE_LINE, CheckboxPreference.FALSE_TRUE); + pref.addDependant(getterSetterPref, valueAcceptor(oneLineOptions[0], oneLineOptions[1], oneLineOptions[4])); + }) + .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_keep_type_declaration_on_one_line, DefaultCodeFormatterConstants.FORMATTER_KEEP_TYPE_DECLARATION_ON_ONE_LINE) + .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_keep_anonymous_type_declaration_on_one_line, DefaultCodeFormatterConstants.FORMATTER_KEEP_ANONYMOUS_TYPE_DECLARATION_ON_ONE_LINE) + .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_keep_enum_declaration_on_one_line, DefaultCodeFormatterConstants.FORMATTER_KEEP_ENUM_DECLARATION_ON_ONE_LINE) + .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_keep_enum_constant_declaration_on_one_line, DefaultCodeFormatterConstants.FORMATTER_KEEP_ENUM_CONSTANT_DECLARATION_ON_ONE_LINE) + .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_keep_annotation_declaration_on_one_line, DefaultCodeFormatterConstants.FORMATTER_KEEP_ANNOTATION_DECLARATION_ON_ONE_LINE); + + return fTree.new SimpleTreeBuilder>(null, null, null) { + @Override + protected PreferenceTreeNode build(Section parent, PreferenceBuilder ignored) { + return sectionBuilder.build(parent, prefBuilder); + } + }; + } + private void createLineWrapTree() { final Section globalSection= fTree.addSection(null, FormatterMessages.FormatterModifyDialog_lineWrap_tree_line_wrapping, "section-linewrap"); //$NON-NLS-1$ fTree.addNumberPref(globalSection, diff -Nru eclipse-jdt-ui-4.9/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ModifyDialog.java eclipse-jdt-ui-4.10/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ModifyDialog.java --- eclipse-jdt-ui-4.9/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ModifyDialog.java 2018-08-30 10:15:15.000000000 +0000 +++ eclipse-jdt-ui-4.10/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ModifyDialog.java 2018-12-03 12:49:27.000000000 +0000 @@ -1518,13 +1518,13 @@ protected Composite createPreviewPane(Composite parent) { final Composite previewPane= new Composite(parent, SWT.NONE); - createGridLayout(previewPane, GRID_COLUMNS, true); + createGridLayout(previewPane, 1, true); previewPane.setFont(parent.getFont()); - createLabel(GRID_COLUMNS, previewPane, FormatterMessages.ModifyDialogTabPage_preview_label_text, 0); + createLabel(1, previewPane, FormatterMessages.ModifyDialogTabPage_preview_label_text, 0); fPreview= new JavaPreview(fWorkingValues, previewPane); - fPreview.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, GRID_COLUMNS, 1)); + fPreview.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); return previewPane; } diff -Nru eclipse-jdt-ui-4.9/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ProfileVersioner.java eclipse-jdt-ui-4.10/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ProfileVersioner.java --- eclipse-jdt-ui-4.9/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ProfileVersioner.java 2018-08-30 10:15:15.000000000 +0000 +++ eclipse-jdt-ui-4.10/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ProfileVersioner.java 2018-12-03 12:49:27.000000000 +0000 @@ -44,7 +44,9 @@ private static final int VERSION_13= 13; // https://bugs.eclipse.org/514019 private static final int VERSION_14= 14; // https://bugs.eclipse.org/128653, https://bugs.eclipse.org/531826 - private static final int CURRENT_VERSION= VERSION_14; + private static final int VERSION_15= 15; // https://bugs.eclipse.org/205973 + + private static final int CURRENT_VERSION= VERSION_15; @Override public int getFirstVersion() { @@ -109,6 +111,9 @@ case VERSION_13 : version13to14(oldSettings); //$FALL-THROUGH$ + case VERSION_14: + version14to15(oldSettings); + //$FALL-THROUGH$ default: for (final Iterator iter= oldSettings.keySet().iterator(); iter.hasNext(); ) { final String key= iter.next(); @@ -580,8 +585,8 @@ private static void version9to10(Map oldSettings) { checkAndReplace(oldSettings, - DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_IN_EMPTY_TYPE_DECLARATION, - DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_IN_EMPTY_ANNOTATION_DECLARATION); + FORMATTER_INSERT_NEW_LINE_IN_EMPTY_TYPE_DECLARATION, + FORMATTER_INSERT_NEW_LINE_IN_EMPTY_ANNOTATION_DECLARATION); checkAndReplace(oldSettings, DefaultCodeFormatterConstants.FORMATTER_INDENT_BODY_DECLARATIONS_COMPARE_TO_TYPE_HEADER, DefaultCodeFormatterConstants.FORMATTER_INDENT_BODY_DECLARATIONS_COMPARE_TO_ANNOTATION_DECLARATION_HEADER); @@ -632,6 +637,26 @@ oldSettings.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_ALIGN_TAGS_DESCREIPTIONS_GROUPED, DefaultCodeFormatterConstants.FALSE); } + private static void version14to15(Map oldSettings) { + String[][] transitions= { + { DefaultCodeFormatterConstants.FORMATTER_KEEP_ANNOTATION_DECLARATION_ON_ONE_LINE, FORMATTER_INSERT_NEW_LINE_IN_EMPTY_ANNOTATION_DECLARATION }, + { DefaultCodeFormatterConstants.FORMATTER_KEEP_ANONYMOUS_TYPE_DECLARATION_ON_ONE_LINE, FORMATTER_INSERT_NEW_LINE_IN_EMPTY_ANONYMOUS_TYPE_DECLARATION }, + { DefaultCodeFormatterConstants.FORMATTER_KEEP_IF_THEN_BODY_BLOCK_ON_ONE_LINE, FORMATTER_INSERT_NEW_LINE_IN_EMPTY_BLOCK }, + { DefaultCodeFormatterConstants.FORMATTER_KEEP_LOOP_BODY_BLOCK_ON_ONE_LINE, FORMATTER_INSERT_NEW_LINE_IN_EMPTY_BLOCK }, + { DefaultCodeFormatterConstants.FORMATTER_KEEP_LAMBDA_BODY_BLOCK_ON_ONE_LINE, FORMATTER_INSERT_NEW_LINE_IN_EMPTY_BLOCK }, + { DefaultCodeFormatterConstants.FORMATTER_KEEP_CODE_BLOCK_ON_ONE_LINE, FORMATTER_INSERT_NEW_LINE_IN_EMPTY_BLOCK }, + { DefaultCodeFormatterConstants.FORMATTER_KEEP_ENUM_CONSTANT_DECLARATION_ON_ONE_LINE, FORMATTER_INSERT_NEW_LINE_IN_EMPTY_ENUM_CONSTANT }, + { DefaultCodeFormatterConstants.FORMATTER_KEEP_ENUM_DECLARATION_ON_ONE_LINE, FORMATTER_INSERT_NEW_LINE_IN_EMPTY_ENUM_DECLARATION }, + { DefaultCodeFormatterConstants.FORMATTER_KEEP_METHOD_BODY_ON_ONE_LINE, FORMATTER_INSERT_NEW_LINE_IN_EMPTY_METHOD_BODY }, + { DefaultCodeFormatterConstants.FORMATTER_KEEP_TYPE_DECLARATION_ON_ONE_LINE, FORMATTER_INSERT_NEW_LINE_IN_EMPTY_TYPE_DECLARATION }, + }; + for (String[] transition : transitions) { + String value= oldSettings.get(transition[1]); + if (JavaCore.DO_NOT_INSERT.equals(value)) + oldSettings.put(transition[0], DefaultCodeFormatterConstants.ONE_LINE_IF_EMPTY); + } + } + /* old format constant values */ private static final String FORMATTER_METHOD_DECLARATION_ARGUMENTS_ALIGNMENT = JavaCore.PLUGIN_ID + ".formatter.method_declaration_arguments_alignment"; //$NON-NLS-1$ @@ -772,4 +797,55 @@ @Deprecated private static final String FORMATTER_COMMENT_FORMATHTML= PreferenceConstants.FORMATTER_COMMENT_FORMATHTML; + /** + * @deprecated As of 3.16 replaced by + * {@link DefaultCodeFormatterConstants#FORMATTER_KEEP_ANNOTATION_DECLARATION_ON_ONE_LINE} + */ + @Deprecated + private static final String FORMATTER_INSERT_NEW_LINE_IN_EMPTY_ANNOTATION_DECLARATION= DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_IN_EMPTY_ANNOTATION_DECLARATION; + + /** + * @deprecated As of 3.16 replaced by + * {@link DefaultCodeFormatterConstants#FORMATTER_KEEP_ANONYMOUS_TYPE_DECLARATION_ON_ONE_LINE} + */ + @Deprecated + private static final String FORMATTER_INSERT_NEW_LINE_IN_EMPTY_ANONYMOUS_TYPE_DECLARATION= DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_IN_EMPTY_ANONYMOUS_TYPE_DECLARATION; + + /** + * @deprecated As of 3.16 replaced by + * {@link DefaultCodeFormatterConstants#FORMATTER_KEEP_IF_THEN_BODY_BLOCK_ON_ONE_LINE}, + * {@link DefaultCodeFormatterConstants#FORMATTER_KEEP_LOOP_BODY_BLOCK_ON_ONE_LINE}, + * {@link DefaultCodeFormatterConstants#FORMATTER_KEEP_LAMBDA_BODY_BLOCK_ON_ONE_LINE}, + * and {@link DefaultCodeFormatterConstants#FORMATTER_KEEP_CODE_BLOCK_ON_ONE_LINE} + */ + @Deprecated + private static final String FORMATTER_INSERT_NEW_LINE_IN_EMPTY_BLOCK= DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_IN_EMPTY_BLOCK; + + /** + * @deprecated As of 3.16 replaced by + * {@link DefaultCodeFormatterConstants#FORMATTER_KEEP_ENUM_CONSTANT_DECLARATION_ON_ONE_LINE} + */ + @Deprecated + private static final String FORMATTER_INSERT_NEW_LINE_IN_EMPTY_ENUM_CONSTANT= DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_IN_EMPTY_ENUM_CONSTANT; + + /** + * @deprecated As of 3.16 replaced by + * {@link DefaultCodeFormatterConstants#FORMATTER_KEEP_ENUM_DECLARATION_ON_ONE_LINE} + */ + @Deprecated + private static final String FORMATTER_INSERT_NEW_LINE_IN_EMPTY_ENUM_DECLARATION= DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_IN_EMPTY_ENUM_DECLARATION; + + /** + * @deprecated As of 3.16 replaced by + * {@link DefaultCodeFormatterConstants#FORMATTER_KEEP_METHOD_BODY_ON_ONE_LINE} + */ + @Deprecated + private static final String FORMATTER_INSERT_NEW_LINE_IN_EMPTY_METHOD_BODY= DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_IN_EMPTY_METHOD_BODY; + + /** + * @deprecated As of 3.16 replaced by + * {@link DefaultCodeFormatterConstants#FORMATTER_KEEP_TYPE_DECLARATION_ON_ONE_LINE} + */ + @Deprecated + private static final String FORMATTER_INSERT_NEW_LINE_IN_EMPTY_TYPE_DECLARATION= DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_IN_EMPTY_TYPE_DECLARATION; } diff -Nru eclipse-jdt-ui-4.9/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaBuildConfigurationBlock.java eclipse-jdt-ui-4.10/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaBuildConfigurationBlock.java --- eclipse-jdt-ui-4.9/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaBuildConfigurationBlock.java 2018-08-30 10:15:15.000000000 +0000 +++ eclipse-jdt-ui-4.10/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaBuildConfigurationBlock.java 2018-12-03 12:49:27.000000000 +0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2015 IBM Corporation and others. + * Copyright (c) 2000, 2018 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -61,6 +61,7 @@ private static final Key PREF_PB_INCOMPLETE_BUILDPATH= getJDTCoreKey(JavaCore.CORE_INCOMPLETE_CLASSPATH); private static final Key PREF_PB_CIRCULAR_BUILDPATH= getJDTCoreKey(JavaCore.CORE_CIRCULAR_CLASSPATH); private static final Key PREF_PB_INCOMPATIBLE_JDK_LEVEL= getJDTCoreKey(JavaCore.CORE_INCOMPATIBLE_JDK_LEVEL); + private static final Key PREF_PB_MAIN_ONLY_PROJECT_HAS_TEST_ONLY_DEPENDENCY= getJDTCoreKey(JavaCore.CORE_MAIN_ONLY_PROJECT_HAS_TEST_ONLY_DEPENDENCY); private static final Key PREF_PB_OUTPUT_LOCATION_OVERLAPPING_ANOTHER_SOURCE= getJDTCoreKey(JavaCore.CORE_OUTPUT_LOCATION_OVERLAPPING_ANOTHER_SOURCE); private static final Key PREF_PB_DUPLICATE_RESOURCE= getJDTCoreKey(JavaCore.CORE_JAVA_BUILD_DUPLICATE_RESOURCE); private static final Key PREF_RECREATE_MODIFIED_CLASS_FILES= getJDTCoreKey(JavaCore.CORE_JAVA_BUILD_RECREATE_MODIFIED_CLASS_FILES_IN_OUTPUT_FOLDER); @@ -91,12 +92,13 @@ fResourceFilterStatus= new StatusInfo(); } - private static Key[] getKeys() { + public static Key[] getKeys() { Key[] keys= new Key[] { PREF_PB_MAX_PER_UNIT, PREF_RESOURCE_FILTER, PREF_BUILD_INVALID_CLASSPATH, PREF_PB_INCOMPLETE_BUILDPATH, PREF_PB_CIRCULAR_BUILDPATH, PREF_BUILD_CLEAN_OUTPUT_FOLDER, PREF_PB_DUPLICATE_RESOURCE, PREF_PB_INCOMPATIBLE_JDK_LEVEL, PREF_PB_OUTPUT_LOCATION_OVERLAPPING_ANOTHER_SOURCE, PREF_ENABLE_EXCLUSION_PATTERNS, PREF_ENABLE_MULTIPLE_OUTPUT_LOCATIONS, - PREF_RECREATE_MODIFIED_CLASS_FILES, PREF_PB_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE, PREF_PB_COMPILER_COMPLIANCE_DOES_NOT_MATCH_JRE + PREF_RECREATE_MODIFIED_CLASS_FILES, PREF_PB_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE, PREF_PB_COMPILER_COMPLIANCE_DOES_NOT_MATCH_JRE, + PREF_PB_MAIN_ONLY_PROJECT_HAS_TEST_ONLY_DEPENDENCY }; return keys; } @@ -141,6 +143,13 @@ PreferencesMessages.JavaBuildConfigurationBlock_warning }; + String[] errorIgnore= new String[] { ERROR, IGNORE }; + + String[] errorIgnoreLabels= new String[] { + PreferencesMessages.JavaBuildConfigurationBlock_error, + PreferencesMessages.JavaBuildConfigurationBlock_ignore + }; + String[] errorWarningInfoIgnore= new String[] { ERROR, WARNING, INFO, IGNORE }; String[] errorWarningInfoIgnoreLabels= new String[] { PreferencesMessages.JavaBuildConfigurationBlock_error, @@ -209,6 +218,9 @@ label= PreferencesMessages.JavaBuildConfigurationBlock_pb_compiler_compliance_does_not_match_jre_label; addComboBox(othersComposite, label, PREF_PB_COMPILER_COMPLIANCE_DOES_NOT_MATCH_JRE, errorWarningInfoIgnore, errorWarningInfoIgnoreLabels, 0); + label= PreferencesMessages.JavaBuildConfigurationBlock_pb_main_only_project_has_test_only_dependency_label; + addComboBox(othersComposite, label, PREF_PB_MAIN_ONLY_PROJECT_HAS_TEST_ONLY_DEPENDENCY, errorIgnore, errorIgnoreLabels, 0); + label= PreferencesMessages.JavaBuildConfigurationBlock_section_output_folder; excomposite= createStyleSection(composite, label, nColumns); diff -Nru eclipse-jdt-ui-4.9/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaBuildPreferencePage.java eclipse-jdt-ui-4.10/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaBuildPreferencePage.java --- eclipse-jdt-ui-4.9/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaBuildPreferencePage.java 2018-08-30 10:15:15.000000000 +0000 +++ eclipse-jdt-ui-4.10/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaBuildPreferencePage.java 2018-12-03 12:49:27.000000000 +0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2018 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.jdt.internal.ui.preferences; +import java.util.Map; + import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; @@ -34,6 +36,14 @@ public static final String PREF_ID= "org.eclipse.jdt.ui.preferences.JavaBuildPreferencePage"; //$NON-NLS-1$ public static final String PROP_ID= "org.eclipse.jdt.ui.propertyPages.JavaBuildPreferencePage"; //$NON-NLS-1$ + public static final String DATA_SELECT_OPTION_KEY= "select_option_key"; //$NON-NLS-1$ + public static final String DATA_SELECT_OPTION_QUALIFIER= "select_option_qualifier"; //$NON-NLS-1$ + + /** + * Key for a Boolean value defining if 'use project specific settings' should be enabled or not. + */ + public static final String USE_PROJECT_SPECIFIC_OPTIONS= "use_project_specific_key"; //$NON-NLS-1$ + private JavaBuildConfigurationBlock fConfigurationBlock; public JavaBuildPreferencePage() { @@ -129,6 +139,26 @@ } @Override + public void applyData(Object data) { + super.applyData(data); + if (data instanceof Map && fConfigurationBlock != null) { + @SuppressWarnings("unchecked") + Map map= (Map) data; + if (isProjectPreferencePage()) { + Boolean useProjectOptions= (Boolean) map.get(USE_PROJECT_SPECIFIC_OPTIONS); + if (useProjectOptions != null) { + enableProjectSpecificSettings(useProjectOptions.booleanValue()); + } + } + + Object key= map.get(DATA_SELECT_OPTION_KEY); + Object qualifier= map.get(DATA_SELECT_OPTION_QUALIFIER); + if (key instanceof String && qualifier instanceof String) { + fConfigurationBlock.selectOption((String) key, (String) qualifier); + } + } + } + @Override public void setElement(IAdaptable element) { super.setElement(element); setDescription(null); // no description for property page diff -Nru eclipse-jdt-ui-4.9/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaEditorCodeMiningConfigurationBlock.java eclipse-jdt-ui-4.10/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaEditorCodeMiningConfigurationBlock.java --- eclipse-jdt-ui-4.9/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaEditorCodeMiningConfigurationBlock.java 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-jdt-ui-4.10/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaEditorCodeMiningConfigurationBlock.java 2018-12-03 12:49:27.000000000 +0000 @@ -0,0 +1,236 @@ +/** + * Copyright (c) 2018 Angelo ZERR. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Angelo Zerr - [CodeMining] Provide Java References/Implementation CodeMinings - Bug 529127 + */ +package org.eclipse.jdt.internal.ui.preferences; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.graphics.Font; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; + +import org.eclipse.jface.dialogs.IDialogSettings; +import org.eclipse.jface.layout.PixelConverter; + +import org.eclipse.ui.forms.widgets.ExpandableComposite; +import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; + +import org.eclipse.jdt.ui.PreferenceConstants; + +import org.eclipse.jdt.internal.ui.JavaPlugin; +import org.eclipse.jdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.jdt.internal.ui.preferences.FilteredPreferenceTree.PreferenceTreeNode; +import org.eclipse.jdt.internal.ui.wizards.IStatusChangeListener; +import org.eclipse.jdt.internal.ui.wizards.dialogfields.LayoutUtil; + +/** + * Configures Java Editor code mining preferences. + * + * @since 3.16 + */ +public class JavaEditorCodeMiningConfigurationBlock extends OptionsConfigurationBlock { + + // Preference store keys + + // --------------------- General + + private static final Key PREF_CODEMINING_ENABLED= getJDTUIKey( + PreferenceConstants.EDITOR_CODEMINING_ENABLED); + + private static final Key PREF_SHOW_CODEMINING_AT_LEAST_ONE= getJDTUIKey( + PreferenceConstants.EDITOR_JAVA_CODEMINING_SHOW_CODEMINING_AT_LEAST_ONE); + + private static final Key PREF_SHOW_REFERENCES= getJDTUIKey( + PreferenceConstants.EDITOR_JAVA_CODEMINING_SHOW_REFERENCES); + + private static final Key PREF_SHOW_REFERENCES_ON_TYPES= getJDTUIKey( + PreferenceConstants.EDITOR_JAVA_CODEMINING_SHOW_REFERENCES_ON_TYPES); + + private static final Key PREF_SHOW_REFERENCES_ON_FIELDS= getJDTUIKey( + PreferenceConstants.EDITOR_JAVA_CODEMINING_SHOW_REFERENCES_ON_FIELDS); + + private static final Key PREF_SHOW_REFERENCES_ON_METHODS= getJDTUIKey( + PreferenceConstants.EDITOR_JAVA_CODEMINING_SHOW_REFERENCES_ON_METHODS); + + private static final Key PREF_SHOW_IMPLEMENTATIONS= getJDTUIKey( + PreferenceConstants.EDITOR_JAVA_CODEMINING_SHOW_IMPLEMENTATIONS); + + private static final String SETTINGS_SECTION_NAME= "JavaEditorCodeMiningConfigurationBlock"; //$NON-NLS-1$ + + private static final String[] TRUE_FALSE= new String[] { "true", "false" }; //$NON-NLS-1$ //$NON-NLS-2$ + + private PixelConverter fPixelConverter; + + private Button atLeastOneCheckBox; + + private PreferenceTree fFilteredPrefTree; + + public JavaEditorCodeMiningConfigurationBlock(IStatusChangeListener context, + IWorkbenchPreferenceContainer container) { + super(context, null, getAllKeys(), container); + } + + public static Key[] getAllKeys() { + return new Key[] { PREF_CODEMINING_ENABLED, PREF_SHOW_CODEMINING_AT_LEAST_ONE, PREF_SHOW_REFERENCES, PREF_SHOW_REFERENCES_ON_TYPES, PREF_SHOW_REFERENCES_ON_FIELDS, + PREF_SHOW_REFERENCES_ON_METHODS, + PREF_SHOW_IMPLEMENTATIONS }; + } + + @Override + protected Control createContents(Composite parent) { + fPixelConverter= new PixelConverter(parent); + setShell(parent.getShell()); + + Composite mainComp= new Composite(parent, SWT.NONE); + mainComp.setFont(parent.getFont()); + GridLayout layout= new GridLayout(); + layout.marginHeight= 0; + layout.marginWidth= 0; + mainComp.setLayout(layout); + + // Add enabled code mining checkbox + Button codeMiningEnabledCheckBox= addCheckBox(mainComp, PreferencesMessages.JavaEditorCodeMiningConfigurationBlock_enableCodeMining_label, PREF_CODEMINING_ENABLED, + TRUE_FALSE, 0); + + // - Only if there is at least one result + atLeastOneCheckBox= addCheckBox(mainComp, + PreferencesMessages.JavaEditorCodeMiningConfigurationBlock_showCodeMining_atLeastOne_label, + PREF_SHOW_CODEMINING_AT_LEAST_ONE, TRUE_FALSE, LayoutUtil.getIndent()); + + Composite commonComposite= createCodeMiningContent(mainComp); + GridData gridData= new GridData(GridData.FILL, GridData.FILL, true, true); + gridData.heightHint= fPixelConverter.convertHeightInCharsToPixels(20); + commonComposite.setLayoutData(gridData); + + codeMiningEnabledCheckBox.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + atLeastOneCheckBox.setEnabled(codeMiningEnabledCheckBox.getSelection()); + fFilteredPrefTree.setEnabled(codeMiningEnabledCheckBox.getSelection()); + updateEnableStates(); + } + }); + atLeastOneCheckBox.setEnabled(codeMiningEnabledCheckBox.getSelection()); + fFilteredPrefTree.setEnabled(codeMiningEnabledCheckBox.getSelection()); + validateSettings(null, null, null); + return mainComp; + } + + private Composite createCodeMiningContent(Composite parent) { + // Create filtered tree which contains code minings + fFilteredPrefTree= new PreferenceTree(this, parent, + PreferencesMessages.JavaEditorCodeMiningConfigurationBlock_common_description, false); + final ScrolledPageContent sc1= fFilteredPrefTree.getScrolledPageContent(); + + int nColumns= 1; + Composite composite= sc1.getBody(); + GridLayout layout= new GridLayout(nColumns, false); + layout.marginHeight= 0; + layout.marginWidth= 0; + composite.setLayout(layout); + + // --- General + createGeneralSection(nColumns, composite); + + IDialogSettings settingsSection= JavaPlugin.getDefault().getDialogSettings().getSection(SETTINGS_SECTION_NAME); + restoreSectionExpansionStates(settingsSection); + + return sc1; + } + + private void createGeneralSection(int nColumns, Composite parent) { + int defaultIndent= 0; + int extraIndent= LayoutUtil.getIndent(); + String label= PreferencesMessages.JavaEditorCodeMiningConfigurationBlock_section_general; + Key twistieKey= OptionsConfigurationBlock.getLocalKey("JavaEditorCodeMiningPreferencePage_section_general"); //$NON-NLS-1$ + PreferenceTreeNode section= fFilteredPrefTree.addExpandableComposite(parent, label, nColumns, twistieKey, + null, false); + ExpandableComposite excomposite= getExpandableComposite(twistieKey); + + Composite inner= createInnerComposite(excomposite, nColumns, parent.getFont()); + + // - Show references + PreferenceTreeNode