### 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	18 Jan 2011 21:12:11 -0000
@@ -101,6 +101,11 @@
 		"\t//\t\t\tSystem.out.println(\"indented\");\n" +  //$NON-NLS-1$
 		"\t//\t}\n" +  //$NON-NLS-1$
 		"\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$
+		"\n" + //$NON-NLS-1$
 		"/* block comment          on first column*/\n" + //$NON-NLS-1$
 		" int bar();\n" + //$NON-NLS-1$
 		"\t/*\n" + //$NON-NLS-1$
@@ -141,6 +146,7 @@
 		GridData spacerData= new GridData(0, 0);
 		spacerData.horizontalSpan= numColumns;
 		new Composite(globalGroup, SWT.NONE).setLayoutData(spacerData);
+		createPrefFalseTrue(globalGroup, numColumns, FormatterMessages.CommentsTabPage_preserve_trailing_line_comment_indentation, DefaultCodeFormatterConstants.FORMATTER_COMMENT_PRESERVE_TRAILING_LINE_COMMENT_INDENTATION, 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	18 Jan 2011 21:12:11 -0000
@@ -356,6 +356,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_trailing_line_comment_indentation;
 	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	18 Jan 2011 21:12:11 -0000
@@ -395,6 +395,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_trailing_line_comment_indentation=Preserve trailing line comment indentation
 CommentsTabPage_remove_blank_block_comment_lines=Remove blank lines
 CommentsTabPage_format_header=Enable &header comment formatting
 CommentsTabPage_format_html=Format HTML tags