Skip to content

Commit 859f15a

Browse files
committed
checkstyle in sync with HtmlUnit
1 parent d0e6257 commit 859f15a

File tree

1 file changed

+21
-8
lines changed

1 file changed

+21
-8
lines changed

checkstyle.xml

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333

3434
<module name="LineLength">
3535
<property name="max" value="120"/>
36+
<property name="ignorePattern" value="^(package|import| *\* *[^ ]+).*"/>
3637
</module>
3738

3839
<!-- Prevent two spaces after @xxxx -->
@@ -99,15 +100,11 @@
99100
<property name="message" value="Use static import for BrowserVersionFeatures"/>
100101
</module>
101102

102-
<!--
103-
at the moment there is a problem with disabling this check for some files
104-
without disabling all RegexpMultiline checks; for this reason this is not active
105103
<module name="RegexpMultiline">
106104
<property name="id" value="sysout"/>
107105
<property name="format" value="System\s*\.\s*(out)|(err)\s*\.\s*print(ln)?\("/>
108106
<property name="message" value="System.out.print/ln found"/>
109107
</module>
110-
-->
111108

112109
<module name="TreeWalker">
113110

@@ -123,12 +120,12 @@
123120
<property name="tokens" value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/>
124121
</module>
125122

126-
<module name="ConstantName">
127-
<property name="format" value="log|^[a-zA-Z][a-zA-Z0-9_]*$"/>
128-
</module>
129-
130123
<!-- Checks for Javadoc comments. -->
131124
<!-- See http://checkstyle.sf.net/config_javadoc.html -->
125+
<module name="MissingJavadocMethod"/>
126+
<module name="MissingJavadocPackage"/>
127+
<module name="MissingJavadocType"/>
128+
132129
<module name="JavadocMethod">
133130
<property name="accessModifiers" value="public, protected"/>
134131
</module>
@@ -145,9 +142,22 @@
145142
<property name="checkEmptyJavadoc" value="false"/>
146143
<property name="checkHtml" value="true"/>
147144
</module>
145+
<module name="InvalidJavadocPosition"/>
146+
<module name="JavadocContentLocation"/>
147+
<module name="JavadocLeadingAsteriskAlign" />
148+
<!--module name="JavadocMissingLeadingAsterisk"/-->
149+
<module name="JavadocMissingWhitespaceAfterAsterisk"/>
150+
<!--module name="JavadocParagraph"/-->
151+
<module name="JavadocTagContinuationIndentation"/>
152+
<module name="NonEmptyAtclauseDescription"/>
153+
<!--module name="RequireEmptyLineBeforeBlockTagGroup"/-->
154+
<module name="SingleLineJavadoc"/>
148155

149156
<!-- Checks for Naming Conventions. -->
150157
<!-- See http://checkstyle.sf.net/config_naming.html -->
158+
<module name="CatchParameterName">
159+
<property name="format" value="^(ex?|ignored|expected)$"/>
160+
</module>
151161
<module name="LocalFinalVariableName"/>
152162
<module name="LocalVariableName"/>
153163
<module name="MethodName">
@@ -162,6 +172,9 @@
162172
<module name="MemberName">
163173
<property name="format" value="^[a-z][a-zA-Z0-9_]+_$"/>
164174
</module>
175+
<module name="ConstantName">
176+
<property name="format" value="log|^[A-Z][A-Z0-9_]*$"/>
177+
</module>
165178

166179
<!-- Checks for imports -->
167180
<!-- See http://checkstyle.sf.net/config_imports.html -->

0 commit comments

Comments
 (0)