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

@@ -44,13 +44,14 @@ public final class LockState implements Serializable
/**
* Constructor.
*
* @param nodeRef
* @param lockType
* @param owner
* @param expires
* @param additionalInfo
*/
private LockState(NodeRef nodeRef, LockType lockType, String owner, Date expires,
* @param nodeRef NodeRef
* @param lockType LockType
* @param owner String
* @param expires Date
* @param lifetime Lifetime
* @param additionalInfo String
*/
private LockState(NodeRef nodeRef, LockType lockType, String owner, Date expires,
Lifetime lifetime, String additionalInfo)
{
this.nodeRef = nodeRef;
@@ -127,13 +128,13 @@ public final class LockState implements Serializable
return new LockState(nodeRef, null, null, null, null, null);
}
/**
* Returns whether this {@link LockState} is for a lock or whether there is no
* lock defined for the node. If a lock is defined for a node, that does not mean that
* the node <em>is</em> locked - the {@link org.alfresco.service.cmr.lock.LockService} must be used to determine that.
*
* @return true if there is a lock defined for the node.
*/
/**
* Returns whether this {@link LockState} is for a lock or whether there is no
* lock defined for the node. If a lock is defined for a node, that does not mean that
* the node <em>is</em> locked - the {@link org.alfresco.service.cmr.lock.LockService} must be used to determine that.
*
* @return true if there is a lock defined for the node.
*/
public boolean isLockInfo()
{
return (lockType != null);