luehe 2002/08/28 15:02:11
Modified: jasper2/src/share/org/apache/jasper/compiler Validator.java
Log:
Simplified custom tag validation by replacing call to
getJspAttribute() with the constructor of Node.JspAttribute directly
(for named attributes).
Revision Changes Path
1.32 +6 -26
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java
Index: Validator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Validator.java 25 Aug 2002 21:49:55 -0000 1.31
+++ Validator.java 28 Aug 2002 22:02:11 -0000 1.32
@@ -756,26 +756,8 @@
boolean found = false;
for (int j=0; j<tldAttrs.length; j++) {
if (na.getName().equals(tldAttrs[j].getName())) {
- Class expectedType = String.class;
- try {
- String typeStr = tldAttrs[j].getTypeName();
- if( tldAttrs[j].isFragment() ) {
- expectedType = JspFragment.class;
- }
- else if( typeStr != null ) {
- expectedType = Class.forName( typeStr );
- }
- jspAttrs[attrs.getLength() + i]
- = getJspAttribute(na.getName(), null, null,
- null, expectedType,
- n.getPrefix(), n, false);
- }
- catch( ClassNotFoundException e ) {
- err.jspError(n,
- "jsp.error.unknown_attribute_type",
- tldAttrs[j].getName(),
- tldAttrs[j].getTypeName() );
- }
+ jspAttrs[attrs.getLength() + i]
+ = new Node.JspAttribute(na.getName(), na, false);
tagDataAttrs.put(na.getName(),
TagData.REQUEST_TIME_VALUE);
found = true;
@@ -785,9 +767,7 @@
if (!found) {
if (tagInfo.hasDynamicAttributes()) {
jspAttrs[attrs.getLength() + i]
- = getJspAttribute(na.getName(), null, null, null,
- java.lang.Object.class,
- n.getPrefix(), n, true);
+ = new Node.JspAttribute(na.getName(), na, true);
} else {
err.jspError(n, "jsp.error.bad_attribute",
na.getName());
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
