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 a5f8df310a
commit 22d2935235
119 changed files with 444 additions and 434 deletions

View File

@@ -167,7 +167,7 @@ public abstract class AbstractArchivedNodeWebScript extends DeclarativeWebScript
* @param storeRef mandatory store ref
* @param paging mandatory paging
* @param filter optional filter
* @return
* @return PagingResults<NodeRef>
*/
protected PagingResults<NodeRef> getArchivedNodesFrom(StoreRef storeRef, ScriptPagingDetails paging, String filter)
{

View File

@@ -50,7 +50,7 @@ public class ArchivedNodesGet extends AbstractArchivedNodeWebScript
/**
* This method is used to inject {@link org.alfresco.repo.web.scripts.archive.ArchivedNodesFilter node filters} on this GET call.
*
* @param nodeFilters
* @param nodeFilters List<ArchivedNodesFilter>
*/
public void setArchivedNodeFilters(List<ArchivedNodesFilter> nodeFilters)
{