[Topia-commits] r2369 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator

20 Oct 2011

Author: tchemit
Date: 2011-10-20 10:24:03 +0200 (Thu, 20 Oct 2011)
New Revision: 2369

Url: http://nuiton.org/repositories/revision/topia/2369

Log:
Anomalie #1783: Do not generate isXXX method for Boolean property + use only TopiaGeneratorUtil

Modified:
   trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java

Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java
===================================================================

--- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java	2011-10-20 08:23:45 UTC (rev 2368)
+++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java	2011-10-20 08:24:03 UTC (rev 2369)
@@ -29,8 +29,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.java.JavaGeneratorUtil;
 import org.nuiton.eugene.java.ObjectModelTransformerToJava;
 import org.nuiton.eugene.models.object.ObjectModelAssociationClass;
 import org.nuiton.eugene.models.object.ObjectModelAttribute;
@@ -142,7 +140,7 @@
         generateImpl = isGenerateImpl(input);
 
         String noGenerateBooleanGetMethods =
-                JavaGeneratorUtil.getDoNotGenerateBooleanGetMethods(model, input);
+                TopiaGeneratorUtil.getDoNotGenerateBooleanGetMethods(model, input);
         generateBooleanGetMethods =
                 StringUtils.isEmpty(noGenerateBooleanGetMethods) ||
                 !"true".equals(noGenerateBooleanGetMethods.trim());
@@ -160,7 +158,7 @@
         }
 
         // Generate i18n block
-        String i18nPrefix = JavaGeneratorUtil.getI18nPrefixTagValue(input, model);
+        String i18nPrefix = TopiaGeneratorUtil.getI18nPrefixTagValue(input, model);
         if (!StringUtils.isEmpty(i18nPrefix)) {
             generateI18nBlock(input, outputAbstract, i18nPrefix);
         }
@@ -217,7 +215,7 @@
                                             ObjectModelClass ouput) {
 
         // serialVersionUID
-        String svUID = TopiaGeneratorUtil.findTagValue(GeneratorUtil.SERIAL_VERSION_UID,
+        String svUID = TopiaGeneratorUtil.findTagValue(TopiaGeneratorUtil.SERIAL_VERSION_UID,
                                                        input,
                                                        model
         );
@@ -226,7 +224,7 @@
             // use a default one
             svUID = TopiaGeneratorUtil.generateSerialVersionUID(ouput) + "L";
         }
-        addConstant(ouput, GeneratorUtil.SERIAL_VERSION_UID, long.class, svUID,
+        addConstant(ouput, TopiaGeneratorUtil.SERIAL_VERSION_UID, long.class, svUID,
                         ObjectModelModifier.PRIVATE);
     }
 
@@ -602,8 +600,10 @@
             // setXXX
             addSingleSetOperation(attribute);
 
+            boolean booleanProperty =
+                    TopiaGeneratorUtil.isBooleanPrimitive(attribute);
+            
             String attrType = getPropertyType(attribute);
-            boolean booleanProperty = attrType.toLowerCase().contains("boolean");
 
             if (booleanProperty) {
 
@@ -789,7 +789,7 @@
                 hasUnidirectionalRelationOnAbstractType(attribute, model))) {
             String reverseAttrName = StringUtils.capitalize(reverse.getName());
             String reverseAttrType = TopiaGeneratorUtil.getSimpleName(reverse.getType());
-            if (!GeneratorUtil.isNMultiplicity(reverse)) {
+            if (!TopiaGeneratorUtil.isNMultiplicity(reverse)) {
                 body.append(""
 /*{
         <%=attrName%>.set<%=reverseAttrName%>(this);
@@ -924,7 +924,7 @@
         if (reverse != null && (reverse.isNavigable() ||
                 hasUnidirectionalRelationOnAbstractType(attribute, model))) {
             String reverseAttrName = StringUtils.capitalize(reverse.getName());
-            if (!GeneratorUtil.isNMultiplicity(reverse)) {
+            if (!TopiaGeneratorUtil.isNMultiplicity(reverse)) {
                 body.append(""
 /*{
         <%=attrName%>.set<%=reverseAttrName%>(null);
@@ -985,7 +985,7 @@
 /*{        for (<%=attrType%> item : this.<%=attrName%>) {
 }*/
             );
-            if (!GeneratorUtil.isNMultiplicity(reverse)) {
+            if (!TopiaGeneratorUtil.isNMultiplicity(reverse)) {
                 body.append(""
 /*{            item.set<%=reverseAttrName%>(null);
 }*/
@@ -1294,7 +1294,7 @@
                 if (attr.isComposite()) {
                     String attrName = attr.getName();
                     String getterName = "get" + StringUtils.capitalize(attrName);
-                    if (GeneratorUtil.isNMultiplicity(attr)) {
+                    if (TopiaGeneratorUtil.isNMultiplicity(attr)) {
                         body.append(""
 /*{        if (<%=getterName%>() != null) {
               tmp.addAll(<%=getterName%>());
@@ -1308,13 +1308,13 @@
                         );
                     }
                 } else if (attr.hasAssociationClass()) {
-                    String assocAttrName = GeneratorUtil.getAssocAttrName(
+                    String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(
                             attr);
                     String assocClassFQN = TopiaGeneratorUtil.getSimpleName(
                             attr.getAssociationClass().getQualifiedName());
-                    String ref = "this." + GeneratorUtil.toLowerCaseFirstLetter(
+                    String ref = "this." + TopiaGeneratorUtil.toLowerCaseFirstLetter(
                             assocAttrName);
-                    if (!GeneratorUtil.isNMultiplicity(attr)) {
+                    if (!TopiaGeneratorUtil.isNMultiplicity(attr)) {
                         body.append(""
 /*{
         if (<%=ref%> != null) {
@@ -1398,7 +1398,7 @@
 
                 String attrName = attr.getName();
                 String getterName = "get" + StringUtils.capitalize(attrName);
-                if (GeneratorUtil.isNMultiplicity(attr)) {
+                if (TopiaGeneratorUtil.isNMultiplicity(attr)) {
                     body.append(""
 /*{        tmp.addAll(<%=getterName%>());
 }*/

    

[Topia-commits] r2369 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator

tchemit＠users.nuiton.org