Rollback of FileFolderServiceImpl accidently checked in on friday

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5422 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2007-03-27 10:59:46 +00:00
parent 1e05a3b0ac
commit f48caf423e

View File

@@ -332,20 +332,6 @@ public class FileFolderServiceImpl implements FileFolderService
return childNodeRef; return childNodeRef;
} }
public NodeRef searchSimple(NodeRef contextNodeRef, String name, QName assocName)
{
NodeRef childNodeRef = nodeService.getChildByName(contextNodeRef, assocName, name);
if (logger.isDebugEnabled())
{
logger.debug(
"Simple name search results: \n" +
" parent: " + contextNodeRef + "\n" +
" name: " + name + "\n" +
" result: " + childNodeRef);
}
return childNodeRef;
}
/** /**
* @see #search(NodeRef, String, boolean, boolean, boolean) * @see #search(NodeRef, String, boolean, boolean, boolean)
*/ */
@@ -841,16 +827,7 @@ public class FileFolderServiceImpl implements FileFolderService
for (int i = 0; i < folderCount; i++) for (int i = 0; i < folderCount; i++)
{ {
String pathElement = pathElements.get(i); String pathElement = pathElements.get(i);
NodeRef folderNodeRef; NodeRef folderNodeRef = searchSimple(parentNodeRef, pathElement);
if (i == 0 && rootNodeRef.equals(nodeService.getRootNode(rootNodeRef.getStoreRef())))
{
// store root nodes use a different assoc name to the immediate children
folderNodeRef = searchSimple(parentNodeRef, pathElement, ContentModel.ASSOC_CHILDREN);
}
else
{
folderNodeRef = searchSimple(parentNodeRef, pathElement);
}
if (folderNodeRef == null) if (folderNodeRef == null)
{ {
StringBuilder sb = new StringBuilder(128); StringBuilder sb = new StringBuilder(128);