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 f46cee2afb3705b407c764899154ca478203ba5e Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun May 24 15:47:11 2015 +0200 Fix collection type if indexedCollection stereotype is on (refs #3694) --- .../main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java index b09347c..88f3f91 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java @@ -768,7 +768,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { ObjectModelAttribute attr) { if (hasUniqueStereotype(attr)) { return Set.class.getName(); - } else if (attr.isOrdered()) { + } else if (hasIndexedCollectionStereotype(attr) || attr.isOrdered()) { return List.class.getName(); } return Collection.class.getName(); @@ -783,7 +783,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { public static String getNMultiplicityObjectType(ObjectModelAttribute attr) { if (hasUniqueStereotype(attr)) { return HashSet.class.getName(); - } else if (attr.isOrdered()) { + } else if (hasIndexedCollectionStereotype(attr) || attr.isOrdered()) { //On considère qu'on ne sait pas traiter vraiment l'attribut "ordered" // puisqu'on va conserver l'ordre d'insertion, et non un ordre en // fonction d'un élément donné. Donc on renvoi une ArrayList @@ -803,7 +803,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { ObjectModelAttribute attr) { if (hasUniqueStereotype(attr)) { return "set"; - } else if (attr.isOrdered()) { + } else if (hasIndexedCollectionStereotype(attr) ) { return "list"; } //attr.isOrdered() - On génère le ordered en bag -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.