Index: topia2/src/java/org/codelutin/topia/generator/DAOAbstractGenerator.java diff -u topia2/src/java/org/codelutin/topia/generator/DAOAbstractGenerator.java:1.3 topia2/src/java/org/codelutin/topia/generator/DAOAbstractGenerator.java:1.4 --- topia2/src/java/org/codelutin/topia/generator/DAOAbstractGenerator.java:1.3 Mon Jan 9 19:31:44 2006 +++ topia2/src/java/org/codelutin/topia/generator/DAOAbstractGenerator.java Thu Feb 23 14:05:47 2006 @@ -24,10 +24,10 @@ * Created: 12 déc. 2005 * * @author Arnaud Thimel -* @version $Revision: 1.3 $ +* @version $Revision: 1.4 $ * -* Mise a jour: $Date: 2006/01/09 19:31:44 $ -* par : $Author: thimel $ +* Mise a jour: $Date: 2006/02/23 14:05:47 $ +* par : $Author: bpoussin $ */ package org.codelutin.topia.generator; @@ -101,6 +101,10 @@ }*/ for (Iterator it = clazz.getAttributes().iterator(); it.hasNext();) { ObjectModelAttribute attr = (ObjectModelAttribute)it.next(); + if (!attr.isNavigable()) { + continue; + } + /*{ /** * Recherche sur l'attribut <%=attr.getName()%> *) Index: topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java diff -u topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java:1.12 topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java:1.13 --- topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java:1.12 Fri Feb 10 14:01:25 2006 +++ topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java Thu Feb 23 14:05:47 2006 @@ -24,9 +24,9 @@ * Created: 12 déc. 2005 * * @author Arnaud Thimel -* @version $Revision: 1.12 $ +* @version $Revision: 1.13 $ * -* Mise a jour: $Date: 2006/02/10 14:01:25 $ +* Mise a jour: $Date: 2006/02/23 14:05:47 $ * par : $Author: bpoussin $ */ @@ -100,6 +100,9 @@ }*/ for (Iterator it = clazz.getAttributes().iterator(); it.hasNext();) { ObjectModelAttribute attr = (ObjectModelAttribute)it.next(); + if (!attr.isNavigable()) { + continue; + } /*{ /** }*/ if (GeneratorUtil.hasDocumentation(attr)) { @@ -121,11 +124,11 @@ } } else { if (!attr.hasAssociationClass()) { -/*{ <%=attr.getVisibility()%> <%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> <%=attr.getName()%>; +/*{ <%=attr.getVisibility()%> <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> <%=attr.getName()%>; }*/ } else { -/*{ <%=attr.getVisibility()%> <%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> <%=Util.toLowerCaseFirstLetter(attr.getName())%>; +/*{ <%=attr.getVisibility()%> <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> <%=Util.toLowerCaseFirstLetter(attr.getName())%>; }*/ } @@ -141,14 +144,6 @@ /*{ <%=attr.getVisibility()%> <%=attr.getType()%> <%=Util.toLowerCaseFirstLetter(attr.getName())%>; }*/ - if (attr.getReverseAttribute() == null) { - String type = ((ObjectModelClassifier)attr.getDeclaringElement()).getQualifiedName(); - String name = attr.getDeclaringElement().getName(); - if (log.isTraceEnabled()) {log.trace("reverse: " + type + " " + name);} -/*{ <%=attr.getVisibility()%> <%=type%> <%=Util.toLowerCaseFirstLetter(name)%>; - -}*/ - } } } } @@ -171,6 +166,10 @@ for (Iterator it = clazz.getAttributes().iterator(); it.hasNext();) { ObjectModelAttribute attr = (ObjectModelAttribute)it.next(); + if (!attr.isNavigable()) { + continue; + } + ObjectModelAttribute reverse = attr.getReverseAttribute(); if (!Util.isNMultiplicity(attr)) { if (!attr.hasAssociationClass()) { /*{ /* (non-Javadoc) @@ -221,12 +220,12 @@ this.<%=attr.getName()%> = new java.util.ArrayList<<%=attr.getType()%>>(); } }*/ - if (attr.getReverseAttribute() != null) { - if (!Util.isNMultiplicity(attr.getReverseAttribute())) { -/*{ <%=attr.getName()%>.set<%=Util.capitalize(attr.getReverseAttribute().getName())%>(this); + if (reverse != null && reverse.isNavigable()) { + if (!Util.isNMultiplicity(reverse)) { +/*{ <%=attr.getName()%>.set<%=Util.capitalize(reverse.getName())%>(this); }*/ } else { -/*{ <%=attr.getName()%>.get<%=Util.capitalize(attr.getReverseAttribute().getName())%>().add(this); +/*{ <%=attr.getName()%>.get<%=Util.capitalize(reverse.getName())%>().add(this); }*/ } } @@ -235,9 +234,9 @@ } /* (non-Javadoc) - * @see <%=clazz.getQualifiedName()%>#addAll<%=Util.capitalize(attr.getName())%>(<%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>>) + * @see <%=clazz.getQualifiedName()%>#addAll<%=Util.capitalize(attr.getName())%>(<%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>>) *) - public void addAll<%=Util.capitalize(attr.getName())%>(<%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> values) { + public void addAll<%=Util.capitalize(attr.getName())%>(<%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> values) { if (values == null) { return; } @@ -247,13 +246,13 @@ } /* (non-Javadoc) - * @see <%=clazz.getQualifiedName()%>#set<%=Util.capitalize(attr.getName())%>(<%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>>) + * @see <%=clazz.getQualifiedName()%>#set<%=Util.capitalize(attr.getName())%>(<%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>>) *) - public void set<%=Util.capitalize(attr.getName())%>(<%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> values) { + public void set<%=Util.capitalize(attr.getName())%>(<%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> values) { // clear<%=Util.capitalize(attr.getName())%>(); // addAll<%=Util.capitalize(attr.getName())%>(values); // FIXME - <%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> _oldValue = <%=attr.getName()%>; + <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> _oldValue = <%=attr.getName()%>; <%=attr.getName()%> = values; fireOnModifyProperty("<%=attr.getName()%>", _oldValue, values); } @@ -266,12 +265,12 @@ throw new IllegalArgumentException("List does not contain given element"); } }*/ - if (attr.getReverseAttribute() != null) { - if (!Util.isNMultiplicity(attr.getReverseAttribute())) { -/*{ value.set<%=Util.capitalize(attr.getReverseAttribute().getName())%>(null); + if (reverse != null && reverse.isNavigable()) { + if (!Util.isNMultiplicity(reverse)) { +/*{ value.set<%=Util.capitalize(reverse.getName())%>(null); }*/ } else { -/*{ value.get<%=Util.capitalize(attr.getReverseAttribute().getName())%>().remove(this); +/*{ value.get<%=Util.capitalize(reverse.getName())%>().remove(this); }*/ } } @@ -286,15 +285,15 @@ return; } }*/ - if (attr.getReverseAttribute() != null) { + if (reverse != null && reverse.isNavigable()) { /*{ for (<%=attr.getType()%> item : this.<%=attr.getName()%>) { }*/ - if (!Util.isNMultiplicity(attr.getReverseAttribute())) { -/*{ item.set<%=Util.capitalize(attr.getReverseAttribute().getName())%>(null); + if (!Util.isNMultiplicity(reverse)) { +/*{ item.set<%=Util.capitalize(reverse.getName())%>(null); }*/ } else { -/*{ item.get<%=Util.capitalize(attr.getReverseAttribute().getName())%>().remove(this); +/*{ item.get<%=Util.capitalize(reverse.getName())%>().remove(this); }*/ } /*{ } @@ -317,8 +316,8 @@ this.<%=Util.toLowerCaseFirstLetter(attr.getName())%> = new java.util.ArrayList<<%=attr.getAssociationClass().getQualifiedName()%>>(); } }*/ - if (attr.getReverseAttribute() != null) { -/*{ value.set<%=Util.capitalize(attr.getReverseAttribute().getName())%>(this); + if (reverse != null && reverse.isNavigable()) { +/*{ value.set<%=Util.capitalize(reverse.getName())%>(this); }*/ } else { /*{ value.set<%=Util.capitalize(attr.getDeclaringElement().getName())%>(this); @@ -329,9 +328,9 @@ } /* (non-Javadoc) - * @see <%=clazz.getQualifiedName()%>#addAll<%=Util.capitalize(assocAttrName)%>(<%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>>() + * @see <%=clazz.getQualifiedName()%>#addAll<%=Util.capitalize(assocAttrName)%>(<%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>>() *) - public void addAll<%=Util.capitalize(assocAttrName)%>(<%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> values) { + public void addAll<%=Util.capitalize(assocAttrName)%>(<%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> values) { if (values == null) { return; } @@ -341,13 +340,13 @@ } /* (non-Javadoc) - * @see <%=clazz.getQualifiedName()%>#set<%=Util.capitalize(assocAttrName)%>(<%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>>() + * @see <%=clazz.getQualifiedName()%>#set<%=Util.capitalize(assocAttrName)%>(<%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>>() *) - public void set<%=Util.capitalize(assocAttrName)%>(<%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> values) { + public void set<%=Util.capitalize(assocAttrName)%>(<%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> values) { // clear<%=Util.capitalize(assocAttrName)%>(); // addAll<%=Util.capitalize(assocAttrName)%>(values); // FIXME - <%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> _oldValue = <%=Util.toLowerCaseFirstLetter(attr.getName())%>; + <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> _oldValue = <%=Util.toLowerCaseFirstLetter(attr.getName())%>; <%=Util.toLowerCaseFirstLetter(attr.getName())%> = values; fireOnModifyProperty("<%=attr.getName()%>", _oldValue, values); } @@ -360,8 +359,8 @@ throw new IllegalArgumentException("List does not contain given element"); } }*/ - if (attr.getReverseAttribute() != null) { -/*{ value.set<%=Util.capitalize(attr.getReverseAttribute().getName())%>(null); + if (reverse != null && reverse.isNavigable()) { +/*{ value.set<%=Util.capitalize(reverse.getName())%>(null); }*/ } /*{ fireOnModifyIndexedProperty("<%=attr.getName()%>", this.<%=attr.getName()%>.size()+1, value, null); @@ -375,9 +374,9 @@ return; } }*/ - if (attr.getReverseAttribute() != null) { + if (reverse != null && reverse.isNavigable()) { /*{ for (<%=attr.getAssociationClass().getQualifiedName()%> item : this.<%=Util.toLowerCaseFirstLetter(attr.getName())%>) { - item.set<%=Util.capitalize(attr.getReverseAttribute().getName())%>(null); + item.set<%=Util.capitalize(reverse.getName())%>(null); } }*/ } @@ -392,7 +391,7 @@ /*{ /* (non-Javadoc) * @see <%=clazz.getQualifiedName()%>#get<%=Util.capitalize(attr.getName())%>() *) - public <%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> get<%=Util.capitalize(attr.getName())%>() { + public <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> get<%=Util.capitalize(attr.getName())%>() { return <%=attr.getName()%>; } @@ -413,7 +412,7 @@ /*{ /* (non-Javadoc) * @see <%=clazz.getQualifiedName()%>#get<%=Util.capitalize(assocAttrName)%>() *) - public <%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> get<%=Util.capitalize(assocAttrName)%>() { + public <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> get<%=Util.capitalize(assocAttrName)%>() { return <%=Util.toLowerCaseFirstLetter(attr.getName())%>; } @@ -456,7 +455,8 @@ String type = attr.getType(); String name = attr.getName(); generateAssociationAccessors(output, name, type); - if (attr.getReverseAttribute() == null) { + ObjectModelAttribute reverse = attr.getReverseAttribute(); + if (reverse == null && reverse.isNavigable()) { type = ((ObjectModelClassifier)attr.getDeclaringElement()).getQualifiedName(); name = attr.getDeclaringElement().getName(); generateAssociationAccessors(output, name, type); @@ -479,7 +479,8 @@ attrEntity = model.getClass(attr.getType()); } boolean isEntity = (attrEntity != null && attrEntity.hasStereotype(GeneratorUtil.STEREOTYPE_ENTITY)); - if ((isEntity && attr.getReverseAttribute() == null && !attr.hasAssociationClass()) || (!isEntity)) { + ObjectModelAttribute reverse = attr.getReverseAttribute(); + if ((isEntity && (reverse == null || !reverse.isNavigable()) && !attr.hasAssociationClass()) || (!isEntity)) { /*{ append("<%=attr.getName()%>", this.<%=attr.getName()%>). }*/ } Index: topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java diff -u topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java:1.15 topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java:1.16 --- topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java:1.15 Tue Jan 24 18:53:05 2006 +++ topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java Thu Feb 23 14:05:47 2006 @@ -24,10 +24,10 @@ * Created: 12 déc. 2005 * * @author Arnaud Thimel -* @version $Revision: 1.15 $ +* @version $Revision: 1.16 $ * -* Mise a jour: $Date: 2006/01/24 18:53:05 $ -* par : $Author: thimel $ +* Mise a jour: $Date: 2006/02/23 14:05:47 $ +* par : $Author: bpoussin $ */ package org.codelutin.topia.generator; @@ -103,13 +103,13 @@ for (Iterator it = clazz.getAttributes().iterator(); it.hasNext(); ) { ObjectModelAttribute attr = (ObjectModelAttribute)it.next(); + if (!attr.isNavigable()) { + continue; + } if (!Util.isNMultiplicity(attr)) { if (attr.getClassifier() != null && attr.getClassifier().hasStereotype(GeneratorUtil.STEREOTYPE_ENTITY)) { - ObjectModelAttribute reverse = attr.getReverseAttribute(); - if (reverse != null && Util.isNMultiplicity(reverse)) { + if (Util.isNMultiplicity(attr.getReverseMaxMultiplicity())) { generateHibernateManyToOne(output, attr); - } else if (reverse != null) { - generateHibernateOneToOne(output, attr); } else { generateHibernateOneToOne(output, attr); } @@ -118,11 +118,8 @@ } } else { if (attr.getClassifier() != null && attr.getClassifier().hasStereotype(GeneratorUtil.STEREOTYPE_ENTITY)) { - ObjectModelAttribute reverse = attr.getReverseAttribute(); - if (reverse != null && Util.isNMultiplicity(reverse)) { + if (Util.isNMultiplicity(attr.getReverseMaxMultiplicity())) { generateHibernateManyToMany(output, attr); - } else if (reverse != null) { - generateHibernateOneToMany(output, attr); } else { generateHibernateOneToMany(output, attr); } @@ -159,7 +156,6 @@ } } } - } if (haveSuper) { @@ -240,7 +236,7 @@ } protected void generateHibernateOneToMany(Writer output, ObjectModelAttribute attr) throws IOException { - boolean isOrdered = GeneratorUtil.isOrdered(attr); + boolean isOrdered = attr.isOrdered(); /*{ <<%=(isOrdered?"list":"bag")%> name="<%=getName(attr)%>"<%=((attr.getReverseAttribute()==null)?"":" inverse=\"true\"")%> lazy="true"<%=((attr.isComposite() || attr.hasAssociationClass())?" cascade=\"delete,delete-orphan\"":"")%>> }*/ @@ -254,7 +250,7 @@ } protected void generateHibernateMany(Writer output, ObjectModelAttribute attr) throws IOException { - boolean isOrdered = GeneratorUtil.isOrdered(attr); + boolean isOrdered = attr.isOrdered(); /*{ <<%=(isOrdered?"list":"bag")%> name="<%=getName(attr)%>"> }*/ @@ -276,7 +272,7 @@ // On ne met le inverse="true" uniquement pour un seul coté de la relation. // Dans le cas contraire, les modifications dans la relation ne seront // pas sauvegardées - boolean isOrdered = GeneratorUtil.isOrdered(attr); + boolean isOrdered = attr.isOrdered(); /*{ <<%=(isOrdered?"list":"bag")%> name="<%=getName(attr)%>" table="<%=getManyToManyTableName(attr)%>" <%=((!Util.isFirstAttribute(attr))?"inverse=\"true\" ":"")%>lazy="true"<%=((attr.isComposite() || attr.hasAssociationClass())?" cascade=\"delete,delete-orphan\"":"")%>> }*/ @@ -292,16 +288,31 @@ /** * Renvoie le nom unique de table pour une relation ManyToMany en fonction * de l'attribut attr + *

+ * Plusieurs cas de figure: + *

  • + * * @param attr l'attribut servant de base au calcul du nom * @return le nom de la table */ protected String getManyToManyTableName(ObjectModelAttribute attr) { String result; - if (!Util.isFirstAttribute(attr)) { - result = attr.getDeclaringElement().getName() + "_" + attr.getReverseAttribute().getDeclaringElement().getName(); + + String name = attr.getName(); + String revers = attr.getReverseAttributeName(); + + if (name.compareToIgnoreCase(revers) < 0) { + result = name + "_" + revers; } else { - result = attr.getReverseAttribute().getDeclaringElement().getName() + "_" + attr.getDeclaringElement().getName(); + result = revers + "_" + name; } + +// String result; +// if (!Util.isFirstAttribute(attr)) { +// result = attr.getDeclaringElement().getName() + "_" + attr.getReverseAttribute().getDeclaringElement().getName(); +// } else { +// result = attr.getReverseAttribute().getDeclaringElement().getName() + "_" + attr.getDeclaringElement().getName(); +// } return result.toLowerCase(); } Index: topia2/src/java/org/codelutin/topia/generator/EntityInterfaceGenerator.java diff -u topia2/src/java/org/codelutin/topia/generator/EntityInterfaceGenerator.java:1.8 topia2/src/java/org/codelutin/topia/generator/EntityInterfaceGenerator.java:1.9 --- topia2/src/java/org/codelutin/topia/generator/EntityInterfaceGenerator.java:1.8 Mon Jan 23 13:51:52 2006 +++ topia2/src/java/org/codelutin/topia/generator/EntityInterfaceGenerator.java Thu Feb 23 14:05:47 2006 @@ -24,9 +24,9 @@ * Created: 12 déc. 2005 * * @author Arnaud Thimel -* @version $Revision: 1.8 $ +* @version $Revision: 1.9 $ * -* Mise a jour: $Date: 2006/01/23 13:51:52 $ +* Mise a jour: $Date: 2006/02/23 14:05:47 $ * par : $Author: bpoussin $ */ @@ -103,6 +103,9 @@ }*/ for (Iterator it = clazz.getAttributes().iterator(); it.hasNext();) { ObjectModelAttribute attr = (ObjectModelAttribute)it.next(); + if (!attr.isNavigable()) { + continue; + } if (!Util.isNMultiplicity(attr)) { if (!attr.hasAssociationClass()) { /*{ /** @@ -162,7 +165,7 @@ } /*{ * @param <%=Util.toLowerCaseFirstLetter(attr.getName())%> Les instances de <%=attr.getName()%> à ajouter. *) - public void addAll<%=Util.capitalize(attr.getName())%>(<%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> <%=Util.toLowerCaseFirstLetter(attr.getName())%>); + public void addAll<%=Util.capitalize(attr.getName())%>(<%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> <%=Util.toLowerCaseFirstLetter(attr.getName())%>); /** }*/ @@ -172,7 +175,7 @@ } /*{ * @param <%=Util.toLowerCaseFirstLetter(attr.getName())%> La Collection de <%=attr.getName()%> à positionner. *) - public void set<%=Util.capitalize(attr.getName())%>(<%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> <%=Util.toLowerCaseFirstLetter(attr.getName())%>); + public void set<%=Util.capitalize(attr.getName())%>(<%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> <%=Util.toLowerCaseFirstLetter(attr.getName())%>); /** }*/ @@ -206,12 +209,12 @@ /** * @param <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> Les instances de <%=attr.getAssociationClass().getName()%> à ajouter. *) - public void addAll<%=Util.capitalize(assocAttrName)%>(<%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>); + public void addAll<%=Util.capitalize(assocAttrName)%>(<%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>); /** * @param <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> La Collection de <%=attr.getAssociationClass().getName()%> à positionner. *) - public void set<%=Util.capitalize(assocAttrName)%>(<%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>); + public void set<%=Util.capitalize(assocAttrName)%>(<%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>); /** * @param <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> L'instance de <%=attr.getAssociationClass().getName()%> à retirer. @@ -235,7 +238,7 @@ } /*{ * @return La Liste de <%=attr.getName()%>. *) - public <%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> get<%=Util.capitalize(attr.getName())%>(); + public <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> get<%=Util.capitalize(attr.getName())%>(); /** * @return Le nombre d'éléments de la collection <%=attr.getName()%>. @@ -249,7 +252,7 @@ /*{ /** * @return La liste des attributs <%=attr.getAssociationClass().getName()%>. *) - public <%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> get<%=Util.capitalize(assocAttrName)%>(); + public <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> get<%=Util.capitalize(assocAttrName)%>(); /** * @return L'attribut <%=attr.getAssociationClass().getName()%> associé à la valeur value de l'attribut <%=attr.getName()%>. Index: topia2/src/java/org/codelutin/topia/generator/GeneratorUtil.java diff -u topia2/src/java/org/codelutin/topia/generator/GeneratorUtil.java:1.7 topia2/src/java/org/codelutin/topia/generator/GeneratorUtil.java:1.8 --- topia2/src/java/org/codelutin/topia/generator/GeneratorUtil.java:1.7 Mon Jan 23 13:51:52 2006 +++ topia2/src/java/org/codelutin/topia/generator/GeneratorUtil.java Thu Feb 23 14:05:47 2006 @@ -25,9 +25,9 @@ * * @author Arnaud Thimel * - * @version $Revision: 1.7 $ + * @version $Revision: 1.8 $ * - * Mise a jour: $Date: 2006/01/23 13:51:52 $ par : $Author: bpoussin $ + * Mise a jour: $Date: 2006/02/23 14:05:47 $ par : $Author: bpoussin $ */ package org.codelutin.topia.generator; @@ -61,11 +61,6 @@ public static final String STEREOTYPE_ENTITY = "entity"; /** - * Stéréotype pour les objets devant être générées sous forme d'entités - */ - public static final String STEREOTYPE_ORDERED = "ordered"; - - /** * Stéréotype pour les interfaces devant être générées sous forme de * services */ @@ -284,8 +279,4 @@ return type; } - public static boolean isOrdered(ObjectModelAttribute attr) { - return (attr != null && attr.hasStereotype(STEREOTYPE_ORDERED)); - } - } // GeneratorUtil