Index: topia/src/java/org/codelutin/topia/generators/jdo/tjdo/ObjectModelToEntityMetadataFileGenerator.java
diff -u topia/src/java/org/codelutin/topia/generators/jdo/tjdo/ObjectModelToEntityMetadataFileGenerator.java:1.5 topia/src/java/org/codelutin/topia/generators/jdo/tjdo/ObjectModelToEntityMetadataFileGenerator.java:1.6
--- topia/src/java/org/codelutin/topia/generators/jdo/tjdo/ObjectModelToEntityMetadataFileGenerator.java:1.5	Tue May 18 14:48:16 2004
+++ topia/src/java/org/codelutin/topia/generators/jdo/tjdo/ObjectModelToEntityMetadataFileGenerator.java	Fri May 28 15:40:16 2004
@@ -14,6 +14,7 @@
 import org.codelutin.generator.ObjectModelGenerator;
 import org.codelutin.generator.models.object.ObjectModelAttribute;
 import org.codelutin.generator.models.object.ObjectModelClass;
+import org.codelutin.generator.models.object.ObjectModelClassifier;
 import org.codelutin.generator.models.object.ObjectModelInterface;
 import org.codelutin.topia.Util;
 
@@ -71,12 +72,19 @@
 		// Iterate on each attribute to generate fields declarations
 		for (Iterator i = clazz.getAttributes().iterator(); i.hasNext();) {
 			ObjectModelAttribute attribute = (ObjectModelAttribute) i.next();
+			ObjectModelClassifier classifier = attribute.getClassifier();
+			if (classifier == null) {
 /*{
       <field name="<%=attribute.getName()%>">
 }*/					
+			} else {
+/*{
+	  <field name="<%=attribute.getName()%>DO">
+}*/					
+			}
 			if ((attribute.getMaxMultiplicity() == -1) || (attribute.getMaxMultiplicity()>1)) {
 /*{
-        <collection element-type="<%=attribute.getType()%>">
+        <collection element-type="<%=classifier.getPackageName()+".persistence."+classifier.getName()%>JDODO">
           <!-- ici instruction key-owner a mettre -->
         </collection>
 }*/