From fcd4ab8d018309587987757624f8c27c0a84435b Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 11 Feb 2014 18:46:30 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 57034: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3) 56501: Merged HEAD-BUG-FIX to V4.2-BUG-FIX (4.2.1) 55924: <> Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2) 55706: Formatting during investigations of MNT-9510 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61667 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../filefolder/FileFolderServiceImpl.java | 5 +- .../getchildren/GetChildrenCannedQuery.java | 90 +++++++++---------- 2 files changed, 46 insertions(+), 49 deletions(-) diff --git a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java index ae7aa86f5f..32da87a6be 100644 --- a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java +++ b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java @@ -32,7 +32,6 @@ import java.util.ResourceBundle.Control; import java.util.Set; import java.util.Stack; -import org.alfresco.repo.copy.AbstractBaseCopyService.AssociationCopyInfo; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.model.ContentModel; import org.alfresco.query.CannedQueryFactory; @@ -428,9 +427,7 @@ public class FileFolderServiceImpl extends AbstractBaseCopyService implements Fi return getPagingResults(pagingRequest, results); } - /* (non-Javadoc) - * @see org.alfresco.service.cmr.model.FileFolderService#list(org.alfresco.service.cmr.repository.NodeRef, boolean, boolean, String, java.util.Set, org.alfresco.service.cmr.model.PagingSortRequest) - */ + @Override public PagingResults list(NodeRef contextNodeRef, boolean files, boolean folders, String pattern, Set ignoreQNames, List> sortProps, PagingRequest pagingRequest) { ParameterCheck.mandatory("contextNodeRef", contextNodeRef); diff --git a/source/java/org/alfresco/repo/node/getchildren/GetChildrenCannedQuery.java b/source/java/org/alfresco/repo/node/getchildren/GetChildrenCannedQuery.java index d079aaa2f4..030f2a5a09 100644 --- a/source/java/org/alfresco/repo/node/getchildren/GetChildrenCannedQuery.java +++ b/source/java/org/alfresco/repo/node/getchildren/GetChildrenCannedQuery.java @@ -224,24 +224,24 @@ public class GetChildrenCannedQuery extends AbstractCannedQueryPermissions assocTypeQNameIds = qnameDAO.convertQNamesToIds(assocTypeQNames, false); + Set assocTypeQNameIds = qnameDAO.convertQNamesToIds(assocTypeQNames, false); if (assocTypeQNameIds.size() > 0) { - params.setAssocTypeQNameIds(assocTypeQNameIds); + params.setAssocTypeQNameIds(assocTypeQNameIds); } } if (pattern != null) { - // TODO, check that we should be tied to the content model in this way. Perhaps a configurable property - // name against which compare the pattern? - Pair nameQName = qnameDAO.getQName(ContentModel.PROP_NAME); - if(nameQName == null) - { - throw new AlfrescoRuntimeException("Unable to determine qname id of name property"); - } - params.setNamePropertyQNameId(nameQName.getFirst()); - params.setPattern(pattern); + // TODO, check that we should be tied to the content model in this way. Perhaps a configurable property + // name against which compare the pattern? + Pair nameQName = qnameDAO.getQName(ContentModel.PROP_NAME); + if(nameQName == null) + { + throw new AlfrescoRuntimeException("Unable to determine qname id of name property"); + } + params.setNamePropertyQNameId(nameQName.getFirst()); + params.setPattern(pattern); } final List result; @@ -608,73 +608,73 @@ public class GetChildrenCannedQuery extends AbstractCannedQueryPermissions children; - private List filterProps; - private boolean applyFilter; + private List children; + private List filterProps; + private boolean applyFilter; private Set inclusiveAspects; private Set exclusiveAspects; - public DefaultFilterSortChildQueryCallback(final List children, final List filterProps) - { + public DefaultFilterSortChildQueryCallback(final List children, final List filterProps) + { this(children, filterProps, null, null); } public DefaultFilterSortChildQueryCallback(final List children, final List filterProps, Set inclusiveAspects, Set exclusiveAspects) { - this.children = children; - this.filterProps = filterProps; + this.children = children; + this.filterProps = filterProps; this.applyFilter = (filterProps.size() > 0); this.inclusiveAspects = inclusiveAspects; this.exclusiveAspects = exclusiveAspects; - } + } - @Override - public boolean handle(FilterSortNode node) - { - if(include(node)) - { + @Override + public boolean handle(FilterSortNode node) + { + if(include(node)) + { children.add(node); - } + } // More results return true; - } - - protected boolean include(FilterSortNode node) - { + } + + protected boolean include(FilterSortNode node) + { // filter, if needed return(!applyFilter || includeFilter(node.getPropVals(), filterProps)) && includeAspects(node.getNodeRef(), inclusiveAspects, exclusiveAspects); - } + } } protected class DefaultUnsortedChildQueryCallback implements UnsortedChildQueryCallback { - private List rawResult; - private int requestedCount; + private List rawResult; + private int requestedCount; private Set inclusiveAspects; private Set exclusiveAspects; public DefaultUnsortedChildQueryCallback(final List rawResult, final int requestedCount, Set inclusiveAspects, Set exclusiveAspects) - { - this.rawResult = rawResult; - this.requestedCount = requestedCount; + { + this.rawResult = rawResult; + this.requestedCount = requestedCount; this.inclusiveAspects = inclusiveAspects; this.exclusiveAspects = exclusiveAspects; - } + } - @Override - public boolean handle(NodeRef nodeRef) - { - if(include(nodeRef)) - { - rawResult.add(tenantService.getBaseName(nodeRef)); - } + @Override + public boolean handle(NodeRef nodeRef) + { + if(include(nodeRef)) + { + rawResult.add(tenantService.getBaseName(nodeRef)); + } // More results ? return (rawResult.size() < requestedCount); - } + } - protected boolean include(NodeRef nodeRef) + protected boolean include(NodeRef nodeRef) { return includeAspects(nodeRef, inclusiveAspects, exclusiveAspects); }