summaryrefslogtreecommitdiffstats
path: root/base/common/src/com/netscape/certsrv/group/GroupMemberData.java
diff options
context:
space:
mode:
Diffstat (limited to 'base/common/src/com/netscape/certsrv/group/GroupMemberData.java')
-rw-r--r--base/common/src/com/netscape/certsrv/group/GroupMemberData.java36
1 files changed, 26 insertions, 10 deletions
diff --git a/base/common/src/com/netscape/certsrv/group/GroupMemberData.java b/base/common/src/com/netscape/certsrv/group/GroupMemberData.java
index 11f3a2147..4bf9edaba 100644
--- a/base/common/src/com/netscape/certsrv/group/GroupMemberData.java
+++ b/base/common/src/com/netscape/certsrv/group/GroupMemberData.java
@@ -33,18 +33,28 @@ import com.netscape.certsrv.common.Constants;
@XmlRootElement(name="GroupMember")
public class GroupMemberData {
- String id;
+ String groupID;
+ String userID;
Link link;
+ @XmlAttribute(name="GroupID")
+ public String getGroupID() {
+ return groupID;
+ }
+
+ public void setGroupID(String groupID) {
+ this.groupID = groupID;
+ }
+
@FormParam(Constants.PR_GROUP_USER)
- @XmlAttribute(name="id")
- public String getID() {
- return id;
+ @XmlAttribute(name="UserID")
+ public String getUserID() {
+ return userID;
}
- public void setID(String id) {
- this.id = id;
+ public void setUserID(String userID) {
+ this.userID = userID;
}
@XmlElement(name="Link")
@@ -60,7 +70,8 @@ public class GroupMemberData {
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + ((groupID == null) ? 0 : groupID.hashCode());
+ result = prime * result + ((userID == null) ? 0 : userID.hashCode());
return result;
}
@@ -73,10 +84,15 @@ public class GroupMemberData {
if (getClass() != obj.getClass())
return false;
GroupMemberData other = (GroupMemberData) obj;
- if (id == null) {
- if (other.id != null)
+ if (groupID == null) {
+ if (other.groupID != null)
+ return false;
+ } else if (!groupID.equals(other.groupID))
+ return false;
+ if (userID == null) {
+ if (other.userID != null)
return false;
- } else if (!id.equals(other.id))
+ } else if (!userID.equals(other.userID))
return false;
return true;
}