This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See http://git.nuiton.org/topia.git commit 694659d0182a0738758fb88a68c51a161656158f Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Aug 23 19:18:17 2015 +0200 Fix hibernateType and attributeType tag value loading when specify on an attribute. --- .../org/nuiton/topia/templates/TopiaTagValues.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaTagValues.java b/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaTagValues.java index ebc18d4..d1e195d 100644 --- a/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaTagValues.java +++ b/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaTagValues.java @@ -787,10 +787,14 @@ public class TopiaTagValues extends TagValueDefinitionProvider { */ public String getHibernateAttributeType(ObjectModelAttribute attribute, ObjectModelClassifier classifier, ObjectModelPackage aPackage, ObjectModel model) { - String tagValueName = TAG_HIBERNATE_ATTRIBUTE_TYPE + "." + attribute.getType(); - String defaultValue = HIBERNATE_ATTRIBUTE_TYPE_DEFAULT_VALUES.get(attribute.getType()); - String value = TagValues.findTagValue(tagValueName, defaultValue, attribute, classifier, aPackage, model); + String value = TagValues.findDirectTagValue(TAG_HIBERNATE_ATTRIBUTE_TYPE, null, attribute); + if (value == null) { + String tagValueName = TAG_HIBERNATE_ATTRIBUTE_TYPE + "." + attribute.getType(); + String defaultValue = HIBERNATE_ATTRIBUTE_TYPE_DEFAULT_VALUES.get(attribute.getType()); + value = TagValues.findTagValue(tagValueName, defaultValue, classifier, aPackage, model); + } return value; + } /** @@ -803,9 +807,13 @@ public class TopiaTagValues extends TagValueDefinitionProvider { */ public String getAttributeType(ObjectModelAttribute attribute, ObjectModelClassifier classifier, ObjectModelPackage aPackage, ObjectModel model) { - String tagValueName = TAG_ATTRIBUTE_TYPE + "." + attribute.getType(); - String value = TagValues.findTagValue(tagValueName, attribute.getType(), attribute, classifier, aPackage, model); + String value = TagValues.findDirectTagValue(TAG_HIBERNATE_ATTRIBUTE_TYPE, null, attribute); + if (value == null) { + String tagValueName = TAG_ATTRIBUTE_TYPE + "." + attribute.getType(); + value = TagValues.findTagValue(tagValueName, attribute.getType(), classifier, aPackage, model); + } return value; + } /** -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.