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

Merged HEAD (5.2) to 5.2.N (5.2.1)

Browse Source 
127581 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      126681 jvonka: Node Associations - child assocs
      - in responses return isPrimary (rather than isPrimaryParent)
      - RA-920, RA-930, RA-634


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127674 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 14:14:53 +00:00
parent 50af2e5cc1
commit 7e1a657cd0
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/rest/api/model/AssocChild.java
View File

@@ -24,17 +24,17 @@ package org.alfresco.rest.api.model;
public class AssocChild extends Assoc
{
private String childId;
private Boolean isPrimaryParent;
private Boolean isPrimary;
public AssocChild()
{
}
public AssocChild(String prefixAssocTypeQName, boolean isPrimaryParent)
public AssocChild(String prefixAssocTypeQName, boolean isPrimary)
{
super(prefixAssocTypeQName);
this.isPrimaryParent = isPrimaryParent;
this.isPrimary = isPrimary;
}
public AssocChild(String childId, String prefixAssocTypeQName)
@@ -44,14 +44,14 @@ public class AssocChild extends Assoc
this.childId = childId;
}
public Boolean getIsPrimaryParent()
public Boolean getIsPrimary()
{
return isPrimaryParent;
return isPrimary;
}
public void setIsPrimaryParent(Boolean isPrimaryParent)
public void setIsPrimary(Boolean isPrimary)
{
this.isPrimaryParent = isPrimaryParent;
this.isPrimary = isPrimary;
}
public String getChildId()