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

Merge from SEAMIST3

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10733 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2008-09-04 11:22:17 +00:00
parent 41b5618d1d
commit a6625b1c61
63 changed files with 5450 additions and 962 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/cmis/dictionary/CMISPropertyDefinition.java
View File

@@ -98,7 +98,7 @@ public class CMISPropertyDefinition implements Serializable
// Properties of associations - all the same
propertyName = cmisMapping.getCmisPropertyName(propertyQName);
propertyId = cmisMapping.getCmisPropertyId(propertyQName);
displayName = propDef.getTitle();
displayName = (propDef.getTitle() != null) ? propDef.getTitle() : propertyName;
description = propDef.getDescription();
isInherited = false;
propertyType = cmisMapping.getPropertyType(propertyQName);
@@ -114,7 +114,7 @@ public class CMISPropertyDefinition implements Serializable
propertyName = cmisMapping.getCmisPropertyName(propertyQName);
propertyId = cmisMapping.getCmisPropertyId(propertyQName);
displayName = propDef.getTitle();
displayName = (propDef.getTitle() != null) ? propDef.getTitle() : propertyName;
description = propDef.getDescription();
if(propDef.getContainerClass().isAspect())
{