kinman 2004/06/10 17:29:57
Modified: jasper2/src/share/org/apache/jasper/compiler Generator.java
JspUtil.java
Log:
- If the value of the "type" attribute of the attribute directive
is an array, allow it to be specified as "[L<classname>;"
Revision Changes Path
1.234 +3 -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.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- Generator.java 10 Jun 2004 21:17:28 -0000 1.233
+++ Generator.java 11 Jun 2004 00:29:56 -0000 1.234
@@ -3444,7 +3444,7 @@
if (attrInfos[i].isFragment()) {
out.print("javax.servlet.jsp.tagext.JspFragment ");
} else {
- out.print(attrInfos[i].getTypeName());
+ out.print(JspUtil.toJavaSourceType(attrInfos[i].getTypeName()));
out.print(" ");
}
out.print(attrInfos[i].getName());
@@ -3460,7 +3460,7 @@
if (attrInfos[i].isFragment()) {
out.print("javax.servlet.jsp.tagext.JspFragment ");
} else {
- out.print(attrInfos[i].getTypeName());
+ out.print(JspUtil.toJavaSourceType(attrInfos[i].getTypeName()));
out.print(" ");
}
out.print(toGetterMethod(attrInfos[i].getName()));
@@ -3480,7 +3480,7 @@
out.print("(javax.servlet.jsp.tagext.JspFragment ");
} else {
out.print("(");
- out.print(attrInfos[i].getTypeName());
+ out.print(JspUtil.toJavaSourceType(attrInfos[i].getTypeName()));
out.print(" ");
}
out.print(attrInfos[i].getName());
1.49 +1 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspUtil.java
Index: JspUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspUtil.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- JspUtil.java 19 Apr 2004 21:10:19 -0000 1.48
+++ JspUtil.java 11 Jun 2004 00:29:56 -0000 1.49
@@ -1047,7 +1047,7 @@
* the element type can be one of ZBCDFIJS or L<classname>;
* It is converted into forms that can be understood by javac.
*/
- private static String toJavaSourceType(String type) {
+ public static String toJavaSourceType(String type) {
if (type.charAt(0) != '[') {
return type;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
