From f1c9210cfe343aa097b066f9c2bbf5b1471ad615 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 11 Feb 2014 18:48:02 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 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: <> 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 --- .../filefolder/GetChildrenCannedQuery.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/source/java/org/alfresco/repo/model/filefolder/GetChildrenCannedQuery.java b/source/java/org/alfresco/repo/model/filefolder/GetChildrenCannedQuery.java index e79dae23fb..cf1e9b5681 100644 --- a/source/java/org/alfresco/repo/model/filefolder/GetChildrenCannedQuery.java +++ b/source/java/org/alfresco/repo/model/filefolder/GetChildrenCannedQuery.java @@ -98,8 +98,8 @@ public class GetChildrenCannedQuery extends org.alfresco.repo.node.getchildren.G @Override protected FilterSortChildQueryCallback getFilterSortChildQuery(final List children, final List filterProps, GetChildrenCannedQueryParams paramBean) { - FilterSortChildQueryCallback callback = new FileFolderFilterSortChildQueryCallback(children, filterProps); - return callback; + FilterSortChildQueryCallback callback = new FileFolderFilterSortChildQueryCallback(children, filterProps); + return callback; } private class FileFolderFilterSortChildQueryCallback extends DefaultFilterSortChildQueryCallback @@ -146,17 +146,17 @@ public class GetChildrenCannedQuery extends org.alfresco.repo.node.getchildren.G private class FileFolderUnsortedChildQueryCallback extends DefaultUnsortedChildQueryCallback { public FileFolderUnsortedChildQueryCallback(List rawResult,int requestedCount, Set inclusiveAspects, Set exclusiveAspects) - { + { super(rawResult, requestedCount, inclusiveAspects, exclusiveAspects); - } + } - @Override - protected boolean include(NodeRef nodeRef) - { - boolean ret = super.include(nodeRef); - - return ret && includeImpl(ret, nodeRef); - } + @Override + protected boolean include(NodeRef nodeRef) + { + boolean ret = super.include(nodeRef); + + return ret && includeImpl(ret, nodeRef); + } } protected boolean includeImpl(boolean ret, NodeRef nodeRef)