[Openutils-svn] SF.net SVN: openutils: [129] trunk/openutils-usermanagement-dataobjects/src /main/java/it/openutils/usermanagement/dataobjects

[<fg...@us...>]

Revision: 129
          http://svn.sourceforge.net/openutils/?rev=129&view=rev
Author:   fgiust
Date:     2006-11-20 11:38:07 -0800 (Mon, 20 Nov 2006)

Log Message:
-----------
add equals and hashcode

Modified Paths:
--------------
    trunk/openutils-usermanagement-dataobjects/src/main/java/it/openutils/usermanagement/dataobjects/Group.java
    trunk/openutils-usermanagement-dataobjects/src/main/java/it/openutils/usermanagement/dataobjects/Role.java
    trunk/openutils-usermanagement-dataobjects/src/main/java/it/openutils/usermanagement/dataobjects/User.java

Modified: trunk/openutils-usermanagement-dataobjects/src/main/java/it/openutils/usermanagement/dataobjects/Group.java
===================================================================
--- trunk/openutils-usermanagement-dataobjects/src/main/java/it/openutils/usermanagement/dataobjects/Group.java	2006-11-16 10:09:48 UTC (rev 128)
+++ trunk/openutils-usermanagement-dataobjects/src/main/java/it/openutils/usermanagement/dataobjects/Group.java	2006-11-20 19:38:07 UTC (rev 129)
@@ -107,4 +107,49 @@
         this.roles = roles;
     }
 
+    /**
+     * @see java.lang.Object#hashCode()
+     */
+    @Override
+    public int hashCode()
+    {
+        final int PRIME = 31;
+        int result = 1;
+        result = PRIME * result + ((this.id == null) ? 0 : this.id.hashCode());
+        return result;
+    }
+
+    /**
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (this == obj)
+        {
+            return true;
+        }
+        if (obj == null)
+        {
+            return false;
+        }
+        if (getClass() != obj.getClass())
+        {
+            return false;
+        }
+        final Group other = (Group) obj;
+        if (this.id == null)
+        {
+            if (other.id != null)
+            {
+                return false;
+            }
+        }
+        else if (!this.id.equals(other.id))
+        {
+            return false;
+        }
+        return true;
+    }
+
 }

Modified: trunk/openutils-usermanagement-dataobjects/src/main/java/it/openutils/usermanagement/dataobjects/Role.java
===================================================================
--- trunk/openutils-usermanagement-dataobjects/src/main/java/it/openutils/usermanagement/dataobjects/Role.java	2006-11-16 10:09:48 UTC (rev 128)
+++ trunk/openutils-usermanagement-dataobjects/src/main/java/it/openutils/usermanagement/dataobjects/Role.java	2006-11-20 19:38:07 UTC (rev 129)
@@ -71,4 +71,47 @@
             this.description).toString();
     }
 
+    /**
+     * @see java.lang.Object#hashCode()
+     */
+    @Override
+    public int hashCode()
+    {
+        final int PRIME = 31;
+        int result = 1;
+        result = PRIME * result + ((this.id == null) ? 0 : this.id.hashCode());
+        return result;
+    }
+
+    /**
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (this == obj)
+        {
+            return true;
+        }
+        if (obj == null)
+        {
+            return false;
+        }
+        if (getClass() != obj.getClass())
+        {
+            return false;
+        }
+        final Role other = (Role) obj;
+        if (this.id == null)
+        {
+            if (other.id != null)
+                return false;
+        }
+        else if (!this.id.equals(other.id))
+        {
+            return false;
+        }
+        return true;
+    }
+
 }

Modified: trunk/openutils-usermanagement-dataobjects/src/main/java/it/openutils/usermanagement/dataobjects/User.java
===================================================================
--- trunk/openutils-usermanagement-dataobjects/src/main/java/it/openutils/usermanagement/dataobjects/User.java	2006-11-16 10:09:48 UTC (rev 128)
+++ trunk/openutils-usermanagement-dataobjects/src/main/java/it/openutils/usermanagement/dataobjects/User.java	2006-11-20 19:38:07 UTC (rev 129)
@@ -52,7 +52,7 @@
     private String name;
 
     @Column(name = "SURNAME", nullable = false, length = 80)
-    private String surname;
+    private String lastname;
 
     @Column(name = "EMAIL", nullable = false, length = 150)
     private String email;
@@ -187,7 +187,7 @@
      */
     public boolean isEnabled()
     {
-        return (this.enabled == null) ? false : this.enabled.booleanValue();
+        return Boolean.TRUE.equals(this.enabled);
     }
 
     public String getName()
@@ -202,14 +202,24 @@
 
     public String getSurname()
     {
-        return surname;
+        return lastname;
     }
 
     public void setSurname(String surname)
     {
-        this.surname = surname;
+        this.lastname = surname;
     }
 
+    public void setLastname(String lastname)
+    {
+        this.lastname = lastname;
+    }
+
+    public String getLastname()
+    {
+        return lastname;
+    }
+
     /**
      * Getter for <code>email</code>.
      * @return Returns the email.
@@ -236,11 +246,56 @@
     {
         return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).append("id", this.id).append(
             "enabled",
-            this.enabled).append("name", this.name).append("surname", this.surname).append(
+            this.enabled).append("name", this.name).append("surname", this.lastname).append(
             "authorities",
             this.getAuthorities()).append("username", this.getUsername()).append("email", this.email).append(
             "password",
             this.password).toString();
     }
 
+    /**
+     * @see java.lang.Object#hashCode()
+     */
+    @Override
+    public int hashCode()
+    {
+        final int PRIME = 31;
+        int result = 1;
+        result = PRIME * result + ((this.id == null) ? 0 : this.id.hashCode());
+        return result;
+    }
+
+    /**
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (this == obj)
+        {
+            return true;
+        }
+        if (obj == null)
+        {
+            return false;
+        }
+        if (getClass() != obj.getClass())
+        {
+            return false;
+        }
+        final User other = (User) obj;
+        if (this.id == null)
+        {
+            if (other.id != null)
+            {
+                return false;
+            }
+        }
+        else if (!this.id.equals(other.id))
+        {
+            return false;
+        }
+        return true;
+    }
+
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.