Index: topia2/src/java/org/codelutin/topia/generator/EntityInterfaceGenerator.java
diff -u topia2/src/java/org/codelutin/topia/generator/EntityInterfaceGenerator.java:1.6 topia2/src/java/org/codelutin/topia/generator/EntityInterfaceGenerator.java:1.7
--- topia2/src/java/org/codelutin/topia/generator/EntityInterfaceGenerator.java:1.6	Wed Jan 11 19:36:12 2006
+++ topia2/src/java/org/codelutin/topia/generator/EntityInterfaceGenerator.java	Mon Jan 16 19:05:18 2006
@@ -24,9 +24,9 @@
 * Created: 12 déc. 2005
 *
 * @author Arnaud Thimel <thimel@codelutin.com>
-* @version $Revision: 1.6 $
+* @version $Revision: 1.7 $
 *
-* Mise a jour: $Date: 2006/01/11 19:36:12 $
+* Mise a jour: $Date: 2006/01/16 19:05:18 $
 * par : $Author: thimel $
 */
 
@@ -51,8 +51,6 @@
 import org.codelutin.generator.models.object.ObjectModelOperation;
 import org.codelutin.generator.models.object.ObjectModelParameter;
 
-import static org.codelutin.topia.generator.GeneratorUtil.STEREOTYPE_ORDERED;
-
 public class EntityInterfaceGenerator extends ObjectModelGenerator {
 
     /**
@@ -166,7 +164,7 @@
                     }
 /*{     * @param <%=Util.toLowerCaseFirstLetter(attr.getName())%> Les instances de <%=attr.getName()%> à ajouter.
      *)
-    public void addAll<%=Util.capitalize(attr.getName())%>(<%=(attr.hasStereotype(STEREOTYPE_ORDERED)?"List":"Collection")%><<%=attr.getType()%>> <%=Util.toLowerCaseFirstLetter(attr.getName())%>);
+    public void addAll<%=Util.capitalize(attr.getName())%>(<%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getType()%>> <%=Util.toLowerCaseFirstLetter(attr.getName())%>);
 
     /**
 }*/
@@ -176,7 +174,7 @@
                     }
 /*{     * @param <%=Util.toLowerCaseFirstLetter(attr.getName())%> La Collection de <%=attr.getName()%> à positionner.
      *)
-    public void set<%=Util.capitalize(attr.getName())%>(<%=(attr.hasStereotype(STEREOTYPE_ORDERED)?"List":"Collection")%><<%=attr.getType()%>> <%=Util.toLowerCaseFirstLetter(attr.getName())%>);
+    public void set<%=Util.capitalize(attr.getName())%>(<%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getType()%>> <%=Util.toLowerCaseFirstLetter(attr.getName())%>);
 
     /**
 }*/
@@ -209,12 +207,12 @@
     /**
      * @param <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> Les instances de <%=attr.getAssociationClass().getName()%> à ajouter.
      *)
-    public void addAll<%=Util.capitalize(assocAttrName)%>(<%=(attr.hasStereotype(STEREOTYPE_ORDERED)?"List":"Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>);
+    public void addAll<%=Util.capitalize(assocAttrName)%>(<%=(GeneratorUtil.isOrdered(attr)?"List":"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)%>(<%=(attr.hasStereotype(STEREOTYPE_ORDERED)?"List":"Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>);
+    public void set<%=Util.capitalize(assocAttrName)%>(<%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>);
 
     /**
      * @param <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> L'instance de <%=attr.getAssociationClass().getName()%> à retirer.
@@ -238,7 +236,7 @@
                     }
 /*{     * @return La Liste de <%=attr.getName()%>.
      *)
-    public <%=(attr.hasStereotype(STEREOTYPE_ORDERED)?"List":"Collection")%><<%=attr.getType()%>> get<%=Util.capitalize(attr.getName())%>();
+    public <%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getType()%>> get<%=Util.capitalize(attr.getName())%>();
 
     /**
      * @return Le nombre d'éléments de la collection <%=attr.getName()%>.
@@ -251,7 +249,7 @@
 /*{    /**
      * @return La liste des attributs <%=attr.getAssociationClass().getName()%>.
      *)
-    public <%=(attr.hasStereotype(STEREOTYPE_ORDERED)?"List":"Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> get<%=Util.capitalize(assocAttrName)%>();
+    public <%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> get<%=Util.capitalize(assocAttrName)%>();
 
     /**
      * @return L'attribut <%=attr.getAssociationClass().getName()%> associé à la valeur <code>value</code> 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.5 topia2/src/java/org/codelutin/topia/generator/GeneratorUtil.java:1.6
--- topia2/src/java/org/codelutin/topia/generator/GeneratorUtil.java:1.5	Mon Jan 16 10:52:52 2006
+++ topia2/src/java/org/codelutin/topia/generator/GeneratorUtil.java	Mon Jan 16 19:05:18 2006
@@ -25,9 +25,9 @@
  * 
  * @author Arnaud Thimel <thimel@codelutin.com>
  * 
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
  * 
- * Mise a jour: $Date: 2006/01/16 10:52:52 $ par : $Author: thimel $
+ * Mise a jour: $Date: 2006/01/16 19:05:18 $ par : $Author: thimel $
  */
 
 package org.codelutin.topia.generator;
@@ -278,17 +278,14 @@
     }
 
     public static String getDOType(String type, ObjectModel model) {
-//        try {
-//            Class typeClass = Class.forName(type);
-//            if (TopiaEntity.class.isAssignableFrom(typeClass)) {
-//                type += "Impl";
-//            }
-//        } catch (ClassNotFoundException cnfe) {
-//        }
         if (model.hasClass(type)) {
             type += "Impl";
         }
         return type;
     }
 
+    public static boolean isOrdered(ObjectModelAttribute attr) {
+        return (attr != null && attr.hasStereotype(STEREOTYPE_ORDERED));
+    }
+
 } // GeneratorUtil

Index: topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java
diff -u topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java:1.11 topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java:1.12
--- topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java:1.11	Mon Jan 16 14:31:02 2006
+++ topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java	Mon Jan 16 19:05:18 2006
@@ -24,9 +24,9 @@
 * Created: 12 déc. 2005
 *
 * @author Arnaud Thimel <thimel@codelutin.com>
-* @version $Revision: 1.11 $
+* @version $Revision: 1.12 $
 *
-* Mise a jour: $Date: 2006/01/16 14:31:02 $
+* Mise a jour: $Date: 2006/01/16 19:05:18 $
 * par : $Author: thimel $
 */
 
@@ -204,18 +204,30 @@
     }
 
     private void generateHibernateOneToMany(Writer output, ObjectModelAttribute attr) throws IOException {
-/*{        <bag name="<%=getName(attr)%>"<%=((attr.getReverseAttribute()==null)?"":" inverse=\"true\"")%> lazy="true"<%=((attr.isComposite() || attr.hasAssociationClass())?" cascade=\"delete,delete-orphan\"":"")%>>
+        boolean isOrdered = GeneratorUtil.isOrdered(attr);
+/*{        <<%=(isOrdered?"list":"bag")%> name="<%=getName(attr)%>"<%=((attr.getReverseAttribute()==null)?"":" inverse=\"true\"")%> lazy="true"<%=((attr.isComposite() || attr.hasAssociationClass())?" cascade=\"delete,delete-orphan\"":"")%>>
             <key column="<%=GeneratorUtil.getReverseDBName(attr)%>"/>
-            <one-to-many class="<%=getType(attr)%>"/>
-        </bag>
+}*/
+        if (isOrdered) {
+/*{        <index/>
+}*/
+        }
+/*{            <one-to-many class="<%=getType(attr)%>"/>
+        </<%=(isOrdered?"list":"bag")%>>
 }*/
     }
 
     private void generateHibernateMany(Writer output, ObjectModelAttribute attr) throws IOException {
-/*{        <bag name="<%=getName(attr)%>">
+        boolean isOrdered = GeneratorUtil.isOrdered(attr);
+/*{        <<%=(isOrdered?"list":"bag")%> name="<%=getName(attr)%>">
             <key column="OWNER"/>
-            <element column="<%=GeneratorUtil.getDBName(attr)%>" type="<%=getType(attr)%>"/>
-        </bag>
+}*/
+        if (isOrdered) {
+/*{        <index/>
+}*/
+        }
+/*{            <element column="<%=GeneratorUtil.getDBName(attr)%>" type="<%=getType(attr)%>"/>
+        </<%=(isOrdered?"list":"bag")%>>
 }*/
     }
 
@@ -228,10 +240,16 @@
         // 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
-/*{        <bag name="<%=getName(attr)%>" table="<%=getManyToManyTableName(attr)%>" <%=((!Util.isFirstAttribute(attr))?"inverse=\"true\" ":"")%>lazy="true"<%=((attr.isComposite() || attr.hasAssociationClass())?" cascade=\"delete,delete-orphan\"":"")%>>
+        boolean isOrdered = GeneratorUtil.isOrdered(attr);
+/*{        <<%=(isOrdered?"list":"bag")%> name="<%=getName(attr)%>" table="<%=getManyToManyTableName(attr)%>" <%=((!Util.isFirstAttribute(attr))?"inverse=\"true\" ":"")%>lazy="true"<%=((attr.isComposite() || attr.hasAssociationClass())?" cascade=\"delete,delete-orphan\"":"")%>>
             <key column="<%=GeneratorUtil.getReverseDBName(attr)%>"/>
-            <many-to-many class="<%=getType(attr)%>" column="<%=GeneratorUtil.getDBName(attr)%>"/>
-        </bag>
+}*/
+        if (isOrdered) {
+/*{        <index/>
+}*/
+        }
+/*{            <many-to-many class="<%=getType(attr)%>" column="<%=GeneratorUtil.getDBName(attr)%>"/>
+        </<%=(isOrdered?"list":"bag")%>>
 }*/
     }
 

Index: topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java
diff -u topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java:1.8 topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java:1.9
--- topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java:1.8	Mon Jan 16 10:52:52 2006
+++ topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java	Mon Jan 16 19:05:18 2006
@@ -24,9 +24,9 @@
 * Created: 12 déc. 2005
 *
 * @author Arnaud Thimel <thimel@codelutin.com>
-* @version $Revision: 1.8 $
+* @version $Revision: 1.9 $
 *
-* Mise a jour: $Date: 2006/01/16 10:52:52 $
+* Mise a jour: $Date: 2006/01/16 19:05:18 $
 * par : $Author: thimel $
 */
 
@@ -45,8 +45,6 @@
 import org.codelutin.generator.models.object.ObjectModelClass;
 import org.codelutin.generator.models.object.ObjectModelClassifier;
 
-import static org.codelutin.topia.generator.GeneratorUtil.STEREOTYPE_ORDERED;
-
 public class EntityAbstractGenerator extends ObjectModelGenerator {
 
     public EntityAbstractGenerator(Generator parent) {
@@ -118,11 +116,11 @@
                 }
             } else {
                 if (!attr.hasAssociationClass()) {
-/*{    <%=attr.getVisibility()%> <%=(attr.hasStereotype(STEREOTYPE_ORDERED)?"List":"Collection")%><<%=attr.getType()%>> <%=attr.getName()%>;
+/*{    <%=attr.getVisibility()%> <%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getType()%>> <%=attr.getName()%>;
 
 }*/
                 } else {
-/*{    <%=attr.getVisibility()%> <%=(attr.hasStereotype(STEREOTYPE_ORDERED)?"List":"Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> <%=Util.toLowerCaseFirstLetter(attr.getName())%>;
+/*{    <%=attr.getVisibility()%> <%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> <%=Util.toLowerCaseFirstLetter(attr.getName())%>;
 
 }*/
                 }
@@ -225,9 +223,9 @@
     }
 
     /* (non-Javadoc)
-     * @see <%=clazz.getQualifiedName()%>#addAll<%=Util.capitalize(attr.getName())%>(<%=(attr.hasStereotype(STEREOTYPE_ORDERED)?"List":"Collection")%><<%=attr.getType()%>>)
+     * @see <%=clazz.getQualifiedName()%>#addAll<%=Util.capitalize(attr.getName())%>(<%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getType()%>>)
      *)
-    public void addAll<%=Util.capitalize(attr.getName())%>(<%=(attr.hasStereotype(STEREOTYPE_ORDERED)?"List":"Collection")%><<%=attr.getType()%>> values) {
+    public void addAll<%=Util.capitalize(attr.getName())%>(<%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getType()%>> values) {
         if (values == null) {
             return;
         }
@@ -237,9 +235,9 @@
     }
 
     /* (non-Javadoc)
-     * @see <%=clazz.getQualifiedName()%>#set<%=Util.capitalize(attr.getName())%>(<%=(attr.hasStereotype(STEREOTYPE_ORDERED)?"List":"Collection")%><<%=attr.getType()%>>)
+     * @see <%=clazz.getQualifiedName()%>#set<%=Util.capitalize(attr.getName())%>(<%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getType()%>>)
      *)
-    public void set<%=Util.capitalize(attr.getName())%>(<%=(attr.hasStereotype(STEREOTYPE_ORDERED)?"List":"Collection")%><<%=attr.getType()%>> values) {
+    public void set<%=Util.capitalize(attr.getName())%>(<%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getType()%>> values) {
 //        clear<%=Util.capitalize(attr.getName())%>();
 //        addAll<%=Util.capitalize(attr.getName())%>(values);
 // FIXME
@@ -309,9 +307,9 @@
     }
 
     /* (non-Javadoc)
-     * @see <%=clazz.getQualifiedName()%>#addAll<%=Util.capitalize(assocAttrName)%>(<%=(attr.hasStereotype(STEREOTYPE_ORDERED)?"List":"Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>>()
+     * @see <%=clazz.getQualifiedName()%>#addAll<%=Util.capitalize(assocAttrName)%>(<%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>>()
      *)
-    public void addAll<%=Util.capitalize(assocAttrName)%>(<%=(attr.hasStereotype(STEREOTYPE_ORDERED)?"List":"Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> values) {
+    public void addAll<%=Util.capitalize(assocAttrName)%>(<%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> values) {
         if (values == null) {
             return;
         }
@@ -321,9 +319,9 @@
     }
 
     /* (non-Javadoc)
-     * @see <%=clazz.getQualifiedName()%>#set<%=Util.capitalize(assocAttrName)%>(<%=(attr.hasStereotype(STEREOTYPE_ORDERED)?"List":"Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>>()
+     * @see <%=clazz.getQualifiedName()%>#set<%=Util.capitalize(assocAttrName)%>(<%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>>()
      *)
-    public void set<%=Util.capitalize(assocAttrName)%>(<%=(attr.hasStereotype(STEREOTYPE_ORDERED)?"List":"Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> values) {
+    public void set<%=Util.capitalize(assocAttrName)%>(<%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> values) {
 //        clear<%=Util.capitalize(assocAttrName)%>();
 //        addAll<%=Util.capitalize(assocAttrName)%>(values);
 // FIXME
@@ -367,7 +365,7 @@
 /*{    /* (non-Javadoc)
      * @see <%=clazz.getQualifiedName()%>#get<%=Util.capitalize(attr.getName())%>()
      *)
-    public <%=(attr.hasStereotype(STEREOTYPE_ORDERED)?"List":"Collection")%><<%=attr.getType()%>> get<%=Util.capitalize(attr.getName())%>() {
+    public <%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getType()%>> get<%=Util.capitalize(attr.getName())%>() {
         return <%=attr.getName()%>;
     }
 
@@ -387,7 +385,7 @@
 /*{    /* (non-Javadoc)
      * @see <%=clazz.getQualifiedName()%>#get<%=Util.capitalize(assocAttrName)%>()
      *)
-    public <%=(attr.hasStereotype(STEREOTYPE_ORDERED)?"List":"Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> get<%=Util.capitalize(assocAttrName)%>() {
+    public <%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> get<%=Util.capitalize(assocAttrName)%>() {
         return <%=Util.toLowerCaseFirstLetter(attr.getName())%>;
     }