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

source/java/org/alfresco/service/cmr/lock/LockService.java

@@ -43,12 +43,12 @@ public interface LockService
     * <p>
     * The lock will be owned by the current user.
     * <p>
-    * A lock made with this call will never expire.
-    * 
-    * @param  nodeRef  a reference to a node 
-    * @param  lockType the lock type
-    * @throws UnableToAquireLockException
-    *                  thrown if the lock could not be obtained
+    * A lock made with this call will never expire.
+    * 
+    * @param  nodeRef  a reference to a node 
+    * @param  lockType the lock type
+    * @throws UnableToAquireLockException
+    *                  thrown if the lock could not be obtained
     */
    @Auditable(parameters = {"nodeRef", "lockType"})
    public void lock(NodeRef nodeRef, LockType lockType)
@@ -262,35 +262,35 @@ public interface LockService
     * process will continue without an error.
     * <p>
     * If the lock on any one of the nodes cannot be released than an exception 
-    * will be raised and the process rolled back.
-    * 
-    * @param  nodeRefs  the node references
-    * @throws UnableToReleaseLockException
-    *                  thrown if the lock could not be released
-    */
+    * will be raised and the process rolled back.
+    * 
+    * @param  nodeRefs  the node references
+    * @throws UnableToReleaseLockException
+    *                  thrown if the lock could not be released
+    */
    @Auditable(parameters = {"nodeRefs"}) 
    public void unlock(Collection<NodeRef> nodeRefs)
        throws UnableToReleaseLockException;
    
-   /**
-    * Gets the lock status for the node reference relative to the current user.
-    * 
-    * @see LockService#getLockStatus(NodeRef)
-    * 
-    * @param nodeRef    the node reference
-    * @return           the lock status
+   /**
+    * Gets the lock status for the node reference relative to the current user.
+    * 
+    * @see LockService#getLockStatus(NodeRef)
+    * 
+    * @param nodeRef    the node reference
+    * @return           the lock status
     */
    @Auditable(parameters = {"nodeRef"})
    public LockStatus getLockStatus(NodeRef nodeRef);
    
    
-   /**
-    * Gets the lock status for the node reference for the specified user.
-    * 
-    * @see LockService#getLockStatus(NodeRef)
-    * 
-    * @param nodeRef    the node reference
-    * @param userName   the user name
+   /**
+    * Gets the lock status for the node reference for the specified user.
+    * 
+    * @see LockService#getLockStatus(NodeRef)
+    * 
+    * @param nodeRef    the node reference
+    * @param userName   the user name
     * @return           the lock status
     */
    @Auditable(parameters = {"nodeRef", "userName"})
@@ -341,7 +341,7 @@ public interface LockService
    /**
     * Retrieve the additional lock info associated with a node ref.
     * <p>
-    * @param nodeRef
+    * @param nodeRef NodeRef
     * @return Additional info string or null
     */
    public String getAdditionalInfo(NodeRef nodeRef);
@@ -355,7 +355,7 @@ public interface LockService
     * The returned data is intended for information purposes only, e.g. returning the timeout
     * in a WebDAV response.
     * 
-    * @param nodeRef
+    * @param nodeRef NodeRef
     * @return LockState
     */
    public LockState getLockState(NodeRef nodeRef);
@@ -365,7 +365,7 @@ public interface LockService
     * will be honoured. Requests for ephemeral locks with expiry times greater than
     * this value will be automatically converted to a request for a persistent lock.
     *  
-    * @param threshSecs
+    * @param threshSecs int
     */
    public void setEphemeralExpiryThreshold(int threshSecs);
 }