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/version/common/AbstractVersionServiceImpl.java

@@ -195,8 +195,8 @@ public abstract class AbstractVersionServiceImpl
 		
 	/**
 	 * How should revert deal with this aspect?
-	 * @param aspectName
-	 * @param revertDetails
+	 * @param aspectName QName
+	 * @param revertDetails VersionRevertDetails
 	 * @return the action to be taken
 	 */
 	protected RevertAspectAction getRevertAspectAction(QName aspectName,  VersionRevertDetails revertDetails)
@@ -221,9 +221,9 @@ public abstract class AbstractVersionServiceImpl
 	
 	/**
 	 * How should revert deal with this association
-	 * @param className
-	 * @param assocName
-	 * @param revertDetails
+	 * @param className QName
+	 * @param assocName QName
+	 * @param revertDetails VersionRevertDetails
 	 * @return the action to be taken
 	 */
 	protected RevertAssocAction getRevertAssocAction(QName className, QName assocName,  VersionRevertDetails revertDetails)
@@ -249,10 +249,10 @@ public abstract class AbstractVersionServiceImpl
 	/**
 	 * Invokes the on create version policy behaviour for a given type 
 	 * 
-	 * @param classRef
-	 * @param nodeDetails
-	 * @param nodeRef
-	 * @param versionProperties
+	 * @param classRef QName
+	 * @param nodeDetails NodeRef
+	 * @param nodeRef Map<String, Serializable>
+	 * @param versionProperties PolicyScope
 	 */
 	private void invokeOnCreateVersion(
 			QName classRef,
@@ -283,9 +283,10 @@ public abstract class AbstractVersionServiceImpl
 	 * Default implementation of the on create version policy.
 	 * Override if you wish to supply your own policy.
 	 * 
-	 * @param nodeRef
-	 * @param versionProperties
-	 * @param nodeDetails
+	 * @param classRef QName
+	 * @param nodeRef NodeRef
+	 * @param versionProperties Map<String, Serializable>
+	 * @param nodeDetails PolicyScope
 	 */
 	abstract protected void defaultOnCreateVersion(
 			QName classRef,
@@ -296,11 +297,11 @@ public abstract class AbstractVersionServiceImpl
 	/**
 	 * Invoke the calculate version label policy behaviour
 	 * 
-	 * @param classRef
-	 * @param preceedingVersion
-	 * @param versionNumber
-	 * @param versionProperties
-	 * @return
+	 * @param classRef QName
+	 * @param preceedingVersion Version
+	 * @param versionNumber int
+	 * @param versionProperties Map<String, Serializable>
+	 * @return String
 	 */
 	protected String invokeCalculateVersionLabel(
 			QName classRef,