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 a203274df1f1d8be08275d7e2e5c35ac1c8b25a8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 22 15:14:48 2015 +0200 generate binder even if entity has no direct attributes (refs #3688) --- .../topia/generator/BinderHelperTransformer.java | 42 ++++++++++++---------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java index 4cb1da0..f157a43 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java @@ -30,12 +30,16 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.java.ObjectModelTransformerToJava; -import org.nuiton.eugene.models.object.*; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelJavaModifier; +import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.util.TopiaEntityBinder; import org.nuiton.topia.persistence.util.TopiaEntityHelper; -import org.nuiton.util.beans.BinderModelBuilder; import org.nuiton.util.beans.BinderFactory; +import org.nuiton.util.beans.BinderModelBuilder; import java.util.ArrayList; import java.util.Iterator; @@ -233,15 +237,6 @@ public class BinderHelperTransformer extends ObjectModelTransformerToJava { String clazzName = clazz.getName(); - if (list.isEmpty()) { - // no attribute, do nothing - if (log.isDebugEnabled()) { - log.debug("no attribute to add in a binder for " + clazzName + - ", will not generate it."); - } - return; - } - if (log.isDebugEnabled()) { log.debug("generate simple binder for " + clazzName); } @@ -250,21 +245,32 @@ public class BinderHelperTransformer extends ObjectModelTransformerToJava { /*{ BinderModelBuilder<<%=clazzName%>, <%=clazzName%>> builder<%=clazzName%> = BinderModelBuilder.newEmptyBuilder(<%=clazzName%>.class); - builder<%=clazzName%>.addSimpleProperties( }*/ ); - Iterator<ObjectModelAttribute> itr = list.iterator(); - while (itr.hasNext()) { - ObjectModelAttribute attr = itr.next(); - String attrName = attr.getName(); - boolean hasNext = itr.hasNext(); + if (!list.isEmpty()) { initCode.append("" +/*{ + builder<%=clazzName%>.addSimpleProperties( +}*/ + ); + Iterator<ObjectModelAttribute> itr = list.iterator(); + while (itr.hasNext()) { + ObjectModelAttribute attr = itr.next(); + String attrName = attr.getName(); + boolean hasNext = itr.hasNext(); + initCode.append("" /*{ <%=clazzName%>.<%=getConstantName(attrName)%><%=(hasNext?",\n":"")%>}*/ + ); + } + initCode.append("" +/*{ + ); + }*/ ); } + initCode.append("" /*{ - ); registerTopiaBinder(builder<%=clazzName%>, "<%=modelName%>"); }*/ ); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.