Attachment 187198 Details for Bug 334690 – Proposed fix

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

[patch] Proposed fix

patch_334690.txt (text/plain), 6.96 KB, created by Olivier Thomann

on 2011-01-20 10:35:21 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2011-01-20 10:35:21 EST

Size: 6.96 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.ui
>Index: ui/org/eclipse/jdt/internal/ui/preferences/formatter/CommentsTabPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/CommentsTabPage.java,v
>retrieving revision 1.29
>diff -u -r1.29 CommentsTabPage.java
>--- ui/org/eclipse/jdt/internal/ui/preferences/formatter/CommentsTabPage.java	3 Mar 2010 15:42:20 -0000	1.29
>+++ ui/org/eclipse/jdt/internal/ui/preferences/formatter/CommentsTabPage.java	20 Jan 2011 15:34:38 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2010 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 IBM Corporation and others.
>  * 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
>@@ -7,6 +7,7 @@
>  *
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>+ *     Ray V. (voidstar@gmail.com) - Contribution for bug 282988
>  *******************************************************************************/
> package org.eclipse.jdt.internal.ui.preferences.formatter;
> 
>@@ -119,6 +120,12 @@
> 		" * @return The result of the foo operation, usually within 0 and 1000.\n" + //$NON-NLS-1$
> 		" */" + //$NON-NLS-1$
> 		" int foo(int a, int b);\n" + //$NON-NLS-1$
>+		"}\n" +//$NON-NLS-1$
>+		"class Test {\n" +//$NON-NLS-1$
>+		"\t\tvoid trailingCommented() {\n" +  //$NON-NLS-1$
>+		"\t\t\t\tSystem.out.println(\"indented\");\t\t// comment\n" +  //$NON-NLS-1$
>+		"\t\t\t\tSystem.out.println(\"indent\");\t\t// comment\n" +  //$NON-NLS-1$
>+		"\t\t}\n" +  //$NON-NLS-1$
> 		"}"; //$NON-NLS-1$
> 
> 	private CompilationUnitPreview fPreview;
>@@ -141,6 +148,7 @@
> 		GridData spacerData= new GridData(0, 0);
> 		spacerData.horizontalSpan= numColumns;
> 		new Composite(globalGroup, SWT.NONE).setLayoutData(spacerData);
>+		createPrefFalseTrue(globalGroup, numColumns, FormatterMessages.CommentsTabPage_preserve_white_space_between_code_and_linecomments, DefaultCodeFormatterConstants.FORMATTER_COMMENT_PRESERVE_WHITE_SPACE_BETWEEN_CODE_AND_LINE_COMMENT, false);
> 		createPrefFalseTrue(globalGroup, numColumns, FormatterMessages.CommentsTabPage_never_indent_block_comments_on_first_column, DefaultCodeFormatterConstants.FORMATTER_NEVER_INDENT_BLOCK_COMMENTS_ON_FIRST_COLUMN, false);
> 		createPrefFalseTrue(globalGroup, numColumns, FormatterMessages.CommentsTabPage_never_indent_line_comments_on_first_column, DefaultCodeFormatterConstants.FORMATTER_NEVER_INDENT_LINE_COMMENTS_ON_FIRST_COLUMN, false);
> 		createPrefFalseTrue(globalGroup, numColumns, FormatterMessages.CommentsTabPage_do_not_join_lines, DefaultCodeFormatterConstants.FORMATTER_JOIN_LINES_IN_COMMENTS, true);
>Index: ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.java,v
>retrieving revision 1.38
>diff -u -r1.38 FormatterMessages.java
>--- ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.java	10 Sep 2010 16:52:44 -0000	1.38
>+++ ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.java	20 Jan 2011 15:34:38 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2010 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 IBM Corporation and others.
>  * 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
>@@ -10,6 +10,7 @@
>  *     istvan@benedek-home.de - 103706 [formatter] indent empty lines
>  *     Aaron Luchko, aluchko@redhat.com - 105926 [Formatter] Exporting Unnamed profile fails silently
>  *     Brock Janiczak <brockj@tpg.com.au> - [formatter] Add  option: "add new line after label" - https://bugs.eclipse.org/bugs/show_bug.cgi?id=150741
>+ *     Ray V. (voidstar@gmail.com) - Contribution for bug 282988
>  *******************************************************************************/
> package org.eclipse.jdt.internal.ui.preferences.formatter;
> 
>@@ -356,6 +357,7 @@
> 	public static String commentsTabPage_enable_javadoc_comment_formatting;
> 	public static String CommentsTabPage_enable_line_comment_formatting;
> 	public static String CommentsTabPage_enable_block_comment_formatting;
>+	public static String CommentsTabPage_preserve_white_space_between_code_and_linecomments;
> 	public static String CommentsTabPage_format_header;
> 	public static String CommentsTabPage_format_html;
> 	public static String CommentsTabPage_format_code_snippets;
>Index: ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties,v
>retrieving revision 1.95
>diff -u -r1.95 FormatterMessages.properties
>--- ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties	10 Sep 2010 16:52:44 -0000	1.95
>+++ ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties	20 Jan 2011 15:34:38 -0000
>@@ -1,5 +1,5 @@
> ###############################################################################
>-# Copyright (c) 2000, 2010 IBM Corporation and others.
>+# Copyright (c) 2000, 2011 IBM Corporation and others.
> # 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
>@@ -10,6 +10,7 @@
> #     istvan@benedek-home.de - 103706 [formatter] indent empty lines
> #     Aaron Luchko, aluchko@redhat.com - 105926 [Formatter] Exporting Unnamed profile fails silently
> #     Brock Janiczak <brockj@tpg.com.au> - [formatter] Add  option: "add new line after label" - https://bugs.eclipse.org/bugs/show_bug.cgi?id=150741
>+#     Ray V. (voidstar@gmail.com) - Contribution for bug 282988
> ###############################################################################
> 
> WhiteSpaceTabPage_assignments=Assignments
>@@ -395,6 +396,7 @@
> commentsTabPage_enable_javadoc_comment_formatting=Enable &Javadoc comment formatting
> CommentsTabPage_enable_line_comment_formatting=Enable line &comment formatting
> CommentsTabPage_enable_block_comment_formatting=Enable &block comment formatting
>+CommentsTabPage_preserve_white_space_between_code_and_linecomments=Preserve white space between code and line comments
> CommentsTabPage_remove_blank_block_comment_lines=Remove blank lines
> CommentsTabPage_format_header=Enable &header comment formatting
> CommentsTabPage_format_html=Format HTML tags

Actions: View | Diff

Attachments on bug 334690: 187114 | 187198