Author: remy.maucherat(a)jboss.com Date: 2009-10-22 10:40:46 -0400 (Thu, 22 Oct 2009) New Revision: 1220 Modified: trunk/java/org/apache/catalina/deploy/jsp/TagInfo.java trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java Log: - Move remaining stuff over to booleans. Modified: trunk/java/org/apache/catalina/deploy/jsp/TagInfo.java =================================================================== --- trunk/java/org/apache/catalina/deploy/jsp/TagInfo.java 2009-10-22 12:05:13 UTC (rev 1219) +++ trunk/java/org/apache/catalina/deploy/jsp/TagInfo.java 2009-10-22 14:40:46 UTC (rev 1220) @@ -43,7 +43,7 @@ /* * Additional private fields for 2.0 info */ - protected boolean dynamicAttributes; + protected String dynamicAttributes; public void addTagAttributeInfo(TagAttributeInfo tagAttributeInfo) { tagAttributeInfos.add(tagAttributeInfo); @@ -125,11 +125,11 @@ this.largeIcon = largeIcon; } - public boolean isDynamicAttributes() { + public String getDynamicAttributes() { return dynamicAttributes; } - public void setDynamicAttributes(boolean dynamicAttributes) { + public void setDynamicAttributes(String dynamicAttributes) { this.dynamicAttributes = dynamicAttributes; } Modified: trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java =================================================================== --- trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java 2009-10-22 12:05:13 UTC (rev 1219) +++ trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java 2009-10-22 14:40:46 UTC (rev 1220) @@ -276,6 +276,8 @@ ArrayList<TagAttributeInfo> attributeInfos = new ArrayList<TagAttributeInfo>(); ArrayList<TagVariableInfo> variableInfos = new ArrayList<TagVariableInfo>(); + boolean dynamicAttributes = JspUtil.booleanValue(tagInfo.getDynamicAttributes()); + org.apache.catalina.deploy.jsp.TagAttributeInfo attributeInfosArray[] = tagInfo.getTagAttributeInfos(); for (int i = 0; i < attributeInfosArray.length; i++) { TagAttributeInfo attributeInfo = createTagAttributeInfo(attributeInfosArray[i]); @@ -299,11 +301,11 @@ e); } } - + return new TagInfo(tagInfo.getTagName(), tagInfo.getTagClassName(), tagInfo.getBodyContent(), tagInfo.getInfoString(), this, tei, attributeInfos.toArray(new TagAttributeInfo[0]), tagInfo.getDisplayName(), tagInfo.getSmallIcon(), tagInfo.getLargeIcon(), - variableInfos.toArray(new TagVariableInfo[0]), tagInfo.isDynamicAttributes()); + variableInfos.toArray(new TagVariableInfo[0]), dynamicAttributes); } protected TagAttributeInfo createTagAttributeInfo(org.apache.catalina.deploy.jsp.TagAttributeInfo attributeInfo) {