minor modifications to group membership analysis so that it actually works

git-svn-id: http://scm.dspace.org/svn/repo/trunk@2921 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Richard Jones
2008-04-17 16:54:18 +00:00
parent 5f79aa75a3
commit 5c9cda751d
3 changed files with 16 additions and 4 deletions

View File

@@ -236,6 +236,18 @@ public abstract class DSpaceObject implements Identifiable
return false; return false;
} }
public boolean contains(List<? extends DSpaceObject> dsos, DSpaceObject dso)
{
for (DSpaceObject obj : dsos)
{
if (obj.equals(dso))
{
return true;
}
}
return false;
}
public int hashCode() public int hashCode()
{ {
return HashCodeBuilder.reflectionHashCode(this); return HashCodeBuilder.reflectionHashCode(this);

View File

@@ -169,12 +169,12 @@ public class Group extends DSpaceObject
return true; return true;
} }
return epeople.contains(e); return this.contains(epeople, e);
} }
public boolean isMember(Group g) public boolean isMember(Group g)
{ {
return groups.contains(g); return this.contains(groups, g);
} }
public Group[] getMemberGroups() public Group[] getMemberGroups()

View File

@@ -155,7 +155,7 @@ public class GroupProxy extends Group
loadEPeople(); loadEPeople();
} }
return epeople.contains(e); return this.contains(epeople, e);
} }
@Override @Override
@@ -166,7 +166,7 @@ public class GroupProxy extends Group
loadGroups(); loadGroups();
} }
return groups.contains(g); return this.contains(groups, g);
} }
@Override @Override