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

@@ -52,7 +52,7 @@ public interface CopyBehaviourCallback
* Always copy the association.
* <br/>
* Note that this can cause duplicate associations when copying over
* {@link CopyAssociationDetails#isTargetNodeIsNew() existing target nodes}.
* {@link CopyAssociationDetails#copyTargetIsNew existing target nodes}.
*/
COPY,
/**
@@ -361,13 +361,13 @@ public interface CopyBehaviourCallback
* @param classQName the name of the class that this is being invoked for
* @param copyDetails the source node's copy details for quick reference
* @param childAssocCopyDetails all other details relating to the child association
* @return Returns the type of {@link ChildAssocRecurseAction recursion}
* to perform after having copied the child association
*
* @see #getChildAssociationCopyAction(QName, CopyDetails, CopyChildAssociationDetails)
*/
ChildAssocRecurseAction getChildAssociationRecurseAction(
QName classQName,
* @return Returns the type of {@link ChildAssocRecurseAction recursion}
* to perform after having copied the child association
*
* @see #getChildAssociationCopyAction(QName, CopyDetails, CopyChildAssociationDetails)
*/
ChildAssocRecurseAction getChildAssociationRecurseAction(
QName classQName,
CopyDetails copyDetails,
CopyChildAssociationDetails childAssocCopyDetails);