mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Merged V1.3 to HEAD (3117:3125)
svn merge svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3117 svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3125 . git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3402 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -107,7 +107,7 @@ public class DictionaryComponent implements DictionaryService
|
||||
*/
|
||||
public Collection<QName> getAllTypes()
|
||||
{
|
||||
Collection<QName> types = new ArrayList<QName>();
|
||||
Collection<QName> types = new ArrayList<QName>(100);
|
||||
for (QName model : getAllModels())
|
||||
{
|
||||
types.addAll(getTypes(model));
|
||||
@@ -136,7 +136,7 @@ public class DictionaryComponent implements DictionaryService
|
||||
*/
|
||||
public Collection<QName> getAllAspects()
|
||||
{
|
||||
Collection<QName> aspects = new ArrayList<QName>();
|
||||
Collection<QName> aspects = new ArrayList<QName>(64);
|
||||
for (QName model : getAllModels())
|
||||
{
|
||||
aspects.addAll(getAspects(model));
|
||||
|
@@ -18,6 +18,7 @@ package org.alfresco.repo.security.permissions.impl;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.HashSet;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
@@ -329,7 +330,7 @@ public class PermissionServiceImpl implements PermissionServiceSPI, Initializing
|
||||
public Set<String> getSettablePermissions(QName type)
|
||||
{
|
||||
Set<PermissionReference> settable = getSettablePermissionReferences(type);
|
||||
Set<String> strings = new HashSet<String>(settable.size());
|
||||
Set<String> strings = new LinkedHashSet<String>(settable.size());
|
||||
for (PermissionReference pr : settable)
|
||||
{
|
||||
strings.add(getPermission(pr));
|
||||
|
@@ -22,6 +22,7 @@ import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
@@ -277,7 +278,7 @@ public class PermissionModel implements ModelDAO, InitializingBean
|
||||
|
||||
private Set<PermissionReference> getAllPermissionsImpl(QName type, boolean exposedOnly)
|
||||
{
|
||||
Set<PermissionReference> permissions = new HashSet<PermissionReference>();
|
||||
Set<PermissionReference> permissions = new LinkedHashSet<PermissionReference>();
|
||||
if (dictionaryService.getClass(type).isAspect())
|
||||
{
|
||||
addAspectPermissions(type, permissions, exposedOnly);
|
||||
|
@@ -19,6 +19,7 @@ package org.alfresco.repo.security.permissions.impl.model;
|
||||
import java.util.Collections;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import org.alfresco.service.namespace.NamespacePrefixResolver;
|
||||
@@ -44,7 +45,7 @@ public class PermissionSet implements XMLModelInitialisable
|
||||
|
||||
private boolean exposeAll;
|
||||
|
||||
private Set<PermissionGroup> permissionGroups = new HashSet<PermissionGroup>();
|
||||
private Set<PermissionGroup> permissionGroups = new LinkedHashSet<PermissionGroup>();
|
||||
|
||||
private Set<Permission> permissions = new HashSet<Permission>();
|
||||
|
||||
|
Reference in New Issue
Block a user