inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code polish

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5069 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrew Hind
2007-02-07 17:06:21 +00:00
parent 76e673d972
commit 59509e7516
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/java/org/alfresco/repo/security/permissions/impl/model/PermissionModel.java
View File

@@ -50,7 +50,8 @@ import org.dom4j.io.SAXReader;
import org.springframework.beans.factory.InitializingBean;
/**
* The implementation of the model DAO Reads and stores the top level model information Encapsulates access to this information
* The implementation of the model DAO Reads and stores the top level model information Encapsulates access to this
* information
*
* @author andyh
*/
@@ -655,16 +656,13 @@ public class PermissionModel implements ModelDAO, InitializingBean
*/
private synchronized PermissionGroup getBasePermissionGroupOrNull(PermissionGroup pg)
{
if (groupsToBaseGroup.containsKey(pg))
PermissionGroup permissionGroup = groupsToBaseGroup.get(pg);
if (permissionGroup == null)
{
return groupsToBaseGroup.get(pg);
}
else
{
PermissionGroup answer = getBasePermissionGroupOrNullImpl(pg);
groupsToBaseGroup.put(pg, answer);
return answer;
permissionGroup = getBasePermissionGroupOrNullImpl(pg);
groupsToBaseGroup.put(pg, permissionGroup);
}
return permissionGroup;
}
/**
@@ -925,16 +923,16 @@ public class PermissionModel implements ModelDAO, InitializingBean
{
for (PermissionGroup pg : ps.getPermissionGroups())
{
permissionGroupMap.put(pg, pg);
permissionReferenceMap.put(pg.toString(), pg);
permissionGroupMap.put(pg, pg);
permissionReferenceMap.put(pg.toString(), pg);
}
for (Permission p : ps.getPermissions())
{
permissionReferenceMap.put(p.toString(), p);
permissionReferenceMap.put(p.toString(), p);
permissionMap.put(p, p);
}
}
for (PermissionSet ps : permissionSets.values())
{
for (PermissionGroup pg : ps.getPermissionGroups())