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

@@ -32,25 +32,25 @@ public interface Acl extends AccessControlListProperties
{
/**
* Get the long key
* @return
* @return Long
*/
public Long getId();
/**
* Get the ACL ID
* @return
* @return String
*/
public String getAclId();
/**
* Get the ACL version
* @return
* @return Long
*/
public Long getAclVersion();
/**
* Is this the latest version of the acl identified by the acl id string?
* @return
* @return Boolean
*/
public Boolean isLatest();
@@ -63,21 +63,21 @@ public interface Acl extends AccessControlListProperties
/**
* Get the ACL from which this one inherits
*
* @return
* @return Long
*/
public Long getInheritsFrom();
/**
* Get the type for this ACL
*
* @return
* @return ACLType
*/
public ACLType getAclType();
/**
* Get the ACL inherited from nodes which have this ACL
*
* @return
* @return Long
*/
public Long getInheritedAcl();
@@ -87,7 +87,7 @@ public interface Acl extends AccessControlListProperties
*
* If an acl is versioned it can not be updated - a new copy has to be created,
*
* @return
* @return Boolean
*/
public Boolean isVersioned();