kinman 2005/02/08 10:03:58
Modified: jasper2/src/share/org/apache/jasper/compiler Generator.java
Log:
- More fine-tuning on smap for <jsp:element>, making sure that the java
line range is at least one.
Revision Changes Path
1.239 +4 -3
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.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- Generator.java 8 Feb 2005 00:23:58 -0000 1.238
+++ Generator.java 8 Feb 2005 18:03:58 -0000 1.239
@@ -1825,9 +1825,6 @@
out.print((String)map.get(attrName));
}
- // Smap should not include the body
- n.setEndJavaLine(out.getJavaLine());
-
// Does the <jsp:element> have nested tags other than
// <jsp:attribute>
boolean hasBody = false;
@@ -1844,6 +1841,9 @@
if (hasBody) {
out.println(" + \">\");");
+ // Smap should not include the body
+ n.setEndJavaLine(out.getJavaLine());
+
// Visit tag body
visitBody(n);
@@ -1853,6 +1853,7 @@
out.println(" + \">\");");
} else {
out.println(" + \"/>\");");
+ n.setEndJavaLine(out.getJavaLine());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
