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

@@ -952,7 +952,8 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
/**
* Asynchronously generates thumbnails for the given node.
*
* @param nodeRef
* @param nodeRef NodeRef
* @param thumbnailNames Set<String>
*/
public void createThumbnails(NodeRef nodeRef, Set<String> thumbnailNames)
{
@@ -1007,7 +1008,7 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
/**
* Extracts metadata for the node.
*
* @param nodeRef
* @param nodeRef NodeRef
*/
public void extractMetadata(NodeRef nodeRef)
{
@@ -1775,12 +1776,12 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
/**
* Notifies listeners that a read has taken place.
*
* @param nodeRef
* @param name
* @param mimeType
* @param contentSize
* @param encoding
* @param range
* @param nodeRef NodeRef
* @param name String
* @param mimeType String
* @param contentSize long
* @param encoding String
* @param range String
*/
protected void publishReadEvent(final NodeRef nodeRef, final String name, final String mimeType, final long contentSize, final String encoding, final String range)
{
@@ -2828,8 +2829,8 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
/**
* Converts Acl to map and ignore the indirect ACEs
*
* @param acl
* @return
* @param acl Acl
* @return Map
*/
private Map<String, Set<String>> convertAclToMap(Acl acl)
{
@@ -2875,9 +2876,9 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
/**
* Filter acl to ignore inherited ACEs
*
* @param nodeRef
* @param acl
* @return
* @param nodeRef NodeRef
* @param acl Acl
* @return Acl
*/
protected Acl excludeInheritedAces(NodeRef nodeRef, Acl acl)
{