From 942bc8887233337c60a12a6f4fcfd3919225b4b0 Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 7 Dec 2010 15:39:09 +0000 Subject: [PATCH] Fix modifier order in org.apache.jasper.* git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1043101 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/jasper/compiler/ELFunctionMapper.java | 2 +- java/org/apache/jasper/compiler/ELNode.java | 2 +- java/org/apache/jasper/compiler/JspConfig.java | 14 +++++++------- java/org/apache/jasper/compiler/Node.java | 2 +- java/org/apache/jasper/el/ELContextImpl.java | 4 ++-- java/org/apache/jasper/el/ELResolverImpl.java | 2 +- .../apache/jasper/runtime/JspApplicationContextImpl.java | 4 ++-- java/org/apache/jasper/xmlparser/EncodingMap.java | 4 ++-- java/org/apache/jasper/xmlparser/XMLEncodingDetector.java | 6 +++--- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/java/org/apache/jasper/compiler/ELFunctionMapper.java b/java/org/apache/jasper/compiler/ELFunctionMapper.java index 4e1e4edc1..939eceb75 100644 --- 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 caf4011d7..0bd597148 100644 --- 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 9bbbdec2f..5add4d125 100644 --- 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 90efb666f..52859bba4 100644 --- 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 004770816..4739c6a27 100644 --- 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 vars; diff --git a/java/org/apache/jasper/el/ELResolverImpl.java b/java/org/apache/jasper/el/ELResolverImpl.java index 129a2ab35..318e806ca 100644 --- 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 c45966b54..7ebf45561 100644 --- 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 contextListeners = new ArrayList(); diff --git a/java/org/apache/jasper/xmlparser/EncodingMap.java b/java/org/apache/jasper/xmlparser/EncodingMap.java index 268e398da..cb17b541e 100644 --- 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 fIANA2JavaMap = + protected static final Hashtable fIANA2JavaMap = new Hashtable(); /** fJava2IANAMap */ - protected final static Hashtable fJava2IANAMap = + protected static final Hashtable fJava2IANAMap = new Hashtable(); // diff --git a/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java b/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java index 99d9f4483..63c1321c5 100644 --- 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; -- 2.11.0