git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(no commit message)
[utils]
/
security
/
impl
/
src
/
main
/
java
/
org
/
wamblee
/
usermgt
/
Group.java
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 697f1b5b343a75a84b6b0905d3f526df7bddc262..87ab4ac7c9cd980e8b311adbcde9fe78412a471c 100644
(file)
--- 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.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
import javax.persistence.Version;
import javax.persistence.Version;
-import org.wamblee.security.AbstractPersistent;
-
/**
* Represents a group.
*
/**
* Represents a group.
*
@@
-116,6
+113,9
@@
public class Group implements Serializable, Comparable {
*/
@Override
public boolean equals(Object aGroup) {
*/
@Override
public boolean equals(Object aGroup) {
+ if (aGroup == null) {
+ return false;
+ }
if (!(aGroup instanceof Group)) {
return false;
}
if (!(aGroup instanceof Group)) {
return false;
}
@@
-141,10
+141,14
@@
public class Group implements Serializable, Comparable {
public int compareTo(Object aGroup) {
return name.compareTo(((Group) aGroup).name);
}
public int compareTo(Object aGroup) {
return name.compareTo(((Group) aGroup).name);
}
-
+
public Long getPrimaryKey() {
return primaryKey;
}
public Long getPrimaryKey() {
return primaryKey;
}
+
+ public void setPrimaryKey(Long aKey) {
+ primaryKey = aKey;
+ }
/*
* (non-Javadoc)
/*
* (non-Javadoc)