X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fimpl%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fusermgt%2FGroup.java;h=87ab4ac7c9cd980e8b311adbcde9fe78412a471c;hb=5bbd2c6e9dcf47e312122a3205c78b676a724e07;hp=275cc0817493feeed6fe8b4418ff7a6d782083cf;hpb=e1d9bd9ae47021814e7d99cb82104b3c7f6cb968;p=utils diff --git a/security/impl/src/main/java/org/wamblee/usermgt/Group.java b/security/impl/src/main/java/org/wamblee/usermgt/Group.java index 275cc081..87ab4ac7 100644 --- a/security/impl/src/main/java/org/wamblee/usermgt/Group.java +++ b/security/impl/src/main/java/org/wamblee/usermgt/Group.java @@ -25,11 +25,8 @@ import javax.persistence.Id; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.Table; -import javax.persistence.UniqueConstraint; import javax.persistence.Version; -import org.wamblee.security.AbstractPersistent; - /** * Represents a group. * @@ -77,6 +74,8 @@ public class Group implements Serializable, Comparable { * */ public Group(Group aGroup) { + primaryKey = aGroup.primaryKey; + version = aGroup.version; name = aGroup.name; } @@ -114,6 +113,9 @@ public class Group implements Serializable, Comparable { */ @Override public boolean equals(Object aGroup) { + if (aGroup == null) { + return false; + } if (!(aGroup instanceof Group)) { return false; } @@ -139,10 +141,14 @@ public class Group implements Serializable, Comparable { public int compareTo(Object aGroup) { return name.compareTo(((Group) aGroup).name); } - + public Long getPrimaryKey() { return primaryKey; } + + public void setPrimaryKey(Long aKey) { + primaryKey = aKey; + } /* * (non-Javadoc)