From 2910fe618bc4a4202c452411364b4f2bd5eb6f57 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 5 Nov 2013 11:18:22 -0800 Subject: [PATCH] Update eclipse formatter XML Update the eclipse formatter XML to align it with the project specific settings files. Also corrected the information in CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- eclipse/eclipse-code-formatter.xml | 78 +++++++++++++++--------------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3345efd8e3..4d045d5ec8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,7 +17,7 @@ the core team, and given the ability to merge pull requests. None of these is essential for a pull request, but they will all help. They can also be added after the original pull request but before a merge. -* Use the Spring Framework code format conventions. Import `eclipse-code-formatter.xml` from the root of the project +* Use the Spring Framework code format conventions. Import `eclipse-code-formatter.xml` from the `eclipse` folder of the project if you are using Eclipse. If using IntelliJ, copy `spring-intellij-code-style.xml` to `~/.IntelliJIdea*/config/codestyles` and select spring-intellij-code-style from Settings -> Code Styles. * Make sure all new .java files to have a simple Javadoc class comment with at least an @author tag identifying you, and diff --git a/eclipse/eclipse-code-formatter.xml b/eclipse/eclipse-code-formatter.xml index 120faad8ba..c9fc25979a 100644 --- a/eclipse/eclipse-code-formatter.xml +++ b/eclipse/eclipse-code-formatter.xml @@ -1,7 +1,7 @@ - - + + @@ -14,17 +14,17 @@ - + - + - + @@ -47,57 +47,57 @@ - + - + - - + + - + - + - - + + - + - + - - + + - + - + @@ -124,7 +124,7 @@ - + @@ -136,8 +136,8 @@ + - @@ -173,7 +173,7 @@ - + @@ -202,68 +202,68 @@ - - + + - + - - + + - + - + - + - + - + - + - - - + + + - + @@ -282,10 +282,10 @@ - + - +