inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 1.4 to HEAD

Browse Source 
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4329 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4331 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4332 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4339 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4653 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-12-19 12:35:52 +00:00
parent 00e6c989fc
commit 473c9ff1ff
20 changed files with 751 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/repo/dictionary/M2AssociationDefinition.java
View File

@@ -221,6 +221,15 @@ import org.alfresco.service.namespace.QName;
}
/* (non-Javadoc)
* @see org.alfresco.service.cmr.dictionary.AssociationDefinition#isTargetMandatoryEnforced()
*/
public boolean isTargetMandatoryEnforced()
{
return assoc.isTargetMandatoryEnforced();
}
/* (non-Javadoc)
* @see org.alfresco.repo.dictionary.AssociationDefinition#isTargetMany()
*/

13
source/java/org/alfresco/repo/dictionary/M2ClassAssociation.java
View File

@@ -35,6 +35,7 @@ public abstract class M2ClassAssociation
private String targetClassName = null;
private String targetRoleName = null;
private Boolean isTargetMandatory = null;
private Boolean isTargetMandatoryEnforced = null;
private Boolean isTargetMany = null;
@@ -173,6 +174,18 @@ public abstract class M2ClassAssociation
{
this.isTargetMandatory = isTargetMandatory;
}
public boolean isTargetMandatoryEnforced()
{
return isTargetMandatoryEnforced == null ? false : isTargetMandatoryEnforced;
}
public void setTargetMandatoryEnforced(boolean isTargetMandatoryEnforced)
{
this.isTargetMandatoryEnforced = isTargetMandatoryEnforced;
}
public boolean isTargetMany()

5
source/java/org/alfresco/repo/dictionary/m2binding.xml
View File

@@ -157,7 +157,10 @@
<structure name="target">
<value name="class" field="targetClassName"/>
<value name="role" field="targetRoleName" usage="optional"/>
<value name="mandatory" field="isTargetMandatory" usage="optional"/>
<structure name="mandatory" usage="optional">
<value style="attribute" name="enforced" field="isTargetMandatoryEnforced" usage="optional"/>
<value style="text" field="isTargetMandatory" />
</structure>
<value name="many" field="isTargetMany" usage="optional"/>
</structure>
</mapping>