Attachment 159908 Details for Bug 282030 – Additional patch

[patch] Additional patch

v03.txt (text/plain), 7.09 KB, created by Frederic Fusier

on 2010-02-23 05:51:34 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Frederic Fusier

Created: 2010-02-23 05:51:34 EST

Size: 7.09 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.7320
>diff -u -r1.7320 buildnotes_jdt-core.html
>--- buildnotes_jdt-core.html	23 Feb 2010 09:38:08 -0000	1.7320
>+++ buildnotes_jdt-core.html	23 Feb 2010 10:47:00 -0000
>@@ -59,7 +59,7 @@
>  * FORMATTER / Option for alignment of arguments in annotation
>  *     - option id:         "org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation"
>  *     - possible values:   values returned by <code>createAlignmentValue(boolean, int, int)</code> call
>- *     - default:           createAlignmentValue(false, WRAP_COMPACT, INDENT_DEFAULT)
>+ *     - default:           createAlignmentValue(false, WRAP_NO_SPLIT, INDENT_DEFAULT)
>  * 
>  * @see #createAlignmentValue(boolean, int, int)
>  * @since 3.6
>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.102
>diff -u -r1.102 DefaultCodeFormatterConstants.java
>--- formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java	22 Feb 2010 16:44:31 -0000	1.102
>+++ formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java	23 Feb 2010 10:47:04 -0000
>@@ -90,7 +90,7 @@
> 	 * FORMATTER / Option for alignment of arguments in annotation
> 	 *     - option id:         "org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation"
> 	 *     - possible values:   values returned by <code>createAlignmentValue(boolean, int, int)</code> call
>-	 *     - default:           createAlignmentValue(false, WRAP_COMPACT, INDENT_DEFAULT)
>+	 *     - default:           createAlignmentValue(false, WRAP_NO_SPLIT, INDENT_DEFAULT)
> 	 * </pre>
> 	 * @see #createAlignmentValue(boolean, int, int)
> 	 * @since 3.6
>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.98
>diff -u -r1.98 DefaultCodeFormatterOptions.java
>--- formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatterOptions.java	22 Feb 2010 16:44:32 -0000	1.98
>+++ formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatterOptions.java	23 Feb 2010 10:47:07 -0000
>@@ -627,9 +627,9 @@
> 			try {
> 				this.alignment_for_arguments_in_annotation = Integer.parseInt((String) alignmentForArgumentsInAnnotationOption);
> 			} catch (NumberFormatException e) {
>-				this.alignment_for_arguments_in_annotation = Alignment.M_COMPACT_SPLIT;
>+				this.alignment_for_arguments_in_annotation = Alignment.M_NO_ALIGNMENT;
> 			} catch (ClassCastException e) {
>-				this.alignment_for_arguments_in_annotation = Alignment.M_COMPACT_SPLIT;
>+				this.alignment_for_arguments_in_annotation = Alignment.M_NO_ALIGNMENT;
> 			}
> 		}
> 		final Object alignmentForArgumentsInEnumConstantOption = settings.get(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ARGUMENTS_IN_ENUM_CONSTANT);
>@@ -1980,7 +1980,7 @@
> 
> 	public void setDefaultSettings() {
> 		this.alignment_for_arguments_in_allocation_expression = Alignment.M_COMPACT_SPLIT;
>-		this.alignment_for_arguments_in_annotation = Alignment.M_COMPACT_SPLIT;
>+		this.alignment_for_arguments_in_annotation = Alignment.M_NO_ALIGNMENT;
> 		this.alignment_for_arguments_in_enum_constant = Alignment.M_COMPACT_SPLIT;
> 		this.alignment_for_arguments_in_explicit_constructor_call = Alignment.M_COMPACT_SPLIT;
> 		this.alignment_for_arguments_in_method_invocation = Alignment.M_COMPACT_SPLIT;
>@@ -2247,7 +2247,7 @@
> 
> 	public void setJavaConventionsSettings() {
> 		this.alignment_for_arguments_in_allocation_expression = Alignment.M_COMPACT_SPLIT;
>-		this.alignment_for_arguments_in_annotation = Alignment.M_COMPACT_SPLIT;
>+		this.alignment_for_arguments_in_annotation = Alignment.M_NO_ALIGNMENT;
> 		this.alignment_for_arguments_in_enum_constant = Alignment.M_COMPACT_SPLIT;
> 		this.alignment_for_arguments_in_explicit_constructor_call = Alignment.M_COMPACT_SPLIT;
> 		this.alignment_for_arguments_in_method_invocation = Alignment.M_COMPACT_SPLIT;
>#P org.eclipse.jdt.core.tests.model
>Index: src/org/eclipse/jdt/core/tests/formatter/FormatterBugsTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/formatter/FormatterBugsTests.java,v
>retrieving revision 1.21
>diff -u -r1.21 FormatterBugsTests.java
>--- src/org/eclipse/jdt/core/tests/formatter/FormatterBugsTests.java	22 Feb 2010 16:44:26 -0000	1.21
>+++ src/org/eclipse/jdt/core/tests/formatter/FormatterBugsTests.java	23 Feb 2010 10:47:11 -0000
>@@ -768,6 +768,7 @@
>  * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=282030"
>  */
> public void testBug282030() throws JavaModelException {
>+	this.formatterPrefs.alignment_for_arguments_in_annotation = Alignment.M_COMPACT_SPLIT;
> 	String source =
> 		"@DeclareParents(value =\n" + 
> 		"\"com.apress.springrecipes.calculator.ArithmeticCalculatorImpl\", defaultImpl =\n" + 
>@@ -783,7 +784,6 @@
> 	);
> }
> public void testBug282030a() throws JavaModelException {
>-	this.formatterPrefs.alignment_for_arguments_in_annotation = Alignment.M_NO_ALIGNMENT;
> 	String source =
> 		"@MyAnnot(value1 = \"this is an example\", value2 = \"of an annotation\", value3 = \"with several arguments\", value4 = \"which may need to be wrapped\")\n" + 
> 		"public class Test {\n" + 
>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.257
>diff -u -r1.257 FormatterRegressionTests.java
>--- src/org/eclipse/jdt/core/tests/formatter/FormatterRegressionTests.java	22 Feb 2010 16:44:27 -0000	1.257
>+++ src/org/eclipse/jdt/core/tests/formatter/FormatterRegressionTests.java	23 Feb 2010 10:47:18 -0000
>@@ -7298,7 +7298,6 @@
> 		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
> 		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
>         preferences.tab_size = 4;
>-		preferences.alignment_for_arguments_in_annotation = Alignment.M_NO_ALIGNMENT;
> 		Hashtable javaCoreOptions = JavaCore.getOptions();
> 		try {
> 			Hashtable newJavaCoreOptions = JavaCore.getOptions();
>@@ -7322,6 +7321,7 @@
> 		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
> 		preferences.tab_char = DefaultCodeFormatterOptions.TAB;
>         preferences.tab_size = 4;
>+		preferences.alignment_for_arguments_in_annotation = Alignment.M_COMPACT_SPLIT;
> 		Hashtable javaCoreOptions = JavaCore.getOptions();
> 		try {
> 			Hashtable newJavaCoreOptions = JavaCore.getOptions();

Actions: View | Diff

Attachments on bug 282030: 159543 | 159549 | 159813 | 159908