Attachment 178168 Details for Bug 308000 – Final proposed patch + doc

[patch] Final proposed patch + doc

v06.txt (text/plain), 69.49 KB, created by Frederic Fusier

on 2010-09-03 11:41:42 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frederic Fusier

Created: 2010-09-03 11:41:42 EDT

Size: 69.49 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: buildnotes_jdt-core.html
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/buildnotes_jdt-core.html,v
>retrieving revision 1.7575
>diff -u -r1.7575 buildnotes_jdt-core.html
>--- buildnotes_jdt-core.html	3 Sep 2010 14:49:53 -0000	1.7575
>+++ buildnotes_jdt-core.html	3 Sep 2010 15:40:09 -0000
>@@ -49,6 +49,37 @@
> (<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.core/?only_with_tag=v_B10">cvs</a>).
> <h2>What's new in this drop</h2>
> <ul>
>+<li>Code formatter: 4 new options were added to better handle the addition of
>+new lines after annotations.
>+<pre>
>+ * FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_FIELD
>+ * FORMATTER / Option to insert a new line after an annotation on a field declaration
>+ *     - option id:         "org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field"
>+ *     - possible values:   { INSERT, DO_NOT_INSERT }
>+ *     - default:           INSERT
>+ * 
>+ * FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_METHOD
>+ * FORMATTER / Option to insert a new line after an annotation on a method declaration
>+ *     - option id:         "org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method"
>+ *     - possible values:   { INSERT, DO_NOT_INSERT }
>+ *     - default:           INSERT
>+ *
>+ * FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PACKAGE
>+ * FORMATTER / Option to insert a new line after an annotation on a package declaration
>+ *     - option id:         "org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package"
>+ *     - possible values:   { INSERT, DO_NOT_INSERT }
>+ *     - default:           INSERT
>+ *
>+ * FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_TYPE
>+ * FORMATTER / Option to insert a new line after an annotation on a type declaration
>+ *     - option id:         "org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type"
>+ *     - possible values:   { INSERT, DO_NOT_INSERT }
>+ *     - default:           INSERT
>+</pre>
>+The addition of new lines after annotations has been discussed in <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=308000">bug 308000</a><br>
>+Also note that previously available code formatter constant FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_MEMBER has been deprecated.<br>
>+All new options must be enabled to activate old strategy.
>+</li>
> <li>
> The previously added new APIs:
> <blockquote>
>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.117
>diff -u -r1.117 DefaultCodeFormatterConstants.java
>--- formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java	31 Aug 2010 07:03:07 -0000	1.117
>+++ formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java	3 Sep 2010 15:40:10 -0000
>@@ -1288,11 +1288,69 @@
> 	 * @see JavaCore#INSERT
> 	 * @see JavaCore#DO_NOT_INSERT
> 	 * @since 3.4
>+	 * @deprecated
>+	 * All new options must be enabled to activate old strategy
>+	 * {@link #FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_FIELD}
>+	 * {@link #FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_METHOD}
>+	 * {@link #FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PACKAGE}
>+	 * {@link #FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_TYPE}
> 	 */
> 	public static final String FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_MEMBER = JavaCore.PLUGIN_ID + ".formatter.insert_new_line_after_annotation_on_member";//$NON-NLS-1$
> 
> 	/**
> 	 * <pre>
>+	 * FORMATTER / Option to insert a new line after an annotation on a field declaration
>+	 *     - option id:         "org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field"
>+	 *     - possible values:   { INSERT, DO_NOT_INSERT }
>+	 *     - default:           INSERT
>+	 * </pre>
>+	 * @see JavaCore#INSERT
>+	 * @see JavaCore#DO_NOT_INSERT
>+	 * @since 3.7
>+	 */
>+	public static final String FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_FIELD = JavaCore.PLUGIN_ID + ".formatter.insert_new_line_after_annotation_on_field";//$NON-NLS-1$
>+
>+	/**
>+	 * <pre>
>+	 * FORMATTER / Option to insert a new line after an annotation on a method declaration
>+	 *     - option id:         "org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method"
>+	 *     - possible values:   { INSERT, DO_NOT_INSERT }
>+	 *     - default:           INSERT
>+	 * </pre>
>+	 * @see JavaCore#INSERT
>+	 * @see JavaCore#DO_NOT_INSERT
>+	 * @since 3.7
>+	 */
>+	public static final String FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_METHOD = JavaCore.PLUGIN_ID + ".formatter.insert_new_line_after_annotation_on_method";//$NON-NLS-1$
>+
>+	/**
>+	 * <pre>
>+	 * FORMATTER / Option to insert a new line after an annotation on a package declaration
>+	 *     - option id:         "org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package"
>+	 *     - possible values:   { INSERT, DO_NOT_INSERT }
>+	 *     - default:           INSERT
>+	 * </pre>
>+	 * @see JavaCore#INSERT
>+	 * @see JavaCore#DO_NOT_INSERT
>+	 * @since 3.7
>+	 */
>+	public static final String FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PACKAGE = JavaCore.PLUGIN_ID + ".formatter.insert_new_line_after_annotation_on_package";//$NON-NLS-1$
>+
>+	/**
>+	 * <pre>
>+	 * FORMATTER / Option to insert a new line after an annotation on a type declaration
>+	 *     - option id:         "org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type"
>+	 *     - possible values:   { INSERT, DO_NOT_INSERT }
>+	 *     - default:           INSERT
>+	 * </pre>
>+	 * @see JavaCore#INSERT
>+	 * @see JavaCore#DO_NOT_INSERT
>+	 * @since 3.7
>+	 */
>+	public static final String FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_TYPE = JavaCore.PLUGIN_ID + ".formatter.insert_new_line_after_annotation_on_type";//$NON-NLS-1$
>+
>+	/**
>+	 * <pre>
> 	 * FORMATTER / Option to insert a new line after an annotation on a parameter
> 	 *     - option id:         "org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter"
> 	 *     - possible values:   { INSERT, DO_NOT_INSERT }
>@@ -3849,6 +3907,35 @@
> 	}
> 
> 	/**
>+	 * Return an array of compatible constants for an obsolete constant.
>+	 * 
>+	 * @param name The name of the obsolete constant
>+	 * @return The list as a non-empty array of the compatible constants or
>+	 * <code>null</code> if the constant is <b>not</b> obsolete.
>+	 */
>+	public static String[] getCompatibleConstants(String name) {
>+		if (FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_MEMBER.equals(name)) {
>+			return new String[] {
>+				FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_FIELD,
>+				FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_METHOD,
>+				FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PACKAGE,
>+				FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_TYPE
>+			};
>+		}
>+		if (FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION.equals(name)) {
>+			return new String[] {
>+				FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_FIELD,
>+				FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_METHOD,
>+				FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PACKAGE,
>+				FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_TYPE,
>+				FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_LOCAL_VARIABLE,
>+				FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PARAMETER
>+			};
>+		}
>+		return null;
>+	}
>+
>+	/**
> 	 * <p>Return the indentation style of the given alignment value.
> 	 * The given alignment value should be created using the <code>createAlignmentValue(boolean, int, int)</code>
> 	 * API.
>Index: formatter/org/eclipse/jdt/internal/formatter/CodeFormatterVisitor.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/CodeFormatterVisitor.java,v
>retrieving revision 1.235
>diff -u -r1.235 CodeFormatterVisitor.java
>--- formatter/org/eclipse/jdt/internal/formatter/CodeFormatterVisitor.java	20 May 2010 09:41:48 -0000	1.235
>+++ formatter/org/eclipse/jdt/internal/formatter/CodeFormatterVisitor.java	3 Sep 2010 15:40:10 -0000
>@@ -561,7 +561,7 @@
> 		Alignment memberAlignment = this.scribe.getMemberAlignment();
> 
>         this.scribe.printComment();
>-		this.scribe.printModifiers(fieldDeclaration.annotations, this, ICodeFormatterConstants.ANNOTATION_ON_MEMBER);
>+		this.scribe.printModifiers(fieldDeclaration.annotations, this, ICodeFormatterConstants.ANNOTATION_ON_FIELD);
> 		this.scribe.space();
> 		/*
> 		 * Field type
>@@ -675,7 +675,7 @@
> 		Alignment fieldAlignment = this.scribe.getMemberAlignment();
> 
>         this.scribe.printComment();
>-		this.scribe.printModifiers(multiFieldDeclaration.annotations, this, ICodeFormatterConstants.ANNOTATION_ON_MEMBER);
>+		this.scribe.printModifiers(multiFieldDeclaration.annotations, this, ICodeFormatterConstants.ANNOTATION_ON_FIELD);
> 		this.scribe.space();
> 
> 		multiFieldDeclaration.declarations[0].type.traverse(this, scope);
>@@ -911,7 +911,7 @@
> 		this.scribe.printComment();
> 		int line = this.scribe.line;
> 
>-		this.scribe.printModifiers(typeDeclaration.annotations, this, ICodeFormatterConstants.ANNOTATION_ON_MEMBER);
>+		this.scribe.printModifiers(typeDeclaration.annotations, this, ICodeFormatterConstants.ANNOTATION_ON_TYPE);
> 
> 		if (this.scribe.line > line) {
> 			// annotations introduced new line, but this is not a line wrapping
>@@ -2443,7 +2443,7 @@
>          * Print comments to get proper line number
>          */
>         this.scribe.printComment();
>-        this.scribe.printModifiers(annotationTypeMemberDeclaration.annotations, this, ICodeFormatterConstants.ANNOTATION_ON_MEMBER);
>+        this.scribe.printModifiers(annotationTypeMemberDeclaration.annotations, this, ICodeFormatterConstants.ANNOTATION_ON_METHOD);
> 		this.scribe.space();
> 		/*
> 		 * Print the method return type
>@@ -3070,7 +3070,7 @@
> 				this.scribe.printEmptyLines(blankLinesBeforePackage);
> 			}
> 
>-			this.scribe.printModifiers(currentPackage.annotations, this, ICodeFormatterConstants.ANNOTATION_ON_MEMBER);
>+			this.scribe.printModifiers(currentPackage.annotations, this, ICodeFormatterConstants.ANNOTATION_ON_PACKAGE);
> 			this.scribe.space();
> 			// dump the package keyword
> 			this.scribe.printNextToken(TerminalTokens.TokenNamepackage);
>@@ -3306,7 +3306,7 @@
>          */
>         this.scribe.printComment();
>         int line = this.scribe.line;
>-		this.scribe.printModifiers(constructorDeclaration.annotations, this, ICodeFormatterConstants.ANNOTATION_ON_MEMBER);
>+		this.scribe.printModifiers(constructorDeclaration.annotations, this, ICodeFormatterConstants.ANNOTATION_ON_METHOD);
> 		if (this.scribe.line > line) {
>         	// annotations introduced new line, but this is not a line wrapping
> 			// see 158267
>@@ -3523,7 +3523,7 @@
>          */
>         this.scribe.printComment();
>         final int line = this.scribe.line;
>-        this.scribe.printModifiers(enumConstant.annotations, this, ICodeFormatterConstants.ANNOTATION_ON_MEMBER);
>+        this.scribe.printModifiers(enumConstant.annotations, this, ICodeFormatterConstants.ANNOTATION_ON_FIELD);
> 		this.scribe.printNextToken(TerminalTokens.TokenNameIdentifier, false);
> 		formatEnumConstantArguments(
> 			enumConstant,
>@@ -4219,7 +4219,7 @@
> 		do {
> 			try {
> 
>-				this.scribe.printModifiers(methodDeclaration.annotations, this, ICodeFormatterConstants.ANNOTATION_ON_MEMBER);
>+				this.scribe.printModifiers(methodDeclaration.annotations, this, ICodeFormatterConstants.ANNOTATION_ON_METHOD);
> 				int fragmentIndex = 0;
> 				this.scribe.alignFragment(methodDeclAlignment, fragmentIndex);
> 
>Index: formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatterOptions.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatterOptions.java,v
>retrieving revision 1.108
>diff -u -r1.108 DefaultCodeFormatterOptions.java
>--- formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatterOptions.java	20 May 2010 09:41:48 -0000	1.108
>+++ formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatterOptions.java	3 Sep 2010 15:40:11 -0000
>@@ -135,7 +135,10 @@
> 	public boolean indent_switchstatements_compare_to_switch;
> 	public int indentation_size;
> 
>-	public boolean insert_new_line_after_annotation_on_member;
>+	public boolean insert_new_line_after_annotation_on_type;
>+	public boolean insert_new_line_after_annotation_on_field;
>+	public boolean insert_new_line_after_annotation_on_method;
>+	public boolean insert_new_line_after_annotation_on_package;
> 	public boolean insert_new_line_after_annotation_on_parameter;
> 	public boolean insert_new_line_after_annotation_on_local_variable;
> 	public boolean insert_new_line_after_label;
>@@ -421,7 +424,10 @@
> 		options.put(DefaultCodeFormatterConstants.FORMATTER_INDENT_SWITCHSTATEMENTS_COMPARE_TO_CASES, this.indent_switchstatements_compare_to_cases ? DefaultCodeFormatterConstants.TRUE : DefaultCodeFormatterConstants.FALSE);
> 		options.put(DefaultCodeFormatterConstants.FORMATTER_INDENT_SWITCHSTATEMENTS_COMPARE_TO_SWITCH, this.indent_switchstatements_compare_to_switch ? DefaultCodeFormatterConstants.TRUE : DefaultCodeFormatterConstants.FALSE);
> 		options.put(DefaultCodeFormatterConstants.FORMATTER_INDENTATION_SIZE, Integer.toString(this.indentation_size));
>-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_MEMBER, this.insert_new_line_after_annotation_on_member ? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
>+		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_TYPE, this.insert_new_line_after_annotation_on_type ? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
>+		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_FIELD, this.insert_new_line_after_annotation_on_field ? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
>+		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_METHOD, this.insert_new_line_after_annotation_on_method ? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
>+		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PACKAGE, this.insert_new_line_after_annotation_on_package ? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
> 		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PARAMETER, this.insert_new_line_after_annotation_on_parameter ? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
> 		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_LOCAL_VARIABLE, this.insert_new_line_after_annotation_on_local_variable ? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
> 		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_OPENING_BRACE_IN_ARRAY_INITIALIZER, this.insert_new_line_after_opening_brace_in_array_initializer? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
>@@ -2028,16 +2034,41 @@
> 				this.comment_clear_blank_lines_in_block_comment = DefaultCodeFormatterConstants.TRUE.equals(commentClearBlankLinesInBlockCommentOption);
> 			}
> 		}
>-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=122247
>+		// New line after annotations
> 		final Object insertNewLineAfterAnnotationOption = settings.get(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION);
>-		if (insertNewLineAfterAnnotationOption != null) { // check if deprecated option was used
>-			this.insert_new_line_after_annotation_on_member = JavaCore.INSERT.equals(insertNewLineAfterAnnotationOption);
>-			this.insert_new_line_after_annotation_on_parameter = JavaCore.INSERT.equals(insertNewLineAfterAnnotationOption);
>-			this.insert_new_line_after_annotation_on_local_variable = JavaCore.INSERT.equals(insertNewLineAfterAnnotationOption);
>+		if (insertNewLineAfterAnnotationOption != null) { // check if deprecated 3.1 option was used
>+			boolean insert = JavaCore.INSERT.equals(insertNewLineAfterAnnotationOption);
>+			this.insert_new_line_after_annotation_on_type = insert;
>+			this.insert_new_line_after_annotation_on_field = insert;
>+			this.insert_new_line_after_annotation_on_method = insert;
>+			this.insert_new_line_after_annotation_on_package = insert;
>+			this.insert_new_line_after_annotation_on_parameter = insert;
>+			this.insert_new_line_after_annotation_on_local_variable = insert;
> 		} else {
> 			final Object insertNewLineAfterAnnotationOnMemberOption = settings.get(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_MEMBER);
>-			if (insertNewLineAfterAnnotationOnMemberOption != null) { // otherwhise, use the new options
>-				this.insert_new_line_after_annotation_on_member = JavaCore.INSERT.equals(insertNewLineAfterAnnotationOnMemberOption);
>+			if (insertNewLineAfterAnnotationOnMemberOption != null) { // check if deprecated 3.4 option was used
>+				boolean insert = JavaCore.INSERT.equals(insertNewLineAfterAnnotationOnMemberOption);
>+				this.insert_new_line_after_annotation_on_type = insert;
>+				this.insert_new_line_after_annotation_on_field = insert;
>+				this.insert_new_line_after_annotation_on_method = insert;
>+				this.insert_new_line_after_annotation_on_package = insert;
>+			} else { // otherwise use new options
>+				final Object insertNewLineAfterAnnotationOnTypeOption = settings.get(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_TYPE);
>+				if (insertNewLineAfterAnnotationOnTypeOption != null) {
>+					this.insert_new_line_after_annotation_on_type = JavaCore.INSERT.equals(insertNewLineAfterAnnotationOnTypeOption);
>+				}
>+				final Object insertNewLineAfterAnnotationOnFieldOption = settings.get(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_FIELD);
>+				if (insertNewLineAfterAnnotationOnFieldOption != null) {
>+					this.insert_new_line_after_annotation_on_field = JavaCore.INSERT.equals(insertNewLineAfterAnnotationOnFieldOption);
>+				}
>+				final Object insertNewLineAfterAnnotationOnMethodOption = settings.get(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_METHOD);
>+				if (insertNewLineAfterAnnotationOnMethodOption != null) {
>+					this.insert_new_line_after_annotation_on_method = JavaCore.INSERT.equals(insertNewLineAfterAnnotationOnMethodOption);
>+				}
>+				final Object insertNewLineAfterAnnotationOnPackageOption = settings.get(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PACKAGE);
>+				if (insertNewLineAfterAnnotationOnPackageOption != null) {
>+					this.insert_new_line_after_annotation_on_package = JavaCore.INSERT.equals(insertNewLineAfterAnnotationOnPackageOption);
>+				}
> 			}
> 			final Object insertNewLineAfterAnnotationOnParameterOption = settings.get(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PARAMETER);
> 			if (insertNewLineAfterAnnotationOnParameterOption != null) {
>@@ -2126,7 +2157,10 @@
> 		this.indent_switchstatements_compare_to_cases = true;
> 		this.indent_switchstatements_compare_to_switch = true;
> 		this.indentation_size = 4;
>-		this.insert_new_line_after_annotation_on_member = true;
>+		this.insert_new_line_after_annotation_on_type = true;
>+		this.insert_new_line_after_annotation_on_field = true;
>+		this.insert_new_line_after_annotation_on_method = true;
>+		this.insert_new_line_after_annotation_on_package = true;
> 		this.insert_new_line_after_annotation_on_parameter = false;
> 		this.insert_new_line_after_annotation_on_local_variable = true;
> 		this.insert_new_line_after_opening_brace_in_array_initializer = false;
>@@ -2401,7 +2435,10 @@
> 		this.indent_switchstatements_compare_to_cases = true;
> 		this.indent_switchstatements_compare_to_switch = false;
> 		this.indentation_size = 4;
>-		this.insert_new_line_after_annotation_on_member = true;
>+		this.insert_new_line_after_annotation_on_type = true;
>+		this.insert_new_line_after_annotation_on_field = true;
>+		this.insert_new_line_after_annotation_on_method = true;
>+		this.insert_new_line_after_annotation_on_package = true;
> 		this.insert_new_line_after_annotation_on_parameter = false;
> 		this.insert_new_line_after_annotation_on_local_variable = true;
> 		this.insert_new_line_after_opening_brace_in_array_initializer = false;
>Index: formatter/org/eclipse/jdt/internal/formatter/ICodeFormatterConstants.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/ICodeFormatterConstants.java,v
>retrieving revision 1.2
>diff -u -r1.2 ICodeFormatterConstants.java
>--- formatter/org/eclipse/jdt/internal/formatter/ICodeFormatterConstants.java	27 Jun 2008 16:04:08 -0000	1.2
>+++ formatter/org/eclipse/jdt/internal/formatter/ICodeFormatterConstants.java	3 Sep 2010 15:40:11 -0000
>@@ -24,12 +24,21 @@
> 	/** annotation on unspecified source*/
> 	public static final int ANNOTATION_UNSPECIFIED = 0;
> 
>-	/** annotation on a member (type, method, field) */
>-	public static final int ANNOTATION_ON_MEMBER = 1;
>+	/** annotation on a type */
>+	public static final int ANNOTATION_ON_TYPE = 1;
>+
>+	/** annotation on a field */
>+	public static final int ANNOTATION_ON_FIELD = 2;
>+
>+	/** annotation on a method */
>+	public static final int ANNOTATION_ON_METHOD = 3;
>+
>+	/** annotation on a package */
>+	public static final int ANNOTATION_ON_PACKAGE = 4;
> 
> 	/** annotation on a parameter */
>-	public static final int ANNOTATION_ON_PARAMETER = 2;
>+	public static final int ANNOTATION_ON_PARAMETER = 5;
> 
> 	/** annotation on a local variable */
>-	public static final int ANNOTATION_ON_LOCAL_VARIABLE = 3;
>+	public static final int ANNOTATION_ON_LOCAL_VARIABLE = 6;
> }
>Index: formatter/org/eclipse/jdt/internal/formatter/Scribe.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/Scribe.java,v
>retrieving revision 1.218
>diff -u -r1.218 Scribe.java
>--- formatter/org/eclipse/jdt/internal/formatter/Scribe.java	3 Sep 2010 14:49:21 -0000	1.218
>+++ formatter/org/eclipse/jdt/internal/formatter/Scribe.java	3 Sep 2010 15:40:11 -0000
>@@ -4487,8 +4487,23 @@
> 							// https://bugs.eclipse.org/bugs/show_bug.cgi?id=122247
> 							boolean shouldAddNewLine = false;
> 							switch (annotationSourceKind) {
>-								case ICodeFormatterConstants.ANNOTATION_ON_MEMBER :
>-									if (this.formatter.preferences.insert_new_line_after_annotation_on_member) {
>+								case ICodeFormatterConstants.ANNOTATION_ON_TYPE :
>+									if (this.formatter.preferences.insert_new_line_after_annotation_on_type) {
>+										shouldAddNewLine = true;
>+									}
>+									break;
>+								case ICodeFormatterConstants.ANNOTATION_ON_FIELD :
>+									if (this.formatter.preferences.insert_new_line_after_annotation_on_field) {
>+										shouldAddNewLine = true;
>+									}
>+									break;
>+								case ICodeFormatterConstants.ANNOTATION_ON_METHOD :
>+									if (this.formatter.preferences.insert_new_line_after_annotation_on_method) {
>+										shouldAddNewLine = true;
>+									}
>+									break;
>+								case ICodeFormatterConstants.ANNOTATION_ON_PACKAGE :
>+									if (this.formatter.preferences.insert_new_line_after_annotation_on_package) {
> 										shouldAddNewLine = true;
> 									}
> 									break;
>Index: model/org/eclipse/jdt/internal/core/JavaModelManager.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java,v
>retrieving revision 1.454
>diff -u -r1.454 JavaModelManager.java
>--- model/org/eclipse/jdt/internal/core/JavaModelManager.java	21 Jul 2010 14:13:46 -0000	1.454
>+++ model/org/eclipse/jdt/internal/core/JavaModelManager.java	3 Sep 2010 15:40:12 -0000
>@@ -2074,6 +2074,16 @@
> 
> 		// backward compatibility
> 		addDeprecatedOptions(options);
>+		try {
>+			final IEclipsePreferences eclipsePreferences = this.preferencesLookup[PREF_INSTANCE];
>+			String[] instanceKeys = eclipsePreferences.keys();
>+			for (int i=0, length=instanceKeys.length; i<length; i++) {
>+				String optionName = instanceKeys[i];
>+				migrateObsoleteOption(options, optionName, eclipsePreferences.get(optionName, null));
>+			}
>+		} catch (BackingStoreException e) {
>+			// skip
>+		}
> 
> 		Util.fixTaskTags(options);
> 		// store built map in cache
>@@ -2083,6 +2093,33 @@
> 		return options;
> 	}
> 
>+	/**
>+	 * Migrates an old option value to its new corresponding option name(s)
>+	 * when necessary.
>+	 * <p>
>+	 * Nothing is done if the given option is not obsolete or if no migration has been
>+	 * specified for it.
>+	 * </p><p>
>+	 * Currently, migration is only done for formatter options.
>+	 * </p>
>+	 * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=308000"
>+	 * 
>+	 * @param options The options map to update
>+	 * @param optionName The old option name to update
>+	 * @param optionValue The value of the old option name
>+	 */
>+	public void migrateObsoleteOption(Map options, String optionName, String optionValue) {
>+
>+		// Migrate formatter options
>+		String[] compatibleConstants = DefaultCodeFormatterConstants.getCompatibleConstants(optionName);
>+		if (compatibleConstants != null) {
>+			for (int i=0, length=compatibleConstants.length; i < length; i++) {
>+				options.put(compatibleConstants[i], optionValue);
>+			}
>+			return;
>+		}
>+	}
>+
> 	// Do not modify without modifying getDefaultOptions()
> 	private Hashtable getDefaultOptionsNoInitialization() {
> 		Map defaultOptionsMap = new CompilerOptions().getMap(); // compiler defaults
>Index: model/org/eclipse/jdt/internal/core/JavaProject.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java,v
>retrieving revision 1.434
>diff -u -r1.434 JavaProject.java
>--- model/org/eclipse/jdt/internal/core/JavaProject.java	30 Aug 2010 10:53:26 -0000	1.434
>+++ model/org/eclipse/jdt/internal/core/JavaProject.java	3 Sep 2010 15:40:12 -0000
>@@ -1637,7 +1637,8 @@
> 		// Get project specific options
> 		JavaModelManager.PerProjectInfo perProjectInfo = null;
> 		Hashtable projectOptions = null;
>-		HashSet optionNames = JavaModelManager.getJavaModelManager().optionNames;
>+		JavaModelManager javaModelManager = JavaModelManager.getJavaModelManager();
>+		HashSet optionNames = javaModelManager.optionNames;
> 		try {
> 			perProjectInfo = getPerProjectInfo();
> 			projectOptions = perProjectInfo.options;
>@@ -1651,8 +1652,13 @@
> 				for (int i = 0; i < propertyNames.length; i++){
> 					String propertyName = propertyNames[i];
> 					String value = projectPreferences.get(propertyName, null);
>-					if (value != null && optionNames.contains(propertyName)){
>-						projectOptions.put(propertyName, value.trim());
>+					if (value != null) {
>+						if (optionNames.contains(propertyName)){
>+							projectOptions.put(propertyName, value.trim());
>+						} else {
>+							// Maybe an obsolete preference, try to migrate it...
>+							javaModelManager.migrateObsoleteOption(projectOptions, propertyName, value.trim());
>+						}
> 					}
> 				}
> 				// cache project options
>#P org.eclipse.jdt.core.tests.model
>Index: src/org/eclipse/jdt/core/tests/formatter/FormatterRegressionTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/formatter/FormatterRegressionTests.java,v
>retrieving revision 1.260
>diff -u -r1.260 FormatterRegressionTests.java
>--- src/org/eclipse/jdt/core/tests/formatter/FormatterRegressionTests.java	20 May 2010 09:41:37 -0000	1.260
>+++ src/org/eclipse/jdt/core/tests/formatter/FormatterRegressionTests.java	3 Sep 2010 15:40:15 -0000
>@@ -10364,7 +10364,10 @@
> 		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
> 		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
> 		preferences.line_separator = "\n";//$NON-NLS-1$
>-		preferences.insert_new_line_after_annotation_on_member = false;
>+		preferences.insert_new_line_after_annotation_on_type = false;
>+		preferences.insert_new_line_after_annotation_on_field = false;
>+		preferences.insert_new_line_after_annotation_on_method = false;
>+		preferences.insert_new_line_after_annotation_on_package = false;
> 		preferences.insert_new_line_after_annotation_on_parameter = true;
> 		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
> 		IRegion[] regions = new IRegion[] {
>@@ -10378,7 +10381,10 @@
> 		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
> 		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
> 		preferences.line_separator = "\n";//$NON-NLS-1$
>-		preferences.insert_new_line_after_annotation_on_member = false;
>+		preferences.insert_new_line_after_annotation_on_type = false;
>+		preferences.insert_new_line_after_annotation_on_field = false;
>+		preferences.insert_new_line_after_annotation_on_method = false;
>+		preferences.insert_new_line_after_annotation_on_package = false;
> 		preferences.insert_new_line_after_annotation_on_parameter = false;
> 		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
> 		IRegion[] regions = new IRegion[] {
>@@ -10393,7 +10399,10 @@
> 		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
> 		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
> 		preferences.line_separator = "\n";//$NON-NLS-1$
>-		preferences.insert_new_line_after_annotation_on_member = false;
>+		preferences.insert_new_line_after_annotation_on_type = false;
>+		preferences.insert_new_line_after_annotation_on_field = false;
>+		preferences.insert_new_line_after_annotation_on_method = false;
>+		preferences.insert_new_line_after_annotation_on_package = false;
> 		preferences.insert_new_line_after_annotation_on_parameter = true;
> 		preferences.insert_new_line_after_annotation_on_local_variable = false;
> 		Hashtable javaCoreOptions = JavaCore.getOptions();
>@@ -10419,7 +10428,10 @@
> 	public void test707() {
> 		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
> 		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
>-		preferences.insert_new_line_after_annotation_on_member = true;
>+		preferences.insert_new_line_after_annotation_on_type = true;
>+		preferences.insert_new_line_after_annotation_on_field = true;
>+		preferences.insert_new_line_after_annotation_on_method = true;
>+		preferences.insert_new_line_after_annotation_on_package = true;
> 		preferences.insert_new_line_after_annotation_on_parameter = true;
> 		preferences.insert_new_line_after_annotation_on_local_variable = false;
> 		preferences.line_separator = "\n";//$NON-NLS-1$
>@@ -10447,7 +10459,10 @@
> 		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
> 		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
> 		preferences.line_separator = "\n";//$NON-NLS-1$
>-		preferences.insert_new_line_after_annotation_on_member = true;
>+		preferences.insert_new_line_after_annotation_on_type = true;
>+		preferences.insert_new_line_after_annotation_on_field = true;
>+		preferences.insert_new_line_after_annotation_on_method = true;
>+		preferences.insert_new_line_after_annotation_on_package = true;
> 		preferences.insert_new_line_after_annotation_on_parameter = false;
> 		preferences.insert_new_line_after_annotation_on_local_variable = false;
> 		Hashtable javaCoreOptions = JavaCore.getOptions();
>@@ -10473,7 +10488,10 @@
> 	public void test709() {
> 		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
> 		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
>-		preferences.insert_new_line_after_annotation_on_member = false;
>+		preferences.insert_new_line_after_annotation_on_type = false;
>+		preferences.insert_new_line_after_annotation_on_field = false;
>+		preferences.insert_new_line_after_annotation_on_method = false;
>+		preferences.insert_new_line_after_annotation_on_package = false;
> 		preferences.insert_new_line_after_annotation_on_parameter = false;
> 		preferences.insert_new_line_after_annotation_on_local_variable = false;
> 		preferences.line_separator = "\n";//$NON-NLS-1$
>@@ -10500,7 +10518,10 @@
> 	public void test710() {
> 		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
> 		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
>-		preferences.insert_new_line_after_annotation_on_member = false;
>+		preferences.insert_new_line_after_annotation_on_type = false;
>+		preferences.insert_new_line_after_annotation_on_field = false;
>+		preferences.insert_new_line_after_annotation_on_method = false;
>+		preferences.insert_new_line_after_annotation_on_package = false;
> 		preferences.insert_new_line_after_annotation_on_parameter = true;
> 		preferences.insert_new_line_after_annotation_on_local_variable = true;
> 		preferences.line_separator = "\n";//$NON-NLS-1$
>@@ -10527,7 +10548,10 @@
> 	public void test711() {
> 		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
> 		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
>-		preferences.insert_new_line_after_annotation_on_member = false;
>+		preferences.insert_new_line_after_annotation_on_type = false;
>+		preferences.insert_new_line_after_annotation_on_field = false;
>+		preferences.insert_new_line_after_annotation_on_method = false;
>+		preferences.insert_new_line_after_annotation_on_package = false;
> 		preferences.insert_new_line_after_annotation_on_parameter = false;
> 		preferences.insert_new_line_after_annotation_on_local_variable = true;
> 		preferences.line_separator = "\n";//$NON-NLS-1$
>@@ -10726,4 +10750,173 @@
> 		"}\n"
> 	);
> }
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=308000
>+public void test725() {
>+	this.formatterPrefs = null;
>+	this.formatterOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_6);
>+	this.formatterOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_6);
>+	this.formatterOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6);
>+	String source =
>+		"@Deprecated package pack;\n" + 
>+		"public class Test {\n" + 
>+		"    @Deprecated Test(String s) {}\n" + 
>+		"    @Deprecated String label;\n" + 
>+		"    @Deprecated void foo() {}\n" + 
>+		"    @Deprecated interface I {}\n" + 
>+		"}\n";
>+	formatSource(source,
>+		"@Deprecated\n" +
>+		"package pack;\n" + 
>+		"\n" + 
>+		"public class Test {\n" + 
>+		"	@Deprecated\n" + 
>+		"	Test(String s) {\n" + 
>+		"	}\n" + 
>+		"\n" + 
>+		"	@Deprecated\n" + 
>+		"	String label;\n" + 
>+		"\n" + 
>+		"	@Deprecated\n" + 
>+		"	void foo() {\n" + 
>+		"	}\n" + 
>+		"\n" + 
>+		"	@Deprecated\n" + 
>+		"	interface I {\n" + 
>+		"	}\n" + 
>+		"}\n"
>+	);
>+}
>+public void test726() {
>+	this.formatterPrefs = null;
>+	this.formatterOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_6);
>+	this.formatterOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_6);
>+	this.formatterOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6);
>+	this.formatterOptions.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_TYPE, DefaultCodeFormatterConstants.FALSE);
>+	this.formatterOptions.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_FIELD, DefaultCodeFormatterConstants.FALSE);
>+	this.formatterOptions.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_METHOD, DefaultCodeFormatterConstants.FALSE);
>+	this.formatterOptions.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PACKAGE, DefaultCodeFormatterConstants.FALSE);
>+	String source =
>+		"@Deprecated package pack;\n" + 
>+		"public class Test {\n" + 
>+		"    @Deprecated Test(String s) {}\n" + 
>+		"    @Deprecated String label;\n" + 
>+		"    @Deprecated void foo() {}\n" + 
>+		"    @Deprecated interface I {}\n" + 
>+		"}\n";
>+	formatSource(source,
>+		"@Deprecated package pack;\n" + 
>+		"\n" + 
>+		"public class Test {\n" + 
>+		"	@Deprecated Test(String s) {\n" + 
>+		"	}\n" + 
>+		"\n" + 
>+		"	@Deprecated String label;\n" + 
>+		"\n" + 
>+		"	@Deprecated void foo() {\n" + 
>+		"	}\n" + 
>+		"\n" + 
>+		"	@Deprecated interface I {\n" + 
>+		"	}\n" + 
>+		"}\n"
>+	);
>+}
>+
>+/**
>+ * @deprecated Use a deprecated formatter option.
>+ */
>+public void test727() {
>+	this.formatterPrefs = null;
>+	this.formatterOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_6);
>+	this.formatterOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_6);
>+	this.formatterOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6);
>+	this.formatterOptions.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_LOCAL_VARIABLE, DefaultCodeFormatterConstants.TRUE);
>+	this.formatterOptions.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_MEMBER, DefaultCodeFormatterConstants.FALSE);
>+	this.formatterOptions.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PARAMETER, DefaultCodeFormatterConstants.FALSE);
>+	String source =
>+		"@Deprecated package pack;\n" + 
>+		"public class Test {\n" + 
>+		"    @Deprecated Test(String s) {}\n" + 
>+		"    @Deprecated String label;\n" + 
>+		"    @Deprecated void foo() {}\n" + 
>+		"    @Deprecated interface I {}\n" + 
>+		"}\n";
>+	formatSource(source,
>+		"@Deprecated package pack;\n" + 
>+		"\n" + 
>+		"public class Test {\n" + 
>+		"	@Deprecated Test(String s) {\n" + 
>+		"	}\n" + 
>+		"\n" + 
>+		"	@Deprecated String label;\n" + 
>+		"\n" + 
>+		"	@Deprecated void foo() {\n" + 
>+		"	}\n" + 
>+		"\n" + 
>+		"	@Deprecated interface I {\n" + 
>+		"	}\n" + 
>+		"}\n"
>+	);
>+}
>+
>+/**
>+ * @deprecated Use a deprecated formatter option.
>+ */
>+public void test728() {
>+	this.formatterPrefs = null;
>+	this.formatterOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_6);
>+	this.formatterOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_6);
>+	this.formatterOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6);
>+	this.formatterOptions.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION, DefaultCodeFormatterConstants.FALSE);
>+	String source =
>+		"@Deprecated package pack;\n" + 
>+		"public class Test {\n" + 
>+		"    @Deprecated Test(String s) {}\n" + 
>+		"    @Deprecated String label;\n" + 
>+		"    @Deprecated void foo() {}\n" + 
>+		"    @Deprecated interface I {}\n" + 
>+		"}\n";
>+	formatSource(source,
>+		"@Deprecated package pack;\n" + 
>+		"\n" + 
>+		"public class Test {\n" + 
>+		"	@Deprecated Test(String s) {\n" + 
>+		"	}\n" + 
>+		"\n" + 
>+		"	@Deprecated String label;\n" + 
>+		"\n" + 
>+		"	@Deprecated void foo() {\n" + 
>+		"	}\n" + 
>+		"\n" + 
>+		"	@Deprecated interface I {\n" + 
>+		"	}\n" + 
>+		"}\n"
>+	);
>+}
>+public void testONLY_729() {
>+	this.formatterPrefs = null;
>+	String profilePath = getResource("profiles", "b308000.xml");
>+	this.formatterOptions = DecodeCodeFormatterPreferences.decodeCodeFormatterOptions(profilePath, "b308000");
>+	assertNotNull("No preferences", this.formatterOptions);
>+	String source =
>+		"package p;\n" + 
>+		"\n" + 
>+		"@Deprecated public class C {\n" + 
>+		"	@Deprecated public static void main(@Deprecated String[] args) {\n" + 
>+		"		@Deprecated int i= 2;\n" + 
>+		"		System.out.println(i);\n" + 
>+		"	}\n" + 
>+		"}\n";
>+	formatSource(source,
>+		"package p;\n" + 
>+		"\n" + 
>+		"@Deprecated public class C {\n" + 
>+		"	@Deprecated public static void main(@Deprecated String[] args) {\n" + 
>+		"		@Deprecated\n" + 
>+		"		int i = 2;\n" + 
>+		"		System.out.println(i);\n" + 
>+		"	}\n" + 
>+		"}\n"
>+	);
>+}
>+
> }
>Index: workspace/Formatter/profiles/b308000.xml
>===================================================================
>RCS file: workspace/Formatter/profiles/b308000.xml
>diff -N workspace/Formatter/profiles/b308000.xml
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ workspace/Formatter/profiles/b308000.xml	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,279 @@
>+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
>+<profiles version="11">
>+<profile kind="CodeFormatterProfile" name="b308000" version="11">
>+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
>+<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
>+<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
>+<setting id="org.eclipse.jdt.core.compiler.source" value="1.5"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
>+<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
>+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="80"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
>+<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
>+<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
>+<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
>+<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="tab"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
>+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
>+<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
>+<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
>+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
>+<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
>+<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
>+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
>+<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
>+<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.5"/>
>+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
>+<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
>+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
>+<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
>+<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
>+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/>
>+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
>+<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
>+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
>+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
>+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
>+<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
>+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
>+<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.5"/>
>+<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
>+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
>+<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
>+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
>+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
>+<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
>+<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
>+</profile>
>+</profiles>

Actions: View | Diff

Attachments on bug 308000: 172780 | 176332 | 176715 | 177102 | 177845 | 178168 | 178171