Index: topia/src/java/org/codelutin/topia/generators/TopiaAbstractObjectModelGenerator.java
diff -u topia/src/java/org/codelutin/topia/generators/TopiaAbstractObjectModelGenerator.java:1.10 topia/src/java/org/codelutin/topia/generators/TopiaAbstractObjectModelGenerator.java:1.11
--- topia/src/java/org/codelutin/topia/generators/TopiaAbstractObjectModelGenerator.java:1.10	Fri Jul 22 13:00:47 2005
+++ topia/src/java/org/codelutin/topia/generators/TopiaAbstractObjectModelGenerator.java	Mon Jul 25 08:45:57 2005
@@ -23,9 +23,9 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
  *
- * Mise a jour: $Date: 2005/07/22 13:00:47 $
+ * Mise a jour: $Date: 2005/07/25 08:45:57 $
  * par : $Author: thimel $
  */
 
@@ -197,7 +197,7 @@
 import org.codelutin.topia.TopiaPersistenceService;
 import org.codelutin.topia.TopiaQuery;
 import org.codelutin.topia.TopiaArgument;
-import org.codelutin.topia.TopiaAssociationsManager;
+import org.codelutin.topia.TopiaAssociationManager;
 import org.codelutin.topia.security.TopiaAccessController;
 import org.codelutin.topia.annotation.ClassInfo;
 import org.codelutin.topia.annotation.ClassType;

Index: topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityImplGenerator.java
diff -u topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityImplGenerator.java:1.20 topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityImplGenerator.java:1.21
--- topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityImplGenerator.java:1.20	Thu Jul 21 12:54:50 2005
+++ topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityImplGenerator.java	Mon Jul 25 08:45:57 2005
@@ -23,9 +23,9 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.20 $
+ * @version $Revision: 1.21 $
  *
- * Mise a jour: $Date: 2005/07/21 12:54:50 $
+ * Mise a jour: $Date: 2005/07/25 08:45:57 $
  * par : $Author: thimel $
  */
 
@@ -117,7 +117,7 @@
 }*/
         //On calcule le nom de l'association stockée dans order (puis dans nameFor<%=Util.capitalize(attribute.getName())%>)
         //De plus, on enregistre dans index<%=Util.capitalize(attribute.getName())%> si l'objet courant est le premier(0) objet de la relation ou le second(1)
-        if (!Util.isPrimitiveAttributeType(attribute)) {
+        if (/*!Util.isPrimitiveAttributeType(attribute)*/Util.isAttributeEntity(attribute)) {
             int index;
             String order = "";
             if (attribute.getReverseAttribute() != null) {
@@ -166,7 +166,7 @@
 }*/
         }
         //if (Util.isAttributeEntity(attribute)) { //TODO Arno !!!
-/*{        //return (<%=attribute.getType()%>)TopiaAssociationsManager.getFirstOppositeObjectForPosition(nameFor<%=Util.capitalize(attribute.getName())%>, this, index<%=Util.capitalize(attribute.getName())%>);
+/*{        //return (<%=attribute.getType()%>)getContext().getAssociationManager().getFirstOppositeObjectForPosition(nameFor<%=Util.capitalize(attribute.getName())%>, this, index<%=Util.capitalize(attribute.getName())%>);
 }*/
         /*} else*/ if (attribute.hasAssociationClass()) {
 /*{        return (<%=attribute.getName()%> == null) ? null : <%=attribute.getName()%>.get<%=Util.capitalize(attribute.getName())%>();