Attachment #75636 for bug #122247

Lines 92-97 Link Here

(-)ui/org/eclipse/jdt/internal/ui/preferences/formatter/NewLinesTabPage.java (+1 lines)
92		92
93	final Group annotationsGroup= createGroup(numColumns, composite, FormatterMessages.NewLinesTabPage_annotations_group_title);	93	final Group annotationsGroup= createGroup(numColumns, composite, FormatterMessages.NewLinesTabPage_annotations_group_title);
94	createPref(annotationsGroup, numColumns, FormatterMessages.NewLinesTabPage_annotations_group_option_after_annotation, DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION, DO_NOT_INSERT_INSERT);	94	createPref(annotationsGroup, numColumns, FormatterMessages.NewLinesTabPage_annotations_group_option_after_annotation, DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION, DO_NOT_INSERT_INSERT);
		95	createPref(annotationsGroup, numColumns, FormatterMessages.NewLinesTabPage_annotations_group_option_after_arg_annotation, DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ARG_ANNOTATION, DO_NOT_INSERT_INSERT);
95		96
96	}	97	}
97		98

Lines 427-432 Link Here

(-)ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.java (+1 lines)
427	public static String NewLinesTabPage_array_group_option_before_closing_brace_of_array_initializer;	427	public static String NewLinesTabPage_array_group_option_before_closing_brace_of_array_initializer;
428	public static String NewLinesTabPage_annotations_group_title;	428	public static String NewLinesTabPage_annotations_group_title;
429	public static String NewLinesTabPage_annotations_group_option_after_annotation;	429	public static String NewLinesTabPage_annotations_group_option_after_annotation;
		430	public static String NewLinesTabPage_annotations_group_option_after_arg_annotation;
430	public static String ProfileManager_default_profile_name;	431	public static String ProfileManager_default_profile_name;
431	public static String ProfileManager_eclipse_profile_name;	432	public static String ProfileManager_eclipse_profile_name;
432	public static String ProfileManager_java_conventions_profile_name;	433	public static String ProfileManager_java_conventions_profile_name;

Lines 485-490 Link Here

(-)ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties (+1 lines)
485		485
486	NewLinesTabPage_annotations_group_title=Annotations	486	NewLinesTabPage_annotations_group_title=Annotations
487	NewLinesTabPage_annotations_group_option_after_annotation=&Insert new line after annotations	487	NewLinesTabPage_annotations_group_option_after_annotation=&Insert new line after annotations
		488	NewLinesTabPage_annotations_group_option_after_arg_annotation=Insert new line after argument annotations
488		489
489	ProfileManager_default_profile_name=Eclipse 2.1 [built-in]	490	ProfileManager_default_profile_name=Eclipse 2.1 [built-in]
490	ProfileManager_eclipse_profile_name=Eclipse [built-in]	491	ProfileManager_eclipse_profile_name=Eclipse [built-in]





	/**
	 * <pre>
	 * FORMATTER / Option to insert a new line after an argument annotation
	 *     - option id:         "org.eclipse.jdt.core.formatter.insert_new_line_after_arg_annotation"
	 *     - possible values:   { INSERT, DO_NOT_INSERT }
	 *     - default:           INSERT
	 * </pre>
	 * @see JavaCore#INSERT
	 * @see JavaCore#DO_NOT_INSERT
	 * @since 3.1
	 */
	public static final String FORMATTER_INSERT_NEW_LINE_AFTER_ARG_ANNOTATION = JavaCore.PLUGIN_ID + ".formatter.insert_new_line_after_arg_annotation";//$NON-NLS-1$

	
	/**
	 * <pre>
	 * FORMATTER / Option to insert a new line after the opening brace in an array initializer
	 *     - option id:         "org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer"
	 *     - possible values:   { INSERT, DO_NOT_INSERT }

Lines 2389-2395 Link Here

(-)formatter/org/eclipse/jdt/internal/formatter/CodeFormatterVisitor.java (-1 / +1 lines)
2389		2389
2390	if (argument.modifiers != NO_MODIFIERS \|\| argument.annotations != null) {	2390	if (argument.modifiers != NO_MODIFIERS \|\| argument.annotations != null) {
2391	this.scribe.printComment();	2391	this.scribe.printComment();
2392	this.scribe.printModifiers(argument.annotations, this);	2392	this.scribe.printModifiers(argument.annotations, this, true);
2393	this.scribe.space();	2393	this.scribe.space();
2394	}	2394	}
2395		2395

Lines 1262-1267 Link Here

(-)formatter/org/eclipse/jdt/internal/formatter/Scribe.java (-2 / +12 lines)
1262	}	1262	}
1263		1263
1264	public void printModifiers(Annotation[] annotations, ASTVisitor visitor) {	1264	public void printModifiers(Annotation[] annotations, ASTVisitor visitor) {
		1265	printModifiers(annotations, visitor, false);
		1266	}
		1267
		1268	public void printModifiers(Annotation[] annotations, ASTVisitor visitor, boolean atArg) {
1265	try {	1269	try {
1266	int annotationsLength = annotations != null ? annotations.length : 0;	1270	int annotationsLength = annotations != null ? annotations.length : 0;
1267	int annotationsIndex = 0;	1271	int annotationsIndex = 0;
Lines 1295-1302 Link Here
1295	this.scanner.resetTo(this.scanner.getCurrentTokenStartPosition(), this.scannerEndPosition - 1);	1299	this.scanner.resetTo(this.scanner.getCurrentTokenStartPosition(), this.scannerEndPosition - 1);
1296	if (annotationsIndex < annotationsLength) {	1300	if (annotationsIndex < annotationsLength) {
1297	annotations[annotationsIndex++].traverse(visitor, (BlockScope) null);	1301	annotations[annotationsIndex++].traverse(visitor, (BlockScope) null);
1298	if (this.formatter.preferences.insert_new_line_after_annotation) {	1302	if (atArg) {
1299	this.printNewLine();	1303	if (this.formatter.preferences.insert_new_line_after_arg_annotation) {
		1304	this.printNewLine();
		1305	}
		1306	} else {
		1307	if (this.formatter.preferences.insert_new_line_after_annotation) {
		1308	this.printNewLine();
		1309	}
1300	}	1310	}
1301	} else {	1311	} else {
1302	return;	1312	return;

Return to bug 122247

Lines 942-947 Link Here

(-)formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java (+14 lines)
942		942
943	/**	943	/**
944	* <pre>	944	* <pre>
		945	* FORMATTER / Option to insert a new line after an argument annotation
		946	* - option id: "org.eclipse.jdt.core.formatter.insert_new_line_after_arg_annotation"
		947	* - possible values: { INSERT, DO_NOT_INSERT }
		948	* - default: INSERT
		949	* </pre>
		950	* @see JavaCore#INSERT
		951	* @see JavaCore#DO_NOT_INSERT
		952	* @since 3.1
		953	*/
		954	public static final String FORMATTER_INSERT_NEW_LINE_AFTER_ARG_ANNOTATION = JavaCore.PLUGIN_ID + ".formatter.insert_new_line_after_arg_annotation";//$NON-NLS-1$
		955
		956
		957	/**
		958	* <pre>
945	* FORMATTER / Option to insert a new line after the opening brace in an array initializer	959	* FORMATTER / Option to insert a new line after the opening brace in an array initializer
946	* - option id: "org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer"	960	* - option id: "org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer"
947	* - possible values: { INSERT, DO_NOT_INSERT }	961	* - possible values: { INSERT, DO_NOT_INSERT }

Lines 123-128 Link Here

(-)formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatterOptions.java (+7 lines)
123	public int indentation_size;	123	public int indentation_size;
124		124
125	public boolean insert_new_line_after_annotation;	125	public boolean insert_new_line_after_annotation;
		126	public boolean insert_new_line_after_arg_annotation;
126	public boolean insert_new_line_after_opening_brace_in_array_initializer;	127	public boolean insert_new_line_after_opening_brace_in_array_initializer;
127	public boolean insert_new_line_at_end_of_file_if_missing;	128	public boolean insert_new_line_at_end_of_file_if_missing;
128	public boolean insert_new_line_before_catch_in_try_statement;	129	public boolean insert_new_line_before_catch_in_try_statement;
Lines 398-403 Link Here
398	options.put(DefaultCodeFormatterConstants.FORMATTER_INDENT_SWITCHSTATEMENTS_COMPARE_TO_SWITCH, this.indent_switchstatements_compare_to_switch ? DefaultCodeFormatterConstants.TRUE : DefaultCodeFormatterConstants.FALSE);	399	options.put(DefaultCodeFormatterConstants.FORMATTER_INDENT_SWITCHSTATEMENTS_COMPARE_TO_SWITCH, this.indent_switchstatements_compare_to_switch ? DefaultCodeFormatterConstants.TRUE : DefaultCodeFormatterConstants.FALSE);
399	options.put(DefaultCodeFormatterConstants.FORMATTER_INDENTATION_SIZE, Integer.toString(this.indentation_size));	400	options.put(DefaultCodeFormatterConstants.FORMATTER_INDENTATION_SIZE, Integer.toString(this.indentation_size));
400	options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION, this.insert_new_line_after_annotation ? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);	401	options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION, this.insert_new_line_after_annotation ? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
		402	options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ARG_ANNOTATION, this.insert_new_line_after_arg_annotation ? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
401	options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_OPENING_BRACE_IN_ARRAY_INITIALIZER, this.insert_new_line_after_opening_brace_in_array_initializer? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);	403	options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_OPENING_BRACE_IN_ARRAY_INITIALIZER, this.insert_new_line_after_opening_brace_in_array_initializer? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
402	options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AT_END_OF_FILE_IF_MISSING, this.insert_new_line_at_end_of_file_if_missing ? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);	404	options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AT_END_OF_FILE_IF_MISSING, this.insert_new_line_at_end_of_file_if_missing ? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
403	options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, this.insert_new_line_before_catch_in_try_statement? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);	405	options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, this.insert_new_line_before_catch_in_try_statement? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
Lines 1132-1137 Link Here
1132	if (insertNewLineAfterAnnotationOption != null) {	1134	if (insertNewLineAfterAnnotationOption != null) {
1133	this.insert_new_line_after_annotation = JavaCore.INSERT.equals(insertNewLineAfterAnnotationOption);	1135	this.insert_new_line_after_annotation = JavaCore.INSERT.equals(insertNewLineAfterAnnotationOption);
1134	}	1136	}
		1137	final Object insertNewLineAfterArgAnnotationOption = settings.get(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ARG_ANNOTATION);
		1138	if (insertNewLineAfterArgAnnotationOption != null) {
		1139	this.insert_new_line_after_arg_annotation = JavaCore.INSERT.equals(insertNewLineAfterArgAnnotationOption);
		1140	}
1135	final Object insertNewLineAfterOpeningBraceInArrayInitializerOption = settings.get(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_OPENING_BRACE_IN_ARRAY_INITIALIZER);	1141	final Object insertNewLineAfterOpeningBraceInArrayInitializerOption = settings.get(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_OPENING_BRACE_IN_ARRAY_INITIALIZER);
1136	if (insertNewLineAfterOpeningBraceInArrayInitializerOption != null) {	1142	if (insertNewLineAfterOpeningBraceInArrayInitializerOption != null) {
1137	this.insert_new_line_after_opening_brace_in_array_initializer = JavaCore.INSERT.equals(insertNewLineAfterOpeningBraceInArrayInitializerOption);	1143	this.insert_new_line_after_opening_brace_in_array_initializer = JavaCore.INSERT.equals(insertNewLineAfterOpeningBraceInArrayInitializerOption);
Lines 2246-2251 Link Here
2246	this.indent_switchstatements_compare_to_switch = false;	2252	this.indent_switchstatements_compare_to_switch = false;
2247	this.indentation_size = 4;	2253	this.indentation_size = 4;
2248	this.insert_new_line_after_annotation = true;	2254	this.insert_new_line_after_annotation = true;
		2255	this.insert_new_line_after_arg_annotation = false;
2249	this.insert_new_line_after_opening_brace_in_array_initializer = false;	2256	this.insert_new_line_after_opening_brace_in_array_initializer = false;
2250	this.insert_new_line_at_end_of_file_if_missing = false;	2257	this.insert_new_line_at_end_of_file_if_missing = false;
2251	this.insert_new_line_before_catch_in_try_statement = false;	2258	this.insert_new_line_before_catch_in_try_statement = false;