Merged 5.2.N (5.2.1) to HEAD (5.2)

128510 mmuller: Fixed some javadoc errors. REPO-466


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129291 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alexandru Epure
2016-08-09 13:56:54 +00:00
parent bd4578ab52
commit 6dc6e5db3c
135 changed files with 76 additions and 256 deletions

View File

@@ -141,7 +141,6 @@ public class ThumbnailRegistry implements ApplicationContextAware, ApplicationLi
/**
* This method is used to inject the thumbnail definitions.
* @param thumbnailDefinitions List<ThumbnailDefinition>
*/
public void setThumbnailDefinitions(final List<ThumbnailDefinition> thumbnailDefinitions)
{
@@ -187,7 +186,7 @@ public class ThumbnailRegistry implements ApplicationContextAware, ApplicationLi
/**
* Get a list of all the thumbnail definitions
*
* @return Collection<ThumbnailDefinition> collection of thumbnail definitions
* @return collection of thumbnail definitions
*/
public List<ThumbnailDefinition> getThumbnailDefinitions()
{
@@ -306,7 +305,6 @@ public class ThumbnailRegistry implements ApplicationContextAware, ApplicationLi
/**
*
* @param mimetype String
* @return List<ThumbnailDefinition>
* @deprecated Use {@link #getThumbnailDefinitions(String)} instead.
*/
@Deprecated