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.6 topia/src/java/org/codelutin/topia/generators/jdo/tjdo/ObjectModelToEntityMetadataFileGenerator.java:1.7
--- topia/src/java/org/codelutin/topia/generators/jdo/tjdo/ObjectModelToEntityMetadataFileGenerator.java:1.6	Fri May 28 15:40:16 2004
+++ topia/src/java/org/codelutin/topia/generators/jdo/tjdo/ObjectModelToEntityMetadataFileGenerator.java	Wed Jun 16 09:41:26 2004
@@ -27,36 +27,36 @@
 public class ObjectModelToEntityMetadataFileGenerator
     extends ObjectModelGenerator {
 
-	public String getFilenameForClass(ObjectModelClass clazz) {
-		return (clazz.getPackageName()+".persistence.").replace('.', File.separatorChar)+clazz.getName()+"JDODO.jdo";
-	}
-
-	public void generateFromClass(Writer output, ObjectModelClass clazz)
-			throws IOException {
-				
-		// Consider only entities, return immediately if not an entity
-		if (! Util.isEntity(clazz)) return;
+    public String getFilenameForClass(ObjectModelClass clazz) {
+        return (clazz.getPackageName()+".persistence.").replace('.', File.separatorChar)+clazz.getName()+"JDODO.jdo";
+    }
+
+    public void generateFromClass(Writer output, ObjectModelClass clazz)
+            throws IOException {
+
+        // Consider only entities, return immediately if not an entity
+        if (! Util.isEntity(clazz)) return;
 
 //				------------- XML header
  /*{
 <?xml version="1.0"?>
 <!DOCTYPE jdo PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 1.0//EN" "http://java.sun.com/dtd/jdo_1_0.dtd">
 }*/
-                                                                                                                                                                
+
 //				------------- JDO start
 /*{
 <jdo>
   <package name="<%=clazz.getPackageName()%>.persistence">
     <class name="<%=clazz.getName()%>JDODO"}*/
         boolean hasSuperClass = false;
-	    for (Iterator i = clazz.getSuperclasses().iterator(); i.hasNext();) {
-		 	ObjectModelClass superclass = (ObjectModelClass) i.next();
-		 	hasSuperClass = true;
-/*{ persistence-capable-superclass="<%=superclass.getName()%>JDODO"}*/             
-		 }
+        for (Iterator i = clazz.getSuperclasses().iterator(); i.hasNext();) {
+            ObjectModelClass superclass = (ObjectModelClass) i.next();
+            hasSuperClass = true;
+/*{ persistence-capable-superclass="<%=superclass.getName()%>JDODO"}*/
+         }
 /*{>
 }*/
-		if (! hasSuperClass) {
+        if (! hasSuperClass) {
 /*{
       <field name="_version">
         <extension vendor-name="triactive" key="length" value="unlimited"/>
@@ -66,37 +66,37 @@
 }*/
 // TODO     <field name="_lastUpdateUser"/>
 
-			}
+            }
 
-//				------------- Fields declaration	
-		// 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) {
+//				------------- Fields declaration
+        // 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 {
+}*/
+            } else {
 /*{
-	  <field name="<%=attribute.getName()%>DO">
-}*/					
-			}
-			if ((attribute.getMaxMultiplicity() == -1) || (attribute.getMaxMultiplicity()>1)) {
+      <field name="<%=attribute.getName()%>DO">
+}*/
+            }
+            if (Util.isNMultiplicity(attribute)) {
 /*{
         <collection element-type="<%=classifier.getPackageName()+".persistence."+classifier.getName()%>JDODO">
           <!-- ici instruction key-owner a mettre -->
         </collection>
-}*/					
-			 } else if ("java.lang.String".equals(attribute.getType())) {
+}*/
+             } else if ("java.lang.String".equals(attribute.getType())) {
 /*{
         <extension vendor-name="triactive" key="length" value="unlimited"/>
-}*/					
-			 }
+}*/
+             }
 /*{
       </field>
-}*/					
-		}
+}*/
+        }
 
 //				------------- JDO end
 /*{
@@ -104,24 +104,24 @@
   </package>
 </jdo>
 }*/
-			 
-	}
 
-	public String getFilenameForInterface(ObjectModelInterface interfacez) {
-		return (interfacez.getPackageName()+".persistence.").replace('.', File.separatorChar)+interfacez.getName()+"DO.jdo";
-	}
-
-	public void generateFromInterface(
-			Writer output,
-			ObjectModelInterface interfacez)
-			throws IOException {
+    }
+
+    public String getFilenameForInterface(ObjectModelInterface interfacez) {
+        return (interfacez.getPackageName()+".persistence.").replace('.', File.separatorChar)+interfacez.getName()+"DO.jdo";
+    }
+
+    public void generateFromInterface(
+            Writer output,
+            ObjectModelInterface interfacez)
+            throws IOException {
 
 //		------------- XML header
 /*{
 <?xml version="1.0"?>
 <!DOCTYPE jdo PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 1.0//EN" "http://java.sun.com/dtd/jdo_1_0.dtd">
 }*/
-                                                                                                                                                                
+
 //		------------- JDO start
 /*{
 <jdo>
@@ -130,7 +130,7 @@
   </package>
 </jdo>
 }*/
-	 
-	}
-	
+
+    }
+
 }