Modified Coding Conventions to not have a new line after annotations on

parameters (#13569).

Change-Id: Idc541f298591453c52285a8b1987052caad79e4f

diff --git a/eclipse/VaadinJavaConventions.xml b/eclipse/VaadinJavaConventions.xml
index 34d96187d9cd302d18f79d0de07976c75f0439d2..8d2c47ab904db3396a72f32ca1dbfd6e9a6ed4fa 100644 (file)
--- a/eclipse/VaadinJavaConventions.xml
+++ b/eclipse/VaadinJavaConventions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
 <profiles version="12">\r
-<profile kind="CodeFormatterProfile" name="Vaadin Java Conventions 20110923" version="12">\r
+<profile kind="CodeFormatterProfile" name="Vaadin Java Conventions 20140408" version="12">\r
 <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>\r
 <setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>\r
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>\r
@@ -193,7 +193,7 @@
 <setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>\r
 <setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>\r
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>\r
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="insert"/>\r
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>\r
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>\r
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>\r
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>\r