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

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
57036: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56503: Merged HEAD-BUG-FIX to V4.2-BUG-FIX (4.2.1)
         55926: <<NOT IN 4.1.6>> Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)
            55707: Formatting during investigations of MNT-9510
            - did not include file in last commit


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61670 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 18:48:02 +00:00
parent b43564995e
commit f1c9210cfe
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/java/org/alfresco/repo/model/filefolder/GetChildrenCannedQuery.java
View File

@@ -98,8 +98,8 @@ public class GetChildrenCannedQuery extends org.alfresco.repo.node.getchildren.G
@Override @Override
protected FilterSortChildQueryCallback getFilterSortChildQuery(final List<FilterSortNode> children, final List<FilterProp> filterProps, GetChildrenCannedQueryParams paramBean) protected FilterSortChildQueryCallback getFilterSortChildQuery(final List<FilterSortNode> children, final List<FilterProp> filterProps, GetChildrenCannedQueryParams paramBean)
{ {
FilterSortChildQueryCallback callback = new FileFolderFilterSortChildQueryCallback(children, filterProps); FilterSortChildQueryCallback callback = new FileFolderFilterSortChildQueryCallback(children, filterProps);
return callback; return callback;
} }
private class FileFolderFilterSortChildQueryCallback extends DefaultFilterSortChildQueryCallback private class FileFolderFilterSortChildQueryCallback extends DefaultFilterSortChildQueryCallback
@@ -146,17 +146,17 @@ public class GetChildrenCannedQuery extends org.alfresco.repo.node.getchildren.G
private class FileFolderUnsortedChildQueryCallback extends DefaultUnsortedChildQueryCallback private class FileFolderUnsortedChildQueryCallback extends DefaultUnsortedChildQueryCallback
{ {
public FileFolderUnsortedChildQueryCallback(List<NodeRef> rawResult,int requestedCount, Set<QName> inclusiveAspects, Set<QName> exclusiveAspects) public FileFolderUnsortedChildQueryCallback(List<NodeRef> rawResult,int requestedCount, Set<QName> inclusiveAspects, Set<QName> exclusiveAspects)
{ {
super(rawResult, requestedCount, inclusiveAspects, exclusiveAspects); super(rawResult, requestedCount, inclusiveAspects, exclusiveAspects);
} }
@Override @Override
protected boolean include(NodeRef nodeRef) protected boolean include(NodeRef nodeRef)
{ {
boolean ret = super.include(nodeRef); boolean ret = super.include(nodeRef);
return ret && includeImpl(ret, nodeRef); return ret && includeImpl(ret, nodeRef);
} }
} }
protected boolean includeImpl(boolean ret, NodeRef nodeRef) protected boolean includeImpl(boolean ret, NodeRef nodeRef)