You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ki...@apache.org on 2003/08/25 22:56:44 UTC
cvs commit: jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext TagInfo.java TagLibraryValidator.java
kinman 2003/08/25 13:56:44
Modified: jsr152/src/share/javax/servlet/jsp/tagext TagInfo.java
TagLibraryValidator.java
Log:
- Patch by Mark Roth.
jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java
- Fixed incorrect clarification of getVariableInfo(). The original
semantics requiring special treatment of the id attribute
were supposed to have been removed in JSP 1.2. We brought them
back to life in JSP 2.0, but the right thing to do was to remove
them altogether, as no other containers implemented them anyway.
jsr152/src/share/javax/servlet/jsp/tagext/TagLibraryValidator.java
- Clarified that the URI passed to validate() is the same as
the URI in the XML View, not the uri passed to the taglib
directive (which doesn't always exist or produce consistent
results)
Revision Changes Path
1.8 +1 -13 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java
Index: TagInfo.java
===================================================================
RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TagInfo.java 8 Aug 2003 22:27:40 -0000 1.7
+++ TagInfo.java 25 Aug 2003 20:56:44 -0000 1.8
@@ -268,25 +268,13 @@
* @param data TagData describing this action.
* @return if a TagExtraInfo object is associated with this TagInfo, the
* result of getTagExtraInfo().getVariableInfo( data ), otherwise
- * null if the tag has no "id" attribute or new VariableInfo[] {
- * new VariableInfo( data.getId(), "java.lang.Object", true,
- * VariableInfo.NESTED ) } if an "id" attribute is present.
+ * null.
*/
public VariableInfo[] getVariableInfo(TagData data) {
VariableInfo[] result = null;
TagExtraInfo tei = getTagExtraInfo();
if (tei != null) {
result = tei.getVariableInfo( data );
- }
- else {
- String idValue = data.getId();
- if( idValue != null ) {
- result =
- new VariableInfo[] {
- new VariableInfo( idValue, "java.lang.Object",
- true, VariableInfo.NESTED )
- };
- }
}
return result;
}
1.7 +1 -1 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagLibraryValidator.java
Index: TagLibraryValidator.java
===================================================================
RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagLibraryValidator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TagLibraryValidator.java 14 Apr 2003 17:36:39 -0000 1.6
+++ TagLibraryValidator.java 25 Aug 2003 20:56:44 -0000 1.7
@@ -76,7 +76,7 @@
*
* once initialized, the validate(String, String, PageData) method will
* be invoked, where the first two arguments are the prefix
- * and uri arguments used in the taglib directive. The prefix is intended
+ * and uri for this tag library in the XML View. The prefix is intended
* to make it easier to produce an error message. However, it is not
* always accurate. In the case where a single URI is mapped to more
* than one prefix in the XML view, the prefix of the first URI is provided.