Add checkstyle rule for modifier order and fix remaining issues in current code base

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1043106 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.xml b/build.xml
index 3428cdc..06a22aa 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -431,6 +431,8 @@
         <exclude name="output/**"/>
         <exclude name="modules/**"/>
         <exclude name="**/*.mdl"/>
+        <!-- Exclude auto-generated files with known errors -->
+        <exclude name="java/org/apache/el/parser/ELParser.java" />
         <!-- Exclude these else Gump runs validate on them -->
         <exclude name="**/org/apache/tomcat/dbcp/**"/>
         <exclude name="**/tomcat-deps/**"/>

diff --git a/checkstyle.xml b/checkstyle.xml
index 59d2e80..325d24f 100644 (file)
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -44,9 +44,7 @@
     <module name="UnusedImports"/>
     
     <!--  Modifiers -->
-    <!-- ~250 errors
     <module name="ModifierOrder"/>
-    -->
     <!-- ~1750 errors
     <module name="RedundantModifier"/>
     -->

diff --git a/test/org/apache/catalina/valves/Benchmarks.java b/test/org/apache/catalina/valves/Benchmarks.java
index 004fe46..b46eb53 100644 (file)
--- a/test/org/apache/catalina/valves/Benchmarks.java
+++ b/test/org/apache/catalina/valves/Benchmarks.java
@@ -182,7 +182,7 @@ public class Benchmarks extends TestCase {
         benchmark.doTest(5, tests);
     }
 
-    private static abstract class TimeDateElementBenchmarkTestBase {
+    private abstract static class TimeDateElementBenchmarkTestBase {
         protected static final String months[] = { "Jan", "Feb", "Mar", "Apr",
                 "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
 

diff --git a/test/org/apache/tomcat/util/http/CookiesBaseTest.java b/test/org/apache/tomcat/util/http/CookiesBaseTest.java
index d8648a1..b5a4921 100644 (file)
--- a/test/org/apache/tomcat/util/http/CookiesBaseTest.java
+++ b/test/org/apache/tomcat/util/http/CookiesBaseTest.java
@@ -30,7 +30,7 @@ import org.apache.catalina.startup.TomcatBaseTest;
 
 /**
  * Base Test case for {@link Cookies}. <b>Note</b> because of the use of
- * <code>final static</code> constants in {@link Cookies}, each of these tests
+ * <code>static final</code> constants in {@link Cookies}, each of these tests
  * must be executed in a new JVM instance. The tests have been place in separate
  * classes to facilitate this when running the unit tests via Ant.
  */