### Eclipse Workspace Patch 1.0 #P org.eclipse.jdt.core Index: formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java,v retrieving revision 1.95 diff -u -r1.95 DefaultCodeFormatterConstants.java --- formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java 4 Dec 2008 16:36:01 -0000 1.95 +++ formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java 8 Dec 2008 14:48:38 -0000 @@ -3115,14 +3115,57 @@ public static final String FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE = JavaCore.PLUGIN_ID + ".formatter.number_of_empty_lines_to_preserve"; //$NON-NLS-1$ /** * 
-	 * FORMATTER / Option to specify whether the formatter should preserve existing line breaks or not
-	 *     - option id:         "org.eclipse.jdt.core.formatter.preserve_existing_line_breaks"
+	 * FORMATTER / Option to specify whether the formatter can join wrapped lines or not
+	 * 
+	 * 		For example, the wrapped lines of method foo return statement in following test case:
+	 * 			class X {
+	 * 			String foo() {
+	 * 			return "select x "
+	 * 			       + "from y "
+	 * 			       + "where z=a";
+	 * 			}
+	 * 			}
+	 *
+	 * 		will be preserved by the formatter when the new preference is used
+	 * 		even if the maximum line width would give it enough space to join the lines.
+	 * 		Hence produces the following output:
+	 * 			class X {
+	 * 			    String foo() {
+	 * 			        return "select x "
+	 * 			                + "from y "
+	 * 			                + "where z=a";
+	 * 			    }
+	 * 			}
+	 *
+	 *     - option id:         "org.eclipse.jdt.core.formatter.join_wrapped_lines"
 	 *     - possible values:   { TRUE, FALSE }
-	 *     - default:           FALSE
+	 *     - default:           TRUE
+	 *
+ * @since 3.5 + */ + public static final String FORMATTER_JOIN_WRAPPED_LINES = JavaCore.PLUGIN_ID + ".formatter.join_wrapped_lines"; //$NON-NLS-1$ + /** + * 
+	 * FORMATTER / Option to specify whether the formatter can join text lines in comments or not
+	 * 
+	 * 		For example, the following comment:
+	 * 			/**
+	 * 			 * The foo method.
+	 * 			 * foo is a substitute for bar.
+	 * 			 */
+	 * 			public class X {
+	 * 			}
+	 * 
+	 * 		will be unchanged by the formatter when this new preference is used,
+	 * 		even if the maximum line width would give it enough space to join the lines.
+	 *
+	 *     - option id:         "org.eclipse.jdt.core.formatter.join_lines_in_comments"
+	 *     - possible values:   { TRUE, FALSE }
+	 *     - default:           TRUE
 	 *
* @since 3.5 */ - public static final String FORMATTER_PRESERVE_EXISTING_LINE_BREAKS = JavaCore.PLUGIN_ID + ".formatter.preserve_existing_line_breaks"; //$NON-NLS-1$ + public static final String FORMATTER_JOIN_LINES_IN_COMMENTS = JavaCore.PLUGIN_ID + ".formatter.join_lines_in_comments"; //$NON-NLS-1$ /** * 
 	 * FORMATTER / Option to specify whether or not empty statement should be on a new line
Index: buildnotes_jdt-core.html
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/buildnotes_jdt-core.html,v
retrieving revision 1.6790
diff -u -r1.6790 buildnotes_jdt-core.html
--- buildnotes_jdt-core.html	8 Dec 2008 12:54:44 -0000	1.6790
+++ buildnotes_jdt-core.html	8 Dec 2008 14:48:36 -0000
@@ -50,7 +50,71 @@