From 660bab71f755dd93710647c1308d1ef222c46d27 Mon Sep 17 00:00:00 2001
From: cduffy <cduffy@unknown>
Date: Wed, 18 Dec 2013 16:46:30 +0000
Subject: [PATCH] Update checkstyle configuration for version 5.7

git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1552014 13f79535-47bb-0310-9956-ffa450edef68
---
 .project                             |  4 ++--
 src/etc/checkstyle/checkstyle-config | 21 ++++++++++++---------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.project b/.project
index 03c0ec0c..67ac5b65 100644
--- a/.project
+++ b/.project
@@ -34,7 +34,7 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
+			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -42,7 +42,7 @@
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
+		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
 		<nature>org.apache.ivyde.eclipse.ivynature</nature>
 	</natures>
 </projectDescription>
diff --git a/src/etc/checkstyle/checkstyle-config b/src/etc/checkstyle/checkstyle-config
index e8497abb..38476d10 100644
--- a/src/etc/checkstyle/checkstyle-config
+++ b/src/etc/checkstyle/checkstyle-config
@@ -19,6 +19,17 @@
    under the License.    
 -->
 <module name="Checker">
+
+  <!-- required licence file -->
+  <module name="Header">
+    <property name="headerFile" value="${checkstyle.src.dir}/RequiredHeader.txt"/>
+    <property name="ignoreLines" value="2"/>
+  </module>
+
+  <!-- Items moved out of TreeWalker for new versions of Checkstyle -->
+  <module name="FileLength"/>
+  <module name="FileTabCharacter"/>
+
   <module name="TreeWalker">
     <!-- Javadoc requirements -->
     <!-- TODO uncomment this when javadoc will be improved
@@ -45,12 +56,6 @@
     <module name="ParameterName"/>
     <module name="StaticVariableName"/>
 
-    <!-- required licence file -->
-    <module name="Header">
-        <property name="headerFile" value="${checkstyle.src.dir}/RequiredHeader.txt"/>
-        <property name="ignoreLines" value="2"/>
-    </module>
-
     <!-- Import conventions -->
     <module name="AvoidStarImport"/>
     <!-- <module name="IllegalImport"/> -->
@@ -58,7 +63,6 @@
     <module name="UnusedImports"/>
 
     <!-- size limits -->
-    <module name="FileLength"/>
     <module name="LineLength">
       <property name="max" value="100"/>
       <property name="ignorePattern" value="^ *\* *[^ ]+$"/>
@@ -73,7 +77,6 @@
     <module name="NoWhitespaceBefore"/>
     <module name="OperatorWrap"/>
     <module name="ParenPad"/>
-    <module name="TabCharacter"/>
     <module name="WhitespaceAfter"/>
     <module name="WhitespaceAround"/>
 
@@ -93,7 +96,7 @@
 
     <!-- Checks for common coding problems -->
     <!--<module name="AvoidInlineConditionals"/> -->
-    <module name="DoubleCheckedLocking"/>
+    <!--<module name="DoubleCheckedLocking"/>--> <!-- removed in checkstyle 5.6 -->
     <module name="EmptyStatement"/>
     <module name="EqualsHashCode"/>
     <module name="IllegalInstantiation">