From 36b5864c8a2031d44db9d0199bfb42f46843e3d9 Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Fri, 25 May 2007 13:24:35 +0000 Subject: [PATCH] Changed BrowseBean to use FileFolderService to retrieve child nodes rather than the NodeService (to enable ML filtering in the web-client browse screens) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/web/bean/BrowseBean.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/source/java/org/alfresco/web/bean/BrowseBean.java b/source/java/org/alfresco/web/bean/BrowseBean.java index adc04d6aca..04cd3af92a 100644 --- a/source/java/org/alfresco/web/bean/BrowseBean.java +++ b/source/java/org/alfresco/web/bean/BrowseBean.java @@ -47,6 +47,7 @@ import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.dictionary.TypeDefinition; import org.alfresco.service.cmr.lock.LockService; import org.alfresco.service.cmr.model.FileFolderService; +import org.alfresco.service.cmr.model.FileInfo; import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.ContentData; import org.alfresco.service.cmr.repository.InvalidNodeRefException; @@ -58,7 +59,6 @@ import org.alfresco.service.cmr.search.ResultSetRow; import org.alfresco.service.cmr.search.SearchParameters; import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.namespace.QName; -import org.alfresco.service.namespace.RegexQNamePattern; import org.alfresco.web.app.Application; import org.alfresco.web.app.context.IContextListener; import org.alfresco.web.app.context.UIContextService; @@ -617,14 +617,13 @@ public class BrowseBean implements IContextListener parentRef = new NodeRef(Repository.getStoreRef(), parentNodeId); } - List childRefs = this.nodeService.getChildAssocs(parentRef, - ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL); - this.containerNodes = new ArrayList(childRefs.size()); - this.contentNodes = new ArrayList(childRefs.size()); - for (ChildAssociationRef ref: childRefs) + List children = this.fileFolderService.list(parentRef); + this.containerNodes = new ArrayList(children.size()); + this.contentNodes = new ArrayList(children.size()); + for (FileInfo fileInfo : children) { // create our Node representation from the NodeRef - NodeRef nodeRef = ref.getChildRef(); + NodeRef nodeRef = fileInfo.getNodeRef(); if (this.nodeService.exists(nodeRef)) {