You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ki...@apache.org on 2004/07/26 22:50:36 UTC
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Generator.java
kinman 2004/07/26 13:50:36
Modified: jasper2/src/share/org/apache/jasper/compiler Generator.java
Log:
- Fix 30291: Smap for a tag should not include its body.
- Fix 30289: Incorrect Smap for multiple line java expression.
Revision Changes Path
1.236 +8 -5 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.235
retrieving revision 1.236
diff -u -r1.235 -r1.236
--- Generator.java 23 Jul 2004 22:45:38 -0000 1.235
+++ Generator.java 26 Jul 2004 20:50:35 -0000 1.236
@@ -830,7 +830,9 @@
public void visit(Node.Expression n) throws JasperException {
n.setBeginJavaLine(out.getJavaLine());
- out.printil("out.print(" + n.getText() + ");");
+ out.printin("out.print(");
+ out.printMultiLn(n.getText());
+ out.println(");");
n.setEndJavaLine(out.getJavaLine());
}
@@ -2125,9 +2127,9 @@
Class tagHandlerClass = handlerInfo.getTagHandlerClass();
- n.setBeginJavaLine(out.getJavaLine());
out.printin("// ");
out.println(n.getQName());
+ n.setBeginJavaLine(out.getJavaLine());
// Declare AT_BEGIN scripting variables
declareScriptingVars(n, VariableInfo.AT_BEGIN);
@@ -2221,7 +2223,10 @@
out.pushIndent();
}
}
- };
+ // Map the Java lines that handles start of custom tags to the
+ // JSP line for this tag
+ n.setEndJavaLine(out.getJavaLine());
+ }
private void generateCustomEnd(
Node.CustomTag n,
@@ -2327,8 +2332,6 @@
syncScriptingVars(n, VariableInfo.AT_END);
restoreScriptingVars(n, VariableInfo.AT_BEGIN);
-
- n.setEndJavaLine(out.getJavaLine());
}
private void generateCustomDoTag(
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org