Skip to content

Commit 8aa2ba6

Browse files
committed
checkstyle.xml: reorganize using SortCheckstyle
1 parent d5b710d commit 8aa2ba6

1 file changed

Lines changed: 26 additions & 24 deletions

File tree

config/checkstyle/checkstyle.xml

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,17 @@
99
<property name="fileExtensions" value="java, properties, xml"/>
1010
<property name="severity" value="error"/>
1111

12-
<!-- Exclude simsilica and JME files from style checking: -->
13-
<!-- See https://checkstyle.org/filefilters/beforeexecutionexclusionfilefilter.html -->
14-
<module name="BeforeExecutionExclusionFileFilter">
15-
<property name="fileNamePattern" value="java[/\\]com[/\\](simsilica|jme3[/\\](math|system|util))"/>
16-
</module>
17-
1812
<!-- Check that a package-info.java file exists for each package: -->
1913
<!-- See https://checkstyle.org/checks/javadoc/javadocpackage.html -->
2014
<module name="JavadocPackage"/>
2115

16+
<module name="RegexpSingleline">
17+
<property name="format" value="\s+$"/>
18+
<property name="maximum" value="0"/>
19+
<property name="message" value="Line has trailing whitespace."/>
20+
<property name="minimum" value="0"/>
21+
</module>
22+
2223
<!-- Checks for size violations: -->
2324
<!-- See https://checkstyle.org/checks/sizes -->
2425
<module name="FileLength">
@@ -35,11 +36,11 @@
3536
<module name="FileTabCharacter">
3637
<property name="eachLine" value="true"/>
3738
</module>
38-
<module name="RegexpSingleline">
39-
<property name="format" value="\s+$"/>
40-
<property name="maximum" value="0"/>
41-
<property name="message" value="Line has trailing whitespace."/>
42-
<property name="minimum" value="0"/>
39+
40+
<!-- Exclude simsilica and JME files from style checking: -->
41+
<!-- See https://checkstyle.org/filefilters/beforeexecutionexclusionfilefilter.html -->
42+
<module name="BeforeExecutionExclusionFileFilter">
43+
<property name="fileNamePattern" value="java[/\\]com[/\\](simsilica|jme3[/\\](math|system|util))"/>
4344
</module>
4445

4546
<module name="TreeWalker">
@@ -71,10 +72,6 @@
7172
<module name="NeedBraces">
7273
<property name="tokens" value="LITERAL_DO, LITERAL_ELSE, LITERAL_FOR, LITERAL_IF, LITERAL_WHILE"/>
7374
</module>
74-
<module name="RegexpSinglelineJava">
75-
<property name="format" value="\{[ ]+\}"/>
76-
<property name="message" value="Empty blocks should have no spaces. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
77-
</module>
7875
<module name="RightCurly">
7976
<property name="id" value="RightCurlyAlone"/>
8077
<property name="option" value="alone"/>
@@ -90,6 +87,14 @@
9087
<property name="tokens" value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_DO"/>
9188
</module>
9289

90+
<!-- Checks for class design: -->
91+
<!-- See https://checkstyle.org/checks/design -->
92+
<module name="DesignForExtension"/>
93+
<module name="FinalClass"/>
94+
<module name="HideUtilityClassConstructor"/>
95+
<module name="InterfaceIsType"/>
96+
<module name="OneTopLevelClass"/>
97+
9398
<!-- Checks for common coding problems: -->
9499
<!-- See https://checkstyle.org/checks/coding -->
95100
<module name="EmptyStatement"/>
@@ -109,14 +114,6 @@
109114
<module name="NoFinalizer"/>
110115
<module name="OneStatementPerLine"/>
111116

112-
<!-- Checks for class design: -->
113-
<!-- See https://checkstyle.org/checks/design -->
114-
<module name="DesignForExtension"/>
115-
<module name="FinalClass"/>
116-
<module name="HideUtilityClassConstructor"/>
117-
<module name="InterfaceIsType"/>
118-
<module name="OneTopLevelClass"/>
119-
120117
<!-- Checks for imports: -->
121118
<!-- See https://checkstyle.org/checks/imports -->
122119
<module name="AvoidStarImport"/>
@@ -140,9 +137,9 @@
140137
</module>
141138
<module name="InvalidJavadocPosition"/>
142139
<module name="JavadocMethod">
143-
<property name="allowedAnnotations" value=""/>
144140
<property name="allowMissingParamTags" value="false"/>
145141
<property name="allowMissingReturnTag" value="false"/>
142+
<property name="allowedAnnotations" value=""/>
146143
<property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF, COMPACT_CTOR_DEF"/>
147144
</module>
148145
<module name="JavadocStyle">
@@ -257,6 +254,11 @@
257254
<message key="name.invalidPattern" value="Type name ''{0}'' must match pattern ''{1}''."/>
258255
</module>
259256

257+
<module name="RegexpSinglelineJava">
258+
<property name="format" value="\{[ ]+\}"/>
259+
<property name="message" value="Empty blocks should have no spaces. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
260+
</module>
261+
260262
<!-- Checks for size violations: -->
261263
<!-- See https://checkstyle.org/checks/sizes -->
262264
<module name="MethodLength">

0 commit comments

Comments
 (0)