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

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

View File

@@ -60,7 +60,7 @@ public interface FileFolderService
* Lists page of immediate child files and/or folders of the given context node
* with optional filtering (exclusion of certain child file/folder subtypes) and sorting
*
* @author janv
* <br/><br/>author janv
* @since 4.0
*/
@Auditable(parameters = {"contextNodeRef", "files", "folders", "ignoreTypeQNames", "sortProps", "pagingRequest"})
@@ -90,13 +90,13 @@ public interface FileFolderService
/**
* Lists all immediate child files of the given context node
*
* Note: this could be a long list (and will be trimmed at a pre-configured maximum). You should consider using a paging request.
*
* @param contextNodeRef the folder nodeRef to start searching in
* @return Returns a list of matching files
*/
@Auditable(parameters = {"folderNodeRef"})
*
* Note: this could be a long list (and will be trimmed at a pre-configured maximum). You should consider using a paging request.
*
* @param contextNodeRef the folder nodeRef to start searching in
* @return Returns a list of matching files
*/
@Auditable(parameters = {"folderNodeRef"})
public List<FileInfo> listFiles(NodeRef contextNodeRef);
/**
@@ -284,7 +284,6 @@ public interface FileFolderService
* @return Returns the new node's file information
* @throws FileExistsException
*
* @see {@link #create(NodeRef, String, QName, QName)}
*/
@Auditable(parameters = {"parentNodeRef", "name", "typeQName"})
public FileInfo create(NodeRef parentNodeRef, String name, QName typeQName) throws FileExistsException;
@@ -433,11 +432,11 @@ public interface FileFolderService
/**
* Lists page of immediate child objects of the given context node
* with specification of which types to list and optional filtering (exclusion of certain child file/folder subtypes) and sorting
* @param rootNodeRef
* @param rootNodeRef NodeRef
* @param searchTypeQNames QNames of types to list
* @param ignoreAspectQNames
* @param sortProps
* @param pagingRequest
* @param ignoreAspectQNames Set<QName>
* @param sortProps List<Pair<QName, Boolean>>
* @param pagingRequest PagingRequest
* @return list of node refs, never null
*/
@Auditable(parameters = {"rootNodeRef"})
@@ -447,7 +446,7 @@ public interface FileFolderService
/**
* Helper method to transform a list of {@link NodeRef} to a list of {@link FileInfo}
*
* @param nodeRefs
* @param nodeRefs List<NodeRef>
* @return list of {@link FileInfo}
*/
@Auditable(parameters = {"nodeRefs"})