inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
107541: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      107413: Merged DEV to 5.0.N (5.0.3)
         106858 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Cleaning of Javadoc,
   107565: MNT-13545 Fix compilation after merge of Javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2015-07-02 16:13:03 +00:00
parent 4c30e52dc3
commit 7dd2291753
784 changed files with 5454 additions and 5487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java
View File

@@ -478,6 +478,16 @@ public class FileFolderServiceImpl extends AbstractBaseCopyService implements Fi
// note: similar to getChildAssocs(contextNodeRef, searchTypeQNames) but enables paging features, including max items, sorting etc (with permissions per-applied)
/**
*
* @param contextNodeRef
* @param pattern
* @param searchTypeQNames
* @param ignoreAspectQNames
* @param sortProps
* @param pagingRequest
* @return
*/
private CannedQueryResults<NodeRef> listImpl(NodeRef contextNodeRef, String pattern, Set<QName> searchTypeQNames, Set<QName> ignoreAspectQNames, List<Pair<QName, Boolean>> sortProps, PagingRequest pagingRequest)
{
Long start = (logger.isDebugEnabled() ? System.currentTimeMillis() : null);
@@ -848,9 +858,9 @@ public class FileFolderServiceImpl extends AbstractBaseCopyService implements Fi
* then all its chidren are excluded as well.
*
* @param contextNodeRef the starting point.
* @param files return nodes of type files.
* @param files return nodes of type files.
* @param folders return nodes of type folders.
* @param folderFilter filter controls which folders to search. If null then all subfolders are searched.
* @param folderFilter filter controls which folders to search. If null then all subfolders are searched.
* @return list of node references
*/
/* <p>
@@ -951,7 +961,7 @@ public class FileFolderServiceImpl extends AbstractBaseCopyService implements Fi
}
/**
* @see #moveOrCopy(NodeRef, NodeRef, NodeRef, String, boolean)
* @see #moveOrCopy(NodeRef, NodeRef, NodeRef, String, boolean)
*/
@Override
public FileInfo move(NodeRef sourceNodeRef, NodeRef targetParentRef, String newName) throws FileExistsException, FileNotFoundException
@@ -960,7 +970,7 @@ public class FileFolderServiceImpl extends AbstractBaseCopyService implements Fi
}
/**
* @see #moveOrCopy(NodeRef, NodeRef, NodeRef, String, boolean)
* @see #moveOrCopy(NodeRef, NodeRef, NodeRef, String, boolean)
*/
@Override
public FileInfo moveFrom(NodeRef sourceNodeRef, NodeRef sourceParentRef, NodeRef targetParentRef, String newName) throws FileExistsException, FileNotFoundException
@@ -978,7 +988,7 @@ public class FileFolderServiceImpl extends AbstractBaseCopyService implements Fi
}
/**
* @see #moveOrCopy(NodeRef, NodeRef, String, boolean)
* @see #moveOrCopy(NodeRef, NodeRef, NodeRef, String, boolean)
*/
@Override
public FileInfo copy(NodeRef sourceNodeRef, NodeRef targetParentRef, String newName) throws FileExistsException, FileNotFoundException
@@ -1647,7 +1657,7 @@ public class FileFolderServiceImpl extends AbstractBaseCopyService implements Fi
}
if (allVisible)
{
hiddenAspect.showNode(nodeRef, true);
hiddenAspect.showNode(nodeRef, true);
}
else
{