kinman 02/04/05 10:40:50 Modified: jasper2/src/share/org/apache/jasper/compiler Generator.java Node.java Log: - Fixed some typo and obvious bugs. - Reverted codes to init JspAttrs in Node.CustomTag: not the right place for it. Revision Changes Path 1.3 +4 -4 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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Generator.java 28 Mar 2002 19:43:08 -0000 1.2 +++ Generator.java 5 Apr 2002 18:40:50 -0000 1.3 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v 1.2 2002/03/28 19:43:08 kinman Exp $ - * $Revision: 1.2 $ - * $Date: 2002/03/28 19:43:08 $ + * $Header: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v 1.3 2002/04/05 18:40:50 kinman Exp $ + * $Revision: 1.3 $ + * $Date: 2002/04/05 18:40:50 $ * * ==================================================================== * @@ -216,7 +216,7 @@ if (pageInfo.isSession()) out.printil("HttpSession session = null;"); - if (ctxt.isErrorPage()) + if (pageInfo.isIsErrorPage()) out.printil("Throwable exception = (Throwable) request.getAttribute(\"javax.servlet.jsp.jspException\");"); out.printil("ServletContext application = null;"); 1.4 +6 -14 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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Node.java 4 Apr 2002 11:32:05 -0000 1.3 +++ Node.java 5 Apr 2002 18:40:50 -0000 1.4 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Node.java,v 1.3 2002/04/04 11:32:05 remm Exp $ - * $Revision: 1.3 $ - * $Date: 2002/04/04 11:32:05 $ + * $Header: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Node.java,v 1.4 2002/04/05 18:40:50 kinman Exp $ + * $Revision: 1.4 $ + * $Date: 2002/04/05 18:40:50 $ * * ==================================================================== * @@ -465,7 +465,7 @@ v.visit(this); } - public void setValue(JspAttribute page) { + public void setValue(JspAttribute value) { this.value = value; } @@ -579,7 +579,7 @@ v.visit(this); } - public void setValue(JspAttribute page) { + public void setValue(JspAttribute value) { this.value = value; } @@ -603,7 +603,7 @@ v.visit(this); } - public void setBeanName(JspAttribute page) { + public void setBeanName(JspAttribute beanName) { this.beanName = beanName; } @@ -663,14 +663,6 @@ this.name = name; this.prefix = prefix; this.shortName = shortName; - jspAttrs = new JspAttribute[attrs.getLength()]; - Hashtable attrsHashtable = new Hashtable(); - for (int i = 0; i < attrs.getLength(); i++) { - jspAttrs[i] = new JspAttribute - (attrs.getLocalName(i), attrs.getValue(i), false); - attrsHashtable.put(attrs.getLocalName(i), attrs.getValue(i)); - } - tagData = new TagData(attrsHashtable); } public void accept(Visitor v) throws JasperException {
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>