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

@@ -69,8 +69,8 @@ public class ThumbnailDefinition
/**
* Constructor
*
* @param destinationMimetype
* @param options
* @param destinationMimetype String
* @param options TransformationOptions
*/
public ThumbnailDefinition(String destinationMimetype, TransformationOptions options)
{
@@ -93,10 +93,10 @@ public class ThumbnailDefinition
/**
* Constructor. Specify the place holder thumbnail path.
*
* @param mimetype
* @param options
* @param thumbnailName
* @param placeHolderResourcePath
* @param mimetype String
* @param options TransformationOptions
* @param thumbnailName String
* @param placeHolderResourcePath String
*/
public ThumbnailDefinition(String mimetype, TransformationOptions options, String thumbnailName, String placeHolderResourcePath)
{
@@ -200,7 +200,7 @@ public class ThumbnailDefinition
/**
* This method sets the placeholder resource path.
*
* @param placeHolderResourcePath
* @param placeHolderResourcePath String
*/
public void setPlaceHolderResourcePath(String placeHolderResourcePath)
{
@@ -209,7 +209,7 @@ public class ThumbnailDefinition
/**
*
* @return
* @return String
*/
public String getPlaceHolderResourcePath()
{
@@ -219,7 +219,7 @@ public class ThumbnailDefinition
/**
* This method sets the mime-aware placeholder resource path template.
*
* @param mimeAwarePlaceHolderResourcePath
* @param mimeAwarePlaceHolderResourcePath String
* @since 3.4.1 (Team)
*/
public void setMimeAwarePlaceHolderResourcePath(String mimeAwarePlaceHolderResourcePath)
@@ -229,7 +229,7 @@ public class ThumbnailDefinition
/**
*
* @return
* @return String
* @since 3.4.1 (Team)
*/
public String getMimeAwarePlaceHolderResourcePath()
@@ -250,7 +250,7 @@ public class ThumbnailDefinition
/**
* Sets the thumbnail registry
*
* @param thumbnailRegistry
* @param thumbnailRegistry ThumbnailRegistry
*/
public void setThumbnailRegistry(ThumbnailRegistry thumbnailRegistry)
{