You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by pi...@locus.apache.org on 2000/09/19 21:23:34 UTC
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler ParseEventListener.java BaseJspListener.java DelegatingListener.java
pierred 00/09/19 12:23:33
Modified: jasper/src/share/org/apache/jasper/compiler
ParseEventListener.java BaseJspListener.java
DelegatingListener.java
Log:
Support for XML syntax:
- added setReader() method
- handler methods that have 'text' associated with them now have it
explicitly declared in the method signature so that these methods
can be reused by both the JSP and the XML parser.
- new handler methods: handleRootBegin() and handleRootEnd()
- include behavior changed to use ParserController
Revision Changes Path
1.2 +20 -7 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ParseEventListener.java
Index: ParseEventListener.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ParseEventListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ParseEventListener.java 2000/08/12 00:52:08 1.1
+++ ParseEventListener.java 2000/09/19 19:23:31 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ParseEventListener.java,v 1.1 2000/08/12 00:52:08 pierred Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/12 00:52:08 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ParseEventListener.java,v 1.2 2000/09/19 19:23:31 pierred Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/09/19 19:23:31 $
*
* ====================================================================
*
@@ -73,18 +73,27 @@
* probably try and make this a SAX (XML) listener.
*
* @author Anil K. Vijendran
+ * @author Pierre Delisle
*/
public interface ParseEventListener {
+ /**
+ * The reader associated with the listener.
+ * As of JSP1.2, each part of the JSP tranlation
+ * unit is parsed with a new instance of a parser
+ * and the reader is different for each one.
+ */
+ public void setReader(JspReader reader);
+
void setTemplateInfo(Mark start, Mark stop);
void beginPageProcessing() throws JasperException;
- void handleComment(Mark start, Mark stop) throws JasperException;
+ void handleComment(Mark start, Mark stop, char[] text) throws JasperException;
void handleDirective(String directive,
Mark start, Mark stop,
Hashtable attrs) throws JasperException;
- void handleDeclaration(Mark start, Mark stop, Hashtable attrs) throws JasperException;
- void handleScriptlet(Mark start, Mark stop, Hashtable attrs) throws JasperException;
- void handleExpression(Mark start, Mark stop, Hashtable attrs) throws JasperException;
+ void handleDeclaration(Mark start, Mark stop, Hashtable attrs, char[] text) throws JasperException;
+ void handleScriptlet(Mark start, Mark stop, Hashtable attrs, char[] text) throws JasperException;
+ void handleExpression(Mark start, Mark stop, Hashtable attrs, char[] text) throws JasperException;
void handleBean(Mark start, Mark stop, Hashtable attrs)
throws JasperException;
void handleBeanEnd (Mark start, Mark stop, Hashtable attrs)
@@ -120,5 +129,9 @@
throws JasperException;
void endPageProcessing() throws JasperException;
+
+ public void handleRootBegin(Hashtable attrs);
+ public void handleRootEnd();
+
}
1.2 +14 -7 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/BaseJspListener.java
Index: BaseJspListener.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/BaseJspListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BaseJspListener.java 2000/08/12 00:52:07 1.1
+++ BaseJspListener.java 2000/09/19 19:23:31 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/BaseJspListener.java,v 1.1 2000/08/12 00:52:07 pierred Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/12 00:52:07 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/BaseJspListener.java,v 1.2 2000/09/19 19:23:31 pierred Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/09/19 19:23:31 $
*
* ====================================================================
*
@@ -83,6 +83,10 @@
this.writer = writer;
}
+ public void setReader(JspReader reader) {
+ this.reader = reader;
+ }
+
public void setTemplateInfo(Mark start, Mark stop) {
}
@@ -92,7 +96,7 @@
public void endPageProcessing() throws JasperException {
}
- public void handleComment(Mark start, Mark stop) throws JasperException {
+ public void handleComment(Mark start, Mark stop, char[] text) throws JasperException {
throw new JasperException(Constants.getString("jsp.error.not.impl.comments"));
}
@@ -102,15 +106,15 @@
throw new JasperException(Constants.getString("jsp.error.not.impl.directives"));
}
- public void handleDeclaration(Mark start, Mark stop, Hashtable attrs) throws JasperException {
+ public void handleDeclaration(Mark start, Mark stop, Hashtable attrs, char[] text) throws JasperException {
throw new JasperException(Constants.getString("jsp.error.not.impl.declarations"));
}
- public void handleScriptlet(Mark start, Mark stop, Hashtable attrs) throws JasperException {
+ public void handleScriptlet(Mark start, Mark stop, Hashtable attrs, char[] text) throws JasperException {
throw new JasperException(Constants.getString("jsp.error.not.impl.scriptlets"));
}
- public void handleExpression(Mark start, Mark stop, Hashtable attrs) throws JasperException {
+ public void handleExpression(Mark start, Mark stop, Hashtable attrs, char[] text) throws JasperException {
throw new JasperException(Constants.getString("jsp.error.not.impl.expressions"));
}
@@ -180,4 +184,7 @@
public TagLibraries getTagLibraries() {
return null;
}
+
+ public void handleRootBegin(Hashtable attrs) {};
+ public void handleRootEnd() {};
}
1.2 +18 -11 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/DelegatingListener.java
Index: DelegatingListener.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/DelegatingListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DelegatingListener.java 2000/08/12 00:52:07 1.1
+++ DelegatingListener.java 2000/09/19 19:23:32 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/DelegatingListener.java,v 1.1 2000/08/12 00:52:07 pierred Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/12 00:52:07 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/DelegatingListener.java,v 1.2 2000/09/19 19:23:32 pierred Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/09/19 19:23:32 $
*
* ====================================================================
*
@@ -87,6 +87,10 @@
this.action = action;
}
+ public void setReader(JspReader reader) {
+ delegate.setReader(reader);
+ }
+
void doAction(Mark start, Mark stop) throws JasperException {
action.execute(start, stop);
}
@@ -104,9 +108,9 @@
delegate.endPageProcessing();
}
- public void handleComment(Mark start, Mark stop) throws JasperException {
+ public void handleComment(Mark start, Mark stop, char[] text) throws JasperException {
doAction(this.tmplStart, this.tmplStop);
- delegate.handleComment(start, stop);
+ delegate.handleComment(start, stop, text);
}
public void handleDirective(String directive, Mark start, Mark stop, Hashtable attrs)
@@ -116,19 +120,19 @@
delegate.handleDirective(directive, start, stop, attrs);
}
- public void handleDeclaration(Mark start, Mark stop, Hashtable attrs) throws JasperException {
+ public void handleDeclaration(Mark start, Mark stop, Hashtable attrs, char[] text) throws JasperException {
doAction(this.tmplStart, this.tmplStop);
- delegate.handleDeclaration(start, stop, attrs);
+ delegate.handleDeclaration(start, stop, attrs, text);
}
- public void handleScriptlet(Mark start, Mark stop, Hashtable attrs) throws JasperException {
+ public void handleScriptlet(Mark start, Mark stop, Hashtable attrs, char[] text) throws JasperException {
doAction(this.tmplStart, this.tmplStop);
- delegate.handleScriptlet(start, stop, attrs);
+ delegate.handleScriptlet(start, stop, attrs, text);
}
- public void handleExpression(Mark start, Mark stop, Hashtable attrs) throws JasperException {
+ public void handleExpression(Mark start, Mark stop, Hashtable attrs, char[] text) throws JasperException {
doAction(this.tmplStart, this.tmplStop);
- delegate.handleExpression(start, stop, attrs);
+ delegate.handleExpression(start, stop, attrs, text);
}
public void handleBean(Mark start, Mark stop, Hashtable attrs)
@@ -206,5 +210,8 @@
public TagLibraries getTagLibraries() {
return delegate.getTagLibraries();
}
+
+ public void handleRootBegin(Hashtable attrs) {};
+ public void handleRootEnd() {};
}