mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged CMIS063 to HEAD
Resolve merge issues. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17272 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -71,8 +71,6 @@ public class CMISBasePropertyDefinition implements CMISPropertyDefinition, Seria
|
||||
private CMISDataTypeEnum propertyType;
|
||||
private CMISCardinalityEnum cardinality;
|
||||
private int maximumLength = -1;
|
||||
private String schemaURI = null;
|
||||
private String encoding = null;
|
||||
private Collection<CMISChoice> choices = new HashSet<CMISChoice>();
|
||||
private boolean isOpenChoice = false;
|
||||
private boolean required;
|
||||
@@ -239,26 +237,6 @@ public class CMISBasePropertyDefinition implements CMISPropertyDefinition, Seria
|
||||
return maximumLength;
|
||||
}
|
||||
|
||||
/**
|
||||
* For properties of type CMISPropertyType.XML the schema to which the property must conform. Unsupported
|
||||
*
|
||||
* @return - the schema URI
|
||||
*/
|
||||
public String getSchemaURI()
|
||||
{
|
||||
return schemaURI;
|
||||
}
|
||||
|
||||
/**
|
||||
* For properties of type CMISPropertyType.XML the encoding used for the property value
|
||||
*
|
||||
* @return the encoding
|
||||
*/
|
||||
public String getEncoding()
|
||||
{
|
||||
return encoding;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the choices available as values for this property TODO: not implemented yet
|
||||
*
|
||||
@@ -370,8 +348,6 @@ public class CMISBasePropertyDefinition implements CMISPropertyDefinition, Seria
|
||||
builder.append("PropertyType=").append(getDataType()).append(", ");
|
||||
builder.append("Cardinality=").append(getCardinality()).append(", ");
|
||||
builder.append("MaximumLength=").append(getMaximumLength()).append(", ");
|
||||
builder.append("SchemaURI=").append(getSchemaURI()).append(", ");
|
||||
builder.append("Encoding=").append(getEncoding()).append(", ");
|
||||
builder.append("Choices=").append(getChoices()).append(", ");
|
||||
builder.append("IsOpenChoice=").append(isOpenChoice()).append(", ");
|
||||
builder.append("Required=").append(isRequired()).append(", ");
|
||||
|
Reference in New Issue
Block a user