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

@@ -272,7 +272,7 @@ public class VersionableAspect implements ContentServicePolicies.OnContentUpdate
}
/**
* @return Returns the {@link VersionableAspectCopyBehaviourCallback}
* @return Returns the CopyBehaviourCallback
*/
public CopyBehaviourCallback getCopyCallback(QName classRef, CopyDetails copyDetails)
{
@@ -327,8 +327,8 @@ public class VersionableAspect implements ContentServicePolicies.OnContentUpdate
/**
* Before add aspect policy behaviour
*
* @param nodeRef
* @param aspectTypeQName
* @param nodeRef NodeRef
* @param aspectTypeQName QName
*/
public void beforeAddAspect(final NodeRef nodeRef, QName aspectTypeQName)
{
@@ -352,8 +352,8 @@ public class VersionableAspect implements ContentServicePolicies.OnContentUpdate
/**
* On add aspect policy behaviour
*
* @param nodeRef
* @param aspectTypeQName
* @param nodeRef NodeRef
* @param aspectTypeQName QName
*/
public void onAddAspect(NodeRef nodeRef, QName aspectTypeQName)
{
@@ -519,8 +519,8 @@ public class VersionableAspect implements ContentServicePolicies.OnContentUpdate
/**
* On create version implementation method
*
* @param nodeRef
* @param versionProperties
* @param nodeRef NodeRef
* @param versionProperties Map<String, Serializable>
*/
private void createVersionImpl(NodeRef nodeRef, Map<String, Serializable> versionProperties)
{