luehe 2002/08/19 18:07:55
Modified: jasper2/src/share/org/apache/jasper/compiler Generator.java
Log:
Renamed non-standard 'sout' to '_jspx_sout'
Revision Changes Path
1.69 +12 -12
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.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- Generator.java 19 Aug 2002 18:44:42 -0000 1.68
+++ Generator.java 20 Aug 2002 01:07:55 -0000 1.69
@@ -1744,9 +1744,9 @@
String varReaderAttr = n.getAttributeValue("varReader");
String varAttr = n.getAttributeValue("var");
if (varReaderAttr != null || varAttr != null) {
- out.printil("sout = new java.io.StringWriter();");
+ out.printil("_jspx_sout = new java.io.StringWriter();");
out.print(toGetterMethod(n.getAttributeValue("fragment")));
- out.println(".invoke(sout, params);");
+ out.println(".invoke(_jspx_sout, params);");
} else {
out.print(toGetterMethod(n.getAttributeValue("fragment")));
out.println(".invoke(null, params);");
@@ -1758,10 +1758,10 @@
out.printin("pageContext.setAttribute(");
if (varReaderAttr != null) {
out.print(quote(varReaderAttr));
- out.print(", new java.io.StringReader(sout.toString())");
+ out.print(", new java.io.StringReader(_jspx_sout.toString())");
} else {
out.print(quote(varAttr));
- out.print(", sout.toString()");
+ out.print(", _jspx_sout.toString()");
}
if (scopeName != null) {
out.print(", ");
@@ -1825,8 +1825,8 @@
String varReaderAttr = n.getAttributeValue("varReader");
String varAttr = n.getAttributeValue("var");
if (varReaderAttr != null || varAttr != null) {
- out.printil("sout = new java.io.StringWriter();");
- out.printil("getJspBody().invoke(sout, params);");
+ out.printil("_jspx_sout = new java.io.StringWriter();");
+ out.printil("getJspBody().invoke(_jspx_sout, params);");
} else {
out.printil("getJspBody().invoke(null, params);");
}
@@ -1837,10 +1837,10 @@
out.printin("pageContext.setAttribute(");
if (varReaderAttr != null) {
out.print(quote(varReaderAttr));
- out.print(", new java.io.StringReader(sout.toString())");
+ out.print(", new java.io.StringReader(_jspx_sout.toString())");
} else {
out.print(quote(varAttr));
- out.print(", sout.toString()");
+ out.print(", _jspx_sout.toString()");
}
if (scopeName != null) {
out.print(", ");
@@ -2835,7 +2835,7 @@
// Declare writer used for storing result of fragment/body invocation
// if 'varReader' or 'var' attribute is specified
- out.printil("java.io.Writer sout = null;");
+ out.printil("java.io.Writer _jspx_sout = null;");
out.printil("javax.servlet.jsp.JspWriter out = pageContext.getOut();");
generatePageScopedVariables(tagInfo);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
