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

@@ -58,8 +58,8 @@ public class RepoSecondaryManifestProcessorImpl extends AbstractManifestProcesso
private static final Log log = LogFactory.getLog(RepoSecondaryManifestProcessorImpl.class);
/**
* @param receiver
* @param transferId
* @param receiver TransferReceiver
* @param transferId String
*/
public RepoSecondaryManifestProcessorImpl(TransferReceiver receiver, String transferId)
{
@@ -117,10 +117,10 @@ public class RepoSecondaryManifestProcessorImpl extends AbstractManifestProcesso
/**
* Process the peer associations
*
* @param requiredAssocs
* @param currentAssocs
* @param nodeRef
* @param isSource
* @param requiredAssocs List<AssociationRef>
* @param currentAssocs List<AssociationRef>
* @param nodeRef NodeRef
* @param isSource boolean
*/
private void processPeerAssociations(List<AssociationRef> requiredAssocs,
List<AssociationRef> currentAssocs,
@@ -316,9 +316,9 @@ public class RepoSecondaryManifestProcessorImpl extends AbstractManifestProcesso
/**
*
* @param sourceRef
* @param targetRef
* @param assocTypeQName
* @param sourceRef NodeRef
* @param targetRef NodeRef
* @param assocTypeQName QName
*/
public AssociationRefKey(NodeRef sourceRef, NodeRef targetRef, QName assocTypeQName)
{
@@ -329,7 +329,7 @@ public class RepoSecondaryManifestProcessorImpl extends AbstractManifestProcesso
/**
*
* @param ref
* @param ref AssociationRef
*/
public AssociationRefKey(AssociationRef ref)
{
@@ -341,7 +341,6 @@ public class RepoSecondaryManifestProcessorImpl extends AbstractManifestProcesso
/**
* Compares:
* <ul>
* <li>{@link #id}</li>
* <li>{@link #sourceRef}</li>
* <li>{@link #targetRef}</li>
* <li>{@link #assocTypeQName}</li>