Index: topia/src/java/org/codelutin/topia/generators/Util.java
diff -u topia/src/java/org/codelutin/topia/generators/Util.java:1.23 topia/src/java/org/codelutin/topia/generators/Util.java:1.24
--- topia/src/java/org/codelutin/topia/generators/Util.java:1.23	Wed Dec 14 18:47:07 2005
+++ topia/src/java/org/codelutin/topia/generators/Util.java	Fri Jan  6 18:36:27 2006
@@ -23,9 +23,9 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.23 $
+ * @version $Revision: 1.24 $
  *
- * Mise a jour: $Date: 2005/12/14 18:47:07 $
+ * Mise a jour: $Date: 2006/01/06 18:36:27 $
  * par : $Author: thimel $
  */
 
@@ -302,7 +302,7 @@
      * @return a boolean indicationg if the given attribute is an Entity
      */
     public static boolean isAttributeEntity(ObjectModelAttribute attribute) {
-        if (attribute == null)
+        if (attribute == null || attribute.getClassifier() == null)
             return false;
         return isEntity(attribute.getClassifier());
     }

Index: topia/src/java/org/codelutin/topia/generators/TopiaObjectModelModifier.java
diff -u topia/src/java/org/codelutin/topia/generators/TopiaObjectModelModifier.java:1.6 topia/src/java/org/codelutin/topia/generators/TopiaObjectModelModifier.java:1.7
--- topia/src/java/org/codelutin/topia/generators/TopiaObjectModelModifier.java:1.6	Tue Aug 16 22:19:33 2005
+++ topia/src/java/org/codelutin/topia/generators/TopiaObjectModelModifier.java	Fri Jan  6 18:36:27 2006
@@ -23,10 +23,10 @@
  *
  * @author Arnaud Thimel <thimel@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
  *
- * Mise a jour: $Date: 2005/08/16 22:19:33 $
- * par : $Author: bpoussin $
+ * Mise a jour: $Date: 2006/01/06 18:36:27 $
+ * par : $Author: thimel $
  */
 
 package org.codelutin.topia.generators;
@@ -77,7 +77,7 @@
                 if (Util.isAttributeEntity(attribute)) {
                     String qualifiedAssociationClassName = Util.getQualifiedAssociationClassName(attribute);
                     // Si la classe existe déjà, on ne la recréé pas !
-                    if (!modelImpl.haveClass(qualifiedAssociationClassName)) {
+                    if (!modelImpl.hasClass(qualifiedAssociationClassName)) {
                         ObjectModelAssociationClassImpl assocClassImpl = (ObjectModelAssociationClassImpl)modelImpl.parsetAssociationClass(null);
 
                         assocClassImpl.parsetType(qualifiedAssociationClassName);