Author: markt
Date: Tue Dec 7 15:39:09 2010
New Revision: 1043101
URL: http://svn.apache.org/viewvc?rev=1043101&view=rev
Log:
Fix modifier order in org.apache.jasper.*
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
tomcat/trunk/java/org/apache/jasper/compiler/ELNode.java
tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
tomcat/trunk/java/org/apache/jasper/compiler/Node.java
tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java
tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java
tomcat/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java
tomcat/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java
tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java?rev=1043101&r1=1043100&r2=1043101&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java Tue Dec
7 15:39:09 2010
@@ -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");
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ELNode.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ELNode.java?rev=1043101&r1=1043100&r2=1043101&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ELNode.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ELNode.java Tue Dec 7
15:39:09 2010
@@ -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
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java?rev=1043101&r1=1043100&r2=1043101&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java Tue Dec 7
15:39:09 2010
@@ -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;
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Node.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Node.java?rev=1043101&r1=1043100&r2=1043101&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Node.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Node.java Tue Dec 7 15:39:09
2010
@@ -815,7 +815,7 @@ abstract class Node implements TagConsta
/**
* 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) {
Modified: tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java?rev=1043101&r1=1043100&r2=1043101&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java Tue Dec 7
15:39:09 2010
@@ -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;
Modified: tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java?rev=1043101&r1=1043100&r2=1043101&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java Tue Dec 7
15:39:09 2010
@@ -35,7 +35,7 @@ import javax.servlet.jsp.el.VariableReso
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) {
Modified:
tomcat/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java?rev=1043101&r1=1043100&r2=1043101&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java
Tue Dec 7 15:39:09 2010
@@ -48,9 +48,9 @@ import org.apache.jasper.el.ELContextImp
*/
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>();
Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java?rev=1043101&r1=1043100&r2=1043101&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java (original)
+++ tomcat/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java Tue Dec 7
15:39:09 2010
@@ -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>();
//
Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java?rev=1043101&r1=1043100&r2=1043101&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java Tue
Dec 7 15:39:09 2010
@@ -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;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
