luehe 2003/02/13 10:15:46
Modified: jasper2/src/share/org/apache/jasper/compiler Tag:
tomcat_4_branch Generator.java
JspDocumentParser.java Node.java Parser.java
Log:
Added support for <jsp:fallback> to XML syntax
Revision Changes Path
No revision
No revision
1.35.2.19 +5 -11
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.35.2.18
retrieving revision 1.35.2.19
diff -u -r1.35.2.18 -r1.35.2.19
--- Generator.java 10 Feb 2003 17:06:11 -0000 1.35.2.18
+++ Generator.java 13 Feb 2003 18:15:45 -0000 1.35.2.19
@@ -1069,14 +1069,8 @@
* Fallback
*/
if (n.getBody() != null) {
- n.getBody().visit(new Node.Visitor() {
- public void visit(Node.FallBackAction n) {
- n.setBeginJavaLine(out.getJavaLine());
- out.printil("out.println(" +
- quote(new String(n.getText())) + ");");
- n.setEndJavaLine(out.getJavaLine());
- }
- });
+ visitBody(n);
+ out.printil("out.write(\"\\n\");");
}
out.printil("out.println(" + quote("</NOEMBED></EMBED>") + ");");
1.4.2.3 +5 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java
Index: JspDocumentParser.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- JspDocumentParser.java 17 Aug 2002 00:14:23 -0000 1.4.2.2
+++ JspDocumentParser.java 13 Feb 2003 18:15:45 -0000 1.4.2.3
@@ -233,6 +233,8 @@
node = new Node.PlugIn(attrsCopy, start, current);
} else if (qName.equals(JSP_TEXT_TAG)) {
node = new Node.JspText(start, current);
+ } else if (qName.equals(JSP_FALLBACK_TAG)) {
+ node = new Node.FallBackAction(start, current);
} else {
node = getCustomTag(qName, attrsCopy, start, current);
if (node == null) {
1.15.2.5 +5 -5
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Node.java
Index: Node.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Node.java,v
retrieving revision 1.15.2.4
retrieving revision 1.15.2.5
diff -u -r1.15.2.4 -r1.15.2.5
--- Node.java 6 Nov 2002 23:43:51 -0000 1.15.2.4
+++ Node.java 13 Feb 2003 18:15:45 -0000 1.15.2.5
@@ -482,8 +482,8 @@
*/
public static class FallBackAction extends Node {
- public FallBackAction(Mark start, char[] text, Node parent) {
- super(text, start, parent);
+ public FallBackAction(Mark start, Node parent) {
+ super(start, parent);
}
public void accept(Visitor v) throws JasperException {
1.7.2.4 +5 -10
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java
Index: Parser.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java,v
retrieving revision 1.7.2.3
retrieving revision 1.7.2.4
diff -u -r1.7.2.3 -r1.7.2.4
--- Parser.java 8 Oct 2002 23:42:06 -0000 1.7.2.3
+++ Parser.java 13 Feb 2003 18:15:45 -0000 1.7.2.4
@@ -610,13 +610,8 @@
err.jspError(reader.mark(), "jsp.error.fallback.notclosed");
}
- Mark bodyStart = reader.mark();
- Mark bodyEnd = reader.skipUntilETag("jsp:fallback");
- if (bodyEnd == null) {
- err.jspError(start, "jsp.error.unterminated", "<jsp:fallback>");
- }
- char[] text = reader.getText(bodyStart, bodyEnd);
- new Node.FallBackAction(start, text, parent);
+ Node.FallBackAction fallback = new Node.FallBackAction(start, parent);
+ parseBodyText(fallback, "jsp:fallback");
}
/*
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
