View | Details | Raw Unified | Return to bug 282988 | Differences between
and this patch

Collapse All | Expand All

(-)ui/org/eclipse/jdt/internal/ui/preferences/formatter/CommentsTabPage.java (+6 lines)
Lines 101-106 Link Here
101
		"\t//\t\t\tSystem.out.println(\"indented\");\n" +  //$NON-NLS-1$
101
		"\t//\t\t\tSystem.out.println(\"indented\");\n" +  //$NON-NLS-1$
102
		"\t//\t}\n" +  //$NON-NLS-1$
102
		"\t//\t}\n" +  //$NON-NLS-1$
103
		"\n" + //$NON-NLS-1$
103
		"\n" + //$NON-NLS-1$
104
		"\t//\tvoid trailingCommented() {\n" +  //$NON-NLS-1$
105
		"\t//\t\t\tSystem.out.println(\"indented\");\t\t// comment\n" +  //$NON-NLS-1$
106
		"\t//\t\t\tSystem.out.println(\"indent\");\t\t// comment\n" +  //$NON-NLS-1$
107
		"\t//\t}\n" +  //$NON-NLS-1$
108
		"\n" + //$NON-NLS-1$
104
		"/* block comment          on first column*/\n" + //$NON-NLS-1$
109
		"/* block comment          on first column*/\n" + //$NON-NLS-1$
105
		" int bar();\n" + //$NON-NLS-1$
110
		" int bar();\n" + //$NON-NLS-1$
106
		"\t/*\n" + //$NON-NLS-1$
111
		"\t/*\n" + //$NON-NLS-1$
Lines 141-146 Link Here
141
		GridData spacerData= new GridData(0, 0);
146
		GridData spacerData= new GridData(0, 0);
142
		spacerData.horizontalSpan= numColumns;
147
		spacerData.horizontalSpan= numColumns;
143
		new Composite(globalGroup, SWT.NONE).setLayoutData(spacerData);
148
		new Composite(globalGroup, SWT.NONE).setLayoutData(spacerData);
149
		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);
150
		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);
151
		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);
152
		createPrefFalseTrue(globalGroup, numColumns, FormatterMessages.CommentsTabPage_do_not_join_lines, DefaultCodeFormatterConstants.FORMATTER_JOIN_LINES_IN_COMMENTS, true);
(-)ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.java (+1 lines)
Lines 356-361 Link Here
356
	public static String commentsTabPage_enable_javadoc_comment_formatting;
356
	public static String commentsTabPage_enable_javadoc_comment_formatting;
357
	public static String CommentsTabPage_enable_line_comment_formatting;
357
	public static String CommentsTabPage_enable_line_comment_formatting;
358
	public static String CommentsTabPage_enable_block_comment_formatting;
358
	public static String CommentsTabPage_enable_block_comment_formatting;
359
	public static String CommentsTabPage_preserve_trailing_line_comment_indentation;
359
	public static String CommentsTabPage_format_header;
360
	public static String CommentsTabPage_format_header;
360
	public static String CommentsTabPage_format_html;
361
	public static String CommentsTabPage_format_html;
361
	public static String CommentsTabPage_format_code_snippets;
362
	public static String CommentsTabPage_format_code_snippets;
(-)ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties (+1 lines)
Lines 395-400 Link Here
395
commentsTabPage_enable_javadoc_comment_formatting=Enable &Javadoc comment formatting
395
commentsTabPage_enable_javadoc_comment_formatting=Enable &Javadoc comment formatting
396
CommentsTabPage_enable_line_comment_formatting=Enable line &comment formatting
396
CommentsTabPage_enable_line_comment_formatting=Enable line &comment formatting
397
CommentsTabPage_enable_block_comment_formatting=Enable &block comment formatting
397
CommentsTabPage_enable_block_comment_formatting=Enable &block comment formatting
398
CommentsTabPage_preserve_trailing_line_comment_indentation=Preserve trailing line comment indentation
398
CommentsTabPage_remove_blank_block_comment_lines=Remove blank lines
399
CommentsTabPage_remove_blank_block_comment_lines=Remove blank lines
399
CommentsTabPage_format_header=Enable &header comment formatting
400
CommentsTabPage_format_header=Enable &header comment formatting
400
CommentsTabPage_format_html=Format HTML tags
401
CommentsTabPage_format_html=Format HTML tags

Return to bug 282988