Author: markt Date: Sun Aug 19 19:40:13 2012 New Revision: 1374825 URL: http://svn.apache.org/viewvc?rev=1374825&view=rev Log: Use LinkedHashSet to preserve ordering
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1374823 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java?rev=1374825&r1=1374824&r2=1374825&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java Sun Aug 19 19:40:13 2012 @@ -16,7 +16,6 @@ */ package org.apache.catalina.deploy; -import java.util.HashSet; import java.util.LinkedHashSet; import java.util.Set; @@ -59,7 +58,7 @@ public class JspPropertyGroup { this.pageEncoding = pageEncoding; } public String getPageEncoding() { return this.pageEncoding; } - + private Boolean scriptingInvalid = null; public void setScriptingInvalid(String scriptingInvalid) { this.scriptingInvalid = Boolean.valueOf(scriptingInvalid); @@ -72,24 +71,24 @@ public class JspPropertyGroup { } public Boolean getTrimWhitespace() { return trimWhitespace; } - private Set<String> urlPattern = new HashSet<String>(); + private LinkedHashSet<String> urlPattern = new LinkedHashSet<String>(); public void addUrlPattern(String urlPattern) { this.urlPattern.add(urlPattern); } public Set<String> getUrlPatterns() { return this.urlPattern; } - + private String defaultContentType = null; public void setDefaultContentType(String defaultContentType) { this.defaultContentType = defaultContentType; } public String getDefaultContentType() { return this.defaultContentType; } - + private Integer buffer = null; public void setBuffer(String buffer) { this.buffer = Integer.valueOf(buffer); } public Integer getBuffer() { return this.buffer; } - + private Boolean errorOnUndeclaredNamespace = null; public void setErrorOnUndeclaredNamespace( String errorOnUndeclaredNamespace) { @@ -99,5 +98,4 @@ public class JspPropertyGroup { public Boolean getErrorOnUndeclaredNamespace() { return this.errorOnUndeclaredNamespace; } - } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org