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

Fixed ALF-4490: VersionModel.versionType is not declared in the model

Browse Source 
- Was being used as a residual property (d:any)
 - To avoid storage as a serializable, the property is now d:text
 - Added conversion from String back to VersionType enum


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22007 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-08-26 10:05:19 +00:00
parent 56ce66ac47
commit a4a51473de
2 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/alfresco/model/contentModel.xml
View File

@@ -876,6 +876,11 @@
<type>d:text</type> <type>d:text</type>
<protected>true</protected> <protected>true</protected>
</property> </property>
<property name="cm:versionType">
<title>Version Type</title>
<type>d:text</type>
<protected>true</protected>
</property>
<property name="cm:initialVersion"> <property name="cm:initialVersion">
<title>Initial Version</title> <title>Initial Version</title>
<type>d:boolean</type> <type>d:boolean</type>

64
source/java/org/alfresco/repo/version/common/VersionImpl.java
View File

@@ -90,41 +90,41 @@ public class VersionImpl implements Version
{ {
return versionProperties.toString(); return versionProperties.toString();
} }
public Date getFrozenModifiedDate() public Date getFrozenModifiedDate()
{ {
Date modifiedDate = (Date)this.versionProperties.get(Version2Model.PROP_FROZEN_MODIFIED); Date modifiedDate = (Date)this.versionProperties.get(Version2Model.PROP_FROZEN_MODIFIED);
if (modifiedDate == null) if (modifiedDate == null)
{ {
// Assume deprecated V1 version store // Assume deprecated V1 version store
modifiedDate = (Date)this.versionProperties.get(VersionBaseModel.PROP_CREATED_DATE); modifiedDate = (Date)this.versionProperties.get(VersionBaseModel.PROP_CREATED_DATE);
} }
return modifiedDate; return modifiedDate;
} }
public String getFrozenModifier() public String getFrozenModifier()
{ {
String modifier = (String)this.versionProperties.get(Version2Model.PROP_FROZEN_MODIFIER); String modifier = (String)this.versionProperties.get(Version2Model.PROP_FROZEN_MODIFIER);
if (modifier == null) if (modifier == null)
{ {
// Assume deprecated V1 version store // Assume deprecated V1 version store
modifier = (String)this.versionProperties.get(VersionBaseModel.PROP_CREATOR); modifier = (String)this.versionProperties.get(VersionBaseModel.PROP_CREATOR);
} }
return modifier; return modifier;
} }
public Date getCreatedDate() public Date getCreatedDate()
{ {
// note: internal version node created date can be retrieved via standard node service // note: internal version node created date can be retrieved via standard node service
return getFrozenModifiedDate(); return getFrozenModifiedDate();
} }
public String getCreator() public String getCreator()
{ {
// note: internal version node creator can be retrieved via standard node service // note: internal version node creator can be retrieved via standard node service
return getFrozenModifier(); return getFrozenModifier();
} }
public String getVersionLabel() public String getVersionLabel()
{ {
return (String)this.versionProperties.get(VersionBaseModel.PROP_VERSION_LABEL); return (String)this.versionProperties.get(VersionBaseModel.PROP_VERSION_LABEL);
@@ -132,7 +132,9 @@ public class VersionImpl implements Version
public VersionType getVersionType() public VersionType getVersionType()
{ {
return (VersionType)this.versionProperties.get(VersionBaseModel.PROP_VERSION_TYPE); return DefaultTypeConverter.INSTANCE.convert(
VersionType.class,
this.versionProperties.get(VersionBaseModel.PROP_VERSION_TYPE));
} }
public String getDescription() public String getDescription()
@@ -144,7 +146,7 @@ public class VersionImpl implements Version
{ {
return this.versionProperties; return this.versionProperties;
} }
public Serializable getVersionProperty(String name) public Serializable getVersionProperty(String name)
{ {
Serializable result = null; Serializable result = null;
@@ -176,7 +178,7 @@ public class VersionImpl implements Version
return versionedNodeRef; return versionedNodeRef;
} }
public NodeRef getFrozenStateNodeRef() public NodeRef getFrozenStateNodeRef()
{ {
return this.nodeRef; return this.nodeRef;