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

@@ -81,7 +81,7 @@ public abstract class AbstractPermissionsDaoComponentImpl implements Permissions
/**
* Set the ACL DAO component
* @param aclDaoComponent
* @param aclDaoComponent AclDAO
*/
public void setAclDAO(AclDAO aclDaoComponent)
{
@@ -115,7 +115,7 @@ public abstract class AbstractPermissionsDaoComponentImpl implements Permissions
/**
* Set the mapping of protocol to DAO
* @param map
* @param map Map<String, AccessControlListDAO>
*/
public void setProtocolToACLDAO(Map<String, AccessControlListDAO> map)
{
@@ -124,7 +124,7 @@ public abstract class AbstractPermissionsDaoComponentImpl implements Permissions
/**
* Set the default DAO
* @param defaultACLDAO
* @param defaultACLDAO AccessControlListDAO
*/
public void setDefaultACLDAO(AccessControlListDAO defaultACLDAO)
{
@@ -650,7 +650,7 @@ public abstract class AbstractPermissionsDaoComponentImpl implements Permissions
/**
* Set the change list
*
* @param changes
* @param changes List<AclChange>
*/
public void setChanges(List<AclChange> changes)
{
@@ -659,7 +659,7 @@ public abstract class AbstractPermissionsDaoComponentImpl implements Permissions
/**
* Set the ACL that was created
* @param created
* @param created Acl
*/
public void setCreated(Acl created)
{