Merged CMIS063 to HEAD

15185: 0.62c upgrade: service document
  15198: 0.62c upgrade: allowable actions
  15228: 0.62c upgrade: types and properties

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17227 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2009-10-29 16:07:47 +00:00
parent 76b68cb8cd
commit f2e3183a5c
23 changed files with 553 additions and 453 deletions

View File

@@ -65,6 +65,7 @@ public class CMISBasePropertyDefinition implements CMISPropertyDefinition, Seria
// Properties of Property
private CMISTypeDefinition typeDef;
private CMISPropertyId propertyId;
private String queryName;
private String displayName;
private String description;
private CMISDataTypeEnum propertyType;
@@ -94,7 +95,8 @@ public class CMISBasePropertyDefinition implements CMISPropertyDefinition, Seria
{
this.propertyId = propertyId;
this.typeDef = typeDef;
displayName = (propDef.getTitle() != null) ? propDef.getTitle() : propertyId.getName();
queryName = cmisMapping.buildPrefixEncodedString(propertyId.getQName());
displayName = (propDef.getTitle() != null) ? propDef.getTitle() : propertyId.getId();
description = propDef.getDescription();
propertyType = cmisMapping.getDataType(propDef.getDataType());
cardinality = propDef.isMultiValued() ? CMISCardinalityEnum.MULTI_VALUED : CMISCardinalityEnum.SINGLE_VALUED;
@@ -177,6 +179,16 @@ public class CMISBasePropertyDefinition implements CMISPropertyDefinition, Seria
return typeDef;
}
/**
* Get the query name
*
* @return
*/
public String getQueryName()
{
return queryName;
}
/**
* Get the display name
*
@@ -348,9 +360,11 @@ public class CMISBasePropertyDefinition implements CMISPropertyDefinition, Seria
StringBuilder builder = new StringBuilder();
builder.append("CMISPropertyDefinition[");
builder.append("OwningTypeId=").append(getOwningType().getTypeId()).append(", ");
builder.append("PropertyName=").append(getPropertyId().getName()).append(", ");
builder.append("PropertyId=").append(getPropertyId().getId()).append(", ");
builder.append("PropertyQName=").append(getPropertyId().getQName()).append(", ");
builder.append("Id=").append(getPropertyId().getId()).append(", ");
builder.append("LocalName=").append(getPropertyId().getLocalName()).append(", ");
builder.append("Namespace=").append(getPropertyId().getLocalNamespace()).append(", ");
builder.append("InternalQName=").append(getPropertyId().getQName()).append(", ");
builder.append("QueryName=").append(getQueryName()).append(", ");
builder.append("DisplayName=").append(getDisplayName()).append(", ");
builder.append("Description=").append(getDescription()).append(", ");
builder.append("PropertyType=").append(getDataType()).append(", ");