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

Follow-up on 21966: Removed special Enum persistence and did early target-type conversion

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22015 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-08-26 12:16:58 +00:00
parent a4a51473de
commit 8bfd2bdd97
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/repo/domain/node/NodePropertyValue.java
View File

@@ -525,7 +525,7 @@ public class NodePropertyValue implements Cloneable, Serializable
return DefaultTypeConverter.INSTANCE.convert(ContentData.class, value); return DefaultTypeConverter.INSTANCE.convert(ContentData.class, value);
} }
} }
} },
; ;
/** /**
@@ -580,7 +580,7 @@ public class NodePropertyValue implements Cloneable, Serializable
{ {
return ValueType.DOUBLE; return ValueType.DOUBLE;
} }
else if (value instanceof String || value instanceof Enum<?>) else if (value instanceof String)
{ {
return ValueType.STRING; return ValueType.STRING;
} }
@@ -744,9 +744,9 @@ public class NodePropertyValue implements Cloneable, Serializable
{ {
ParameterCheck.mandatory("typeQName", typeQName); ParameterCheck.mandatory("typeQName", typeQName);
this.actualType = NodePropertyValue.getActualType(value);
if (value == null) if (value == null)
{ {
this.actualType = NodePropertyValue.getActualType(value);
setPersistedValue(ValueType.NULL, null); setPersistedValue(ValueType.NULL, null);
} }
else else
@@ -756,6 +756,8 @@ public class NodePropertyValue implements Cloneable, Serializable
// back out because it is unconvertable. // back out because it is unconvertable.
ValueType valueType = makeValueType(typeQName); ValueType valueType = makeValueType(typeQName);
value = valueType.convert(value); value = valueType.convert(value);
this.actualType = NodePropertyValue.getActualType(value);
// get the persisted type // get the persisted type
ValueType persistedValueType = this.actualType.getPersistedType(value); ValueType persistedValueType = this.actualType.getPersistedType(value);
// convert to the persistent type // convert to the persistent type
@@ -780,7 +782,6 @@ public class NodePropertyValue implements Cloneable, Serializable
NodePropertyValue that = (NodePropertyValue) obj; NodePropertyValue that = (NodePropertyValue) obj;
return (this.actualType.equals(that.actualType) && return (this.actualType.equals(that.actualType) &&
EqualsHelper.nullSafeEquals(this.getPersistedValue(), that.getPersistedValue())); EqualsHelper.nullSafeEquals(this.getPersistedValue(), that.getPersistedValue()));
} }
else else
{ {