Author: tchemit Date: 2011-10-20 10:20:33 +0200 (Thu, 20 Oct 2011) New Revision: 1117 Url: http://nuiton.org/repositories/revision/eugene/1117 Log: Anomalie #1783: Do not generate isXXX method for Boolean property Modified: trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2011-10-20 04:20:56 UTC (rev 1116) +++ trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2011-10-20 08:20:33 UTC (rev 1117) @@ -339,6 +339,18 @@ return composition; } + /** + * Tests if an attribute is a boolean primitive. + * + * @param attribute the attribute to test + * @return {@code true} if attribute is a primitivie boolean + * @since 2.4.1 + */ + public static boolean isBooleanPrimitive(ObjectModelAttribute attribute) { + String type = attribute.getType(); + return "boolean".equals(type); + } + public static String getParsingExpression(String type, String attributeStringName) { if ("byte".equals(type)) { Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2011-10-20 04:20:56 UTC (rev 1116) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2011-10-20 08:20:33 UTC (rev 1117) @@ -28,7 +28,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.EugeneTagValues; -import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.models.object.*; import java.beans.PropertyChangeListener; @@ -312,9 +311,9 @@ simpleType = JavaGeneratorUtil.getSimpleName(attrType); } - boolean booleanProperty = attrType.toLowerCase().contains("boolean"); + boolean booleanProperty = JavaGeneratorUtil.isBooleanPrimitive(attr); - if (booleanProperty && ! multiple) { + if (booleanProperty && !multiple) { // creates a isXXX method createGetMethod(output, @@ -674,10 +673,10 @@ } // Generate the serialVersionUID - long serialVersionUID = GeneratorUtil.generateSerialVersionUID(input); + long serialVersionUID = JavaGeneratorUtil.generateSerialVersionUID(input); addConstant(output, - GeneratorUtil.SERIAL_VERSION_UID, + JavaGeneratorUtil.SERIAL_VERSION_UID, "long", serialVersionUID + "L", ObjectModelModifier.PRIVATE @@ -731,7 +730,7 @@ // add a fix serialVersionUID, since the class has no field nor method addConstant(resultClassImpl, - GeneratorUtil.SERIAL_VERSION_UID, + JavaGeneratorUtil.SERIAL_VERSION_UID, "long", "1L", ObjectModelModifier.PRIVATE