Browse Source

Fix checkstyle order for static imports.

We put them below all other imports, checkstyle defaults to below
each group.

Also fix the formatting of the checkstyle config, replacing tabs
with spaces and fixing broken indentation/spacing.

Change-Id: I46f71e58f9ff4f8719ba59ff95d6415095058d21
Reviewed-on: http://gerrit.dmdirc.com/3121
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>
tags/0.8rc1
Chris Smith 10 years ago
parent
commit
a76204fc2f
1 changed files with 76 additions and 75 deletions
  1. 76
    75
      etc/checkstyle/dmdirc.xml

+ 76
- 75
etc/checkstyle/dmdirc.xml View File

2
 <!DOCTYPE module PUBLIC
2
 <!DOCTYPE module PUBLIC
3
     "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
3
     "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
4
     "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
4
     "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
5
-
6
 <module name="Checker">
5
 <module name="Checker">
7
 
6
 
8
     <!-- Checks that a package.html file exists for each package.     -->
7
     <!-- Checks that a package.html file exists for each package.     -->
9
     <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
8
     <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
10
     <module name="JavadocPackage">
9
     <module name="JavadocPackage">
11
-            <property name="severity" value="warning"/>
10
+        <property name="severity" value="warning"/>
12
     </module>
11
     </module>
13
 
12
 
14
     <!-- Checks whether files end with a new line.                        -->
13
     <!-- Checks whether files end with a new line.                        -->
29
     <module name="TreeWalker">
28
     <module name="TreeWalker">
30
         <module name="UncommentedMain"/>
29
         <module name="UncommentedMain"/>
31
         <module name="TodoComment">
30
         <module name="TodoComment">
32
-		<property name="severity" value="warning"/>
33
-	</module>
31
+            <property name="severity" value="warning"/>
32
+        </module>
34
         <module name="SuperFinalize"/>
33
         <module name="SuperFinalize"/>
35
         <module name="SuperClone"/>
34
         <module name="SuperClone"/>
36
         <module name="RightCurly"/>
35
         <module name="RightCurly"/>
42
         <module name="NoClone"/>
41
         <module name="NoClone"/>
43
         <module name="NestedForDepth"/>
42
         <module name="NestedForDepth"/>
44
         <module name="NPathComplexity">
43
         <module name="NPathComplexity">
45
-                <property name="severity" value="warning"/>
46
-		<property name="max" value="500"/>
44
+            <property name="severity" value="warning"/>
45
+            <property name="max" value="500"/>
47
         </module>
46
         </module>
48
         <module name="MultipleVariableDeclarations"/>
47
         <module name="MultipleVariableDeclarations"/>
49
         <module name="MissingOverride"/>
48
         <module name="MissingOverride"/>
50
         <module name="MissingDeprecated"/>
49
         <module name="MissingDeprecated"/>
51
-	<module name="MethodTypeParameterName"/>
50
+        <module name="MethodTypeParameterName"/>
52
         <module name="MethodCount"/>
51
         <module name="MethodCount"/>
53
         <module name="MagicNumber">
52
         <module name="MagicNumber">
54
-		<property name="ignoreHashCodeMethod" value="true"/>
53
+            <property name="ignoreHashCodeMethod" value="true"/>
55
         </module>
54
         </module>
56
-	<module name="LineLength">
57
-		<property name="severity" value="warning"/>
58
-		<property name="max" value="100"/>
59
-	</module>
60
-	<module name="JavaNCSS">
61
-	    <property name="methodMaximum" value="200"/>
62
-	</module>
63
-	<module name="InnerTypeLast"/>
64
-	<module name="Indentation"/>
65
-	<module name="IllegalType"/>
66
-	<module name="FinalLocalVariable"/>
67
-	<module name="CyclomaticComplexity"/>
68
-
69
-	<module name="ImportOrder">
70
-		    <property name="groups" value="com.dmdirc,com.google,java,javax"/>
71
-		    <property name="ordered" value="true"/>
72
-		    <property name="separated" value="true"/>
73
-	</module>
74
-	    
55
+        <module name="LineLength">
56
+            <property name="severity" value="warning"/>
57
+            <property name="max" value="100"/>
58
+        </module>
59
+        <module name="JavaNCSS">
60
+            <property name="methodMaximum" value="200"/>
61
+        </module>
62
+        <module name="InnerTypeLast"/>
63
+        <module name="Indentation"/>
64
+        <module name="IllegalType"/>
65
+        <module name="FinalLocalVariable"/>
66
+        <module name="CyclomaticComplexity"/>
67
+        <module name="ImportOrder">
68
+            <property name="groups" value="com.dmdirc,com.google,java,javax"/>
69
+            <property name="ordered" value="true"/>
70
+            <property name="separated" value="true"/>
71
+            <property name="option" value="bottom"/>
72
+        </module>
73
+
75
         <!-- Checks for Javadoc comments.                     -->
74
         <!-- Checks for Javadoc comments.                     -->
76
         <!-- See http://checkstyle.sf.net/config_javadoc.html -->
75
         <!-- See http://checkstyle.sf.net/config_javadoc.html -->
77
         <module name="JavadocMethod">
76
         <module name="JavadocMethod">
78
-		<property name="allowUndeclaredRTE" value="true"/>
79
-	</module>
77
+            <property name="allowUndeclaredRTE" value="true"/>
78
+        </module>
80
         <module name="JavadocType"/>
79
         <module name="JavadocType"/>
81
         <module name="JavadocVariable"/>
80
         <module name="JavadocVariable"/>
82
         <module name="JavadocStyle"/>
81
         <module name="JavadocStyle"/>
84
         <!-- Checks for Naming Conventions.                  -->
83
         <!-- Checks for Naming Conventions.                  -->
85
         <!-- See http://checkstyle.sf.net/config_naming.html -->
84
         <!-- See http://checkstyle.sf.net/config_naming.html -->
86
         <module name="ConstantName"/>
85
         <module name="ConstantName"/>
87
-	<module name="ClassTypeParameterName"/>
86
+        <module name="ClassTypeParameterName"/>
88
         <module name="LocalFinalVariableName"/>
87
         <module name="LocalFinalVariableName"/>
89
         <module name="LocalVariableName"/>
88
         <module name="LocalVariableName"/>
90
         <module name="MemberName"/>
89
         <module name="MemberName"/>
106
         <!-- Checks for whitespace                               -->
105
         <!-- Checks for whitespace                               -->
107
         <!-- See http://checkstyle.sf.net/config_whitespace.html -->
106
         <!-- See http://checkstyle.sf.net/config_whitespace.html -->
108
         <module name="EmptyForIteratorPad"/>
107
         <module name="EmptyForIteratorPad"/>
109
-	<module name="EmptyForInitializerPad"/>
108
+        <module name="EmptyForInitializerPad"/>
110
         <module name="MethodParamPad"/>
109
         <module name="MethodParamPad"/>
111
         <module name="NoWhitespaceAfter"/>
110
         <module name="NoWhitespaceAfter"/>
112
         <module name="NoWhitespaceBefore"/>
111
         <module name="NoWhitespaceBefore"/>
115
         <module name="TypecastParenPad"/>
114
         <module name="TypecastParenPad"/>
116
         <module name="WhitespaceAfter"/>
115
         <module name="WhitespaceAfter"/>
117
         <module name="WhitespaceAround">
116
         <module name="WhitespaceAround">
118
-		<property name="tokens" value="
119
-			  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" />
120
-	</module>
117
+            <property name="tokens" value="
118
+                ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN,
119
+                COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT,
120
+                LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF,
121
+                LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS,
122
+                MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL,
123
+                SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN,  TYPE_EXTENSION_AND, 
124
+                WILDCARD_TYPE" />
125
+        </module>
121
 
126
 
122
 
127
 
123
         <!-- Modifier Checks                                    -->
128
         <!-- Modifier Checks                                    -->
140
         <module name="EmptyStatement"/>
145
         <module name="EmptyStatement"/>
141
         <module name="EqualsHashCode"/>
146
         <module name="EqualsHashCode"/>
142
         <module name="HiddenField">
147
         <module name="HiddenField">
143
-                <property name="ignoreConstructorParameter" value="true"/>
144
-                <property name="ignoreSetter" value="true"/>
145
-                <property name="ignoreAbstractMethods" value="true"/>
148
+            <property name="ignoreConstructorParameter" value="true"/>
149
+            <property name="ignoreSetter" value="true"/>
150
+            <property name="ignoreAbstractMethods" value="true"/>
146
         </module>
151
         </module>
147
         <module name="IllegalInstantiation"/>
152
         <module name="IllegalInstantiation"/>
148
         <module name="InnerAssignment">
153
         <module name="InnerAssignment">
149
             <property name="severity" value="warning"/>
154
             <property name="severity" value="warning"/>
150
-	</module>
155
+        </module>
151
         <module name="MissingSwitchDefault"/>
156
         <module name="MissingSwitchDefault"/>
152
         <module name="RedundantThrows"/>
157
         <module name="RedundantThrows"/>
153
         <module name="SimplifyBooleanExpression"/>
158
         <module name="SimplifyBooleanExpression"/>
154
         <module name="SimplifyBooleanReturn"/>
159
         <module name="SimplifyBooleanReturn"/>
155
-	<module name="ArrayTrailingComma"/>
156
-	<module name="CovariantEquals"/>
157
-	<module name="FinalLocalVariable"/>
158
-	<module name="ModifiedControlVariable">
160
+        <module name="ArrayTrailingComma"/>
161
+        <module name="CovariantEquals"/>
162
+        <module name="FinalLocalVariable"/>
163
+        <module name="ModifiedControlVariable">
159
             <property name="severity" value="warning"/>
164
             <property name="severity" value="warning"/>
160
         </module>
165
         </module>
161
-	<module name="StringLiteralEquality"/>
162
-	<module name="NestedIfDepth">
163
-		<property name="max" value="3"/>
164
-	</module>
165
-	<module name="NestedTryDepth"/>
166
-	<module name="IllegalCatch"/>
167
-	<module name="HiddenField">
168
-	    <property name="ignoreConstructorParameter" value="true"/>
169
-	    <property name="ignoreSetter" value="true"/>
170
-	</module>
166
+        <module name="StringLiteralEquality"/>
167
+        <module name="NestedIfDepth">
168
+            <property name="max" value="3"/>
169
+        </module>
170
+        <module name="NestedTryDepth"/>
171
+        <module name="IllegalCatch"/>
172
+        <module name="HiddenField">
173
+            <property name="ignoreConstructorParameter" value="true"/>
174
+            <property name="ignoreSetter" value="true"/>
175
+        </module>
171
         <module name="GenericWhitespace"/>
176
         <module name="GenericWhitespace"/>
172
-	<module name="EqualsAvoidNull"/>
173
-	<module name="BooleanExpressionComplexity"/>
174
-	<module name="AnonInnerLength">
175
-	      <property name="max" value="50"/>
176
-	</module>
177
-	<module name="AnnotationUseStyle"/>
178
-
179
-	<module name="IllegalThrows"/>
180
-
181
-	<module name="PackageDeclaration"/>
182
-	<module name="DeclarationOrder"/>
183
-	<module name="ParameterAssignment"/>
184
-	<module name="ExplicitInitialization"/>
185
-	<module name="DefaultComesLast"/>
186
-	<module name="FallThrough"/>
187
-	<module name="UnnecessaryParentheses"/>
188
-	
177
+        <module name="EqualsAvoidNull"/>
178
+        <module name="BooleanExpressionComplexity"/>
179
+        <module name="AnonInnerLength">
180
+            <property name="max" value="50"/>
181
+        </module>
182
+        <module name="AnnotationUseStyle"/>
183
+        <module name="IllegalThrows"/>
184
+        <module name="PackageDeclaration"/>
185
+        <module name="DeclarationOrder"/>
186
+        <module name="ParameterAssignment"/>
187
+        <module name="ExplicitInitialization"/>
188
+        <module name="DefaultComesLast"/>
189
+        <module name="FallThrough"/>
190
+        <module name="UnnecessaryParentheses"/>
191
+
189
 
192
 
190
         <!-- Checks for class design                         -->
193
         <!-- Checks for class design                         -->
191
         <!-- See http://checkstyle.sf.net/config_design.html -->
194
         <!-- See http://checkstyle.sf.net/config_design.html -->
193
         <module name="HideUtilityClassConstructor"/>
196
         <module name="HideUtilityClassConstructor"/>
194
         <module name="InterfaceIsType"/>
197
         <module name="InterfaceIsType"/>
195
         <module name="VisibilityModifier"/>
198
         <module name="VisibilityModifier"/>
196
-	<module name="MutableException"/>
197
-	<module name="ThrowsCount">
198
-		<property name="max" value="2"/>
199
-	</module>
199
+        <module name="MutableException"/>
200
+        <module name="ThrowsCount">
201
+            <property name="max" value="2"/>
202
+        </module>
200
 
203
 
201
 
204
 
202
         <!-- Miscellaneous other checks.                   -->
205
         <!-- Miscellaneous other checks.                   -->
204
         <module name="ArrayTypeStyle"/>
207
         <module name="ArrayTypeStyle"/>
205
         <module name="FinalParameters"/>
208
         <module name="FinalParameters"/>
206
         <module name="UpperEll"/>
209
         <module name="UpperEll"/>
207
-
208
     </module>
210
     </module>
209
-
210
 </module>
211
 </module>

Loading…
Cancel
Save