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 f697fe46450301239673f4dd5e14ab9a8065bd30 Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Jan 23 16:38:50 2015 +0100 On entities addAll operations should accept any kind of iterables (fixes #3627) --- .../main/java/org/nuiton/topia/templates/EntityTransformer.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java b/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java index 4e3c172..9d2b452 100644 --- a/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java +++ b/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java @@ -692,7 +692,7 @@ public class EntityTransformer extends ObjectModelTransformerToJava { * @see #addSingleGetOperation(ObjectModelAttribute, String, String) * @see #addSingleSetOperation(ObjectModelAttribute) * @see #addMultipleAddOperation(ObjectModelAttribute, String) - * @see #addMultipleAddAllOperation(ObjectModelAttribute, String) + * @see #addMultipleAddAllOperation(ObjectModelAttribute) * @see #addMultipleSetOperation(ObjectModelAttribute, String, String) * @see #addMultipleRemoveOperation(ObjectModelAttribute) * @see #addMultipleClearOperation(ObjectModelAttribute, String, String) @@ -764,7 +764,7 @@ public class EntityTransformer extends ObjectModelTransformerToJava { } // addAllXXX - addMultipleAddAllOperation(attribute, collectionInterface); + addMultipleAddAllOperation(attribute); // setXXX addMultipleSetOperation(attribute, collectionInterface, collectionImpl); @@ -1098,8 +1098,7 @@ public class EntityTransformer extends ObjectModelTransformerToJava { setOperationBody(implOperation, body.toString()); } - protected void addMultipleAddAllOperation(ObjectModelAttribute attribute, - String collectionInterface) { + protected void addMultipleAddAllOperation(ObjectModelAttribute attribute) { String attrName = getPropertyName(attribute); String attrType = getPropertyType(attribute); @@ -1114,7 +1113,7 @@ public class EntityTransformer extends ObjectModelTransformerToJava { addOperation(outputInterface, getJavaBeanMethodName("addAll", attrName), void.class, ObjectModelJavaModifier.PACKAGE); ObjectModelParameter param = - addParameter(interfaceOperation, collectionInterface + "<" + attrType + ">", attrName); + addParameter(interfaceOperation, "Iterable<" + attrType + ">", attrName); // Implementation ObjectModelOperation implOperation = -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.