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/repo/webdav/LockInfo.java

@@ -57,7 +57,7 @@ public interface LockInfo
     /**
      * Setter for lock scope.
      * 
-     * @param scope
+     * @param scope String
      */
     void setScope(String scope);
 
@@ -92,7 +92,7 @@ public interface LockInfo
     /**
      * Setter for sharedLockTokens list.
      * 
-     * @param sharedLockTokens
+     * @param sharedLockTokens Set<String>
      */
     void setSharedLockTokens(Set<String> sharedLockTokens);
 
@@ -168,18 +168,18 @@ public interface LockInfo
     long getRemainingTimeoutSeconds();
 
     /**
-     * Sets the expiry date/time to lockTimeout seconds into the future. Provide
-     * a lockTimeout of WebDAV.TIMEOUT_INFINITY for never expires.
-     * 
-     * @param lockTimeoutSecs
-     */
-    void setTimeoutSeconds(int lockTimeoutSecs);
-    
+     * Sets the expiry date/time to lockTimeout seconds into the future. Provide
+     * a lockTimeout of WebDAV.TIMEOUT_INFINITY for never expires.
+     * 
+     * @param lockTimeoutSecs int
+     */
+    void setTimeoutSeconds(int lockTimeoutSecs);
+    
     /**
      * Sets the expiry date/time to lockTimeout minutes into the future. Provide
      * a lockTimeout of WebDAV.TIMEOUT_INFINITY for never expires.
      * 
-     * @param lockTimeoutMins
+     * @param lockTimeoutMins int
      */
     void setTimeoutMinutes(int lockTimeoutMins);
 }