kinman 2003/03/20 16:43:58 Modified: jasper2/src/share/org/apache/jasper/compiler ELFunctionMapper.java Generator.java Validator.java jasper2/src/share/org/apache/jasper/resources messages.properties Log: - Minor fix in function mapper. Revision Changes Path 1.2 +6 -5 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ELFunctionMapper.java Index: ELFunctionMapper.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ELFunctionMapper.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ELFunctionMapper.java 19 Mar 2003 20:51:34 -0000 1.1 +++ ELFunctionMapper.java 21 Mar 2003 00:43:57 -0000 1.2 @@ -83,14 +83,15 @@ map.ds = new StringBuffer(); map.ss = new StringBuffer(); - map.ds.append("static {\n"); page.visit(map.new ELFunctionVisitor()); - map.ds.append("}\n"); // Append the declarations to the root node - Node root = page.getRoot(); - new Node.Declaration(map.ss.toString(), root.getStart(), root); - new Node.Declaration(map.ds.toString(), root.getStart(), root); + String ds = map.ds.toString(); + if (ds.length() > 0) { + Node root = page.getRoot(); + new Node.Declaration(map.ss.toString(), root.getStart(), root); + new Node.Declaration("static {\n" + ds + "}\n", root.getStart(), root); + } } class ELFunctionVisitor extends Node.Visitor { 1.175 +4 -4 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java Index: Generator.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v retrieving revision 1.174 retrieving revision 1.175 diff -u -r1.174 -r1.175 --- Generator.java 19 Mar 2003 20:51:34 -0000 1.174 +++ Generator.java 21 Mar 2003 00:43:57 -0000 1.175 @@ -1020,7 +1020,7 @@ "pageContext.findAttribute(\"" + name + "\"), \"" + property + "\", " + quote(value.getValue()) + ", " - + "pageContext, _jspx_fnmap);"); + + "pageContext, " + value.getEL().getMapName() + ");"); /* + "(javax.servlet.jsp.el.VariableResolver) pageContext, " + "(javax.servlet.jsp.el.FunctionMapper) this );"); 1.92 +4 -4 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java Index: Validator.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- Validator.java 19 Mar 2003 20:51:35 -0000 1.91 +++ Validator.java 21 Mar 2003 00:43:57 -0000 1.92 @@ -1205,7 +1205,7 @@ if (prefix == null) { // In XML syntax, use the default namespace if (defaultNS == null) { - err.jspError(n, "jsp.error.noFuncionPrefix", + err.jspError(n, "jsp.error.noFunctionPrefix", function); } uri = defaultNS; 1.106 +2 -4 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties Index: messages.properties =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- messages.properties 19 Mar 2003 20:51:35 -0000 1.105 +++ messages.properties 21 Mar 2003 00:43:58 -0000 1.106 @@ -97,8 +97,6 @@ jsp.error.beans.nomethod.setproperty=Can''t find a method to write property ''{0}'' of type ''{1}'' in a bean of type ''{2}'' jsp.error.beans.noproperty=Cannot find any information on property ''{0}'' in a bean of type ''{1}'' jsp.error.beans.setproperty.noindexset=Cannot set indexed property -jsp.error.beans.property.conversion=Unable to convert string \"{0}\" to class \"{1}\" for attribute \"{2}\": {3} -jsp.error.beans.propertyeditor.notregistered=Property Editor not registered with the PropertyEditorManager jsp.error.include.tag=Invalid jsp:include tag jsp.error.include.noflush=jsp:include needs to have \"flush=true\" jsp.error.include.badflush=jsp:include page=\"...\" flush=\"true\" is the only valid combination in JSP 1.0 @@ -375,4 +373,4 @@ jsp.error.jsptext.badcontent=\'<\', when appears in the body of <jsp:text>, must be encapsulated within a CDATA jsp.error.jsproot.version.invalid=Invalid version number: \"{0}\", must be \"1.2\" or \"2.0\" jsp.error.noFunctionPrefix=The function {0} must be used with a prefix when a default namespace is not specified -jsp.error.noFunction=The function {0} is cannot be located with the specified prefix +jsp.error.noFunction=The function {0} cannot be located with the specified prefix
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]