inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

18
source/java/org/alfresco/repo/copy/CompoundCopyBehaviourCallback.java
View File

@@ -122,13 +122,13 @@ public class CompoundCopyBehaviourCallback extends AbstractCopyBehaviourCallback
}
return bestAction;
}
/**
* Individual callbacks effectively have a veto on the copy i.e. if one of the
* callbacks returns <tt>false</tt> for {@link CopyBehaviourCallback#getMustCopy(org.alfresco.service.namespace.QName, org.alfresco.repo.copy.CopyDetails)},
* then the copy will NOT proceed. However, a warning is generated indicating that
* there is a conflict in the defined behaviour.
*
/**
* Individual callbacks effectively have a veto on the copy i.e. if one of the
* callbacks returns <tt>false</tt> for {@link CopyBehaviourCallback#getMustCopy(org.alfresco.service.namespace.QName, org.alfresco.repo.copy.CopyDetails)},
* then the copy will NOT proceed. However, a warning is generated indicating that
* there is a conflict in the defined behaviour.
*
* @return Returns <tt>true</tt> if all registered callbacks return <tt>true</tt>
* or <b><tt>false</tt> if any of the registered callbacks return <tt>false</tt></b>.
*/
@@ -181,7 +181,7 @@ public class CompoundCopyBehaviourCallback extends AbstractCopyBehaviourCallback
}
/**
* Uses the {@link ChildAssocCopyAction} ordering to drive priority i.e. a vote
* Uses the ChildAssocCopyAction ordering to drive priority i.e. a vote
* to copy will override a vote NOT to copy.
*
* @return Returns the most lively choice of action
@@ -217,7 +217,7 @@ public class CompoundCopyBehaviourCallback extends AbstractCopyBehaviourCallback
}
/**
* Uses the {@link ChildAssocRecurseAction} ordering to drive recursive copy behaviour.
* Uses the ChildAssocRecurseAction ordering to drive recursive copy behaviour.
*
* @return Returns the most lively choice of action
*/