mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-08 14:51:49 +00:00
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:
@@ -127,12 +127,12 @@ public class PolicyScope extends AspectDetails
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds a child association
|
||||
*
|
||||
* @param classRef
|
||||
* @param childAssocRef
|
||||
*/
|
||||
public void addChildAssociation(QName classRef, ChildAssociationRef childAssocRef)
|
||||
* Adds a child association
|
||||
*
|
||||
* @param classRef QName
|
||||
* @param childAssocRef ChildAssociationRef
|
||||
*/
|
||||
public void addChildAssociation(QName classRef, ChildAssociationRef childAssocRef)
|
||||
{
|
||||
if (classRef.equals(this.classRef) == true)
|
||||
{
|
||||
@@ -152,9 +152,9 @@ public class PolicyScope extends AspectDetails
|
||||
|
||||
/**
|
||||
*
|
||||
* @param classRef
|
||||
* @param childAssocRef
|
||||
* @param alwaysTraverseAssociation
|
||||
* @param classRef QName
|
||||
* @param childAssocRef ChildAssociationRef
|
||||
* @param alwaysTraverseAssociation boolean
|
||||
*/
|
||||
public void addChildAssociation(QName classRef, ChildAssociationRef childAssocRef, boolean alwaysTraverseAssociation)
|
||||
{
|
||||
@@ -177,8 +177,8 @@ public class PolicyScope extends AspectDetails
|
||||
/**
|
||||
* Get a child association
|
||||
*
|
||||
* @param classRef
|
||||
* @return
|
||||
* @param classRef QName
|
||||
* @return List<ChildAssociationRef>
|
||||
*/
|
||||
public List<ChildAssociationRef> getChildAssociations(QName classRef)
|
||||
{
|
||||
@@ -221,9 +221,8 @@ public class PolicyScope extends AspectDetails
|
||||
/**
|
||||
* Add an association
|
||||
*
|
||||
* @param classRef
|
||||
* @param qname
|
||||
* @param nodeAssocRef
|
||||
* @param classRef QName
|
||||
* @param nodeAssocRef AssociationRef
|
||||
*/
|
||||
public void addAssociation(QName classRef, AssociationRef nodeAssocRef)
|
||||
{
|
||||
@@ -248,8 +247,8 @@ public class PolicyScope extends AspectDetails
|
||||
/**
|
||||
* Get associations
|
||||
*
|
||||
* @param classRef
|
||||
* @return
|
||||
* @param classRef QName
|
||||
* @return List<AssociationRef>
|
||||
*/
|
||||
public List<AssociationRef> getAssociations(QName classRef)
|
||||
{
|
||||
@@ -390,13 +389,13 @@ public class PolicyScope extends AspectDetails
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a child association
|
||||
*
|
||||
* @param childAssocRef the child assoc reference
|
||||
* @param alwaysTraverseAssociation indicates whether the assoc should always be traversed
|
||||
*/
|
||||
protected void addChildAssociation(ChildAssociationRef childAssocRef, boolean alwaysTraverseAssociation)
|
||||
{
|
||||
* Add a child association
|
||||
*
|
||||
* @param childAssocRef the child assoc reference
|
||||
* @param alwaysTraverseAssociation indicates whether the assoc should always be traversed
|
||||
*/
|
||||
protected void addChildAssociation(ChildAssociationRef childAssocRef, boolean alwaysTraverseAssociation)
|
||||
{
|
||||
addChildAssociation(childAssocRef);
|
||||
|
||||
if (alwaysTraverseAssociation == true)
|
||||
@@ -427,12 +426,12 @@ public class PolicyScope extends AspectDetails
|
||||
return this.childAssocs;
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds an association to be copied
|
||||
*
|
||||
* @param nodeAssocRef the association reference
|
||||
*/
|
||||
protected void addAssociation(AssociationRef nodeAssocRef)
|
||||
/**
|
||||
* Adds an association to be copied
|
||||
*
|
||||
* @param nodeAssocRef the association reference
|
||||
*/
|
||||
protected void addAssociation(AssociationRef nodeAssocRef)
|
||||
{
|
||||
this.targetAssocs.add(nodeAssocRef);
|
||||
}
|
||||
|
Reference in New Issue
Block a user