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/thumbnail/ThumbnailRenditionConvertor.java

@@ -69,9 +69,9 @@ public class ThumbnailRenditionConvertor
      * {@link ThumbnailParentAssociationDetails assocDetails},
      * create and return an equivalent {@link RenditionDefinition} object.
      * 
-     * @param thumbnailDefinition
-     * @param assocDetails
-     * @return
+     * @param thumbnailDefinition ThumbnailDefinition
+     * @param assocDetails ThumbnailParentAssociationDetails
+     * @return RenditionDefinitions
      */
     public RenditionDefinition convert(ThumbnailDefinition thumbnailDefinition, ThumbnailParentAssociationDetails assocDetails)
     {
@@ -110,7 +110,7 @@ public class ThumbnailRenditionConvertor
     /**
      * This method examines the various data values on the thumbnail definition and
      * works out if it is an 'image' rendition or a 'reformat' rendition
-     * @param thumbnailDefinition
+     * @param thumbnailDefinition ThumbnailDefinition
      * @return <code>true</code> for an image-based RenditionDefinition, else <code>false</code>
      */
     private boolean isImageBasedRendition(ThumbnailDefinition thumbnailDefinition)
@@ -125,9 +125,9 @@ public class ThumbnailRenditionConvertor
      * create and return a parameter Map which contains the equivalent {@link RenditionDefinition}
      * configuration.
      * 
-     * @param transformationOptions
-     * @param assocDetails
-     * @return
+     * @param transformationOptions TransformationOptions
+     * @param assocDetails ThumbnailParentAssociationDetails
+     * @return Map
      */
     public Map<String, Serializable> convert(TransformationOptions transformationOptions, ThumbnailParentAssociationDetails assocDetails)
     {