From: <tri...@us...> - 2007-10-02 23:10:16
|
Revision: 25 http://staticwiki.svn.sourceforge.net/staticwiki/?rev=25&view=rev Author: triathlon98 Date: 2007-10-02 16:10:09 -0700 (Tue, 02 Oct 2007) Log Message: ----------- improve checkstyle configuration Modified Paths: -------------- trunk/config/checkstyle.xml Modified: trunk/config/checkstyle.xml =================================================================== --- trunk/config/checkstyle.xml 2007-10-02 21:06:31 UTC (rev 24) +++ trunk/config/checkstyle.xml 2007-10-02 23:10:09 UTC (rev 25) @@ -12,11 +12,13 @@ <!-- Checks that a package.html file exists for each package. --> <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml --> - <module name="PackageHtml"/> + <!--<module name="PackageHtml"/>--> <!-- Checks whether files end with a new line. --> <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile --> - <module name="NewlineAtEndOfFile"/> + <module name="NewlineAtEndOfFile"> + <property name="severity" value="info"/> + </module> <!-- Checks that property files contain the same keys. --> <!-- See http://checkstyle.sf.net/config_misc.html#Translation --> @@ -34,21 +36,23 @@ <!-- Block checks, see http://checkstyle.sourceforge.net/config_blocks.html --> <module name="LeftCurly"> + <property name="severity" value="info"/> <property name="option" value="nl"/> </module> <module name="RightCurly"> + <property name="severity" value="info"/> <property name="option" value="alone"/> </module> <!--<module name="EmptyBlock"/>--> <module name="AvoidNestedBlocks"/> - <module name="NeedBraces"/> + <!--<module name="NeedBraces"/> no braces is allowed when on same line --> <!-- Javadoc comments checks, see http://checkstyle.sourceforge.net/config_javadoc.html --> <module name="JavadocMethod"> <property name="excludeScope" value="private"/> </module> - <module name="JavadocType"/> + <!--<module name="JavadocType"/>--> <!--<module name="JavadocVariable"/>--> <!--<module name="JavadocStyle"/>--> @@ -65,7 +69,9 @@ <module name="MethodName"/> <module name="PackageName"/> <module name="ParameterName"/> - <module name="StaticVariableName"/> + <module name="StaticVariableName"> + <property name="format" value="^([A-Z][A-Z0-9]*(_[A-Z0-9]+)*)$"/> + </module> <module name="TypeName"/> <!-- header, see http://checkstyle.sourceforge.net/config_header.html --> @@ -84,17 +90,26 @@ <module name="IllegalImport"/> <module name="RedundantImport"/> <module name="UnusedImports"/> - <module name="ImportOrder"/> + <module name="ImportOrder"> + <property name="severity" value="info"/> + </module> <!--<module name="ImportControl"/>--> <!-- size violations, see http://checkstyle.sourceforge.net/config_sizes.html --> <module name="LineLength"> + <property name="severity" value="info"/> <property name="max" value="120"/> </module> - <module name="FileLength"/> - <module name="MethodLength"/> - <module name="ParameterNumber"/> + <module name="FileLength"> + <property name="severity" value="info"/> + </module> + <module name="MethodLength"> + <property name="severity" value="info"/> + </module> + <module name="ParameterNumber"> + <property name="severity" value="info"/> + </module> <!-- whitespace, see http://checkstyle.sourceforge.net/config_whitespace.html --> @@ -106,49 +121,58 @@ </module> <module name="MethodParamPad"/> <module name="NoWhitespaceAfter"> + <property name="severity" value="info"/> <!-- Default tokens and additional GENERIC_START --> <property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS, GENERIC_START"/> </module> <module name="NoWhitespaceBefore"> + <property name="severity" value="info"/> <!-- Default tokens and additional GENERIC_START and GENERIC_END --> - <property name="tokens" value="SEMI, POST_DEC, POST_INC, GENERIC_START, GENERIC_END"/> + <property name="tokens" value="POST_DEC, POST_INC, GENERIC_START, GENERIC_END"/> </module> - <module name="OperatorWrap"/> + <!--<module name="OperatorWrap"/>--> <module name="ParenPad"> <property name="option" value="space"/> </module> <module name="TypecastParenPad"/> <module name="TabCharacter"/> <module name="WhitespaceAfter"> + <property name="severity" value="info"/> <!-- Default tokens and additional GENERIC_END --> <property name="tokens" value="COMMA, SEMI, TYPECAST, GENERIC_END"/> </module> <module name="WhitespaceAround"> + <property name="severity" value="info"/> <!-- Default tokens without GENERIC_START and GENERIC_END --> - <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND, WILDCARD_TYPE"/> - </module> - <module name="TabCharacter"/> - <module name="WhitespaceAfter"/> - <module name="WhitespaceAround"> + <property name="tokens" + value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND, WILDCARD_TYPE"/> <property name="allowEmptyConstructors" value="true"/> <property name="allowEmptyMethods" value="true"/> </module> + <module name="TabCharacter"> + <property name="severity" value="info"/> + </module> <!-- modifiers, see http://checkstyle.sourceforge.net/config_modifier.html --> - <module name="ModifierOrder"/> - <module name="RedundantModifier"/> + <!--<module name="ModifierOrder"/>--> + <module name="RedundantModifier"> + <property name="severity" value="info"/> + </module> <!-- coding , see http://checkstyle.sourceforge.net/config_coding.html --> - <module name="ArrayTrailingComma"/> + <module name="ArrayTrailingComma"> + <property name="severity" value="info"/> + </module> <!--<module name="AvoidInlineConditionals"/>--> <module name="CovariantEquals"/> <module name="DoubleCheckedLocking"/> <module name="EmptyStatement"/> <module name="EqualsHashCode"/> - <module name="FinalLocalVariable"/> + <!--<module name="FinalLocalVariable"/>--> <module name="HiddenField"> + <property name="severity" value="info"/> <property name="ignoreConstructorParameter" value="true"/> <property name="ignoreSetter" value="true"/> </module> @@ -159,11 +183,13 @@ <property name="tokens" value="LITERAL_NATIVE"/> </module> <module name="IllegalTokenText"/> - <module name="InnerAssignment"/> - <module name="MagicNumber"/> + <module name="InnerAssignment"> + <property name="severity" value="warning"/> + </module> + <!--<module name="MagicNumber"/>--> <module name="MissingSwitchDefault"/> <module name="ModifiedControlVariable"/> - <module name="RedundantThrows"/> + <!--<module name="RedundantThrows"/>--> <module name="SimplifyBooleanExpression"/> <module name="SimplifyBooleanReturn"/> <module name="StringLiteralEquality"/> @@ -175,15 +201,17 @@ <!--<module name="IllegalThrows"/>--> <module name="PackageDeclaration"/> <module name="JUnitTestCase"/> - <module name="ReturnCount"/> - <module name="IllegalType"/> - <module name="DeclarationOrder"/> + <!--<module name="ReturnCount"/>--> + <!--<module name="IllegalType"/>--> + <!--<module name="DeclarationOrder"/>--> <module name="ParameterAssignment"/> - <module name="ExplicitInitialization"/> + <module name="ExplicitInitialization"> + <property name="severity" value="info"/> + </module> <module name="DefaultComesLast"/> <!--<module name="MissingCtor"/>--> <module name="FallThrough"/> - <module name="MultipleStringLiterals"/> + <!--<module name="MultipleStringLiterals"/>--> <!--<module name="MultipleVariableDeclarations"/>--> <!--<module name="RequireThis"/>--> <!--<module name="UnnecessaryParentheses"/>--> @@ -191,6 +219,7 @@ <!-- class design, see http://checkstyle.sourceforge.net/config_design.html --> <module name="VisibilityModifier"> + <property name="severity" value="info"/> <property name="protectedAllowed" value="true"/> </module> <module name="FinalClass"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |