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

source/java/org/alfresco/repo/rendition/RenditionNodeManager.java

@@ -84,9 +84,10 @@ public class RenditionNodeManager
      * @param sourceNode the source node which is being rendered.
      * @param tempRenditionNode the temporary rendition
      * @param location the proposed location of the rendition node.
-     * @param renditionDefinition
-     * @param nodeService
-     * @param renditionService
+     * @param renditionDefinition RenditionDefinition
+     * @param nodeService NodeService
+     * @param renditionService RenditionService
+     * @param behaviourFilter BehaviourFilter
      */
     public RenditionNodeManager(NodeRef sourceNode, NodeRef tempRenditionNode, RenditionLocation location,
                 RenditionDefinition renditionDefinition, NodeService nodeService, RenditionService renditionService,
@@ -381,8 +382,8 @@ public class RenditionNodeManager
      * the primary parent of the newly created rendition node, the rendition node is added as
      * a child of the source node.
      * 
-     * @param renditionName
-     * @param nodeTypeQName
+     * @param renditionName QName
+     * @param nodeTypeQName QName
      * @return the primary parent association of the newly created rendition node.
      */
     private ChildAssociationRef createNewRendition(QName renditionName, QName nodeTypeQName)
@@ -449,9 +450,9 @@ public class RenditionNodeManager
     }
 
     /**
-     * @param parentIsSource
-     * @param renditionName
-     * @return
+     * @param parentIsSource boolean
+     * @param renditionName QName
+     * @return QName
      */
     private QName getAssociationName(boolean parentIsSource, QName renditionName)
     {
@@ -495,7 +496,7 @@ public class RenditionNodeManager
     /**
      * This method copies properties from the temporary rendition node onto the targetNode. It also sets the node type.
      * {@link #unchangedProperties Some properties} are not copied.
-     * @param finalRenditionAssoc 
+     * @param finalRenditionAssoc ChildAssociationRef
      */
     private void transferNodeProperties(ChildAssociationRef finalRenditionAssoc)
     {