Fix modifier order in org.apache.jasper.*

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

diff --git a/java/org/apache/jasper/compiler/ELFunctionMapper.java b/java/org/apache/jasper/compiler/ELFunctionMapper.java
index 4e1e4ed..939eceb 100644 (file)
--- a/java/org/apache/jasper/compiler/ELFunctionMapper.java
+++ b/java/org/apache/jasper/compiler/ELFunctionMapper.java
@@ -198,7 +198,7 @@ public class ELFunctionMapper {
         
             // Generate declaration for the map statically
             decName = getMapName();
-            ss.append("static private org.apache.jasper.runtime.ProtectedFunctionMapper " + decName + ";\n");
+            ss.append("private static org.apache.jasper.runtime.ProtectedFunctionMapper " + decName + ";\n");
 
             ds.append("  " + decName + "= ");
             ds.append("org.apache.jasper.runtime.ProtectedFunctionMapper");

diff --git a/java/org/apache/jasper/compiler/ELNode.java b/java/org/apache/jasper/compiler/ELNode.java
index caf4011..0bd5971 100644 (file)
--- a/java/org/apache/jasper/compiler/ELNode.java
+++ b/java/org/apache/jasper/compiler/ELNode.java
@@ -36,7 +36,7 @@ import org.apache.jasper.JasperException;
 
 abstract class ELNode {
 
-    abstract public void accept(Visitor v) throws JasperException;
+    public abstract void accept(Visitor v) throws JasperException;
 
     /**
      * Child classes

diff --git a/java/org/apache/jasper/compiler/JspConfig.java b/java/org/apache/jasper/compiler/JspConfig.java
index 9bbbdec..5add4d1 100644 (file)
--- a/java/org/apache/jasper/compiler/JspConfig.java
+++ b/java/org/apache/jasper/compiler/JspConfig.java
@@ -45,14 +45,14 @@ public class JspConfig {
     private ServletContext ctxt;
     private volatile boolean initialized = false;
 
-    private final static String defaultIsXml = null;    // unspecified
+    private static final String defaultIsXml = null;    // unspecified
     private String defaultIsELIgnored = null;           // unspecified
-    private final static String defaultIsScriptingInvalid = null;
+    private static final String defaultIsScriptingInvalid = null;
     private String defaultDeferedSyntaxAllowedAsLiteral = null;
-    private final static String defaultTrimDirectiveWhitespaces = null;
-    private final static String defaultDefaultContentType = null;
-    private final static String defaultBuffer = null;
-    private final static String defaultErrorOnUndeclaredNamespace = "false";
+    private static final String defaultTrimDirectiveWhitespaces = null;
+    private static final String defaultDefaultContentType = null;
+    private static final String defaultBuffer = null;
+    private static final String defaultErrorOnUndeclaredNamespace = "false";
     private JspProperty defaultJspProperty;
 
     public JspConfig(ServletContext ctxt) {
@@ -515,7 +515,7 @@ public class JspConfig {
         }
     }
 
-    static public class JspProperty {
+    public static class JspProperty {
 
         private String isXml;
         private String elIgnored;

diff --git a/java/org/apache/jasper/compiler/Node.java b/java/org/apache/jasper/compiler/Node.java
index 90efb66..52859bb 100644 (file)
--- a/java/org/apache/jasper/compiler/Node.java
+++ b/java/org/apache/jasper/compiler/Node.java
@@ -815,7 +815,7 @@ abstract class Node implements TagConstants {
     /**
      * Represents an expression, declaration, or scriptlet
      */
-    public static abstract class ScriptingElement extends Node {
+    public abstract static class ScriptingElement extends Node {
 
         public ScriptingElement(String qName, String localName, String text,
                 Mark start, Node parent) {

diff --git a/java/org/apache/jasper/el/ELContextImpl.java b/java/org/apache/jasper/el/ELContextImpl.java
index 0047708..4739c6a 100644 (file)
--- a/java/org/apache/jasper/el/ELContextImpl.java
+++ b/java/org/apache/jasper/el/ELContextImpl.java
@@ -33,14 +33,14 @@ import javax.el.VariableMapper;
  */
 public final class ELContextImpl extends ELContext {
 
-    private final static FunctionMapper NullFunctionMapper = new FunctionMapper() {
+    private static final FunctionMapper NullFunctionMapper = new FunctionMapper() {
         @Override
         public Method resolveFunction(String prefix, String localName) {
             return null;
         }
     };
 
-    private final static class VariableMapperImpl extends VariableMapper {
+    private static final class VariableMapperImpl extends VariableMapper {
 
         private Map<String, ValueExpression> vars;
 

diff --git a/java/org/apache/jasper/el/ELResolverImpl.java b/java/org/apache/jasper/el/ELResolverImpl.java
index 129a2ab..318e806 100644 (file)
--- a/java/org/apache/jasper/el/ELResolverImpl.java
+++ b/java/org/apache/jasper/el/ELResolverImpl.java
@@ -35,7 +35,7 @@ import javax.servlet.jsp.el.VariableResolver;
 import org.apache.jasper.Constants;
 
 public final class ELResolverImpl extends ELResolver {
-    private final static ELResolver DefaultResolver;
+    private static final ELResolver DefaultResolver;
 
     static {
         if (Constants.IS_SECURITY_ENABLED) {

diff --git a/java/org/apache/jasper/runtime/JspApplicationContextImpl.java b/java/org/apache/jasper/runtime/JspApplicationContextImpl.java
index c45966b..7ebf455 100644 (file)
--- a/java/org/apache/jasper/runtime/JspApplicationContextImpl.java
+++ b/java/org/apache/jasper/runtime/JspApplicationContextImpl.java
@@ -48,9 +48,9 @@ import org.apache.jasper.el.ELContextImpl;
  */
 public class JspApplicationContextImpl implements JspApplicationContext {
 
-    private final static String KEY = JspApplicationContextImpl.class.getName();
+    private static final String KEY = JspApplicationContextImpl.class.getName();
 
-    private final static ExpressionFactory expressionFactory =
+    private static final ExpressionFactory expressionFactory =
         ExpressionFactory.newInstance();
 
     private final List<ELContextListener> contextListeners = new ArrayList<ELContextListener>();

diff --git a/java/org/apache/jasper/xmlparser/EncodingMap.java b/java/org/apache/jasper/xmlparser/EncodingMap.java
index 268e398..cb17b54 100644 (file)
--- a/java/org/apache/jasper/xmlparser/EncodingMap.java
+++ b/java/org/apache/jasper/xmlparser/EncodingMap.java
@@ -483,11 +483,11 @@ public class EncodingMap {
     //
 
     /** fIANA2JavaMap */
-    protected final static Hashtable<String,String> fIANA2JavaMap =
+    protected static final Hashtable<String,String> fIANA2JavaMap =
         new Hashtable<String,String>();
 
     /** fJava2IANAMap */
-    protected final static Hashtable<String,String> fJava2IANAMap =
+    protected static final Hashtable<String,String> fJava2IANAMap =
         new Hashtable<String,String>();
 
     //

diff --git a/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java b/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
index 99d9f44..63c1321 100644 (file)
--- a/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
+++ b/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
@@ -69,9 +69,9 @@ public class XMLEncodingDetector {
     private XMLString fString = new XMLString();    
     private XMLStringBuffer fStringBuffer = new XMLStringBuffer();
     private XMLStringBuffer fStringBuffer2 = new XMLStringBuffer();
-    private final static String fVersionSymbol = "version";
-    private final static String fEncodingSymbol = "encoding";
-    private final static String fStandaloneSymbol = "standalone";
+    private static final String fVersionSymbol = "version";
+    private static final String fEncodingSymbol = "encoding";
+    private static final String fStandaloneSymbol = "standalone";
     
     // org.apache.xerces.impl.XMLDocumentFragmentScannerImpl fields
     private int fMarkupDepth = 0;