Index: topia2/src/java/org/codelutin/topia/generator/DTOGenerator.java
diff -u topia2/src/java/org/codelutin/topia/generator/DTOGenerator.java:1.1 topia2/src/java/org/codelutin/topia/generator/DTOGenerator.java:1.2
--- topia2/src/java/org/codelutin/topia/generator/DTOGenerator.java:1.1	Mon Jun  2 10:21:48 2008
+++ topia2/src/java/org/codelutin/topia/generator/DTOGenerator.java	Tue Jul  1 09:48:41 2008
@@ -24,9 +24,9 @@
 * Created: 12 déc. 2005
 *
 * @author Arnaud Thimel <thimel@codelutin.com>
-* @version $Revision: 1.1 $
+* @version $Revision: 1.2 $
 *
-* Mise a jour: $Date: 2008-06-02 10:21:48 $
+* Mise a jour: $Date: 2008-07-01 09:48:41 $
 * par : $Author: eore $
 */
 
@@ -175,23 +175,19 @@
             if (!Util.isNMultiplicity(attr)) {
                 if (!attr.hasAssociationClass()) {
 /*{    <%=attr.getVisibility()%> <%=attr.getType()%><%=(isDTO(attr.getType())?"DTO":"")%> <%=attr.getName()%>;
-
 }*/
                 } else {
                     String assocAttrName = GeneratorUtil.getAssocAttrName(attr);
 /*{    <%=attr.getVisibility()%> <%=attr.getAssociationClass().getQualifiedName()%>DTO <%=Util.toLowerCaseFirstLetter(assocAttrName)%>;
-
 }*/
                 }
             } else {
                 if (!attr.hasAssociationClass()) {
 /*{    <%=attr.getVisibility()%> <%=((attr.isOrdered())?"java.util.List":"java.util.Collection")%><<%=attr.getType()%><%=(isDTO(attr.getType())?"DTO":"")%>> <%=attr.getName()%>;
-
 }*/
                 } else {
                     String assocAttrName = GeneratorUtil.getAssocAttrName(attr);
 /*{    <%=attr.getVisibility()%> <%=((attr.isOrdered())?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>DTO> <%=Util.toLowerCaseFirstLetter(assocAttrName)%>;
-
 }*/
                 }
             }
@@ -204,18 +200,96 @@
                 ObjectModelAttribute attr = (ObjectModelAttribute) i.next();
                 if (attr != null) {
 /*{    <%=attr.getVisibility()%> <%=attr.getType()%><%=(isDTO(attr.getType())?"DTO":"")%> <%=Util.toLowerCaseFirstLetter(attr.getName())%>;
-
 }*/
                 }
             }
         }
-
+/*{
+}*/
+        
 /*{    /**
      * Constructeur de <%=clazz.getName()%>DTO par défaut.
      *)
     public <%=clazz.getName()%>DTO() {}
 
 }*/
+        
+/*{    /**
+     * Constructeur de <%=clazz.getName()%>DTO avec tous ses paramètres.
+     *)
+    public <%=clazz.getName()%>DTO(}*/
+        
+        boolean une_fois = true;
+        for (Iterator it = clazz.getAttributes().iterator(); it.hasNext();) {
+            ObjectModelAttribute attr = (ObjectModelAttribute)it.next();
+                        
+            if (!(attr.isNavigable()
+                   || attr.hasAssociationClass())) {
+                continue;
+            }
+            
+            if (une_fois) {
+            	une_fois = false;
+            } else {
+            	/*{, }*/
+            }
+            
+            if (!Util.isNMultiplicity(attr)) {
+                if (!attr.hasAssociationClass()) {
+/*{<%=attr.getType()%><%=(isDTO(attr.getType())?"DTO":"")%> <%=attr.getName()%>}*/
+                } else {
+                    String assocAttrName = GeneratorUtil.getAssocAttrName(attr);
+/*{<%=attr.getAssociationClass().getQualifiedName()%>DTO <%=Util.toLowerCaseFirstLetter(assocAttrName)%>}*/
+                }
+            } else {
+                if (!attr.hasAssociationClass()) {
+/*{<%=((attr.isOrdered())?"java.util.List":"java.util.Collection")%><<%=attr.getType()%><%=(isDTO(attr.getType())?"DTO":"")%>> <%=attr.getName()%>}*/
+                } else {
+                    String assocAttrName = GeneratorUtil.getAssocAttrName(attr);
+/*{<%=((attr.isOrdered())?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>DTO> <%=Util.toLowerCaseFirstLetter(assocAttrName)%>}*/
+                }
+            }
+            
+        
+        } // end for
+        
+        /*{ ) {
+}*/
+        
+
+        for (Iterator it = clazz.getAttributes().iterator(); it.hasNext();) {
+            ObjectModelAttribute attr = (ObjectModelAttribute)it.next();
+                        
+            if (!(attr.isNavigable()
+                   || attr.hasAssociationClass())) {
+                continue;
+            }
+            
+            if (!Util.isNMultiplicity(attr)) {
+                if (!attr.hasAssociationClass()) {
+/*{	this.<%=attr.getName()%> = <%=attr.getName()%>;
+}*/
+                } else {
+                    String assocAttrName = GeneratorUtil.getAssocAttrName(attr);
+/*{	this.<%=Util.toLowerCaseFirstLetter(assocAttrName)%> = <%=Util.toLowerCaseFirstLetter(assocAttrName)%>;
+}*/
+                }
+            } else {
+                if (!attr.hasAssociationClass()) {
+/*{	this.<%=attr.getName()%> = <%=attr.getName()%>;
+}*/
+                } else {
+                    String assocAttrName = GeneratorUtil.getAssocAttrName(attr);
+/*{	this.<%=Util.toLowerCaseFirstLetter(assocAttrName)%> = <%=Util.toLowerCaseFirstLetter(assocAttrName)%>;
+}*/
+                }
+            }
+        }
+/*{    }
+
+}*/
+
+
         /*
          * Définition des getteurs et setteurs
          */
@@ -257,6 +331,30 @@
     }
 
 }*/
+                	
+                	//AddChild
+/*{    public <%=attr.getType()%><%=(isDTO(attr.getType())?"DTO":"")%> addChild(<%=attr.getType()%><%=(isDTO(attr.getType())?"DTO":"")%> <%=attr.getName()%>) {
+ 	this.<%=attr.getName()%>.add(<%=attr.getName()%>);
+}*/
+                	if (reverse.isNavigable()) {
+/*{ 	<%=attr.getName()%>.set<%=Util.capitalize(reverse.getName())%>(this);
+}*/
+                	}
+/*{ 	return <%=attr.getName()%>;
+    }
+      
+}*/
+                	//RemoveChild
+/*{    public void removeChild(<%=attr.getType()%><%=(isDTO(attr.getType())?"DTO":"")%> <%=attr.getName()%>) {
+        this.<%=attr.getName()%>.remove(<%=attr.getName()%>);
+}*/
+                                	if (reverse.isNavigable()) {
+/*{ 	<%=attr.getName()%>.set<%=Util.capitalize(reverse.getName())%>(null);
+}*/
+                                	}
+/*{    }
+      
+}*/           	
                 } else {
                     String assocAttrName = GeneratorUtil.getAssocAttrName(attr);
                     if (log.isTraceEnabled()) { log.trace("assocAttrName: " + assocAttrName); }
@@ -287,6 +385,7 @@
 /*{    /* (non-Javadoc)
      * @see java.lang.Object#toString()
      *)
+    @Override
     public String toString() {
         String result = new ToStringBuilder(this).
 }*/