Author: remy.maucherat(a)jboss.com Date: 2010-12-01 05:44:48 -0500 (Wed, 01 Dec 2010) New Revision: 1600 Modified: trunk/java/org/apache/jasper/compiler/Compiler.java trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java Log: - Port Tomcat code formatting, the old one is unreadable in this class. Modified: trunk/java/org/apache/jasper/compiler/Compiler.java =================================================================== --- trunk/java/org/apache/jasper/compiler/Compiler.java 2010-12-01 10:44:46 UTC (rev 1599) +++ trunk/java/org/apache/jasper/compiler/Compiler.java 2010-12-01 10:44:48 UTC (rev 1600) @@ -237,7 +237,7 @@ TextOptimizer.concatenate(this, pageNodes); // Generate static function mapper codes. - ELFunctionMapper.map(this, pageNodes); + ELFunctionMapper.map(pageNodes); // generate servlet .java file writer = setupContextWriter(javaFileName); Modified: trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java =================================================================== --- trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java 2010-12-01 10:44:46 UTC (rev 1599) +++ trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java 2010-12-01 10:44:48 UTC (rev 1600) @@ -19,7 +19,9 @@ import java.security.AccessController; import java.security.PrivilegedAction; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; + import javax.servlet.jsp.tagext.FunctionInfo; import org.apache.jasper.Constants; @@ -27,7 +29,7 @@ /** * This class generates functions mappers for the EL expressions in the page. - * Instead of a global mapper, a mapper is used for ecah call to EL + * Instead of a global mapper, a mapper is used for each call to EL * evaluator, thus avoiding the prefix overlapping and redefinition * issues. * @@ -42,25 +44,24 @@ /** * Creates the functions mappers for all EL expressions in the JSP page. * - * @param compiler Current compiler, mainly for accessing error dispatcher. * @param page The current compilation unit. */ - public static void map(Compiler compiler, Node.Nodes page) - throws JasperException { + public static void map(Node.Nodes page) + throws JasperException { - ELFunctionMapper map = new ELFunctionMapper(); - map.ds = new StringBuilder(); - map.ss = new StringBuilder(); + ELFunctionMapper map = new ELFunctionMapper(); + map.ds = new StringBuilder(); + map.ss = new StringBuilder(); - page.visit(map.new ELFunctionVisitor()); + page.visit(map.new ELFunctionVisitor()); - // Append the declarations to the root node - String ds = map.ds.toString(); - if (ds.length() > 0) { - Node root = page.getRoot(); - new Node.Declaration(map.ss.toString(), null, root); - new Node.Declaration("static {\n" + ds + "}\n", null, root); - } + // Append the declarations to the root node + String ds = map.ds.toString(); + if (ds.length() > 0) { + Node root = page.getRoot(); + new Node.Declaration(map.ss.toString(), null, root); + new Node.Declaration("static {\n" + ds + "}\n", null, root); + } } /** @@ -68,210 +69,196 @@ * for functions, and if found functions mappers are created. */ class ELFunctionVisitor extends Node.Visitor { - - /** - * Use a global name map to facilitate reuse of function maps. - * The key used is prefix:function:uri. - */ - private HashMap gMap = new HashMap(); + + /** + * Use a global name map to facilitate reuse of function maps. + * The key used is prefix:function:uri. + */ + private HashMap<String, String> gMap = new HashMap<String, String>(); - public void visit(Node.ParamAction n) throws JasperException { - doMap(n.getValue()); - visitBody(n); - } + @Override + public void visit(Node.ParamAction n) throws JasperException { + doMap(n.getValue()); + visitBody(n); + } - public void visit(Node.IncludeAction n) throws JasperException { - doMap(n.getPage()); - visitBody(n); - } + @Override + public void visit(Node.IncludeAction n) throws JasperException { + doMap(n.getPage()); + visitBody(n); + } - public void visit(Node.ForwardAction n) throws JasperException { - doMap(n.getPage()); - visitBody(n); - } + @Override + public void visit(Node.ForwardAction n) throws JasperException { + doMap(n.getPage()); + visitBody(n); + } + @Override public void visit(Node.SetProperty n) throws JasperException { - doMap(n.getValue()); - visitBody(n); - } + doMap(n.getValue()); + visitBody(n); + } + @Override public void visit(Node.UseBean n) throws JasperException { - doMap(n.getBeanName()); - visitBody(n); - } + doMap(n.getBeanName()); + visitBody(n); + } + @Override public void visit(Node.PlugIn n) throws JasperException { - doMap(n.getHeight()); - doMap(n.getWidth()); - visitBody(n); - } + doMap(n.getHeight()); + doMap(n.getWidth()); + visitBody(n); + } + @Override public void visit(Node.JspElement n) throws JasperException { - Node.JspAttribute[] attrs = n.getJspAttributes(); - for (int i = 0; attrs != null && i < attrs.length; i++) { - doMap(attrs[i]); - } - doMap(n.getNameAttribute()); - visitBody(n); - } + Node.JspAttribute[] attrs = n.getJspAttributes(); + for (int i = 0; attrs != null && i < attrs.length; i++) { + doMap(attrs[i]); + } + doMap(n.getNameAttribute()); + visitBody(n); + } + @Override public void visit(Node.UninterpretedTag n) throws JasperException { - Node.JspAttribute[] attrs = n.getJspAttributes(); - for (int i = 0; attrs != null && i < attrs.length; i++) { - doMap(attrs[i]); - } - visitBody(n); - } + Node.JspAttribute[] attrs = n.getJspAttributes(); + for (int i = 0; attrs != null && i < attrs.length; i++) { + doMap(attrs[i]); + } + visitBody(n); + } + @Override public void visit(Node.CustomTag n) throws JasperException { - Node.JspAttribute[] attrs = n.getJspAttributes(); - for (int i = 0; attrs != null && i < attrs.length; i++) { - doMap(attrs[i]); - } - visitBody(n); - } + Node.JspAttribute[] attrs = n.getJspAttributes(); + for (int i = 0; attrs != null && i < attrs.length; i++) { + doMap(attrs[i]); + } + visitBody(n); + } + @Override public void visit(Node.ELExpression n) throws JasperException { - doMap(n.getEL()); - } + doMap(n.getEL()); + } - private void doMap(Node.JspAttribute attr) - throws JasperException { - if (attr != null) { - doMap(attr.getEL()); - } - } + private void doMap(Node.JspAttribute attr) + throws JasperException { + if (attr != null) { + doMap(attr.getEL()); + } + } /** * Creates function mappers, if needed, from ELNodes */ - private void doMap(ELNode.Nodes el) - throws JasperException { + private void doMap(ELNode.Nodes el) + throws JasperException { // Only care about functions in ELNode's - class Fvisitor extends ELNode.Visitor { - ArrayList funcs = new ArrayList(); - HashMap keyMap = new HashMap(); - public void visit(ELNode.Function n) throws JasperException { - String key = n.getPrefix() + ":" + n.getName(); - if (! keyMap.containsKey(key)) { - keyMap.put(key,""); - funcs.add(n); - } - } - } + class Fvisitor extends ELNode.Visitor { + ArrayList<ELNode.Function> funcs = + new ArrayList<ELNode.Function>(); + HashMap<String, String> keyMap = new HashMap<String, String>(); + @Override + public void visit(ELNode.Function n) throws JasperException { + String key = n.getPrefix() + ":" + n.getName(); + if (! keyMap.containsKey(key)) { + keyMap.put(key,""); + funcs.add(n); + } + } + } - if (el == null) { - return; - } + if (el == null) { + return; + } - // First locate all unique functions in this EL - Fvisitor fv = new Fvisitor(); - el.visit(fv); - ArrayList functions = fv.funcs; + // First locate all unique functions in this EL + Fvisitor fv = new Fvisitor(); + el.visit(fv); + ArrayList<ELNode.Function> functions = fv.funcs; - if (functions.size() == 0) { - return; - } + if (functions.size() == 0) { + return; + } - // Reuse a previous map if possible - String decName = matchMap(functions); - if (decName != null) { - el.setMapName(decName); - return; - } - - // Generate declaration for the map statically - decName = getMapName(); - ss.append("static private org.apache.jasper.runtime.ProtectedFunctionMapper " + decName + ";\n"); + // Reuse a previous map if possible + String decName = matchMap(functions); + if (decName != null) { + el.setMapName(decName); + return; + } + + // Generate declaration for the map statically + decName = getMapName(); + ss.append("static private org.apache.jasper.runtime.ProtectedFunctionMapper " + decName + ";\n"); - ds.append(" " + decName + "= "); - ds.append("org.apache.jasper.runtime.ProtectedFunctionMapper"); + ds.append(" " + decName + "= "); + ds.append("org.apache.jasper.runtime.ProtectedFunctionMapper"); - // Special case if there is only one function in the map - String funcMethod = null; - if (functions.size() == 1) { - funcMethod = ".getMapForFunction"; - } else { - ds.append(".getInstance();\n"); - funcMethod = " " + decName + ".mapFunction"; - } + // Special case if there is only one function in the map + String funcMethod = null; + if (functions.size() == 1) { + funcMethod = ".getMapForFunction"; + } else { + ds.append(".getInstance();\n"); + funcMethod = " " + decName + ".mapFunction"; + } // Setup arguments for either getMapForFunction or mapFunction - for (int i = 0; i < functions.size(); i++) { - ELNode.Function f = (ELNode.Function)functions.get(i); - FunctionInfo funcInfo = f.getFunctionInfo(); - String key = f.getPrefix()+ ":" + f.getName(); - ds.append(funcMethod + "(\"" + key + "\", " + - getCanonicalName(funcInfo.getFunctionClass()) + - ".class, " + '\"' + f.getMethodName() + "\", " + - "new Class[] {"); - String params[] = f.getParameters(); - for (int k = 0; k < params.length; k++) { - if (k != 0) { - ds.append(", "); - } - int iArray = params[k].indexOf('['); - if (iArray < 0) { - ds.append(params[k] + ".class"); - } - else { - String baseType = params[k].substring(0, iArray); - ds.append("java.lang.reflect.Array.newInstance("); - ds.append(baseType); - ds.append(".class,"); + for (int i = 0; i < functions.size(); i++) { + ELNode.Function f = functions.get(i); + FunctionInfo funcInfo = f.getFunctionInfo(); + String key = f.getPrefix()+ ":" + f.getName(); + ds.append(funcMethod + "(\"" + key + "\", " + + getCanonicalName(funcInfo.getFunctionClass()) + + ".class, " + '\"' + f.getMethodName() + "\", " + + "new Class[] {"); + String params[] = f.getParameters(); + for (int k = 0; k < params.length; k++) { + if (k != 0) { + ds.append(", "); + } + int iArray = params[k].indexOf('['); + if (iArray < 0) { + ds.append(params[k] + ".class"); + } + else { + String baseType = params[k].substring(0, iArray); + ds.append("java.lang.reflect.Array.newInstance("); + ds.append(baseType); + ds.append(".class,"); - // Count the number of array dimension - int aCount = 0; - for (int jj = iArray; jj < params[k].length(); jj++ ) { - if (params[k].charAt(jj) == '[') { - aCount++; - } - } - if (aCount == 1) { - ds.append("0).getClass()"); - } else { - ds.append("new int[" + aCount + "]).getClass()"); - } - } - } - ds.append("});\n"); - // Put the current name in the global function map - gMap.put(f.getPrefix() + ':' + f.getName() + ':' + f.getUri(), - decName); - } - el.setMapName(decName); - } + // Count the number of array dimension + int aCount = 0; + for (int jj = iArray; jj < params[k].length(); jj++ ) { + if (params[k].charAt(jj) == '[') { + aCount++; + } + } + if (aCount == 1) { + ds.append("0).getClass()"); + } else { + ds.append("new int[" + aCount + "]).getClass()"); + } + } + } + ds.append("});\n"); + // Put the current name in the global function map + gMap.put(f.getPrefix() + ':' + f.getName() + ':' + f.getUri(), + decName); + } + el.setMapName(decName); + } - /** - * Convert a binary class name into a canonical one that can be used - * when generating Java source code. - * - * @param className Binary class name - * @return Canonical equivalent - */ - private String getCanonicalName(String className) throws JasperException { - Class<?> clazz; - - ClassLoader tccl; - if (Constants.IS_SECURITY_ENABLED) { - PrivilegedAction<ClassLoader> pa = new PrivilegedGetTccl(); - tccl = AccessController.doPrivileged(pa); - } else { - tccl = Thread.currentThread().getContextClassLoader(); - } - - try { - clazz = Class.forName(className, true, tccl); - } catch (ClassNotFoundException e) { - throw new JasperException(e); - } - return clazz.getCanonicalName(); - } - - /** + /** * Find the name of the function mapper for an EL. Reuse a * previously generated one if possible. * @param functions An ArrayList of ELNode.Function instances that @@ -279,41 +266,66 @@ * @return A previous generated function mapper name that can be used * by this EL; null if none found. */ - private String matchMap(ArrayList functions) { + private String matchMap(ArrayList<ELNode.Function> functions) { - String mapName = null; - for (int i = 0; i < functions.size(); i++) { - ELNode.Function f = (ELNode.Function)functions.get(i); - String temName = (String) gMap.get(f.getPrefix() + ':' + - f.getName() + ':' + f.getUri()); - if (temName == null) { - return null; - } - if (mapName == null) { - mapName = temName; - } else if (!temName.equals(mapName)) { - // If not all in the previous match, then no match. - return null; - } - } - return mapName; - } + String mapName = null; + for (int i = 0; i < functions.size(); i++) { + ELNode.Function f = functions.get(i); + String temName = gMap.get(f.getPrefix() + ':' + f.getName() + + ':' + f.getUri()); + if (temName == null) { + return null; + } + if (mapName == null) { + mapName = temName; + } else if (!temName.equals(mapName)) { + // If not all in the previous match, then no match. + return null; + } + } + return mapName; + } /* * @return An unique name for a function mapper. */ - private String getMapName() { - return "_jspx_fnmap_" + currFunc++; - } + private String getMapName() { + return "_jspx_fnmap_" + currFunc++; + } + + /** + * Convert a binary class name into a canonical one that can be used + * when generating Java source code. + * + * @param className Binary class name + * @return Canonical equivalent + */ + private String getCanonicalName(String className) throws JasperException { + Class<?> clazz; + + ClassLoader tccl; + if (Constants.IS_SECURITY_ENABLED) { + PrivilegedAction<ClassLoader> pa = new PrivilegedGetTccl(); + tccl = AccessController.doPrivileged(pa); + } else { + tccl = Thread.currentThread().getContextClassLoader(); + } + + try { + clazz = Class.forName(className, true, tccl); + } catch (ClassNotFoundException e) { + throw new JasperException(e); + } + return clazz.getCanonicalName(); + } } - + private static class PrivilegedGetTccl - implements PrivilegedAction<ClassLoader> { + implements PrivilegedAction<ClassLoader> { public ClassLoader run() { return Thread.currentThread().getContextClassLoader(); } } - }