Attachment #282817 for bug #563125

Lines 218-223 Link Here

(-)a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.java (+1 lines)
218	public static String FormatterModifyDialog_newLines_pref_enum_constants;	218	public static String FormatterModifyDialog_newLines_pref_enum_constants;
219	public static String FormatterModifyDialog_newLines_pref_fields;	219	public static String FormatterModifyDialog_newLines_pref_fields;
220	public static String FormatterModifyDialog_newLines_pref_keep_else_if_on_one_line;	220	public static String FormatterModifyDialog_newLines_pref_keep_else_if_on_one_line;
		221	public static String FormatterModifyDialog_newLines_pref_keep_if_after_else_unindented;
221	public static String FormatterModifyDialog_newLines_pref_keep_else_on_same_line;	222	public static String FormatterModifyDialog_newLines_pref_keep_else_on_same_line;
222	public static String FormatterModifyDialog_newLines_pref_keep_guardian_clause_on_one_line;	223	public static String FormatterModifyDialog_newLines_pref_keep_guardian_clause_on_one_line;
223	public static String FormatterModifyDialog_newLines_pref_keep_simple_do_while_body_on_one_line;	224	public static String FormatterModifyDialog_newLines_pref_keep_simple_do_while_body_on_one_line;

Lines 419-424 Link Here

(-)a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties (+1 lines)
419	FormatterModifyDialog_newLines_pref_keep_simple_while_body_on_one_line=Keep simple 'while' loop body on same line	419	FormatterModifyDialog_newLines_pref_keep_simple_while_body_on_one_line=Keep simple 'while' loop body on same line
420	FormatterModifyDialog_newLines_pref_keep_else_on_same_line=Keep 'else' statement on same line	420	FormatterModifyDialog_newLines_pref_keep_else_on_same_line=Keep 'else' statement on same line
421	FormatterModifyDialog_newLines_pref_keep_else_if_on_one_line=Keep 'else if' on one line	421	FormatterModifyDialog_newLines_pref_keep_else_if_on_one_line=Keep 'else if' on one line
		422	FormatterModifyDialog_newLines_pref_keep_if_after_else_unindented=Keep 'if' after 'else' unindented
422	FormatterModifyDialog_newLines_pref_keep_guardian_clause_on_one_line=Keep 'return' or 'throw' clause on one line	423	FormatterModifyDialog_newLines_pref_keep_guardian_clause_on_one_line=Keep 'return' or 'throw' clause on one line
423	FormatterModifyDialog_newLines_pref_keep_annotation_declaration_on_one_line=Annotation declaration	424	FormatterModifyDialog_newLines_pref_keep_annotation_declaration_on_one_line=Annotation declaration
424	FormatterModifyDialog_newLines_pref_keep_anonymous_type_declaration_on_one_line=Anonymous class declaration	425	FormatterModifyDialog_newLines_pref_keep_anonymous_type_declaration_on_one_line=Anonymous class declaration

Lines 1344-1350 Link Here

(-)a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterModifyDialog.java (-1 / +5 lines)
1344	pref.addDependant(child, valueAcceptor(DefaultCodeFormatterConstants.FALSE));	1344	pref.addDependant(child, valueAcceptor(DefaultCodeFormatterConstants.FALSE));
1345	})	1345	})
1346	.pref(FormatterMessages.FormatterModifyDialog_newLines_pref_keep_else_on_same_line, DefaultCodeFormatterConstants.FORMATTER_KEEP_ELSE_STATEMENT_ON_SAME_LINE)	1346	.pref(FormatterMessages.FormatterModifyDialog_newLines_pref_keep_else_on_same_line, DefaultCodeFormatterConstants.FORMATTER_KEEP_ELSE_STATEMENT_ON_SAME_LINE)
1347	.pref(FormatterMessages.FormatterModifyDialog_newLines_pref_keep_else_if_on_one_line, DefaultCodeFormatterConstants.FORMATTER_COMPACT_ELSE_IF))	1347	.pref(FormatterMessages.FormatterModifyDialog_newLines_pref_keep_else_if_on_one_line, DefaultCodeFormatterConstants.FORMATTER_COMPACT_ELSE_IF, pref -> {
		1348	CheckboxPreference child= fTree.addCheckbox(pref, FormatterMessages.FormatterModifyDialog_newLines_pref_keep_if_after_else_unindented,
		1349	DefaultCodeFormatterConstants.FORMATTER_KEEP_IF_AFTER_ELSE_UNINDENTED, CheckboxPreference.FALSE_TRUE);
		1350	pref.addDependant(child, valueAcceptor(DefaultCodeFormatterConstants.FALSE));
		1351	}))
1348	.node(fTree.builder(FormatterMessages.FormatterModifyDialog_newLines_tree_simple_loops, "-simpleloops", modAll) //$NON-NLS-1$	1352	.node(fTree.builder(FormatterMessages.FormatterModifyDialog_newLines_tree_simple_loops, "-simpleloops", modAll) //$NON-NLS-1$
1349	.pref(FormatterMessages.FormatterModifyDialog_newLines_pref_keep_simple_for_body_on_one_line, DefaultCodeFormatterConstants.FORMATTER_KEEP_SIMPLE_FOR_BODY_ON_SAME_LINE)	1353	.pref(FormatterMessages.FormatterModifyDialog_newLines_pref_keep_simple_for_body_on_one_line, DefaultCodeFormatterConstants.FORMATTER_KEEP_SIMPLE_FOR_BODY_ON_SAME_LINE)
1350	.pref(FormatterMessages.FormatterModifyDialog_newLines_pref_keep_simple_while_body_on_one_line, DefaultCodeFormatterConstants.FORMATTER_KEEP_SIMPLE_WHILE_BODY_ON_SAME_LINE)	1354	.pref(FormatterMessages.FormatterModifyDialog_newLines_pref_keep_simple_while_body_on_one_line, DefaultCodeFormatterConstants.FORMATTER_KEEP_SIMPLE_WHILE_BODY_ON_SAME_LINE)

Return to bug 563125