Author: lfryc(a)redhat.com Date: 2011-03-09 04:26:00 -0500 (Wed, 09 Mar 2011) New Revision: 22092 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attribute.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Extensions.java Log: updated Attribute and Extensions with equals, hashCode and toString Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attribute.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attribute.java 2011-03-09 09:25:27 UTC (rev 22091) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attribute.java 2011-03-09 09:26:00 UTC (rev 22092) @@ -30,8 +30,10 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang.builder.ToStringStyle; /** * Representation an attribute of a JSF component. @@ -41,9 +43,9 @@ */ @XmlRootElement(name = "property", namespace = "http://java.sun.com/xml/ns/javaee") public class Attribute implements Serializable { - - private static final long serialVersionUID = -6716974687380275186L; - private Logger logger; + + private static final long serialVersionUID = 6142493504360646686L; + private String name; private Object value; private Class<?> type; @@ -53,11 +55,9 @@ private Extensions extensions; public Attribute() { - logger = LoggerFactory.getLogger(getClass()); } public Attribute(String name) { - logger = LoggerFactory.getLogger(getClass()); this.name = name; } @@ -176,4 +176,19 @@ public boolean isRequired() { return extensions.getRequired(); } + + @Override + public boolean equals(Object obj) { + return EqualsBuilder.reflectionEquals(this, obj); + } + + @Override + public int hashCode() { + return HashCodeBuilder.reflectionHashCode(this, true); + } + + @Override + public String toString() { + return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE); + } } Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Extensions.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Extensions.java 2011-03-09 09:25:27 UTC (rev 22091) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Extensions.java 2011-03-09 09:26:00 UTC (rev 22092) @@ -26,6 +26,11 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang.builder.ToStringStyle; + /** * Representation of CDK extension of a RichFaces component in faces-config.xml. * @@ -97,4 +102,19 @@ public void setRequired(boolean required) { this.required = required; } + + @Override + public boolean equals(Object obj) { + return EqualsBuilder.reflectionEquals(this, obj); + } + + @Override + public int hashCode() { + return HashCodeBuilder.reflectionHashCode(this, true); + } + + @Override + public String toString() { + return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE); + } }