Index: topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java diff -u topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java:1.18 topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java:1.19 --- topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java:1.18 Mon Mar 6 18:44:36 2006 +++ topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java Wed Mar 8 19:13:26 2006 @@ -24,9 +24,9 @@ * Created: 12 déc. 2005 * * @author Arnaud Thimel -* @version $Revision: 1.18 $ +* @version $Revision: 1.19 $ * -* Mise a jour: $Date: 2006/03/06 18:44:36 $ +* Mise a jour: $Date: 2006/03/08 19:13:26 $ * par : $Author: bpoussin $ */ @@ -245,7 +245,7 @@ } protected void generateHibernateOneToMany(Writer output, ObjectModelAttribute attr) throws IOException { - boolean isOrdered = attr.isOrdered(); + boolean isIndexed = attr.isIndexed(); boolean isInverse = attr.getReverseAttribute().isNavigable(); String orderBy = attr.getTagValue("order-by"); if (orderBy == null) { @@ -253,7 +253,7 @@ } else { orderBy = "order-by=\"" + orderBy + "\""; } - if (!isOrdered) { + if (!isIndexed) { /*{ <%=((!isInverse)?"":"inverse=\"true\"")%> lazy="true" <%=((attr.isComposite() || attr.hasAssociationClass())?"cascade=\"delete,delete-orphan\"":"")%>> @@ -270,16 +270,16 @@ } protected void generateHibernateMany(Writer output, ObjectModelAttribute attr) throws IOException { - boolean isOrdered = attr.isOrdered(); -/*{ <<%=(isOrdered?"list":"bag")%> name="<%=getName(attr)%>"> + boolean isIndexed = attr.isIndexed(); +/*{ <<%=(isIndexed?"list":"bag")%> name="<%=getName(attr)%>"> }*/ - if (isOrdered) { + if (isIndexed) { /*{ }*/ } /*{ - > + > }*/ } @@ -294,16 +294,16 @@ // pas sauvegardées // Note(poussin) 20060306: pour moi il n'y a pas jamais d'inverse pour many-to-many // car on est dans une table intermediaire specifique.<%=((!Util.isFirstAttribute(attr))?"inverse=\"true\" ":"")%> - boolean isOrdered = attr.isOrdered(); -/*{ <<%=(isOrdered?"list":"bag")%> name="<%=getName(attr)%>" table="<%=getManyToManyTableName(attr)%>" lazy="true"<%=((attr.isComposite() || attr.hasAssociationClass())?" cascade=\"delete,delete-orphan\"":"")%>> + boolean isIndexed = attr.isIndexed(); +/*{ <<%=(isIndexed?"list":"bag")%> name="<%=getName(attr)%>" table="<%=getManyToManyTableName(attr)%>" lazy="true"<%=((attr.isComposite() || attr.hasAssociationClass())?" cascade=\"delete,delete-orphan\"":"")%>> }*/ - if (isOrdered) { + if (isIndexed) { /*{ }*/ } /*{ - > + > }*/ }