luehe 2002/08/19 18:42:38
Modified: jasper2/src/share/org/apache/jasper/compiler Generator.java
Log:
Renamed non-standard 'params' to '_jspx_params'
Revision Changes Path
1.71 +13 -13
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.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- Generator.java 20 Aug 2002 01:37:30 -0000 1.70
+++ Generator.java 20 Aug 2002 01:42:38 -0000 1.71
@@ -1724,7 +1724,7 @@
class ParamVisitor extends Node.Visitor {
public void visit(Node.ParamAction n) throws JasperException {
- out.printin("params.put(");
+ out.printin("_jspx_params.put(");
out.print(quote(n.getAttributeValue("name")));
out.print(", ");
out.print(attributeValue(n.getValue(), false,
@@ -1734,7 +1734,7 @@
}
// Assemble parameter map
- out.printil("params = new java.util.HashMap();");
+ out.printil("_jspx_params = new java.util.HashMap();");
if (n.getBody() != null) {
prepareParams(n);
n.getBody().visit(new ParamVisitor());
@@ -1746,10 +1746,10 @@
if (varReaderAttr != null || varAttr != null) {
out.printil("_jspx_sout = new java.io.StringWriter();");
out.print(toGetterMethod(n.getAttributeValue("fragment")));
- out.println(".invoke(_jspx_sout, params);");
+ out.println(".invoke(_jspx_sout, _jspx_params);");
} else {
out.print(toGetterMethod(n.getAttributeValue("fragment")));
- out.println(".invoke(null, params);");
+ out.println(".invoke(null, _jspx_params);");
}
// Store varReader in appropriate scope
@@ -1779,7 +1779,7 @@
class ParamVisitor extends Node.Visitor {
public void visit(Node.ParamAction n) throws JasperException {
- out.printin("params.put(");
+ out.printin("_jspx_params.put(");
out.print(quote(n.getAttributeValue("name")));
out.print(", ");
out.print(attributeValue(n.getValue(), false,
@@ -1789,7 +1789,7 @@
}
// Assemble parameter map
- out.printil("params = new java.util.HashMap();");
+ out.printil("_jspx_params = new java.util.HashMap();");
if (n.getBody() != null) {
prepareParams(n);
n.getBody().visit(new ParamVisitor());
@@ -1804,7 +1804,7 @@
&& scope != VariableInfo.NESTED) {
continue;
}
- out.printin("params.put(");
+ out.printin("_jspx_params.put(");
String name = tagVars[i].getNameGiven();
if (name != null) {
out.print(quote(name));
@@ -1826,9 +1826,9 @@
String varAttr = n.getAttributeValue("var");
if (varReaderAttr != null || varAttr != null) {
out.printil("_jspx_sout = new java.io.StringWriter();");
- out.printil("getJspBody().invoke(_jspx_sout, params);");
+ out.printil("getJspBody().invoke(_jspx_sout, _jspx_params);");
} else {
- out.printil("getJspBody().invoke(null, params);");
+ out.printil("getJspBody().invoke(null, _jspx_params);");
}
// Store varReader in appropriate scope
@@ -2822,7 +2822,7 @@
out.pushIndent();
out.printil("PageContext pageContext = new
JspContextWrapper(getJspContext());");
// Declare parameter map for fragment/body invocation
- out.printil("java.util.Map params = null;");
+ out.printil("java.util.Map _jspx_params = null;");
// Declare writer used for storing result of fragment/body invocation
// if 'varReader' or 'var' attribute is specified
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
