You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlgraphics.apache.org by vh...@apache.org on 2014/02/11 19:31:37 UTC
svn commit: r1567273 - in /xmlgraphics/commons/branches/Temp_Checkstyle:
build.xml checkstyle-5.5.xml
Author: vhennebert
Date: Tue Feb 11 18:31:36 2014
New Revision: 1567273
URL: http://svn.apache.org/r1567273
Log:
Synchronise Checkstyle with FOP and also check test cases
Modified:
xmlgraphics/commons/branches/Temp_Checkstyle/build.xml
xmlgraphics/commons/branches/Temp_Checkstyle/checkstyle-5.5.xml
Modified: xmlgraphics/commons/branches/Temp_Checkstyle/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/Temp_Checkstyle/build.xml?rev=1567273&r1=1567272&r2=1567273&view=diff
==============================================================================
--- xmlgraphics/commons/branches/Temp_Checkstyle/build.xml (original)
+++ xmlgraphics/commons/branches/Temp_Checkstyle/build.xml Tue Feb 11 18:31:36 2014
@@ -484,6 +484,7 @@ NOTE:
<pathelement location="${build.codegen-classes.dir}"/>
</classpath>
<fileset dir="${src.dir}" includes="**/*.java"/>
+ <fileset dir="${basedir}/test" includes="**/*.java"/>
<formatter type="xml" toFile="${build.dir}/report_checkstyle.xml"/>
</checkstyle>
<xslt in="${build.dir}/report_checkstyle.xml" out="${build.dir}/report_checkstyle.html" style="${checkstyle.noframes.xslt}"/>
Modified: xmlgraphics/commons/branches/Temp_Checkstyle/checkstyle-5.5.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/Temp_Checkstyle/checkstyle-5.5.xml?rev=1567273&r1=1567272&r2=1567273&view=diff
==============================================================================
--- xmlgraphics/commons/branches/Temp_Checkstyle/checkstyle-5.5.xml (original)
+++ xmlgraphics/commons/branches/Temp_Checkstyle/checkstyle-5.5.xml Tue Feb 11 18:31:36 2014
@@ -37,24 +37,26 @@
<!-- ===================================================================================================== -->
<module name="SuppressionCommentFilter">
- <property name="offCommentFormat" value="CSOFF\: ([\w\|]+)"/>
+ <property name="offCommentFormat" value="CSOFF\: (LineLength)"/>
<property name="onCommentFormat" value="CSON\: ([\w\|]+)"/>
<property name="checkFormat" value="$1"/>
</module>
<!-- ===================================================================================================== -->
- <!-- ===================================================================================================== -->
- <module name="SuppressWithNearbyCommentFilter">
- <property name="commentFormat" value="CSOK\: ([\w\|]+)"/>
- <property name="checkFormat" value="$1"/>
- <property name="influenceFormat" value="0"/>
+ <module name="SuppressionFilter">
+ <property name="file" value="${samedir}/checkstyle-suppressions.xml"/>
</module>
- <!-- ===================================================================================================== -->
<!-- ===================================================================================================== -->
<module name="TreeWalker">
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
+ <module name="LineLength">
+ <property name="max" value="120"/>
+ </module>
+ <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
+
+ <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
<module name="AnnotationUseStyle"/>
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
@@ -83,10 +85,6 @@
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
- <module name="DoubleCheckedLocking"/>
- <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
-
- <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
<module name="EmptyBlock">
<property name="tokens" value="LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_TRY,LITERAL_WHILE,STATIC_INIT"/>
<property name="option" value="text"/> <!-- changing block policy to stmt produces 110 new errors -->
@@ -134,7 +132,8 @@
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
<module name="InnerAssignment">
- <property name="tokens" value="ASSIGN,BAND_ASSIGN,BOR_ASSIGN,BSR_ASSIGN,BXOR_ASSIGN,DIV_ASSIGN,MINUS_ASSIGN,MOD_ASSIGN,PLUS_ASSIGN,SL_ASSIGN,SR_ASSIGN,STAR_ASSIGN"/>
+ <property name="tokens"
+ value="BAND_ASSIGN,BOR_ASSIGN,BSR_ASSIGN,BXOR_ASSIGN,DIV_ASSIGN,MINUS_ASSIGN,MOD_ASSIGN,PLUS_ASSIGN,SL_ASSIGN,SR_ASSIGN,STAR_ASSIGN"/>
</module>
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
@@ -159,7 +158,7 @@
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
- <!-- <module name="MethodParamPad"/> produces 4316 new errors -->
+ <module name="MethodParamPad"/>
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
@@ -183,10 +182,6 @@
<property name="allowLineBreaks" value="false"/>
<property name="tokens" value="BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/>
</module>
- <module name="NoWhitespaceAfter">
- <property name="allowLineBreaks" value="true"/>
- <property name="tokens" value="ARRAY_INIT"/>
- </module>
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
@@ -210,7 +205,7 @@
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
- <!-- <module name="ParenPad"/> produces 16666 new errors -->
+ <module name="ParenPad"/>
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org