branch develop updated (4025472 -> e94dda2)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository topia. See http://git.nuiton.org/topia.git from 4025472 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new dd83c93 Generate binders for direct and inheriated attributes (refs #3742) new e94dda2 fixes #3742: merge branch 'feature/3742' into develop The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit e94dda29409c2eb372c7b4eae82a0d49f01e492f Merge: 4025472 dd83c93 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Aug 11 10:01:28 2015 +0200 fixes #3742: merge branch 'feature/3742' into develop commit dd83c932c46ee4a6678272d4c369b431165be7f0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 10 18:25:25 2015 +0200 Generate binders for direct and inheriated attributes (refs #3742) Summary of changes: .../java/org/nuiton/topia/generator/BinderHelperTransformer.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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 dd83c932c46ee4a6678272d4c369b431165be7f0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 10 18:25:25 2015 +0200 Generate binders for direct and inheriated attributes (refs #3742) --- .../java/org/nuiton/topia/generator/BinderHelperTransformer.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 982b3dd..faea5a7 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 @@ -42,6 +42,8 @@ import org.nuiton.util.beans.BinderFactory; import org.nuiton.util.beans.BinderModelBuilder; import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -222,7 +224,12 @@ public class BinderHelperTransformer extends ObjectModelTransformerToJava { StringBuilder initCode) { List<ObjectModelAttribute> list = new ArrayList<ObjectModelAttribute>(); - for (ObjectModelAttribute attr : clazz.getAllOtherAttributes()) { + + Collection<ObjectModelAttribute> attributes = new HashSet<ObjectModelAttribute>(); + attributes.addAll(clazz.getAllOtherAttributes()); + attributes.addAll(clazz.getAttributes()); + + for (ObjectModelAttribute attr : attributes) { if (!attr.isNavigable()) { continue; } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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 e94dda29409c2eb372c7b4eae82a0d49f01e492f Merge: 4025472 dd83c93 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Aug 11 10:01:28 2015 +0200 fixes #3742: merge branch 'feature/3742' into develop .../java/org/nuiton/topia/generator/BinderHelperTransformer.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm