[jbossweb-commits] JBossWeb SVN: r1082 - trunk/java/org/apache/catalina/deploy/jsp.

Author: remy.maucherat(a)jboss.com Date: 2009-06-04 17:54:35 -0400 (Thu, 04 Jun 2009) New Revision: 1082 Modified: trunk/java/org/apache/catalina/deploy/jsp/TagAttributeInfo.java trunk/java/org/apache/catalina/deploy/jsp/TagLibraryInfo.java trunk/java/org/apache/catalina/deploy/jsp/TagLibraryValidatorInfo.java Log: - Some defaults and type updates, as I update the Jasper code. Modified: trunk/java/org/apache/catalina/deploy/jsp/TagAttributeInfo.java =================================================================== --- trunk/java/org/apache/catalina/deploy/jsp/TagAttributeInfo.java 2009-06-04 15:03:52 UTC (rev 1081) +++ trunk/java/org/apache/catalina/deploy/jsp/TagAttributeInfo.java 2009-06-04 21:54:35 UTC (rev 1082) @@ -20,18 +20,18 @@ public class TagAttributeInfo { protected String name; protected String type; - protected boolean reqTime; - protected boolean required; + protected boolean reqTime = false; + protected boolean required = false; /* * private fields for JSP 2.0 */ - protected boolean fragment; + protected boolean fragment = false; /* * private fields for JSP 2.1 */ protected String description; - protected boolean deferredValue; - protected boolean deferredMethod; + protected boolean deferredValue = false; + protected boolean deferredMethod = false; protected String expectedTypeName; protected String methodSignature; Modified: trunk/java/org/apache/catalina/deploy/jsp/TagLibraryInfo.java =================================================================== --- trunk/java/org/apache/catalina/deploy/jsp/TagLibraryInfo.java 2009-06-04 15:03:52 UTC (rev 1081) +++ trunk/java/org/apache/catalina/deploy/jsp/TagLibraryInfo.java 2009-06-04 21:54:35 UTC (rev 1082) @@ -126,6 +126,13 @@ this.jspversion = jspversion; } + /** + * For the version attribute. + */ + public void setVersion(String jspversion) { + this.jspversion = jspversion; + } + public String getShortname() { return shortname; } Modified: trunk/java/org/apache/catalina/deploy/jsp/TagLibraryValidatorInfo.java =================================================================== --- trunk/java/org/apache/catalina/deploy/jsp/TagLibraryValidatorInfo.java 2009-06-04 15:03:52 UTC (rev 1081) +++ trunk/java/org/apache/catalina/deploy/jsp/TagLibraryValidatorInfo.java 2009-06-04 21:54:35 UTC (rev 1082) @@ -23,7 +23,7 @@ public class TagLibraryValidatorInfo { protected String validatorClass; - protected Map<String, String> initParams = new HashMap<String, String>(); + protected Map<String, Object> initParams = new HashMap<String, Object>(); public String getValidatorClass() { return validatorClass; @@ -31,10 +31,10 @@ public void setValidatorClass(String validatorClass) { this.validatorClass = validatorClass; } - public void addInitParam(String name, String value) { + public void addInitParam(String name, Object value) { initParams.put(name, value); } - public Map<String, String> getInitParams() { + public Map<String, Object> getInitParams() { return initParams; }