Index: topia2/src/java/org/codelutin/topia/generator/DAOHelperGenerator.java
diff -u topia2/src/java/org/codelutin/topia/generator/DAOHelperGenerator.java:1.4 topia2/src/java/org/codelutin/topia/generator/DAOHelperGenerator.java:1.5
--- topia2/src/java/org/codelutin/topia/generator/DAOHelperGenerator.java:1.4	Fri Jan 13 18:38:49 2006
+++ topia2/src/java/org/codelutin/topia/generator/DAOHelperGenerator.java	Mon Jan 23 13:51:52 2006
@@ -25,9 +25,9 @@
  * 
  * @author Arnaud Thimel <thimel@codelutin.com>
  * 
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
  * 
- * Mise a jour: $Date: 2006/01/13 18:38:49 $ par : $Author: thimel $
+ * Mise a jour: $Date: 2006/01/23 13:51:52 $ par : $Author: bpoussin $
  */
 
 package org.codelutin.topia.generator;
@@ -83,6 +83,17 @@
             }
         }
 /*{
+    public static final Class [] entitiesClasses = new Class []{
+}*/
+        for (Iterator i=model.getClassifiers().iterator(); i.hasNext();) {
+            ObjectModelClassifier classifier = (ObjectModelClassifier)i.next();
+            if(classifier.hasStereotype(GeneratorUtil.STEREOTYPE_ENTITY)){
+/*{        <%=GeneratorUtil.getDOType(classifier, model)%>.class,
+}*/
+            }
+        }
+/*{        };
+        
     /**
     *)
     protected <%=model.getName()%>DAOHelper() {

Index: topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java
diff -u topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java:1.9 topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java:1.10
--- topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java:1.9	Mon Jan 16 19:05:18 2006
+++ topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java	Mon Jan 23 13:51:52 2006
@@ -24,14 +24,17 @@
 * Created: 12 déc. 2005
 *
 * @author Arnaud Thimel <thimel@codelutin.com>
-* @version $Revision: 1.9 $
+* @version $Revision: 1.10 $
 *
-* Mise a jour: $Date: 2006/01/16 19:05:18 $
-* par : $Author: thimel $
+* Mise a jour: $Date: 2006/01/23 13:51:52 $
+* par : $Author: bpoussin $
 */
 
 package org.codelutin.topia.generator;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.Writer;
@@ -47,6 +50,12 @@
 
 public class EntityAbstractGenerator extends ObjectModelGenerator {
 
+    /**
+     * Logger for this class
+     */
+    private static final Log log = LogFactory
+            .getLog(EntityAbstractGenerator.class);
+
     public EntityAbstractGenerator(Generator parent) {
         super(parent);
     }
@@ -63,10 +72,6 @@
         }
 /*{package <%=clazz.getPackageName()%>;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.codelutin.topia.TopiaException;
 import org.codelutin.topia.framework.TopiaContextImplementor;
@@ -90,7 +95,7 @@
             extendClass += "org.codelutin.topia.persistence.TopiaEntityAbstract";
         }
 
-        /*{<%=extendClass%> implements Serializable, <%=clazz.getQualifiedName()%> {
+        /*{<%=extendClass%> implements java.io.Serializable, <%=clazz.getQualifiedName()%> {
 
 }*/
         for (Iterator it = clazz.getAttributes().iterator(); it.hasNext();) {
@@ -116,11 +121,11 @@
                 }
             } else {
                 if (!attr.hasAssociationClass()) {
-/*{    <%=attr.getVisibility()%> <%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getType()%>> <%=attr.getName()%>;
+/*{    <%=attr.getVisibility()%> <%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> <%=attr.getName()%>;
 
 }*/
                 } else {
-/*{    <%=attr.getVisibility()%> <%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> <%=Util.toLowerCaseFirstLetter(attr.getName())%>;
+/*{    <%=attr.getVisibility()%> <%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> <%=Util.toLowerCaseFirstLetter(attr.getName())%>;
 
 }*/
                 }
@@ -139,6 +144,7 @@
                    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)%>;
 
 }*/
@@ -184,6 +190,7 @@
 }*/
                 } else {
                     String assocAttrName = GeneratorUtil.getAssocAttrName(attr);
+                    if (log.isTraceEnabled()) { log.trace("assocAttrName: " + assocAttrName); }
 /*{    /* (non-Javadoc)
      * @see <%=clazz.getQualifiedName()%>#set<%=Util.capitalize(assocAttrName)%>(<%=attr.getAssociationClass().getQualifiedName()%>)
      *)
@@ -207,7 +214,7 @@
      *)
     public void add<%=Util.capitalize(attr.getName())%>(<%=attr.getType()%> <%=Util.toLowerCaseFirstLetter(attr.getName())%>) {
         if (this.<%=attr.getName()%> == null) {
-            this.<%=attr.getName()%> = new ArrayList<<%=attr.getType()%>>();
+            this.<%=attr.getName()%> = new java.util.ArrayList<<%=attr.getType()%>>();
         }
 }*/
                     if (attr.getReverseAttribute() != null) {
@@ -223,9 +230,9 @@
     }
 
     /* (non-Javadoc)
-     * @see <%=clazz.getQualifiedName()%>#addAll<%=Util.capitalize(attr.getName())%>(<%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getType()%>>)
+     * @see <%=clazz.getQualifiedName()%>#addAll<%=Util.capitalize(attr.getName())%>(<%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>>)
      *)
-    public void addAll<%=Util.capitalize(attr.getName())%>(<%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getType()%>> values) {
+    public void addAll<%=Util.capitalize(attr.getName())%>(<%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> values) {
         if (values == null) {
             return;
         }
@@ -235,9 +242,9 @@
     }
 
     /* (non-Javadoc)
-     * @see <%=clazz.getQualifiedName()%>#set<%=Util.capitalize(attr.getName())%>(<%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getType()%>>)
+     * @see <%=clazz.getQualifiedName()%>#set<%=Util.capitalize(attr.getName())%>(<%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>>)
      *)
-    public void set<%=Util.capitalize(attr.getName())%>(<%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getType()%>> values) {
+    public void set<%=Util.capitalize(attr.getName())%>(<%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> values) {
 //        clear<%=Util.capitalize(attr.getName())%>();
 //        addAll<%=Util.capitalize(attr.getName())%>(values);
 // FIXME
@@ -270,9 +277,11 @@
         if (this.<%=attr.getName()%> == null) {
             return;
         }
-        for (<%=attr.getType()%> item : this.<%=attr.getName()%>) {
 }*/
                     if (attr.getReverseAttribute() != null) {
+                    
+/*{        for (<%=attr.getType()%> item : this.<%=attr.getName()%>) {
+}*/
                         if (!Util.isNMultiplicity(attr.getReverseAttribute())) {
 /*{            item.set<%=Util.capitalize(attr.getReverseAttribute().getName())%>(null);
 }*/
@@ -280,20 +289,22 @@
 /*{            item.get<%=Util.capitalize(attr.getReverseAttribute().getName())%>().remove(this);
 }*/
                         }
-                    }
 /*{        }
-        this.<%=attr.getName()%>.clear();
+}*/
+                    }                    
+/*{        this.<%=attr.getName()%>.clear();
     }
 
 }*/
                 } else {
                     String assocAttrName = GeneratorUtil.getAssocAttrName(attr);
+                    if (log.isTraceEnabled()) { log.trace("assocAttrName: " + assocAttrName); }
 /*{    /* (non-Javadoc)
      * @see <%=clazz.getQualifiedName()%>#add<%=Util.capitalize(assocAttrName)%>(<%=attr.getAssociationClass().getQualifiedName()%>)
      *)
     public void add<%=Util.capitalize(assocAttrName)%>(<%=attr.getAssociationClass().getQualifiedName()%> value) {
         if (this.<%=Util.toLowerCaseFirstLetter(attr.getName())%> == null) {
-            this.<%=Util.toLowerCaseFirstLetter(attr.getName())%> = new ArrayList<<%=attr.getAssociationClass().getQualifiedName()%>>();
+            this.<%=Util.toLowerCaseFirstLetter(attr.getName())%> = new java.util.ArrayList<<%=attr.getAssociationClass().getQualifiedName()%>>();
         }
 }*/
                     if (attr.getReverseAttribute() != null) {
@@ -307,9 +318,9 @@
     }
 
     /* (non-Javadoc)
-     * @see <%=clazz.getQualifiedName()%>#addAll<%=Util.capitalize(assocAttrName)%>(<%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>>()
+     * @see <%=clazz.getQualifiedName()%>#addAll<%=Util.capitalize(assocAttrName)%>(<%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>>()
      *)
-    public void addAll<%=Util.capitalize(assocAttrName)%>(<%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> values) {
+    public void addAll<%=Util.capitalize(assocAttrName)%>(<%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> values) {
         if (values == null) {
             return;
         }
@@ -319,9 +330,9 @@
     }
 
     /* (non-Javadoc)
-     * @see <%=clazz.getQualifiedName()%>#set<%=Util.capitalize(assocAttrName)%>(<%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>>()
+     * @see <%=clazz.getQualifiedName()%>#set<%=Util.capitalize(assocAttrName)%>(<%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>>()
      *)
-    public void set<%=Util.capitalize(assocAttrName)%>(<%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> values) {
+    public void set<%=Util.capitalize(assocAttrName)%>(<%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> values) {
 //        clear<%=Util.capitalize(assocAttrName)%>();
 //        addAll<%=Util.capitalize(assocAttrName)%>(values);
 // FIXME
@@ -365,7 +376,7 @@
 /*{    /* (non-Javadoc)
      * @see <%=clazz.getQualifiedName()%>#get<%=Util.capitalize(attr.getName())%>()
      *)
-    public <%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getType()%>> get<%=Util.capitalize(attr.getName())%>() {
+    public <%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> get<%=Util.capitalize(attr.getName())%>() {
         return <%=attr.getName()%>;
     }
 
@@ -382,10 +393,11 @@
 }*/
                 } else {
                     String assocAttrName = GeneratorUtil.getAssocAttrName(attr);
+                    if (log.isTraceEnabled()) { log.trace("assocAttrName: " + assocAttrName); }
 /*{    /* (non-Javadoc)
      * @see <%=clazz.getQualifiedName()%>#get<%=Util.capitalize(assocAttrName)%>()
      *)
-    public <%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> get<%=Util.capitalize(assocAttrName)%>() {
+    public <%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> get<%=Util.capitalize(assocAttrName)%>() {
         return <%=Util.toLowerCaseFirstLetter(attr.getName())%>;
     }
 

Index: topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java
diff -u topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java:1.12 topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java:1.13
--- topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java:1.12	Mon Jan 16 19:05:18 2006
+++ topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java	Mon Jan 23 13:51:52 2006
@@ -24,10 +24,10 @@
 * Created: 12 déc. 2005
 *
 * @author Arnaud Thimel <thimel@codelutin.com>
-* @version $Revision: 1.12 $
+* @version $Revision: 1.13 $
 *
-* Mise a jour: $Date: 2006/01/16 19:05:18 $
-* par : $Author: thimel $
+* Mise a jour: $Date: 2006/01/23 13:51:52 $
+* par : $Author: bpoussin $
 */
 
 package org.codelutin.topia.generator;
@@ -145,6 +145,7 @@
                     if (attr.getReverseAttribute() == null) {
                         String type = GeneratorUtil.getDOType(((ObjectModelClassifier)attr.getDeclaringElement()).getQualifiedName(), model);
                         String name = Util.toLowerCaseFirstLetter(attr.getDeclaringElement().getName());
+                        if (log.isTraceEnabled()) {log.trace("reverse: " + type + " " + name);}
                         if (!Util.isNMultiplicity(attr)) {
 /*{        <one-to-one name="<%=name%>" class="<%=type%>"/>
 }*/
@@ -169,11 +170,11 @@
 }*/
     }
 
-    private String getName(ObjectModelAttribute attr) {
+    protected String getName(ObjectModelAttribute attr) {
         return getName(attr, false);
     }
 
-    private String getName(ObjectModelAttribute attr, boolean isAssoc) {
+    protected String getName(ObjectModelAttribute attr, boolean isAssoc) {
         String result = Util.toLowerCaseFirstLetter(attr.getName());
         if (attr.hasAssociationClass() && !isAssoc) {
             result = GeneratorUtil.getAssocAttrName(attr);
@@ -181,11 +182,11 @@
         return result;
     }
 
-    private String getType(ObjectModelAttribute attr) {
+    protected String getType(ObjectModelAttribute attr) {
         return getType(attr, false);
     }
 
-    private String getType(ObjectModelAttribute attr, boolean isAssoc) {
+    protected String getType(ObjectModelAttribute attr, boolean isAssoc) {
         String type = attr.getType();
         if (attr.hasAssociationClass() && !isAssoc) {
             type = attr.getAssociationClass().getQualifiedName();
@@ -193,17 +194,17 @@
         return GeneratorUtil.getDOType(type, model);
     }
 
-    private void generateHibernateProperty(Writer output, ObjectModelAttribute attr) throws IOException {
+    protected void generateHibernateProperty(Writer output, ObjectModelAttribute attr) throws IOException {
 /*{        <property name="<%=getName(attr)%>" type="<%=getType(attr)%>" column="<%=GeneratorUtil.getDBName(attr)%>"<%=(GeneratorUtil.notEmpty(attr.getTagValue(GeneratorUtil.TAG_LENGTH))?(" length=\"" + attr.getTagValue(GeneratorUtil.TAG_LENGTH) + "\""):"")%>/>
 }*/
     }
 
-    private void generateHibernateOneToOne(Writer output, ObjectModelAttribute attr) throws IOException {
+    protected void generateHibernateOneToOne(Writer output, ObjectModelAttribute attr) throws IOException {
 /*{        <one-to-one name="<%=getName(attr)%>" class="<%=getType(attr)%>"<%=(GeneratorUtil.notEmpty(attr.getTagValue(GeneratorUtil.TAG_LENGTH))?(" length=\"" + attr.getTagValue(GeneratorUtil.TAG_LENGTH) + "\""):"")%><%=((attr.isComposite() || attr.hasAssociationClass())?" cascade=\"delete\"":"")%>/>
 }*/
     }
 
-    private void generateHibernateOneToMany(Writer output, ObjectModelAttribute attr) throws IOException {
+    protected void generateHibernateOneToMany(Writer output, ObjectModelAttribute attr) throws IOException {
         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)%>"/>
@@ -217,7 +218,7 @@
 }*/
     }
 
-    private void generateHibernateMany(Writer output, ObjectModelAttribute attr) throws IOException {
+    protected void generateHibernateMany(Writer output, ObjectModelAttribute attr) throws IOException {
         boolean isOrdered = GeneratorUtil.isOrdered(attr);
 /*{        <<%=(isOrdered?"list":"bag")%> name="<%=getName(attr)%>">
             <key column="OWNER"/>
@@ -231,12 +232,12 @@
 }*/
     }
 
-    private void generateHibernateManyToOne(Writer output, ObjectModelAttribute attr) throws IOException {
+    protected void generateHibernateManyToOne(Writer output, ObjectModelAttribute attr) throws IOException {
 /*{        <many-to-one name="<%=getName(attr)%>" class="<%=getType(attr)%>" column="<%=GeneratorUtil.getDBName(attr)%>"<%=((attr.isComposite() || attr.hasAssociationClass())?" cascade=\"delete\"":"")%>/>
 }*/
     }
 
-    private void generateHibernateManyToMany(Writer output, ObjectModelAttribute attr) throws IOException {
+    protected void generateHibernateManyToMany(Writer output, ObjectModelAttribute attr) throws IOException {
         // 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
@@ -259,8 +260,7 @@
      * @param attr l'attribut servant de base au calcul du nom
      * @return le nom de la table
      */ 
-    @SuppressWarnings("unused") // utilisé dans le template
-    private String getManyToManyTableName(ObjectModelAttribute attr) {
+    protected String getManyToManyTableName(ObjectModelAttribute attr) {
         String result;
         if (!Util.isFirstAttribute(attr)) {
             result = attr.getDeclaringElement().getName() + "_" + attr.getReverseAttribute().getDeclaringElement().getName();

Index: topia2/src/java/org/codelutin/topia/generator/EntityInterfaceGenerator.java
diff -u topia2/src/java/org/codelutin/topia/generator/EntityInterfaceGenerator.java:1.7 topia2/src/java/org/codelutin/topia/generator/EntityInterfaceGenerator.java:1.8
--- topia2/src/java/org/codelutin/topia/generator/EntityInterfaceGenerator.java:1.7	Mon Jan 16 19:05:18 2006
+++ topia2/src/java/org/codelutin/topia/generator/EntityInterfaceGenerator.java	Mon Jan 23 13:51:52 2006
@@ -24,10 +24,10 @@
 * Created: 12 déc. 2005
 *
 * @author Arnaud Thimel <thimel@codelutin.com>
-* @version $Revision: 1.7 $
+* @version $Revision: 1.8 $
 *
-* Mise a jour: $Date: 2006/01/16 19:05:18 $
-* par : $Author: thimel $
+* Mise a jour: $Date: 2006/01/23 13:51:52 $
+* par : $Author: bpoussin $
 */
 
 package org.codelutin.topia.generator;
@@ -75,9 +75,6 @@
         }
 /*{package <%=clazz.getPackageName()%>;
 
-import java.util.Collection;
-import java.util.List;
-
 }*/
         if (GeneratorUtil.hasDocumentation(clazz)) {
 /*{
@@ -132,6 +129,7 @@
 }*/
                 } else {
                     String assocAttrName = GeneratorUtil.getAssocAttrName(attr);
+                    if (log.isTraceEnabled()) { log.trace("assocAttrName: " + assocAttrName); }
 /*{    /**
      * @param <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> La valeur de l'attribut <%=attr.getAssociationClass().getName()%> à positionner.
      *)
@@ -164,7 +162,7 @@
                     }
 /*{     * @param <%=Util.toLowerCaseFirstLetter(attr.getName())%> Les instances de <%=attr.getName()%> à ajouter.
      *)
-    public void addAll<%=Util.capitalize(attr.getName())%>(<%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getType()%>> <%=Util.toLowerCaseFirstLetter(attr.getName())%>);
+    public void addAll<%=Util.capitalize(attr.getName())%>(<%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> <%=Util.toLowerCaseFirstLetter(attr.getName())%>);
 
     /**
 }*/
@@ -174,7 +172,7 @@
                     }
 /*{     * @param <%=Util.toLowerCaseFirstLetter(attr.getName())%> La Collection de <%=attr.getName()%> à positionner.
      *)
-    public void set<%=Util.capitalize(attr.getName())%>(<%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getType()%>> <%=Util.toLowerCaseFirstLetter(attr.getName())%>);
+    public void set<%=Util.capitalize(attr.getName())%>(<%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> <%=Util.toLowerCaseFirstLetter(attr.getName())%>);
 
     /**
 }*/
@@ -199,6 +197,7 @@
 }*/
                 } else {
                     String assocAttrName = GeneratorUtil.getAssocAttrName(attr);
+                    if (log.isTraceEnabled()) { log.trace("assocAttrName: " + assocAttrName); }
 /*{    /**
      * @param <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> L'instance de <%=attr.getAssociationClass().getName()%> à ajouter.
      *)
@@ -207,12 +206,12 @@
     /**
      * @param <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> Les instances de <%=attr.getAssociationClass().getName()%> à ajouter.
      *)
-    public void addAll<%=Util.capitalize(assocAttrName)%>(<%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>);
+    public void addAll<%=Util.capitalize(assocAttrName)%>(<%=(GeneratorUtil.isOrdered(attr)?"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)?"List":"Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>);
+    public void set<%=Util.capitalize(assocAttrName)%>(<%=(GeneratorUtil.isOrdered(attr)?"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.
@@ -236,7 +235,7 @@
                     }
 /*{     * @return La Liste de <%=attr.getName()%>.
      *)
-    public <%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getType()%>> get<%=Util.capitalize(attr.getName())%>();
+    public <%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> get<%=Util.capitalize(attr.getName())%>();
 
     /**
      * @return Le nombre d'éléments de la collection <%=attr.getName()%>.
@@ -246,10 +245,11 @@
 }*/
                 } else {
                     String assocAttrName = GeneratorUtil.getAssocAttrName(attr);
+                    if (log.isTraceEnabled()) { log.trace("assocAttrName: " + assocAttrName); }
 /*{    /**
      * @return La liste des attributs <%=attr.getAssociationClass().getName()%>.
      *)
-    public <%=(GeneratorUtil.isOrdered(attr)?"List":"Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> get<%=Util.capitalize(assocAttrName)%>();
+    public <%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.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.6 topia2/src/java/org/codelutin/topia/generator/GeneratorUtil.java:1.7
--- topia2/src/java/org/codelutin/topia/generator/GeneratorUtil.java:1.6	Mon Jan 16 19:05:18 2006
+++ topia2/src/java/org/codelutin/topia/generator/GeneratorUtil.java	Mon Jan 23 13:51:52 2006
@@ -25,9 +25,9 @@
  * 
  * @author Arnaud Thimel <thimel@codelutin.com>
  * 
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
  * 
- * Mise a jour: $Date: 2006/01/16 19:05:18 $ par : $Author: thimel $
+ * Mise a jour: $Date: 2006/01/23 13:51:52 $ par : $Author: bpoussin $
  */
 
 package org.codelutin.topia.generator;
@@ -38,13 +38,13 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.codelutin.generator.Generator;
+import org.codelutin.generator.Util;
 import org.codelutin.generator.models.object.ObjectModel;
 import org.codelutin.generator.models.object.ObjectModelAttribute;
 import org.codelutin.generator.models.object.ObjectModelClass;
 import org.codelutin.generator.models.object.ObjectModelElement;
 import org.codelutin.generator.models.object.ObjectModelInterface;
-import org.codelutin.generator.Util;
-import org.codelutin.topia.persistence.TopiaEntity;
+
 /**
  * Classe regroupant divers méthodes utiles pour la génération des entités
  */
@@ -278,7 +278,7 @@
     }
 
     public static String getDOType(String type, ObjectModel model) {
-        if (model.hasClass(type)) {
+        if (model.hasClass(type) && model.getClassifier(type).hasStereotype(STEREOTYPE_ENTITY)) {
             type += "Impl";
         }
         return type;