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

@@ -271,9 +271,9 @@ public class CheckOutCheckInServiceImpl implements CheckOutCheckInService
* Invoke before check in policy
*
* @param workingCopyNodeRef the current working copy to check in
* @param versionProperties
* @param contentUrl
* @param keepCheckedOut
* @param versionProperties Map<String,Serializable>
* @param contentUrl String
* @param keepCheckedOut boolean
*/
private void invokeBeforeCheckIn(
NodeRef workingCopyNodeRef,
@@ -795,9 +795,9 @@ public class CheckOutCheckInServiceImpl implements CheckOutCheckInService
* <p>
* Example: "" becomes "wc".
*
* @param name
* @param workingCopyLabel
* @return
* @param name String
* @param workingCopyLabel String
* @return String
*/
public static String createWorkingCopyName(String name, final String workingCopyLabel)
{
@@ -834,7 +834,8 @@ public class CheckOutCheckInServiceImpl implements CheckOutCheckInService
* Get original name from the working copy name and the cm:workingCopyLabel
* that was used to create it.
*
* @param workingCopyLabel
* @param workingCopyName String
* @param workingCopyLabel String
* @return original name
*/
private String getNameFromWorkingCopyName(String workingCopyName, String workingCopyLabel)