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
This commit is contained in:
Kevin Roast
2007-05-25 13:24:35 +00:00
parent b907e7cfa0
commit 36b5864c8a

View File

@@ -47,6 +47,7 @@ import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.dictionary.TypeDefinition; import org.alfresco.service.cmr.dictionary.TypeDefinition;
import org.alfresco.service.cmr.lock.LockService; import org.alfresco.service.cmr.lock.LockService;
import org.alfresco.service.cmr.model.FileFolderService; 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.ChildAssociationRef;
import org.alfresco.service.cmr.repository.ContentData; import org.alfresco.service.cmr.repository.ContentData;
import org.alfresco.service.cmr.repository.InvalidNodeRefException; 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.SearchParameters;
import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.cmr.search.SearchService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.service.namespace.RegexQNamePattern;
import org.alfresco.web.app.Application; import org.alfresco.web.app.Application;
import org.alfresco.web.app.context.IContextListener; import org.alfresco.web.app.context.IContextListener;
import org.alfresco.web.app.context.UIContextService; import org.alfresco.web.app.context.UIContextService;
@@ -617,14 +617,13 @@ public class BrowseBean implements IContextListener
parentRef = new NodeRef(Repository.getStoreRef(), parentNodeId); parentRef = new NodeRef(Repository.getStoreRef(), parentNodeId);
} }
List<ChildAssociationRef> childRefs = this.nodeService.getChildAssocs(parentRef, List<FileInfo> children = this.fileFolderService.list(parentRef);
ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL); this.containerNodes = new ArrayList<Node>(children.size());
this.containerNodes = new ArrayList<Node>(childRefs.size()); this.contentNodes = new ArrayList<Node>(children.size());
this.contentNodes = new ArrayList<Node>(childRefs.size()); for (FileInfo fileInfo : children)
for (ChildAssociationRef ref: childRefs)
{ {
// create our Node representation from the NodeRef // create our Node representation from the NodeRef
NodeRef nodeRef = ref.getChildRef(); NodeRef nodeRef = fileInfo.getNodeRef();
if (this.nodeService.exists(nodeRef)) if (this.nodeService.exists(nodeRef))
{ {