diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | scripts/checkstyle-config.xml | 2 | ||||
| -rw-r--r-- | scripts/jalopy-gnu.xml | 7 |
3 files changed, 11 insertions, 5 deletions
@@ -1,5 +1,12 @@ 2004-09-21 Michael Koch <konqueror@gmx.de> + * scripts/checkstyle-config.xml: + Enabled check for ordered import statements. + * scripts/jalopy-gnu.xml: + Fix grouping of import statements. + +2004-09-21 Michael Koch <konqueror@gmx.de> + * scripts/jalopy-gnu.xml: Converted to use Unix-style EOL. 2004-09-21 Michael Koch <konqueror@gmx.de> diff --git a/scripts/checkstyle-config.xml b/scripts/checkstyle-config.xml index 9e686339d..0b0c1f419 100644 --- a/scripts/checkstyle-config.xml +++ b/scripts/checkstyle-config.xml @@ -42,13 +42,11 @@ mailing list first and probably documented in the hacking guide. <module name="AvoidStarImport"/> <module name="RedundantImport"/> <module name="UnusedImports"/> - <!-- <module name="ImportOrder"> <property name="groups" value="gnu,java,javax,org"/> <property name="ordered" value="true"/> <property name="separated" value="true"/> </module> - --> <!-- size checks --> <!-- diff --git a/scripts/jalopy-gnu.xml b/scripts/jalopy-gnu.xml index d8e20cb17..ca30ccb19 100644 --- a/scripts/jalopy-gnu.xml +++ b/scripts/jalopy-gnu.xml @@ -113,7 +113,7 @@ <footer>1</footer> <header>1</header> <interface>1</interface> - <lastImport>2</lastImport> + <lastImport>1</lastImport> <method>1</method> <package>1</package> </after> @@ -130,6 +130,7 @@ <declaration>0</declaration> <footer>0</footer> <header>0</header> + <package>2</package> </before> <keepUpTo>1</keepUpTo> </blanklines> @@ -228,8 +229,8 @@ </history> <imports> <grouping> - <defaultDepth>0</defaultDepth> - <packages>*:0|gnu:2|java:2|javax:2</packages> + <defaultDepth>1</defaultDepth> + <packages>*:0|gnu:1|java:1|javax:1|org:1</packages> </grouping> <policy>disabled</policy> <sort>true</sort> |