hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-10 19:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DS-707] Generify List usage

Browse Source 
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@5610 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Graham Triggs
2010-10-24 19:25:15 +00:00
parent 8fe16d07db
commit 135da8769a
3 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
dspace-api/src/main/java/org/dspace/content/Item.java
View File

@@ -1413,10 +1413,7 @@ public class Item extends DSpaceObject
}
}
Bitstream[] bsArray = new Bitstream[bitstreamList.size()];
bsArray = (Bitstream[]) bitstreamList.toArray(bsArray);
return bsArray;
return bitstreamList.toArray(new Bitstream[bitstreamList.size()]);
}
/**
@@ -2114,7 +2111,7 @@ public class Item extends DSpaceObject
* @throws SQLException
* @throws AuthorizeException
*/
public void replaceAllItemPolicies(List newpolicies) throws SQLException,
public void replaceAllItemPolicies(List<ResourcePolicy> newpolicies) throws SQLException,
AuthorizeException
{
// remove all our policies, add new ones
@@ -2132,7 +2129,7 @@ public class Item extends DSpaceObject
* @throws SQLException
* @throws AuthorizeException
*/
public void replaceAllBitstreamPolicies(List newpolicies)
public void replaceAllBitstreamPolicies(List<ResourcePolicy> newpolicies)
throws SQLException, AuthorizeException
{
// remove all policies from bundles, add new ones
@@ -2196,44 +2193,36 @@ public class Item extends DSpaceObject
{
// remove the submit authorization policies
// and replace them with the collection's default READ policies
List policies = AuthorizeManager.getPoliciesActionFilter(ourContext, c,
Constants.DEFAULT_ITEM_READ);
// change the action to just READ
// just don't call update on the resourcepolicies!!!
Iterator i = policies.iterator();
List<ResourcePolicy> policies = AuthorizeManager.getPoliciesActionFilter(ourContext, c, Constants.DEFAULT_ITEM_READ);
// MUST have default policies
if (!i.hasNext())
if (policies.size() < 1)
{
throw new java.sql.SQLException("Collection " + c.getID()
+ " has no default item READ policies");
}
while (i.hasNext())
// change the action to just READ
// just don't call update on the resourcepolicies!!!
for (ResourcePolicy rp : policies)
{
ResourcePolicy rp = (ResourcePolicy) i.next();
rp.setAction(Constants.READ);
}
replaceAllItemPolicies(policies);
policies = AuthorizeManager.getPoliciesActionFilter(ourContext, c,
Constants.DEFAULT_BITSTREAM_READ);
policies = AuthorizeManager.getPoliciesActionFilter(ourContext, c, Constants.DEFAULT_BITSTREAM_READ);
// change the action to just READ
// just don't call update on the resourcepolicies!!!
i = policies.iterator();
if (!i.hasNext())
if (policies.size() < 1)
{
throw new java.sql.SQLException("Collection " + c.getID()
+ " has no default bitstream READ policies");
}
while (i.hasNext())
// change the action to just READ
// just don't call update on the resourcepolicies!!!
for (ResourcePolicy rp : policies)
{
ResourcePolicy rp = (ResourcePolicy) i.next();
rp.setAction(Constants.READ);
}