Author: remy.maucherat(a)jboss.com Date: 2007-12-07 11:31:32 -0500 (Fri, 07 Dec 2007) New Revision: 375 Modified: trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java trunk/java/javax/servlet/jsp/tagext/TagInfo.java Log: - Forgotten API fixes. Modified: trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java =================================================================== --- trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java 2007-12-07 15:14:27 UTC (rev 374) +++ trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java 2007-12-07 16:31:32 UTC (rev 375) @@ -57,7 +57,7 @@ return null; } - public Class getType(ELContext context, Object base, Object property) + public Class<Object> getType(ELContext context, Object base, Object property) throws NullPointerException, PropertyNotFoundException, ELException { if (context == null) { throw new NullPointerException(); Modified: trunk/java/javax/servlet/jsp/tagext/TagInfo.java =================================================================== --- trunk/java/javax/servlet/jsp/tagext/TagInfo.java 2007-12-07 15:14:27 UTC (rev 374) +++ trunk/java/javax/servlet/jsp/tagext/TagInfo.java 2007-12-07 16:31:32 UTC (rev 375) @@ -38,21 +38,21 @@ * Static constant for getBodyContent() when it is Tag dependent. */ - public static final String BODY_CONTENT_TAG_DEPENDENT = "TAGDEPENDENT"; + public static final String BODY_CONTENT_TAG_DEPENDENT = "tagdependent"; /** * Static constant for getBodyContent() when it is empty. */ - public static final String BODY_CONTENT_EMPTY = "EMPTY"; + public static final String BODY_CONTENT_EMPTY = "empty"; /** * Static constant for getBodyContent() when it is scriptless. * * @since 2.0 */ - public static final String BODY_CONTENT_SCRIPTLESS = "SCRIPTLESS"; + public static final String BODY_CONTENT_SCRIPTLESS = "scriptless"; /** * Constructor for TagInfo from data in the JSP 1.1 format for TLD.