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-QA to HEAD (4.2) (including moving test classes into separate folders)

Browse Source 
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2013-08-20 17:17:31 +00:00
parent 0a36e2af67
commit ab4ca7177f
1576 changed files with 36419 additions and 8603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/repo/node/db/NodeHierarchyWalker.java
View File

@@ -103,8 +103,9 @@ public class NodeHierarchyWalker
Long nodeId = nodePair.getFirst();
NodeRef nodeRef = nodePair.getSecond();
QName nodeType = nodeDAO.getNodeType(nodeId);
Long nodeAclId = nodeDAO.getNodeAclId(nodeId);
// Record the first node (parent)
VisitedNode visitedNode = new VisitedNode(nodeId, nodeRef, nodeType, parentAssocPair);
VisitedNode visitedNode = new VisitedNode(nodeId, nodeRef, nodeType, nodeAclId, parentAssocPair);
nodesVisitedById.put(nodeId, visitedNode);
nodesVisitedByNodeRef.put(nodeRef, visitedNode);
// Now walk
@@ -149,10 +150,11 @@ public class NodeHierarchyWalker
Long childNodeId = childNodePair.getFirst();
NodeRef childNodeRef = childNodePair.getSecond();
QName childNodeType = nodeDAO.getNodeType(childNodeId);
Long childNodeAclId = nodeDAO.getNodeAclId(childNodeId);
// Keep the IDs of the nodes for recursion
nodesVisitedWorking.add(childNodeId);
// We have a node in the hierarchy to record
VisitedNode visitedNode = new VisitedNode(childNodeId, childNodeRef, childNodeType, childAssocPair);
VisitedNode visitedNode = new VisitedNode(childNodeId, childNodeRef, childNodeType, childNodeAclId, childAssocPair);
nodesVisitedById.put(childNodeId, visitedNode);
nodesVisitedByNodeRef.put(childNodeRef, visitedNode);
}
@@ -265,6 +267,7 @@ public class NodeHierarchyWalker
public final Long id;
public final NodeRef nodeRef;
public final QName nodeType;
public final Long aclId;
public final Pair<Long, ChildAssociationRef> primaryParentAssocPair;
public final List<Pair<Long, ChildAssociationRef>> secondaryParentAssocs;
public final List<Pair<Long, ChildAssociationRef>> secondaryChildAssocs;
@@ -275,11 +278,13 @@ public class NodeHierarchyWalker
Long id,
NodeRef nodeRef,
QName type,
Long aclId,
Pair<Long, ChildAssociationRef> primaryParentAssocPair)
{
this.id = id;
this.nodeRef = nodeRef;
this.nodeType = type;
this.aclId = aclId;
this.primaryParentAssocPair = primaryParentAssocPair;
this.secondaryParentAssocs = new ArrayList<Pair<Long,ChildAssociationRef>>(17);
this.secondaryChildAssocs = new ArrayList<Pair<Long,ChildAssociationRef>>(17);