|
30 | 30 | <module name="TreeWalker">
|
31 | 31 | <property name="tabWidth" value="4" />
|
32 | 32 |
|
33 |
| - <!-- To enable SuppressWithNearbyCommentFilter --> |
34 |
| - <module name="FileContentsHolder" /> |
35 |
| - |
36 | 33 | <!-- Annotations -->
|
37 | 34 | <module name="AnnotationLocation">
|
38 | 35 | <property name="allowSamelineMultipleAnnotations" value="false" />
|
|
172 | 169 | <module name="ImportOrder">
|
173 | 170 | <property name="option" value="bottom" />
|
174 | 171 | <property name="groups" value="android,com,cucumber,edu,junit,net,org,java,javax" />
|
| 172 | + <property name="staticGroups" value="android,com,cucumber,edu,junit,net,org,java,javax" /> |
175 | 173 | <property name="ordered" value="true" />
|
176 | 174 | <property name="separated" value="true" />
|
| 175 | + <property name="separatedStaticGroups" value="true" /> |
177 | 176 | </module>
|
178 | 177 | <module name="RedundantImport" />
|
179 | 178 | <module name="PackageDeclaration" />
|
|
230 | 229 | <property name="ignoreComments" value="true" />
|
231 | 230 | <property name="message" value="Spaces aren't allowed for indentation. Tabs only" />
|
232 | 231 | </module>
|
| 232 | + |
| 233 | + <module name="SuppressWithNearbyCommentFilter"> |
| 234 | + <property name="commentFormat" value="CHECKSTYLE DISABLE ([\w\|]+) FOR (-?\d+) LINES" /> |
| 235 | + <property name="checkFormat" value="$1" /> |
| 236 | + <property name="influenceFormat" value="$2" /> |
| 237 | + </module> |
| 238 | + |
| 239 | + <module name="SuppressionCommentFilter"> |
| 240 | + <property name="offCommentFormat" value="@formatter\:off" /> |
| 241 | + <property name="onCommentFormat" value="@formatter\:on" /> |
| 242 | + </module> |
233 | 243 | </module>
|
234 | 244 |
|
235 | 245 | <module name="NewlineAtEndOfFile">
|
|
289 | 299 | <property name="message" value="Use ellipses character … instead of &#8230;." />
|
290 | 300 | </module>
|
291 | 301 |
|
292 |
| - <module name="SuppressWithNearbyCommentFilter"> |
293 |
| - <property name="commentFormat" value="CHECKSTYLE DISABLE ([\w\|]+) FOR (-?\d+) LINES" /> |
294 |
| - <property name="checkFormat" value="$1" /> |
295 |
| - <property name="influenceFormat" value="$2" /> |
296 |
| - </module> |
297 |
| - |
298 |
| - <module name="SuppressionCommentFilter"> |
299 |
| - <property name="offCommentFormat" value="@formatter\:off" /> |
300 |
| - <property name="onCommentFormat" value="@formatter\:on" /> |
301 |
| - </module> |
302 |
| - |
303 | 302 | <module name="SuppressionFilter">
|
304 | 303 | <property name="file" value="catroid/config/checkstyle_suppressions.xml" />
|
305 | 304 | </module>
|
|
0 commit comments