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

@@ -91,13 +91,13 @@ public abstract class ParameterizedItemAbstractBase extends CommonResourceAbstra
*/
protected abstract void addParameterDefinitions(List<ParameterDefinition> paramList);
/**
* Sets the action service
*
* @param runtimeActionService the action service
*/
public void setRuntimeActionService(RuntimeActionService runtimeActionService)
{
/**
* Sets the action service
*
* @param runtimeActionService the action service
*/
public void setRuntimeActionService(RuntimeActionService runtimeActionService)
{
this.runtimeActionService = runtimeActionService;
}
@@ -124,7 +124,7 @@ public abstract class ParameterizedItemAbstractBase extends CommonResourceAbstra
/**
* Setter for Spring injection of adhocPropertiesAllowed property
*
* @param allowed
* @param allowed boolean
*/
public void setAdhocPropertiesAllowed(boolean allowed)
{