This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository eugene. See http://git.nuiton.org/eugene.git commit 926398aa8c837e72c44ad7c08068c64af5750d97 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 27 22:42:20 2015 +0100 fixes #3628: Dependencies are not merged in method org.nuiton.eugene.models.object.xml.ObjectModelImpl#mergeClassifiers --- .../java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java index 0ed334a..f9578f9 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java @@ -483,6 +483,12 @@ public class ObjectModelImpl implements ObjectModel { initialClazzifier.operations.add(operation); } } + for (it = additionalClazzifier.getDependencies().iterator(); it.hasNext();) { + ObjectModelDependencyImpl dependency = (ObjectModelDependencyImpl) it.next(); + if (!contains(initialClazzifier.getDependencies(), dependency)) { + initialClazzifier.dependencies.add(dependency); + } + } for (it = additionalClazzifier.getComments().iterator(); it.hasNext();) { String comment = (String) it.next(); if (!initialClazzifier.comments.contains(comment)) { -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.