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 851b2a73f05fe1f83b9f73b7897ecb1faaaafc43 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Aug 21 16:18:25 2015 +0200 Can not use hibernateAttributeType (closes #3763) --- .../java/org/nuiton/topia/templates/TopiaTagValues.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 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 31b4156..3e94b2c 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 @@ -26,7 +26,6 @@ package org.nuiton.topia.templates; import com.google.common.base.Preconditions; import com.google.common.collect.Maps; -import org.apache.commons.lang3.StringUtils; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; @@ -736,18 +735,10 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @since 3.0 */ public String getHibernateAttributeType(ObjectModelAttribute attribute, ObjectModelClassifier classifier, ObjectModelPackage aPackage, ObjectModel model) { - // Look for "hibernateAttributeType" on attribute and classifier - String tagValueName = TAG_HIBERNATE_ATTRIBUTE_TYPE; - String value = findTagValue(tagValueName, attribute, classifier, aPackage); - - if (StringUtils.isEmpty(value)) { - - // If not found, try "hibernateAttributeType.<type>" on model - tagValueName = TAG_HIBERNATE_ATTRIBUTE_TYPE + "." + attribute.getType(); - String defaultValue = HIBERNATE_ATTRIBUTE_TYPE_DEFAULT_VALUES.get(attribute.getType()); - value = TagValues.findTagValue(tagValueName, defaultValue, 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); return value; } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.