Author: echatellier Date: 2011-09-05 11:00:25 +0200 (Mon, 05 Sep 2011) New Revision: 2780 Url: http://chorem.org/repositories/revision/jtimer/2780 Log: Update checkstyle config file Modified: trunk/src/main/config/checkstyle.xml Modified: trunk/src/main/config/checkstyle.xml =================================================================== --- trunk/src/main/config/checkstyle.xml 2011-09-05 08:38:01 UTC (rev 2779) +++ trunk/src/main/config/checkstyle.xml 2011-09-05 09:00:25 UTC (rev 2780) @@ -25,14 +25,14 @@ --> <!DOCTYPE module PUBLIC - "-//Puppy Crawl//DTD Check Configuration 1.3//EN" - "http://www.puppycrawl.com/dtds/configuration_1_3.dtd"> + "-//Puppy Crawl//DTD Check Configuration 1.3//EN" + "http://www.puppycrawl.com/dtds/configuration_1_3.dtd"> <module name="Checker"> <!-- If you set the basedir property below, then all reported file names will be relative to the specified directory. See - http://checkstyle.sourceforge.net/config.html#Checker + http://checkstyle.sourceforge.net/5.x/config.html#Checker <property name="basedir" value="${basedir}"/> --> @@ -59,6 +59,8 @@ <property name="fileExtensions" value="java"/> </module> + <module name="NewlineAtEndOfFile"/> + <!-- <module name="Header"> <property name="headerFile" value="checkstyle_header.xml"/> <property name="fileExtensions" value="java"/> @@ -73,6 +75,7 @@ </module> <module name="TreeWalker"> + <property name="cacheFile" value="target/cachefile"/> <property name="tabWidth" value="4" /> <module name="AvoidStarImport"/> @@ -80,6 +83,7 @@ <module name="EmptyBlock"/> <module name="EmptyForIteratorPad"/> <module name="EqualsHashCode"/> + <module name="OneStatementPerLine"/> <!-- module name="IllegalCatch"/ <module name="ImportControl"> @@ -95,26 +99,41 @@ <module name="JavadocMethod"> <property name="allowUndeclaredRTE" value="true"/> <property name="allowThrowsTagsForSubclasses" value="true"/> + <property name="allowMissingPropertyJavadoc" value="true"/> </module> <module name="JavadocVariable"/> <module name="JavadocStyle"> - <property name="scope" value="protected"/> + <property name="scope" value="public"/> </module> <module name="LeftCurly"> - <property name="tokens" value="CLASS_DEF,INTERFACE_DEF,METHOD_DEF,CTOR_DEF"/> <property name="option" value="eol"/> + <property name="tokens" value="CLASS_DEF"/> + <property name="tokens" value="CTOR_DEF"/> + <property name="tokens" value="INTERFACE_DEF"/> + <property name="tokens" value="METHOD_DEF"/> </module> <module name="LeftCurly"> - <property name="tokens" value="LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE"/> <property name="option" value="eol"/> + <property name="tokens" value="LITERAL_CATCH"/> + <property name="tokens" value="LITERAL_DO"/> + <property name="tokens" value="LITERAL_ELSE"/> + <property name="tokens" value="LITERAL_FINALLY"/> + <property name="tokens" value="LITERAL_FOR"/> + <property name="tokens" value="LITERAL_IF"/> + <property name="tokens" value="LITERAL_SWITCH"/> + <property name="tokens" value="LITERAL_SYNCHRONIZED"/> + <property name="tokens" value="LITERAL_TRY"/> + <property name="tokens" value="LITERAL_WHILE"/> </module> <module name="OuterTypeNumber"/> <module name="LineLength"> - <property name="severity" value="info" /> <property name="ignorePattern" value="^ *\* *[^ ]+$"/> </module> + <module name="MethodCount"> + <property name="maxTotal" value="30"/> + </module> <module name="LocalFinalVariableName"/> <module name="LocalVariableName"/> @@ -127,7 +146,13 @@ <module name="ModifierOrder"/> <module name="NeedBraces"/> <module name="NoWhitespaceAfter"> - <property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS" /> + <property name="tokens" value="BNOT"/> + <property name="tokens" value="DEC"/> + <property name="tokens" value="DOT"/> + <property name="tokens" value="INC"/> + <property name="tokens" value="LNOT"/> + <property name="tokens" value="UNARY_MINUS"/> + <property name="tokens" value="UNARY_PLUS"/> </module> <module name="NoWhitespaceBefore"/> @@ -138,7 +163,18 @@ <module name="OperatorWrap"/> <module name="OperatorWrap"> - <property name="tokens" value="ASSIGN, DIV_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN, STAR_ASSIGN, MOD_ASSIGN, SR_ASSIGN, BSR_ASSIGN, SL_ASSIGN, BXOR_ASSIGN, BOR_ASSIGN, BAND_ASSIGN"/> + <property name="tokens" value="ASSIGN"/> + <property name="tokens" value="DIV_ASSIGN"/> + <property name="tokens" value="PLUS_ASSIGN"/> + <property name="tokens" value="MINUS_ASSIGN"/> + <property name="tokens" value="STAR_ASSIGN"/> + <property name="tokens" value="MOD_ASSIGN"/> + <property name="tokens" value="SR_ASSIGN"/> + <property name="tokens" value="BSR_ASSIGN"/> + <property name="tokens" value="SL_ASSIGN"/> + <property name="tokens" value="BXOR_ASSIGN"/> + <property name="tokens" value="BOR_ASSIGN"/> + <property name="tokens" value="BAND_ASSIGN"/> <property name="option" value="eol"/> </module> <module name="PackageName"/> @@ -188,12 +224,16 @@ <module name="ArrayTrailingComma"/> <!--<module name="FinalLocalVariable"/> --> <module name="EqualsAvoidNull"/> + <module name="ParameterAssignment"/> <!-- Generates quite a few errors --> <module name="CyclomaticComplexity"> <property name="severity" value="ignore"/> </module> + <module name="NestedForDepth"> + <property name="max" value="2"/> + </module> <module name="NestedIfDepth"> <property name="max" value="3"/> </module> @@ -206,5 +246,7 @@ </module> <module name="PackageAnnotation"/> <module name="SuppressWarnings"/> + <module name="OuterTypeFilename"/> + <module name="HideUtilityClassConstructor"/> </module> -</module> \ No newline at end of file +</module>