|
276 | 276 | <property name="tokens" value="LAMBDA"/> |
277 | 277 | <property name="allowSingleLineStatement" value="true"/> |
278 | 278 | </module> |
| 279 | + <!-- modified --> |
279 | 280 | <module name="RightCurly"> |
280 | 281 | <property name="tokens" value="METHOD_DEF"/> |
281 | 282 | <property name="tokens" value="CTOR_DEF"/> |
|
284 | 285 | <property name="tokens" value="LITERAL_FOR"/> |
285 | 286 | <property name="tokens" value="STATIC_INIT"/> |
286 | 287 | <property name="tokens" value="LITERAL_WHILE"/> |
287 | | - <property name="tokens" value="LITERAL_CATCH"/> |
288 | 288 | <property name="tokens" value="LITERAL_ELSE"/> |
289 | 289 | <property name="tokens" value="LITERAL_FINALLY"/> |
290 | 290 | <property name="tokens" value="LITERAL_IF"/> |
291 | | - <property name="tokens" value="LITERAL_TRY"/> |
| 291 | + <property name="tokens" value="LITERAL_CATCH"/> |
292 | 292 | <property name="tokens" value="ANNOTATION_DEF"/> |
293 | 293 | <property name="tokens" value="ENUM_DEF"/> |
294 | 294 | <property name="option" value="alone"/> |
295 | 295 | </module> |
| 296 | + <!-- modified --> |
296 | 297 | <module name="RightCurly"> |
297 | 298 | <property name="tokens" value="LITERAL_DO"/> |
| 299 | + <property name="tokens" value="LITERAL_TRY"/> |
298 | 300 | <property name="option" value="same"/> |
299 | 301 | </module> |
300 | 302 |
|
|
487 | 489 | <!-- Imports --> |
488 | 490 | <module name="AvoidStarImport"/> |
489 | 491 | <module name="AvoidStaticImport"/> |
| 492 | + <!-- disable till we sync import order with main project --> |
| 493 | + <!-- |
490 | 494 | <module name="CustomImportOrder"> |
491 | 495 | <property name="customImportOrderRules" |
492 | 496 | value="STATIC###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE"/> |
493 | 497 | <property name="standardPackageRegExp" value="^java\."/> |
494 | 498 | <property name="specialImportsRegExp" value="^javax\."/> |
495 | | - <property name="thirdPartyPackageRegExp" value="^org\."/> |
| 499 | + <property name="thirdPartyPackageRegExp" value="^(net|org)\."/> |
496 | 500 | <property name="sortImportsInGroupAlphabetically" value="true"/> |
497 | 501 | <property name="separateLineBetweenGroups" value="true"/> |
498 | 502 | </module> |
| 503 | + --> |
499 | 504 | <module name="IllegalImport"/> |
500 | 505 | <module name="ImportControl"> |
501 | 506 | <property name="id" value="ImportControlMain"/> |
|
508 | 513 | <property name="path" value="^.*[\\/]src[\\/]test[\\/].*$"/> |
509 | 514 | </module> |
510 | 515 | <module name="ImportOrder"> |
511 | | - <property name="groups" value="/^java\./,javax,org"/> |
| 516 | + <property name="groups" value="/^java\./,javax,net,org"/> |
512 | 517 | <property name="ordered" value="true"/> |
513 | 518 | <property name="separated" value="true"/> |
514 | 519 | <property name="option" value="top"/> |
|
612 | 617 | --> |
613 | 618 | <property name="severity" value="ignore"/> |
614 | 619 | </module> |
| 620 | + <!-- modified to adjut eclipse-cs style --> |
615 | 621 | <module name="Indentation"> |
616 | | - <property name="basicOffset" value="4"/> |
| 622 | + <property name="basicOffset" value="2"/> |
617 | 623 | <property name="braceAdjustment" value="0"/> |
618 | | - <property name="caseIndent" value="4"/> |
619 | | - <property name="throwsIndent" value="8"/> |
| 624 | + <property name="caseIndent" value="2"/> |
| 625 | + <property name="throwsIndent" value="4"/> |
620 | 626 | </module> |
621 | 627 | <module name="OuterTypeFilename"/> |
622 | 628 | <module name="TodoComment"> |
|
0 commit comments