Author: fdesbois Date: 2010-05-27 18:37:38 +0200 (Thu, 27 May 2010) New Revision: 910 Url: http://nuiton.org/repositories/revision/eugene/910 Log: Evo #611 : manage getter method in JavaBeanTransformer for boolean properties : add getter with 'is' prefix Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2010-05-20 11:57:15 UTC (rev 909) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2010-05-27 16:37:38 UTC (rev 910) @@ -232,7 +232,8 @@ createGetMethod(output, attrName, attrNameCapitalized, - attrType + attrType, + null ); createSetMethod(output, @@ -283,10 +284,16 @@ protected void createGetMethod(ObjectModelClass output, String attrName, String attrNameCapitalized, - String attrType) { + String attrType, + String methodPrefix) { + + if (methodPrefix == null) { + methodPrefix = JavaGeneratorUtil.OPERATION_GETTER_DEFAULT_PREFIX; + } + ObjectModelOperation getter = addOperation( output, - "get" + attrNameCapitalized, + methodPrefix + attrNameCapitalized, attrType, ObjectModelModifier.PUBLIC ); @@ -295,6 +302,13 @@ return <%=attrName%>; }*/ ); + + // Create also getter for boolean with 'is' prefix + if (attrType.toLowerCase().contains("boolean") && + !methodPrefix.equals(JavaGeneratorUtil.OPERATION_GETTER_BOOLEAN_PREFIX)) { + createGetMethod(output, attrName, attrNameCapitalized, attrType, + JavaGeneratorUtil.OPERATION_GETTER_BOOLEAN_PREFIX); + } } protected void createGetChildMethod(ObjectModelClass output, Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2010-05-20 11:57:15 UTC (rev 909) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2010-05-27 16:37:38 UTC (rev 910) @@ -24,12 +24,18 @@ */ package org.nuiton.eugene.java; +import org.apache.commons.lang.StringUtils; import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelClassifier; import org.nuiton.eugene.models.object.ObjectModelModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelParameter; +import java.util.Collection; +import java.util.List; + /** * Utility class for pure java templates. * @@ -38,6 +44,10 @@ */ public class JavaGeneratorUtil extends GeneratorUtil { + public static final String OPERATION_GETTER_DEFAULT_PREFIX = "get"; + + public static final String OPERATION_GETTER_BOOLEAN_PREFIX = "is"; + /** Stereotype for JavaBean objects. */ public static final String STEREOTYPE_BEAN = "bean";