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

@@ -93,7 +93,7 @@ public class RenditionServiceImpl implements
/**
* Injects the RenditionDefinitionPersister bean.
* @param renditionDefinitionPersister
* @param renditionDefinitionPersister RenditionDefinitionPersister
*/
public void setRenditionDefinitionPersister(RenditionDefinitionPersister renditionDefinitionPersister)
{
@@ -110,7 +110,7 @@ public class RenditionServiceImpl implements
/**
* Injects the ServiceRegistry bean.
* @param serviceRegistry
* @param serviceRegistry ServiceRegistry
*/
public void setServiceRegistry(ServiceRegistry serviceRegistry)
{
@@ -120,7 +120,7 @@ public class RenditionServiceImpl implements
/**
* Injects the ActionService bean.
* @param actionService
* @param actionService ActionService
*/
public void setActionService(ActionService actionService)
{
@@ -129,7 +129,7 @@ public class RenditionServiceImpl implements
/**
* Injects the ActionTrackingService bean.
* @param actionTrackingService
* @param actionTrackingService ActionTrackingService
*/
public void setActionTrackingService(ActionTrackingService actionTrackingService)
{
@@ -138,7 +138,7 @@ public class RenditionServiceImpl implements
/**
* Injects the DictionaryService bean.
* @param dictionaryService
* @param dictionaryService DictionaryService
*/
public void setDictionaryService(DictionaryService dictionaryService)
{
@@ -147,7 +147,7 @@ public class RenditionServiceImpl implements
/**
* Injects the PolicyComponent bean.
* @param policyComponent
* @param policyComponent PolicyComponent
*/
public void setPolicyComponent(PolicyComponent policyComponent)
{
@@ -156,7 +156,7 @@ public class RenditionServiceImpl implements
/**
* Sets the list of known cancellable actions used by {@link #cancelRenditions(NodeRef)}.
* @param knownCancellableActionTypes
* @param knownCancellableActionTypes List<String>
* @since 4.1.6
*/
public void setKnownCancellableActionTypes(List<String> knownCancellableActionTypes)