Attachment #187114 for bug #334690

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 1-5 Link Here

(-)ui/org/eclipse/jdt/internal/ui/preferences/formatter/CommentsTabPage.java (-1 / +9 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2010 IBM Corporation and others.	2	* Copyright (c) 2000, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 7-12 Link Here
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Ray V. (voidstar@gmail.com) - Contribution for bug 282988
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.jdt.internal.ui.preferences.formatter;	12	package org.eclipse.jdt.internal.ui.preferences.formatter;
12		13
Lines 119-124 Link Here
119	" * @return The result of the foo operation, usually within 0 and 1000.\n" + //$NON-NLS-1$	120	" * @return The result of the foo operation, usually within 0 and 1000.\n" + //$NON-NLS-1$
120	" */" + //$NON-NLS-1$	121	" */" + //$NON-NLS-1$
121	" int foo(int a, int b);\n" + //$NON-NLS-1$	122	" int foo(int a, int b);\n" + //$NON-NLS-1$
		123	"}\n" +//$NON-NLS-1$
		124	"class Test {\n" +//$NON-NLS-1$
		125	"\t\tvoid trailingCommented() {\n" + //$NON-NLS-1$
		126	"\t\t\t\tSystem.out.println(\"indented\");\t\t// comment\n" + //$NON-NLS-1$
		127	"\t\t\t\tSystem.out.println(\"indent\");\t\t// comment\n" + //$NON-NLS-1$
		128	"\t\t}\n" + //$NON-NLS-1$
122	"}"; //$NON-NLS-1$	129	"}"; //$NON-NLS-1$
123		130
124	private CompilationUnitPreview fPreview;	131	private CompilationUnitPreview fPreview;
Lines 141-146 Link Here
141	GridData spacerData= new GridData(0, 0);	148	GridData spacerData= new GridData(0, 0);
142	spacerData.horizontalSpan= numColumns;	149	spacerData.horizontalSpan= numColumns;
143	new Composite(globalGroup, SWT.NONE).setLayoutData(spacerData);	150	new Composite(globalGroup, SWT.NONE).setLayoutData(spacerData);
		151	createPrefFalseTrue(globalGroup, numColumns, FormatterMessages.CommentsTabPage_preserve_trailing_line_comment_indentation, DefaultCodeFormatterConstants.FORMATTER_COMMENT_PRESERVE_TRAILING_LINE_COMMENT_INDENTATION, false);
144	createPrefFalseTrue(globalGroup, numColumns, FormatterMessages.CommentsTabPage_never_indent_block_comments_on_first_column, DefaultCodeFormatterConstants.FORMATTER_NEVER_INDENT_BLOCK_COMMENTS_ON_FIRST_COLUMN, false);	152	createPrefFalseTrue(globalGroup, numColumns, FormatterMessages.CommentsTabPage_never_indent_block_comments_on_first_column, DefaultCodeFormatterConstants.FORMATTER_NEVER_INDENT_BLOCK_COMMENTS_ON_FIRST_COLUMN, false);
145	createPrefFalseTrue(globalGroup, numColumns, FormatterMessages.CommentsTabPage_never_indent_line_comments_on_first_column, DefaultCodeFormatterConstants.FORMATTER_NEVER_INDENT_LINE_COMMENTS_ON_FIRST_COLUMN, false);	153	createPrefFalseTrue(globalGroup, numColumns, FormatterMessages.CommentsTabPage_never_indent_line_comments_on_first_column, DefaultCodeFormatterConstants.FORMATTER_NEVER_INDENT_LINE_COMMENTS_ON_FIRST_COLUMN, false);
146	createPrefFalseTrue(globalGroup, numColumns, FormatterMessages.CommentsTabPage_do_not_join_lines, DefaultCodeFormatterConstants.FORMATTER_JOIN_LINES_IN_COMMENTS, true);	154	createPrefFalseTrue(globalGroup, numColumns, FormatterMessages.CommentsTabPage_do_not_join_lines, DefaultCodeFormatterConstants.FORMATTER_JOIN_LINES_IN_COMMENTS, true);

Return to bug 334690

Lines 1-5 Link Here

(-)ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties (-1 / +3 lines)
1	###############################################################################	1	###############################################################################
2	# Copyright (c) 2000, 2010 IBM Corporation and others.	2	# Copyright (c) 2000, 2011 IBM Corporation and others.
3	# All rights reserved. This program and the accompanying materials	3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0	4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at	5	# which accompanies this distribution, and is available at
Lines 10-15 Link Here
10	# istvan@benedek-home.de - 103706 [formatter] indent empty lines	10	# istvan@benedek-home.de - 103706 [formatter] indent empty lines
11	# Aaron Luchko, aluchko@redhat.com - 105926 [Formatter] Exporting Unnamed profile fails silently	11	# Aaron Luchko, aluchko@redhat.com - 105926 [Formatter] Exporting Unnamed profile fails silently
12	# Brock Janiczak <brockj@tpg.com.au> - [formatter] Add option: "add new line after label" - https://bugs.eclipse.org/bugs/show_bug.cgi?id=150741	12	# Brock Janiczak <brockj@tpg.com.au> - [formatter] Add option: "add new line after label" - https://bugs.eclipse.org/bugs/show_bug.cgi?id=150741
		13	# Ray V. (voidstar@gmail.com) - Contribution for bug 282988
13	###############################################################################	14	###############################################################################
14		15
15	WhiteSpaceTabPage_assignments=Assignments	16	WhiteSpaceTabPage_assignments=Assignments
Lines 395-400 Link Here
395	commentsTabPage_enable_javadoc_comment_formatting=Enable &Javadoc comment formatting	396	commentsTabPage_enable_javadoc_comment_formatting=Enable &Javadoc comment formatting
396	CommentsTabPage_enable_line_comment_formatting=Enable line &comment formatting	397	CommentsTabPage_enable_line_comment_formatting=Enable line &comment formatting
397	CommentsTabPage_enable_block_comment_formatting=Enable &block comment formatting	398	CommentsTabPage_enable_block_comment_formatting=Enable &block comment formatting
		399	CommentsTabPage_preserve_trailing_line_comment_indentation=Preserve trailing line comment indentation
398	CommentsTabPage_remove_blank_block_comment_lines=Remove blank lines	400	CommentsTabPage_remove_blank_block_comment_lines=Remove blank lines
399	CommentsTabPage_format_header=Enable &header comment formatting	401	CommentsTabPage_format_header=Enable &header comment formatting
400	CommentsTabPage_format_html=Format HTML tags	402	CommentsTabPage_format_html=Format HTML tags