[Topia-commits] r1328 - in topia/branches/generators-refactoring: topia-soa/src/main/java/org/codelutin/topia/generator topia-ui/src/main/java/org/codelutin/topia/generator

29 Jan 2009

Author: thimel
Date: 2009-01-29 11:18:00 +0000 (Thu, 29 Jan 2009)
New Revision: 1328

Modified:
   topia/branches/generators-refactoring/topia-soa/src/main/java/org/codelutin/topia/generator/ServiceAbstractGenerator.java
   topia/branches/generators-refactoring/topia-soa/src/main/java/org/codelutin/topia/generator/ServiceImplGenerator.java
   topia/branches/generators-refactoring/topia-soa/src/main/java/org/codelutin/topia/generator/ServiceInterfaceGenerator.java
   topia/branches/generators-refactoring/topia-ui/src/main/java/org/codelutin/topia/generator/TapestryWebGenerator.java
Log:
Apply LutinGenerator Util rename in topia-soa and topia-ui


Modified: topia/branches/generators-refactoring/topia-soa/src/main/java/org/codelutin/topia/generator/ServiceAbstractGenerator.java
===================================================================

--- topia/branches/generators-refactoring/topia-soa/src/main/java/org/codelutin/topia/generator/ServiceAbstractGenerator.java	2009-01-29 10:53:27 UTC (rev 1327)
+++ topia/branches/generators-refactoring/topia-soa/src/main/java/org/codelutin/topia/generator/ServiceAbstractGenerator.java	2009-01-29 11:18:00 UTC (rev 1328)
@@ -16,7 +16,7 @@
  * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
 package org.codelutin.topia.generator;
 
-import static org.codelutin.topia.generator.GeneratorUtil.hasUnidirectionalRelationOnAbstractType;
+import static org.codelutin.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType;
 
 import java.io.File;
 import java.io.IOException;
@@ -29,7 +29,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.codelutin.generator.Generator;
 import org.codelutin.generator.ObjectModelGenerator;
-import org.codelutin.generator.Util;
+import org.codelutin.generator.GeneratorUtil;
 import org.codelutin.generator.models.object.ObjectModelAssociationClass;
 import org.codelutin.generator.models.object.ObjectModelAttribute;
 import org.codelutin.generator.models.object.ObjectModelClass;
@@ -80,7 +80,7 @@
     @Override
     public void generateFromInterface(Writer output, ObjectModelInterface interfacez) throws IOException {
     	 
-    	if (!interfacez.hasStereotype(GeneratorUtil.STEREOTYPE_SERVICE)) {
+    	if (!interfacez.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_SERVICE)) {
             return;
         }
     	
@@ -104,8 +104,8 @@
     }
 
     private void generateInterfaceHeader(Writer output, ObjectModelClassifier classifier) throws IOException {
-        String copyright = GeneratorUtil.getCopyright(model);
-        if (GeneratorUtil.notEmpty(copyright)) {
+        String copyright = TopiaGeneratorUtil.getCopyright(model);
+        if (TopiaGeneratorUtil.notEmpty(copyright)) {
 /*{<%=copyright%>
 }*/
         }
@@ -122,7 +122,7 @@
     	// ajouter les imports des interfaces de DAO
     	for (Iterator i=classifier.getInterfaces().iterator(); i.hasNext();) {
     		ObjectModelClassifier parent = (ObjectModelClassifier)i.next();
-    		if(parent.hasStereotype(GeneratorUtil.STEREOTYPE_DAO)){            	
+    		if(parent.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_DAO)){            	
             	// r�cup�rer la classe de l'object model correspondant � la DAO
     			String className = parent.getQualifiedName().replace("DAO", "");
             	String interfaceName = parent.getQualifiedName()+"Abstract";
@@ -132,7 +132,7 @@
     		}
     	}
             	
-        if (GeneratorUtil.hasDocumentation(classifier)) {
+        if (TopiaGeneratorUtil.hasDocumentation(classifier)) {
         	
 /*{
 /**
@@ -161,7 +161,7 @@
     /**
      * Implementation a la charge du developpeur
 }*/
-            if (GeneratorUtil.hasDocumentation(op)) {
+            if (TopiaGeneratorUtil.hasDocumentation(op)) {
 /*{     * <%=op.getName()%> : <%=op.getDocumentation()%>
 }*/
             }
@@ -198,14 +198,14 @@
         for (Iterator i=classifier.getInterfaces().iterator(); i.hasNext();) {
             ObjectModelClassifier parent = (ObjectModelClassifier)i.next();
             // pour tous les DAOInterface
-            if(parent.hasStereotype(GeneratorUtil.STEREOTYPE_DAO)){
+            if(parent.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_DAO)){
             	
             	// r�cup�rer la classe de l'object model correspondant � la DAO
             	String entityClassName = parent.getQualifiedName().replace("DAO", "");
             	if(getModel().hasClass(entityClassName)){
             		ObjectModelClass clazz =  getModel().getClass(entityClassName);
             		
-            		if (!clazz.hasStereotype(GeneratorUtil.STEREOTYPE_ENTITY)) {
+            		if (!clazz.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_ENTITY)) {
             			return;  
             		}
 /*{
@@ -269,7 +269,7 @@
             		 	   continue;
                         }
 
-            	        if (!Util.isNMultiplicity(attr)) {
+            	        if (!GeneratorUtil.isNMultiplicity(attr)) {
             	            generateNoNMultiplicity(output, attr, clazz, false);
             	        } else {
             	            generateNMultiplicity(output, attr, clazz, false);
@@ -282,7 +282,7 @@
             	        while (it.hasNext()) {
             	            ObjectModelAttribute attr = (ObjectModelAttribute)it.next();
             	            if (attr != null) {
-            	                if (!Util.isNMultiplicity(attr)) {
+            	                if (!GeneratorUtil.isNMultiplicity(attr)) {
             	                   generateNoNMultiplicity(output, attr, clazz, true);
             	                } else {
             	                   generateNMultiplicity(output, attr, clazz, true);
@@ -298,7 +298,7 @@
     protected void generateNoNMultiplicity(Writer output, ObjectModelAttribute attr, ObjectModelClass clazz, boolean isAssoc) throws IOException {
 	    String propertyName = attr.getName();
 	    if (!isAssoc && attr.hasAssociationClass()) {
-	        propertyName = GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName()) + "." + propertyName;
+	        propertyName = TopiaGeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName()) + "." + propertyName;
 	    }
 /*{
     /**
@@ -307,10 +307,10 @@
      * @param v la valeur que doit avoir <%=attr.getName()%>
      * @return un element ou null
      *)
-    public <%=clazz.getQualifiedName()%> find<%=clazz.getName()%>By<%=GeneratorUtil.capitalize(attr.getName())%>(<%=attr.getType()%> v) throws TopiaException{
+    public <%=clazz.getQualifiedName()%> find<%=clazz.getName()%>By<%=TopiaGeneratorUtil.capitalize(attr.getName())%>(<%=attr.getType()%> v) throws TopiaException{
 		TopiaContextImplementor usedContextImpl = (TopiaContextImplementor) topiaContext;
 		<%=clazz.getName()%>DAOAbstract dao = (<%=clazz.getName()%>DAOAbstract)usedContextImpl.getDAO(<%=clazz.getName()%>.class);
-		<%=clazz.getName()%> entity = dao.findBy<%=GeneratorUtil.capitalize(attr.getName())%>(v); 
+		<%=clazz.getName()%> entity = dao.findBy<%=TopiaGeneratorUtil.capitalize(attr.getName())%>(v); 
     	return entity;
     };
     
@@ -320,10 +320,10 @@
      * @param v la valeur que doit avoir <%=attr.getName()%>
      * @return une liste
      *)
-    public List<<%=clazz.getQualifiedName()%>> findAll<%=clazz.getName()%>By<%=GeneratorUtil.capitalize(attr.getName())%>(<%=attr.getType()%> v) throws TopiaException{
+    public List<<%=clazz.getQualifiedName()%>> findAll<%=clazz.getName()%>By<%=TopiaGeneratorUtil.capitalize(attr.getName())%>(<%=attr.getType()%> v) throws TopiaException{
 		TopiaContextImplementor usedContextImpl = (TopiaContextImplementor) topiaContext;
 		<%=clazz.getName()%>DAOAbstract dao = (<%=clazz.getName()%>DAOAbstract)usedContextImpl.getDAO(<%=clazz.getName()%>.class);
-		List<<%=clazz.getName()%>> entityList = dao.findAllBy<%=GeneratorUtil.capitalize(attr.getName())%>(v); 
+		List<<%=clazz.getName()%>> entityList = dao.findAllBy<%=TopiaGeneratorUtil.capitalize(attr.getName())%>(v); 
     	return entityList; 
     };
 }*/
@@ -331,27 +331,27 @@
 /*{
     /**
      * Retourne le premier element trouve ayant comme valeur pour l'attribut
-     * <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> le parametre
-     * @param value la valeur que doit avoir <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>
+     * <%=TopiaGeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> le parametre
+     * @param value la valeur que doit avoir <%=TopiaGeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>
      * @return un element ou null
      *)
-    public <%=clazz.getQualifiedName()%> find<%=clazz.getName()%>By<%=GeneratorUtil.capitalize(attr.getAssociationClass().getName())%>(<%=attr.getAssociationClass().getQualifiedName()%> value) throws TopiaException{
+    public <%=clazz.getQualifiedName()%> find<%=clazz.getName()%>By<%=TopiaGeneratorUtil.capitalize(attr.getAssociationClass().getName())%>(<%=attr.getAssociationClass().getQualifiedName()%> value) throws TopiaException{
 		TopiaContextImplementor usedContextImpl = (TopiaContextImplementor) topiaContext;
 		<%=clazz.getName()%>DAOAbstract dao = (<%=clazz.getName()%>DAOAbstract)usedContextImpl.getDAO(<%=clazz.getName()%>.class);
-		<%=clazz.getName()%> entity = dao.findBy<%=GeneratorUtil.capitalize(attr.getName())%>(v); 
+		<%=clazz.getName()%> entity = dao.findBy<%=TopiaGeneratorUtil.capitalize(attr.getName())%>(v); 
     	return entity; 
     };
     
     /**
      * Retourne les elements ayant comme valeur pour l'attribut
-     * <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> le param�tre
-     * @param value la valeur que doit avoir <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>
+     * <%=TopiaGeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> le param�tre
+     * @param value la valeur que doit avoir <%=TopiaGeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>
      * @return une liste
      *)
-    public List<<%=clazz.getQualifiedName()%>> findAll<%=clazz.getName()%>By<%=GeneratorUtil.capitalize(attr.getAssociationClass().getName())%>(<%=attr.getAssociationClass().getQualifiedName()%> value) throws TopiaException{
+    public List<<%=clazz.getQualifiedName()%>> findAll<%=clazz.getName()%>By<%=TopiaGeneratorUtil.capitalize(attr.getAssociationClass().getName())%>(<%=attr.getAssociationClass().getQualifiedName()%> value) throws TopiaException{
 		TopiaContextImplementor usedContextImpl = (TopiaContextImplementor) topiaContext;
 		<%=clazz.getName()%>DAOAbstract dao = (<%=clazz.getName()%>DAOAbstract)usedContextImpl.getDAO(<%=clazz.getName()%>.class);
-		List<<%=clazz.getName()%>> entityList = dao.findAllBy<%=GeneratorUtil.capitalize(attr.getName())%>(v); 
+		List<<%=clazz.getName()%>> entityList = dao.findAllBy<%=TopiaGeneratorUtil.capitalize(attr.getName())%>(v); 
     	return entityList;
     };
 }*/
@@ -366,10 +366,10 @@
      * @param v la valeur que doit contenir <%=attr.getName()%>
      * @return un element ou null
      *)
-    public <%=clazz.getQualifiedName()%> find<%=clazz.getName()%>Contains<%=GeneratorUtil.capitalize(attr.getName())%>(<%=attr.getType()%> ... v) throws TopiaException{
+    public <%=clazz.getQualifiedName()%> find<%=clazz.getName()%>Contains<%=TopiaGeneratorUtil.capitalize(attr.getName())%>(<%=attr.getType()%> ... v) throws TopiaException{
 		TopiaContextImplementor usedContextImpl = (TopiaContextImplementor) topiaContext;
 		<%=clazz.getName()%>DAOAbstract dao = (<%=clazz.getName()%>DAOAbstract)usedContextImpl.getDAO(<%=clazz.getName()%>.class);
-		<%=clazz.getName()%> entity = (<%=clazz.getName()%>) dao.findContainsProperties("<%=GeneratorUtil.toLowerCaseFirstLetter(attr.getName())%>", Arrays.asList(v)); 
+		<%=clazz.getName()%> entity = (<%=clazz.getName()%>) dao.findContainsProperties("<%=TopiaGeneratorUtil.toLowerCaseFirstLetter(attr.getName())%>", Arrays.asList(v)); 
     	return entity; 
     };
     
@@ -379,10 +379,10 @@
      * @param v la valeur que doit contenir <%=attr.getName()%>
      * @return une liste
      *)
-    public List<<%=clazz.getQualifiedName()%>> findAll<%=clazz.getName()%>Contains<%=GeneratorUtil.capitalize(attr.getName())%>(<%=attr.getType()%> ... v) throws TopiaException{
+    public List<<%=clazz.getQualifiedName()%>> findAll<%=clazz.getName()%>Contains<%=TopiaGeneratorUtil.capitalize(attr.getName())%>(<%=attr.getType()%> ... v) throws TopiaException{
 		TopiaContextImplementor usedContextImpl = (TopiaContextImplementor) topiaContext;
 		<%=clazz.getName()%>DAOAbstract dao = (<%=clazz.getName()%>DAOAbstract)usedContextImpl.getDAO(<%=clazz.getName()%>.class);
-		List<<%=clazz.getName()%>> entityList = dao.findAllContainsProperties("<%=GeneratorUtil.toLowerCaseFirstLetter(attr.getName())%>", Arrays.asList(v)); 
+		List<<%=clazz.getName()%>> entityList = dao.findAllContainsProperties("<%=TopiaGeneratorUtil.toLowerCaseFirstLetter(attr.getName())%>", Arrays.asList(v)); 
     	return entityList;
     };
 }*/        
@@ -393,7 +393,7 @@
         for (Iterator i=classifier.getInterfaces().iterator(); i.hasNext();) {
             ObjectModelClassifier parent = (ObjectModelClassifier)i.next();
             // pour tous les DAOInterface
-            if(parent.hasStereotype(GeneratorUtil.STEREOTYPE_DAO)){
+            if(parent.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_DAO)){
             	
             	// r�cup�rer la classe de l'object model correspondant � la DAO
             	String entityClassName = null;
@@ -407,7 +407,7 @@
     }
     
     private void generateFromDAOClass(Writer output, ObjectModelClass clazz) throws IOException {
-        if (!clazz.hasStereotype(GeneratorUtil.STEREOTYPE_ENTITY)) {
+        if (!clazz.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_ENTITY)) {
             return;
         }
 
@@ -418,62 +418,62 @@
                     && !hasUnidirectionalRelationOnAbstractType(reverse, model)) {
                 continue;
             }
-            if (!Util.isNMultiplicity(attr)) {
+            if (!GeneratorUtil.isNMultiplicity(attr)) {
                 if (!attr.hasAssociationClass()) {
 /*{    /**
 }*/
-                    if (GeneratorUtil.hasDocumentation(attr)) {
+                    if (TopiaGeneratorUtil.hasDocumentation(attr)) {
 /*{     * <%=attr.getName()%> : <%=attr.getDocumentation()%>
 }*/
                     }
-/*{     * @param <%=Util.toLowerCaseFirstLetter(attr.getName())%> La valeur de l'attribut <%=attr.getName()%> � positionner.
+/*{     * @param <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getName())%> La valeur de l'attribut <%=attr.getName()%> � positionner.
      *)
-    public void set<%=Util.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId, <%=attr.getType()%> <%=Util.toLowerCaseFirstLetter(attr.getName())%>) throws TopiaException{
+    public void set<%=GeneratorUtil.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId, <%=attr.getType()%> <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getName())%>) throws TopiaException{
         TopiaContextImplementor usedContextImpl = (TopiaContextImplementor) topiaContext;
 		<%=clazz.getName()%>DAOAbstract dao = (<%=clazz.getName()%>DAOAbstract)usedContextImpl.getDAO(<%=clazz.getName()%>.class);
 		<%=clazz.getName()%> entity = (<%=clazz.getName()%>)dao.findByTopiaId(topiaId); 
-    	entity.set<%=Util.capitalize(attr.getName())%>(<%=Util.toLowerCaseFirstLetter(attr.getName())%>);
+    	entity.set<%=GeneratorUtil.capitalize(attr.getName())%>(<%=GeneratorUtil.toLowerCaseFirstLetter(attr.getName())%>);
     	usedContextImpl.commitTransaction();
     }
 
 }*/
 /*{    /**
 }*/
-                    if (GeneratorUtil.hasDocumentation(attr)) {
+                    if (TopiaGeneratorUtil.hasDocumentation(attr)) {
 /*{     * <%=attr.getName()%> : <%=attr.getDocumentation()%>
 }*/
                     }
 /*{     * @return La valeur de l'attribut <%=attr.getName()%>.
      *)
-    public <%=attr.getType()%> get<%=Util.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException{
+    public <%=attr.getType()%> get<%=GeneratorUtil.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException{
         TopiaContextImplementor usedContextImpl = (TopiaContextImplementor) topiaContext;
 		<%=clazz.getName()%>DAOAbstract dao = (<%=clazz.getName()%>DAOAbstract)usedContextImpl.getDAO(<%=clazz.getName()%>.class);
 		<%=clazz.getName()%> entity = (<%=clazz.getName()%>)dao.findByTopiaId(topiaId); 
-    	return entity.get<%=Util.capitalize(attr.getName())%>();
+    	return entity.get<%=GeneratorUtil.capitalize(attr.getName())%>();
     }
 
 }*/
                 } else {
-                    String assocAttrName = GeneratorUtil.getAssocAttrName(attr);
+                    String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr);
                     if (log.isTraceEnabled()) { log.trace("assocAttrName: " + assocAttrName); }
 /*{    /**
-     * @param <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> La valeur de l'attribut <%=attr.getAssociationClass().getName()%> � positionner.
+     * @param <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> La valeur de l'attribut <%=attr.getAssociationClass().getName()%> � positionner.
      *)
-    public void set<%=Util.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId, <%=attr.getAssociationClass().getQualifiedName()%> <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>) throws TopiaException{
+    public void set<%=GeneratorUtil.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId, <%=attr.getAssociationClass().getQualifiedName()%> <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>) throws TopiaException{
         TopiaContextImplementor usedContextImpl = (TopiaContextImplementor) topiaContext;
 		<%=clazz.getName()%>DAOAbstract dao = (<%=clazz.getName()%>DAOAbstract)usedContextImpl.getDAO(<%=clazz.getName()%>.class);
 		<%=clazz.getName()%> entity = (<%=clazz.getName()%>)dao.findByTopiaId(topiaId); 
-        entity.set<%=Util.capitalize(assocAttrName)%>(<%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>);    
+        entity.set<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>);    
     }
 
     /**
      * @return La valeur de l'attribut <%=attr.getAssociationClass().getName()%>.
      *)
-    public <%=attr.getAssociationClass().getQualifiedName()%> get<%=Util.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException{
+    public <%=attr.getAssociationClass().getQualifiedName()%> get<%=GeneratorUtil.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException{
         TopiaContextImplementor usedContextImpl = (TopiaContextImplementor) topiaContext;
 		<%=clazz.getName()%>DAOAbstract dao = (<%=clazz.getName()%>DAOAbstract)usedContextImpl.getDAO(<%=clazz.getName()%>.class);
 		<%=clazz.getName()%> entity = (<%=clazz.getName()%>)dao.findByTopiaId(topiaId); 
-    	return entity.get<%=Util.capitalize(assocAttrName)%>();
+    	return entity.get<%=GeneratorUtil.capitalize(assocAttrName)%>();
     }
 
 }*/
@@ -482,131 +482,131 @@
                 if (!attr.hasAssociationClass()) { //M�thodes remplac�es par des add/set sur les classes d'assoc
 /*{    /**
 }*/
-                    if (GeneratorUtil.hasDocumentation(attr)) {
+                    if (TopiaGeneratorUtil.hasDocumentation(attr)) {
 /*{     * <%=attr.getName()%> : <%=attr.getDocumentation()%>
 }*/
                     }
-/*{     * @param <%=Util.toLowerCaseFirstLetter(attr.getName())%> L'instance de <%=attr.getName()%> � ajouter.
+/*{     * @param <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getName())%> L'instance de <%=attr.getName()%> � ajouter.
      *)
-    public void add<%=Util.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId, <%=attr.getType()%> <%=Util.toLowerCaseFirstLetter(attr.getName())%>) throws TopiaException{
+    public void add<%=GeneratorUtil.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId, <%=attr.getType()%> <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getName())%>) throws TopiaException{
         TopiaContextImplementor usedContextImpl = (TopiaContextImplementor) topiaContext;
 		<%=clazz.getName()%>DAOAbstract dao = (<%=clazz.getName()%>DAOAbstract)usedContextImpl.getDAO(<%=clazz.getName()%>.class);
 		<%=clazz.getName()%> entity = (<%=clazz.getName()%>)dao.findByTopiaId(topiaId); 
-    	entity.add<%=Util.capitalize(attr.getName())%>(<%=Util.toLowerCaseFirstLetter(attr.getName())%>);
+    	entity.add<%=GeneratorUtil.capitalize(attr.getName())%>(<%=GeneratorUtil.toLowerCaseFirstLetter(attr.getName())%>);
     }
 
     /**
 }*/
-                    if (GeneratorUtil.hasDocumentation(attr)) {
+                    if (TopiaGeneratorUtil.hasDocumentation(attr)) {
 /*{     * <%=attr.getName()%> : <%=attr.getDocumentation()%>
 }*/
                     }
-/*{     * @param <%=Util.toLowerCaseFirstLetter(attr.getName())%> Les instances de <%=attr.getName()%> � ajouter.
+/*{     * @param <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getName())%> Les instances de <%=attr.getName()%> � ajouter.
      *)
-    public void addAll<%=Util.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId, <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> <%=Util.toLowerCaseFirstLetter(attr.getName())%>) throws TopiaException{
+    public void addAll<%=GeneratorUtil.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId, <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getName())%>) throws TopiaException{
     	TopiaContextImplementor usedContextImpl = (TopiaContextImplementor) topiaContext;
 		<%=clazz.getName()%>DAOAbstract dao = (<%=clazz.getName()%>DAOAbstract)usedContextImpl.getDAO(<%=clazz.getName()%>.class);
 		<%=clazz.getName()%> entity = (<%=clazz.getName()%>)dao.findByTopiaId(topiaId);
-    	entity.addAll<%=Util.capitalize(attr.getName())%>(<%=Util.toLowerCaseFirstLetter(attr.getName())%>);
+    	entity.addAll<%=GeneratorUtil.capitalize(attr.getName())%>(<%=GeneratorUtil.toLowerCaseFirstLetter(attr.getName())%>);
     }
 
     /**
 }*/
-                    if (GeneratorUtil.hasDocumentation(attr)) {
+                    if (TopiaGeneratorUtil.hasDocumentation(attr)) {
 /*{     * <%=attr.getName()%> : <%=attr.getDocumentation()%>
 }*/
                     }
-/*{     * @param <%=Util.toLowerCaseFirstLetter(attr.getName())%> La Collection de <%=attr.getName()%> � positionner.
+/*{     * @param <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getName())%> La Collection de <%=attr.getName()%> � positionner.
      *)
-    public void set<%=Util.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId, <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> <%=Util.toLowerCaseFirstLetter(attr.getName())%>) throws TopiaException{
+    public void set<%=GeneratorUtil.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId, <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getName())%>) throws TopiaException{
     	TopiaContextImplementor usedContextImpl = (TopiaContextImplementor) topiaContext;
 		<%=clazz.getName()%>DAOAbstract dao = (<%=clazz.getName()%>DAOAbstract)usedContextImpl.getDAO(<%=clazz.getName()%>.class);
 		<%=clazz.getName()%> entity = (<%=clazz.getName()%>)dao.findByTopiaId(topiaId);
-    	entity.set<%=Util.capitalize(attr.getName())%>(<%=Util.toLowerCaseFirstLetter(attr.getName())%>);
+    	entity.set<%=GeneratorUtil.capitalize(attr.getName())%>(<%=GeneratorUtil.toLowerCaseFirstLetter(attr.getName())%>);
     }
 
     /**
 }*/
-                    if (GeneratorUtil.hasDocumentation(attr)) {
+                    if (TopiaGeneratorUtil.hasDocumentation(attr)) {
 /*{     * <%=attr.getName()%> : <%=attr.getDocumentation()%>
 }*/
                     }
-/*{     * @param <%=Util.toLowerCaseFirstLetter(attr.getName())%> L'instance de <%=attr.getName()%> � retirer.
+/*{     * @param <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getName())%> L'instance de <%=attr.getName()%> � retirer.
      *)
-    public void remove<%=Util.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId, <%=attr.getType()%> <%=Util.toLowerCaseFirstLetter(attr.getName())%>) throws TopiaException{
+    public void remove<%=GeneratorUtil.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId, <%=attr.getType()%> <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getName())%>) throws TopiaException{
     	TopiaContextImplementor usedContextImpl = (TopiaContextImplementor) topiaContext;
 		<%=clazz.getName()%>DAOAbstract dao = (<%=clazz.getName()%>DAOAbstract)usedContextImpl.getDAO(<%=clazz.getName()%>.class);
 		<%=clazz.getName()%> entity = (<%=clazz.getName()%>)dao.findByTopiaId(topiaId);
-    	entity.remove<%=Util.capitalize(attr.getName())%>(<%=Util.toLowerCaseFirstLetter(attr.getName())%>);
+    	entity.remove<%=GeneratorUtil.capitalize(attr.getName())%>(<%=GeneratorUtil.toLowerCaseFirstLetter(attr.getName())%>);
     }
 
     /**
 }*/
-                    if (GeneratorUtil.hasDocumentation(attr)) {
+                    if (TopiaGeneratorUtil.hasDocumentation(attr)) {
 /*{     * <%=attr.getName()%> : <%=attr.getDocumentation()%>
 }*/
                     }
 /*{     * Vide la Collection de <%=attr.getName()%>.
      *)
-    public void clear<%=Util.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException{
+    public void clear<%=GeneratorUtil.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException{
     	TopiaContextImplementor usedContextImpl = (TopiaContextImplementor) topiaContext;
 		<%=clazz.getName()%>DAOAbstract dao = (<%=clazz.getName()%>DAOAbstract)usedContextImpl.getDAO(<%=clazz.getName()%>.class);
 		<%=clazz.getName()%> entity = (<%=clazz.getName()%>)dao.findByTopiaId(topiaId);
-    	entity.clear<%=Util.capitalize(attr.getName())%>();
+    	entity.clear<%=GeneratorUtil.capitalize(attr.getName())%>();
     }
 
 }*/
                 } else {
-                    String assocAttrName = GeneratorUtil.getAssocAttrName(attr);
+                    String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr);
                     if (log.isTraceEnabled()) { log.trace("assocAttrName: " + assocAttrName); }
 /*{    /**
-     * @param <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> L'instance de <%=attr.getAssociationClass().getName()%> � ajouter.
+     * @param <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> L'instance de <%=attr.getAssociationClass().getName()%> � ajouter.
      *)
-    public void add<%=Util.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId, <%=attr.getAssociationClass().getQualifiedName()%> <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>) throws TopiaException{
+    public void add<%=GeneratorUtil.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId, <%=attr.getAssociationClass().getQualifiedName()%> <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>) throws TopiaException{
     	TopiaContextImplementor usedContextImpl = (TopiaContextImplementor) topiaContext;
 		<%=clazz.getName()%>DAOAbstract dao = (<%=clazz.getName()%>DAOAbstract)usedContextImpl.getDAO(<%=clazz.getName()%>.class);
 		<%=clazz.getName()%> entity = (<%=clazz.getName()%>)dao.findByTopiaId(topiaId);
-    	entity.add<%=Util.capitalize(assocAttrName)%>(<%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>);
+    	entity.add<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>);
     }
 
     /**
-     * @param <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> Les instances de <%=attr.getAssociationClass().getName()%> � ajouter.
+     * @param <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> Les instances de <%=attr.getAssociationClass().getName()%> � ajouter.
      *)
-    public void addAll<%=Util.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId, <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>) throws TopiaException{
+    public void addAll<%=GeneratorUtil.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId, <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>) throws TopiaException{
     	TopiaContextImplementor usedContextImpl = (TopiaContextImplementor) topiaContext;
 		<%=clazz.getName()%>DAOAbstract dao = (<%=clazz.getName()%>DAOAbstract)usedContextImpl.getDAO(<%=clazz.getName()%>.class);
 		<%=clazz.getName()%> entity = (<%=clazz.getName()%>)dao.findByTopiaId(topiaId);
-    	entity.addAll<%=Util.capitalize(assocAttrName)%>(<%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>);
+    	entity.addAll<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>);
     }
 
     /**
-     * @param <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> La Collection de <%=attr.getAssociationClass().getName()%> � positionner.
+     * @param <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> La Collection de <%=attr.getAssociationClass().getName()%> � positionner.
      *)
-    public void set<%=Util.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId, <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>) throws TopiaException{
+    public void set<%=GeneratorUtil.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId, <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>) throws TopiaException{
     	TopiaContextImplementor usedContextImpl = (TopiaContextImplementor) topiaContext;
 		<%=clazz.getName()%>DAOAbstract dao = (<%=clazz.getName()%>DAOAbstract)usedContextImpl.getDAO(<%=clazz.getName()%>.class);
 		<%=clazz.getName()%> entity = (<%=clazz.getName()%>)dao.findByTopiaId(topiaId);
-    	entity.set<%=Util.capitalize(assocAttrName)%>(<%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>);
+    	entity.set<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>);
     }
 
     /**
-     * @param <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> L'instance de <%=attr.getAssociationClass().getName()%> � retirer.
+     * @param <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> L'instance de <%=attr.getAssociationClass().getName()%> � retirer.
      *)
-    public void remove<%=Util.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId, <%=attr.getAssociationClass().getQualifiedName()%> <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>) throws TopiaException{
+    public void remove<%=GeneratorUtil.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId, <%=attr.getAssociationClass().getQualifiedName()%> <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>) throws TopiaException{
     	TopiaContextImplementor usedContextImpl = (TopiaContextImplementor) topiaContext;
 		<%=clazz.getName()%>DAOAbstract dao = (<%=clazz.getName()%>DAOAbstract)usedContextImpl.getDAO(<%=clazz.getName()%>.class);
 		<%=clazz.getName()%> entity = (<%=clazz.getName()%>)dao.findByTopiaId(topiaId);
-    	entity.remove<%=Util.capitalize(assocAttrName)%>(<%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>);   
+    	entity.remove<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>);   
     }
 
     /**
      * Vide la Collection de <%=attr.getAssociationClass().getName()%>.
      *)
-    public void clear<%=Util.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException{
+    public void clear<%=GeneratorUtil.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException{
     	TopiaContextImplementor usedContextImpl = (TopiaContextImplementor) topiaContext;
 		<%=clazz.getName()%>DAOAbstract dao = (<%=clazz.getName()%>DAOAbstract)usedContextImpl.getDAO(<%=clazz.getName()%>.class);
 		<%=clazz.getName()%> entity = (<%=clazz.getName()%>)dao.findByTopiaId(topiaId);
-    	entity.clear<%=Util.capitalize(assocAttrName)%>();
+    	entity.clear<%=GeneratorUtil.capitalize(assocAttrName)%>();
     }
 
 }*/
@@ -615,61 +615,61 @@
                 if (!attr.hasAssociationClass()) {
 /*{    /**
 }*/
-                    if (GeneratorUtil.hasDocumentation(attr)) {
+                    if (TopiaGeneratorUtil.hasDocumentation(attr)) {
 /*{     * <%=attr.getName()%> : <%=attr.getDocumentation()%>
 }*/
                     }
 /*{     * @return La Liste de <%=attr.getName()%>.
      *)
-    public <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> get<%=Util.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException{
+    public <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> get<%=GeneratorUtil.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException{
     	TopiaContextImplementor usedContextImpl = (TopiaContextImplementor) topiaContext;
 		<%=clazz.getName()%>DAOAbstract dao = (<%=clazz.getName()%>DAOAbstract)usedContextImpl.getDAO(<%=clazz.getName()%>.class);
 		<%=clazz.getName()%> entity = (<%=clazz.getName()%>)dao.findByTopiaId(topiaId);
-    	return entity.get<%=Util.capitalize(attr.getName())%>();
+    	return entity.get<%=GeneratorUtil.capitalize(attr.getName())%>();
     }
 
     /**
      * @return Le nombre d'�l�ments de la collection <%=attr.getName()%>.
      *)
-    public int size<%=Util.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException{
+    public int size<%=GeneratorUtil.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException{
     	TopiaContextImplementor usedContextImpl = (TopiaContextImplementor) topiaContext;
 		<%=clazz.getName()%>DAOAbstract dao = (<%=clazz.getName()%>DAOAbstract)usedContextImpl.getDAO(<%=clazz.getName()%>.class);
 		<%=clazz.getName()%> entity = (<%=clazz.getName()%>)dao.findByTopiaId(topiaId);
-    	return entity.size<%=Util.capitalize(attr.getName())%>();
+    	return entity.size<%=GeneratorUtil.capitalize(attr.getName())%>();
     }
 
 }*/
                 } else {
-                    String assocAttrName = GeneratorUtil.getAssocAttrName(attr);
+                    String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr);
                     if (log.isTraceEnabled()) { log.trace("assocAttrName: " + assocAttrName); }
 /*{    /**
      * @return La liste des attributs <%=attr.getAssociationClass().getName()%>.
      *)
-    public <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> get<%=Util.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException{
+    public <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> get<%=GeneratorUtil.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException{
     	TopiaContextImplementor usedContextImpl = (TopiaContextImplementor) topiaContext;
 		<%=clazz.getName()%>DAOAbstract dao = (<%=clazz.getName()%>DAOAbstract)usedContextImpl.getDAO(<%=clazz.getName()%>.class);
 		<%=clazz.getName()%> entity = (<%=clazz.getName()%>)dao.findByTopiaId(topiaId);
-    	return entity.get<%=Util.capitalize(assocAttrName)%>();
+    	return entity.get<%=GeneratorUtil.capitalize(assocAttrName)%>();
     }
 
     /**
      * @return L'attribut <%=attr.getAssociationClass().getName()%> associ� � la valeur <code>value</code> de l'attribut <%=attr.getName()%>.
      *)
-    public <%=attr.getAssociationClass().getQualifiedName()%> get<%=Util.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId, <%=attr.getType()%> value) throws TopiaException{
+    public <%=attr.getAssociationClass().getQualifiedName()%> get<%=GeneratorUtil.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId, <%=attr.getType()%> value) throws TopiaException{
     	TopiaContextImplementor usedContextImpl = (TopiaContextImplementor) topiaContext;
 		<%=clazz.getName()%>DAOAbstract dao = (<%=clazz.getName()%>DAOAbstract)usedContextImpl.getDAO(<%=clazz.getName()%>.class);
 		<%=clazz.getName()%> entity = (<%=clazz.getName()%>)dao.findByTopiaId(topiaId);
-    	return entity.get<%=Util.capitalize(assocAttrName)%>((<%=attr.getType()%>) value);
+    	return entity.get<%=GeneratorUtil.capitalize(assocAttrName)%>((<%=attr.getType()%>) value);
     }
 
     /**
      * @return Le nombre d'�l�ments de la collection <%=attr.getName()%>.
      *)
-    public int size<%=Util.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException{
+    public int size<%=GeneratorUtil.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException{
     	TopiaContextImplementor usedContextImpl = (TopiaContextImplementor) topiaContext;
 		<%=clazz.getName()%>DAOAbstract dao = (<%=clazz.getName()%>DAOAbstract)usedContextImpl.getDAO(<%=clazz.getName()%>.class);
 		<%=clazz.getName()%> entity = (<%=clazz.getName()%>)dao.findByTopiaId(topiaId);
-    	return entity.size<%=Util.capitalize(assocAttrName)%>();
+    	return entity.size<%=GeneratorUtil.capitalize(assocAttrName)%>();
     }
 
 }*/
@@ -704,7 +704,7 @@
             ObjectModelOperation op = (ObjectModelOperation)it.next();                
 /*{    /**
 }*/
-            if (GeneratorUtil.hasDocumentation(op)) {
+            if (TopiaGeneratorUtil.hasDocumentation(op)) {
 /*{     * <%=op.getName()%> : <%=op.getDocumentation()%>
 }*/
             }
@@ -761,21 +761,21 @@
     	/*{    /**
     	     * @param value La valeur de l'attribut <%=name%> � positionner.
     	     *)
-    	    public void set<%=Util.capitalize(name)%>Of<%=clazz.getName()%>(String topiaId, <%=type%> value) throws TopiaException{
+    	    public void set<%=GeneratorUtil.capitalize(name)%>Of<%=clazz.getName()%>(String topiaId, <%=type%> value) throws TopiaException{
     	    	TopiaContextImplementor usedContextImpl = (TopiaContextImplementor) topiaContext;
 				<%=clazz.getName()%>DAOAbstract dao = (<%=clazz.getName()%>DAOAbstract)usedContextImpl.getDAO(<%=clazz.getName()%>.class);
 				<%=clazz.getName()%> entity = (<%=clazz.getName()%>)dao.findByTopiaId(topiaId);
-    	    	entity.set<%=Util.capitalize(name)%>( value);
+    	    	entity.set<%=GeneratorUtil.capitalize(name)%>( value);
     	    }
 
     	    /**
     	     * @return La valeur de l'attribut <%=name%>.
     	     *)
-    	    public <%=type%> get<%=Util.capitalize(name)%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException{
+    	    public <%=type%> get<%=GeneratorUtil.capitalize(name)%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException{
     	    	TopiaContextImplementor usedContextImpl = (TopiaContextImplementor) topiaContext;
 				<%=clazz.getName()%>DAOAbstract dao = (<%=clazz.getName()%>DAOAbstract)usedContextImpl.getDAO(<%=clazz.getName()%>.class);
 				<%=clazz.getName()%> entity = (<%=clazz.getName()%>)dao.findByTopiaId(topiaId);
-    	    	return entity.get<%=Util.capitalize(name)%>();
+    	    	return entity.get<%=GeneratorUtil.capitalize(name)%>();
     	    }
 
     	}*/

Modified: topia/branches/generators-refactoring/topia-soa/src/main/java/org/codelutin/topia/generator/ServiceImplGenerator.java
===================================================================
--- topia/branches/generators-refactoring/topia-soa/src/main/java/org/codelutin/topia/generator/ServiceImplGenerator.java	2009-01-29 10:53:27 UTC (rev 1327)
+++ topia/branches/generators-refactoring/topia-soa/src/main/java/org/codelutin/topia/generator/ServiceImplGenerator.java	2009-01-29 11:18:00 UTC (rev 1328)
@@ -76,7 +76,7 @@
     @Override
     public void generateFromInterface(Writer output, ObjectModelInterface interfacez) throws IOException {
    	 
-    	if (!interfacez.hasStereotype(GeneratorUtil.STEREOTYPE_SERVICE)) {
+    	if (!interfacez.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_SERVICE)) {
             return;
         }
     	
@@ -89,7 +89,7 @@
         for (Iterator i=interfacez.getInterfaces().iterator(); i.hasNext();) {
             ObjectModelClassifier parent = (ObjectModelClassifier)i.next();
             // pour tous les DAOInterface
-            if(parent.hasStereotype(GeneratorUtil.STEREOTYPE_DAO)){
+            if(parent.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_DAO)){
             	// récupérer la classe de l'object model correspondant à la DAO
             	String entityClassName = null;
             	entityClassName = parent.getQualifiedName().replace("DAO", "");
@@ -109,14 +109,14 @@
     }
 
     private void generateInterfaceHeader(Writer output, ObjectModelClassifier classifier) throws IOException {
-        String copyright = GeneratorUtil.getCopyright(model);
-        if (GeneratorUtil.notEmpty(copyright)) {
+        String copyright = TopiaGeneratorUtil.getCopyright(model);
+        if (TopiaGeneratorUtil.notEmpty(copyright)) {
 /*{<%=copyright%>
 }*/
         }
 /*{package <%=classifier.getPackageName()%>;}*/
     	
-        if (GeneratorUtil.hasDocumentation(classifier)) {
+        if (TopiaGeneratorUtil.hasDocumentation(classifier)) {
         	
 /*{
 /**

Modified: topia/branches/generators-refactoring/topia-soa/src/main/java/org/codelutin/topia/generator/ServiceInterfaceGenerator.java
===================================================================
--- topia/branches/generators-refactoring/topia-soa/src/main/java/org/codelutin/topia/generator/ServiceInterfaceGenerator.java	2009-01-29 10:53:27 UTC (rev 1327)
+++ topia/branches/generators-refactoring/topia-soa/src/main/java/org/codelutin/topia/generator/ServiceInterfaceGenerator.java	2009-01-29 11:18:00 UTC (rev 1328)
@@ -17,7 +17,7 @@
 
 package org.codelutin.topia.generator;
 
-import static org.codelutin.topia.generator.GeneratorUtil.hasUnidirectionalRelationOnAbstractType;
+import static org.codelutin.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType;
 
 import java.io.File;
 import java.io.IOException;
@@ -32,7 +32,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.codelutin.generator.Generator;
 import org.codelutin.generator.ObjectModelGenerator;
-import org.codelutin.generator.Util;
+import org.codelutin.generator.GeneratorUtil;
 import org.codelutin.generator.models.object.ObjectModelAssociationClass;
 import org.codelutin.generator.models.object.ObjectModelAttribute;
 import org.codelutin.generator.models.object.ObjectModelClass;
@@ -97,7 +97,7 @@
     @Override
     public void generateFromInterface(Writer output, ObjectModelInterface interfacez) throws IOException {
 
-    	if (!interfacez.hasStereotype(GeneratorUtil.STEREOTYPE_SERVICE)) {
+    	if (!interfacez.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_SERVICE)) {
             return;
         }
     	    	
@@ -133,8 +133,8 @@
     }
 
     private void generateInterfaceHeader(Writer output, ObjectModelClassifier classifier) throws IOException {
-        String copyright = GeneratorUtil.getCopyright(model);
-        if (GeneratorUtil.notEmpty(copyright)) {
+        String copyright = TopiaGeneratorUtil.getCopyright(model);
+        if (TopiaGeneratorUtil.notEmpty(copyright)) {
 /*{<%=copyright%>
 }*/
         }
@@ -144,7 +144,7 @@
 import org.codelutin.topia.TopiaException;
 
 }*/
-        if (GeneratorUtil.hasDocumentation(classifier)) {
+        if (TopiaGeneratorUtil.hasDocumentation(classifier)) {
 /*{
 /**
  * <%=classifier.getDocumentation()%>
@@ -166,7 +166,7 @@
             ObjectModelClass clazz = (ObjectModelClass)classifier;
             for (Iterator i=clazz.getSuperclasses().iterator(); i.hasNext();) {
                 ObjectModelClassifier parent = (ObjectModelClassifier)i.next();
-                if (parent.hasStereotype(GeneratorUtil.STEREOTYPE_SERVICE)) {
+                if (parent.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_SERVICE)) {
                     extendClass += parent.getQualifiedName();
                 }
                 extendClass += ", ";            
@@ -195,7 +195,7 @@
     /** 
      * Methode metier
 }*/
-            if (GeneratorUtil.hasDocumentation(op)) {
+            if (TopiaGeneratorUtil.hasDocumentation(op)) {
 /*{     * <%=op.getName()%> : <%=op.getDocumentation()%>
 }*/
             }
@@ -245,7 +245,7 @@
             	if(getModel().hasClass(entityClassName)){
             		ObjectModelClass clazz =  getModel().getClass(entityClassName);
             		
-            		if (!clazz.hasStereotype(GeneratorUtil.STEREOTYPE_ENTITY)) {
+            		if (!clazz.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_ENTITY)) {
             			return;  
             		}
 
@@ -293,7 +293,7 @@
             		 	   continue;
                         }
 
-            	        if (!Util.isNMultiplicity(attr)) {
+            	        if (!GeneratorUtil.isNMultiplicity(attr)) {
             	            generateNoNMultiplicity(output, attr, clazz, false);
             	        } else {
             	            generateNMultiplicity(output, attr, clazz, false);
@@ -306,7 +306,7 @@
             	        while (it.hasNext()) {
             	            ObjectModelAttribute attr = (ObjectModelAttribute)it.next();
             	            if (attr != null) {
-            	                if (!Util.isNMultiplicity(attr)) {
+            	                if (!GeneratorUtil.isNMultiplicity(attr)) {
             	                    generateNoNMultiplicity(output, attr, clazz, true);
             	                } else {
             	                   generateNMultiplicity(output, attr, clazz, true);
@@ -322,12 +322,12 @@
     protected void generateNoNMultiplicity(Writer output, ObjectModelAttribute attr, ObjectModelClass clazz, boolean isAssoc) throws IOException {
 	    String propertyName = attr.getName();
 	    if (!isAssoc && attr.hasAssociationClass()) {
-	        propertyName = GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName()) + "." + propertyName;
+	        propertyName = TopiaGeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName()) + "." + propertyName;
 	    }
 
 		// ajouter les methodes à la liste
-        methods.add(clazz.getName()+" find"+clazz.getName()+"By"+GeneratorUtil.capitalize(attr.getName())+"("+attr.getType()+" v)");
-        methods.add("List<"+clazz.getName()+"> findAll"+clazz.getName()+"By"+GeneratorUtil.capitalize(attr.getName())+"("+attr.getType()+" v)");
+        methods.add(clazz.getName()+" find"+clazz.getName()+"By"+TopiaGeneratorUtil.capitalize(attr.getName())+"("+attr.getType()+" v)");
+        methods.add("List<"+clazz.getName()+"> findAll"+clazz.getName()+"By"+TopiaGeneratorUtil.capitalize(attr.getName())+"("+attr.getType()+" v)");
 /*{
     /**
      * Retourne le premier element trouve ayant comme valeur pour l'attribut
@@ -335,40 +335,40 @@
      * @param v la valeur que doit avoir <%=attr.getName()%>
      * @return un element ou null
      *)
-    public abstract <%=clazz.getQualifiedName()%> find<%=clazz.getName()%>By<%=GeneratorUtil.capitalize(attr.getName())%>(<%=attr.getType()%> v) throws TopiaException;
+    public abstract <%=clazz.getQualifiedName()%> find<%=clazz.getName()%>By<%=TopiaGeneratorUtil.capitalize(attr.getName())%>(<%=attr.getType()%> v) throws TopiaException;
     /**
      * Retourne les éléments ayant comme valeur pour l'attribut
      * <%=attr.getName()%> le paramêtre
      * @param v la valeur que doit avoir <%=attr.getName()%>
      * @return une liste
      *)
-    public abstract  List<<%=clazz.getQualifiedName()%>> findAll<%=clazz.getName()%>By<%=GeneratorUtil.capitalize(attr.getName())%>(<%=attr.getType()%> v) throws TopiaException;
+    public abstract  List<<%=clazz.getQualifiedName()%>> findAll<%=clazz.getName()%>By<%=TopiaGeneratorUtil.capitalize(attr.getName())%>(<%=attr.getType()%> v) throws TopiaException;
 }*/
         if (attr.hasAssociationClass()) {
-            methods.add(clazz.getName() +" find"+clazz.getName()+"By"+GeneratorUtil.capitalize(attr.getAssociationClass().getName())+"("+attr.getAssociationClass().getQualifiedName()+" value)");
-            methods.add("List<"+clazz.getName()+"> findAll"+clazz.getName()+"By"+GeneratorUtil.capitalize(attr.getAssociationClass().getName())+"("+attr.getAssociationClass().getQualifiedName()+" value)");
+            methods.add(clazz.getName() +" find"+clazz.getName()+"By"+TopiaGeneratorUtil.capitalize(attr.getAssociationClass().getName())+"("+attr.getAssociationClass().getQualifiedName()+" value)");
+            methods.add("List<"+clazz.getName()+"> findAll"+clazz.getName()+"By"+TopiaGeneratorUtil.capitalize(attr.getAssociationClass().getName())+"("+attr.getAssociationClass().getQualifiedName()+" value)");
 /*{
     /**
      * Retourne le premier element trouve ayant comme valeur pour l'attribut
-     * <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> le parametre
-     * @param value la valeur que doit avoir <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>
+     * <%=TopiaGeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> le parametre
+     * @param value la valeur que doit avoir <%=TopiaGeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>
      * @return un element ou null
      *)
-    public abstract  <%=clazz.getQualifiedName()%> find<%=clazz.getName()%>By<%=GeneratorUtil.capitalize(attr.getAssociationClass().getName())%>(<%=attr.getAssociationClass().getQualifiedName()%> value) throws TopiaException;
+    public abstract  <%=clazz.getQualifiedName()%> find<%=clazz.getName()%>By<%=TopiaGeneratorUtil.capitalize(attr.getAssociationClass().getName())%>(<%=attr.getAssociationClass().getQualifiedName()%> value) throws TopiaException;
     /**
      * Retourne les éléments ayant comme valeur pour l'attribut
-     * <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> le paramêtre
-     * @param value la valeur que doit avoir <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>
+     * <%=TopiaGeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> le paramêtre
+     * @param value la valeur que doit avoir <%=TopiaGeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>
      * @return une liste
      *)
-    public abstract  List<<%=clazz.getQualifiedName()%>> findAll<%=clazz.getName()%>By<%=GeneratorUtil.capitalize(attr.getAssociationClass().getName())%>(<%=attr.getAssociationClass().getQualifiedName()%> value) throws TopiaException;
+    public abstract  List<<%=clazz.getQualifiedName()%>> findAll<%=clazz.getName()%>By<%=TopiaGeneratorUtil.capitalize(attr.getAssociationClass().getName())%>(<%=attr.getAssociationClass().getQualifiedName()%> value) throws TopiaException;
 }*/
 	    }
 	}        
 	        
     protected void generateNMultiplicity(Writer output, ObjectModelAttribute attr, ObjectModelClass clazz, boolean isAssoc) throws IOException {
-        methods.add(clazz.getName() + " find"+clazz.getName()+"Contains"+GeneratorUtil.capitalize(attr.getName())+"("+attr.getType()+" ... v)");
-        methods.add("List<"+clazz.getName()+"> findAll"+clazz.getName()+"Contains"+GeneratorUtil.capitalize(attr.getName())+"("+attr.getType()+" ... v)");
+        methods.add(clazz.getName() + " find"+clazz.getName()+"Contains"+TopiaGeneratorUtil.capitalize(attr.getName())+"("+attr.getType()+" ... v)");
+        methods.add("List<"+clazz.getName()+"> findAll"+clazz.getName()+"Contains"+TopiaGeneratorUtil.capitalize(attr.getName())+"("+attr.getType()+" ... v)");
 /*{
     /**
      * Retourne le premier element trouve dont l'attribut
@@ -376,14 +376,14 @@
      * @param v la valeur que doit contenir <%=attr.getName()%>
      * @return un element ou null
      *)
-    public abstract <%=clazz.getQualifiedName()%> find<%=clazz.getName()%>Contains<%=GeneratorUtil.capitalize(attr.getName())%>(<%=attr.getType()%> ... v) throws TopiaException;
+    public abstract <%=clazz.getQualifiedName()%> find<%=clazz.getName()%>Contains<%=TopiaGeneratorUtil.capitalize(attr.getName())%>(<%=attr.getType()%> ... v) throws TopiaException;
     /**
      * Retourne les elements trouve dont l'attribut
      * <%=attr.getName()%> contient le parametre
      * @param v la valeur que doit contenir <%=attr.getName()%>
      * @return une liste
      *)
-    public abstract  List<<%=clazz.getQualifiedName()%>> findAll<%=clazz.getName()%>Contains<%=GeneratorUtil.capitalize(attr.getName())%>(<%=attr.getType()%> ... v) throws TopiaException;
+    public abstract  List<<%=clazz.getQualifiedName()%>> findAll<%=clazz.getName()%>Contains<%=TopiaGeneratorUtil.capitalize(attr.getName())%>(<%=attr.getType()%> ... v) throws TopiaException;
 }*/        
 	}
     
@@ -405,7 +405,7 @@
     }
     
     private void generateFromDAOClass(Writer output, ObjectModelClass clazz) throws IOException {
-        if (!clazz.hasStereotype(GeneratorUtil.STEREOTYPE_ENTITY)) {
+        if (!clazz.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_ENTITY)) {
             return;
         }
 
@@ -416,48 +416,48 @@
                     && !hasUnidirectionalRelationOnAbstractType(reverse, model)) {
                 continue;
             }
-            if (!Util.isNMultiplicity(attr)) {
+            if (!GeneratorUtil.isNMultiplicity(attr)) {
                 if (!attr.hasAssociationClass()) {
 /*{    /**
 }*/
-                    if (GeneratorUtil.hasDocumentation(attr)) {
-                        methods.add("void set"+Util.capitalize(attr.getName())+"Of"+clazz.getName()+"(String topiaId, "+attr.getType()+ " "+Util.toLowerCaseFirstLetter(attr.getName())+")");
+                    if (TopiaGeneratorUtil.hasDocumentation(attr)) {
+                        methods.add("void set"+GeneratorUtil.capitalize(attr.getName())+"Of"+clazz.getName()+"(String topiaId, "+attr.getType()+ " "+GeneratorUtil.toLowerCaseFirstLetter(attr.getName())+")");
                         
 /*{     * <%=attr.getName()%> : <%=attr.getDocumentation()%>
 }*/
                     }
-/*{     * @param <%=Util.toLowerCaseFirstLetter(attr.getName())%> La valeur de l'attribut <%=attr.getName()%> à positionner.
+/*{     * @param <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getName())%> La valeur de l'attribut <%=attr.getName()%> à positionner.
      *)
-    public abstract void set<%=Util.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId, <%=attr.getType()%> <%=Util.toLowerCaseFirstLetter(attr.getName())%>) throws TopiaException;
+    public abstract void set<%=GeneratorUtil.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId, <%=attr.getType()%> <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getName())%>) throws TopiaException;
 
 }*/
 /*{    /**
 }*/
-                    if (GeneratorUtil.hasDocumentation(attr)) {
-                        methods.add(attr.getType()+" get"+Util.capitalize(attr.getName())+"Of"+clazz.getName()+"(String topiaId)");
+                    if (TopiaGeneratorUtil.hasDocumentation(attr)) {
+                        methods.add(attr.getType()+" get"+GeneratorUtil.capitalize(attr.getName())+"Of"+clazz.getName()+"(String topiaId)");
 /*{     * <%=attr.getName()%> : <%=attr.getDocumentation()%>
 }*/
                     }
 /*{     * @return La valeur de l'attribut <%=attr.getName()%>.
      *)
-    public abstract <%=attr.getType()%> get<%=Util.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException;
+    public abstract <%=attr.getType()%> get<%=GeneratorUtil.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException;
 
 }*/
                 } else {
-                    String assocAttrName = GeneratorUtil.getAssocAttrName(attr);
+                    String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr);
                     if (log.isTraceEnabled()) { log.trace("assocAttrName: " + assocAttrName); }
-                    methods.add("void set"+Util.capitalize(assocAttrName)+"Of"+clazz.getName()+"(String topiaId, "+attr.getAssociationClass().getName()+" "+Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())+")");
-                    methods.add(attr.getAssociationClass().getName()+" get"+Util.capitalize(assocAttrName)+"Of"+clazz.getName()+"(String topiaId)");
+                    methods.add("void set"+GeneratorUtil.capitalize(assocAttrName)+"Of"+clazz.getName()+"(String topiaId, "+attr.getAssociationClass().getName()+" "+GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())+")");
+                    methods.add(attr.getAssociationClass().getName()+" get"+GeneratorUtil.capitalize(assocAttrName)+"Of"+clazz.getName()+"(String topiaId)");
                     
 /*{    /**
-     * @param <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> La valeur de l'attribut <%=attr.getAssociationClass().getName()%> � positionner.
+     * @param <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> La valeur de l'attribut <%=attr.getAssociationClass().getName()%> � positionner.
      *)
-    public abstract void set<%=Util.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId, <%=attr.getAssociationClass().getQualifiedName()%> <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>)  throws TopiaException;
+    public abstract void set<%=GeneratorUtil.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId, <%=attr.getAssociationClass().getQualifiedName()%> <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>)  throws TopiaException;
 
     /**
      * @return La valeur de l'attribut <%=attr.getAssociationClass().getName()%>.
      *)
-    public abstract <%=attr.getAssociationClass().getQualifiedName()%> get<%=Util.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId)  throws TopiaException;
+    public abstract <%=attr.getAssociationClass().getQualifiedName()%> get<%=GeneratorUtil.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId)  throws TopiaException;
 
 }*/
                 }
@@ -465,93 +465,93 @@
                 if (!attr.hasAssociationClass()) { //Méthodes remplacées par des add/set sur les classes d'assoc
 /*{    /**
 }*/
-                    if (GeneratorUtil.hasDocumentation(attr)) {
-                        methods.add("void add"+Util.capitalize(attr.getName())+"Of"+clazz.getName()+"(String topiaId, "+attr.getType()+" "+Util.toLowerCaseFirstLetter(attr.getName())+")");
+                    if (TopiaGeneratorUtil.hasDocumentation(attr)) {
+                        methods.add("void add"+GeneratorUtil.capitalize(attr.getName())+"Of"+clazz.getName()+"(String topiaId, "+attr.getType()+" "+GeneratorUtil.toLowerCaseFirstLetter(attr.getName())+")");
 /*{     * <%=attr.getName()%> : <%=attr.getDocumentation()%>
 }*/
                     }
-/*{     * @param <%=Util.toLowerCaseFirstLetter(attr.getName())%> L'instance de <%=attr.getName()%> à ajouter.
+/*{     * @param <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getName())%> L'instance de <%=attr.getName()%> à ajouter.
      *)
-    public abstract void add<%=Util.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId, <%=attr.getType()%> <%=Util.toLowerCaseFirstLetter(attr.getName())%>)  throws TopiaException;
+    public abstract void add<%=GeneratorUtil.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId, <%=attr.getType()%> <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getName())%>)  throws TopiaException;
 
     /**
 }*/
-                    if (GeneratorUtil.hasDocumentation(attr)) {
-                        methods.add("void addAll"+Util.capitalize(attr.getName())+"Of"+clazz.getName()+"(String topiaId, "+(attr.isOrdered()?"java.util.List":"java.util.Collection")+"<"+attr.getType()+"> "+Util.toLowerCaseFirstLetter(attr.getName())+")");;
+                    if (TopiaGeneratorUtil.hasDocumentation(attr)) {
+                        methods.add("void addAll"+GeneratorUtil.capitalize(attr.getName())+"Of"+clazz.getName()+"(String topiaId, "+(attr.isOrdered()?"java.util.List":"java.util.Collection")+"<"+attr.getType()+"> "+GeneratorUtil.toLowerCaseFirstLetter(attr.getName())+")");;
                         		
 /*{     * <%=attr.getName()%> : <%=attr.getDocumentation()%>
 }*/
                     }
-/*{     * @param <%=Util.toLowerCaseFirstLetter(attr.getName())%> Les instances de <%=attr.getName()%> à ajouter.
+/*{     * @param <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getName())%> Les instances de <%=attr.getName()%> à ajouter.
      *)
-    public abstract void addAll<%=Util.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId, <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> <%=Util.toLowerCaseFirstLetter(attr.getName())%>)  throws TopiaException;
+    public abstract void addAll<%=GeneratorUtil.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId, <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getName())%>)  throws TopiaException;
 
     /**
 }*/
-                    if (GeneratorUtil.hasDocumentation(attr)) {
-                    	methods.add("void set"+Util.capitalize(attr.getName())+"Of"+clazz.getName()+"(String topiaId, "+ (attr.isOrdered()?"java.util.List":"java.util.Collection")+"<"+attr.getType()+"> "+Util.toLowerCaseFirstLetter(attr.getName())+")");
+                    if (TopiaGeneratorUtil.hasDocumentation(attr)) {
+                    	methods.add("void set"+GeneratorUtil.capitalize(attr.getName())+"Of"+clazz.getName()+"(String topiaId, "+ (attr.isOrdered()?"java.util.List":"java.util.Collection")+"<"+attr.getType()+"> "+GeneratorUtil.toLowerCaseFirstLetter(attr.getName())+")");
 /*{     * <%=attr.getName()%> : <%=attr.getDocumentation()%>
 }*/
                     }
-/*{     * @param <%=Util.toLowerCaseFirstLetter(attr.getName())%> La Collection de <%=attr.getName()%> à positionner.
+/*{     * @param <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getName())%> La Collection de <%=attr.getName()%> à positionner.
      *)
-    public abstract void set<%=Util.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId, <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> <%=Util.toLowerCaseFirstLetter(attr.getName())%>)  throws TopiaException;
+    public abstract void set<%=GeneratorUtil.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId, <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getName())%>)  throws TopiaException;
 
     /** 
 }*/
-                    if (GeneratorUtil.hasDocumentation(attr)) {
-                    	methods.add("void remove"+Util.capitalize(attr.getName())+"Of"+clazz.getName()+"(String topiaId, "+attr.getType()+ " "+Util.toLowerCaseFirstLetter(attr.getName())+")");
+                    if (TopiaGeneratorUtil.hasDocumentation(attr)) {
+                    	methods.add("void remove"+GeneratorUtil.capitalize(attr.getName())+"Of"+clazz.getName()+"(String topiaId, "+attr.getType()+ " "+GeneratorUtil.toLowerCaseFirstLetter(attr.getName())+")");
 /*{     * <%=attr.getName()%> : <%=attr.getDocumentation()%>
 }*/
                     }
-/*{     * @param <%=Util.toLowerCaseFirstLetter(attr.getName())%> L'instance de <%=attr.getName()%> à retirer.
+/*{     * @param <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getName())%> L'instance de <%=attr.getName()%> à retirer.
      *)
-    public abstract void remove<%=Util.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId, <%=attr.getType()%> <%=Util.toLowerCaseFirstLetter(attr.getName())%>)  throws TopiaException;
+    public abstract void remove<%=GeneratorUtil.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId, <%=attr.getType()%> <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getName())%>)  throws TopiaException;
 
     /**
 }*/
-                    if (GeneratorUtil.hasDocumentation(attr)) {
-                    	methods.add("void clear"+Util.capitalize(attr.getName())+"Of"+clazz.getName()+"(String topiaId)");
+                    if (TopiaGeneratorUtil.hasDocumentation(attr)) {
+                    	methods.add("void clear"+GeneratorUtil.capitalize(attr.getName())+"Of"+clazz.getName()+"(String topiaId)");
 /*{     * <%=attr.getName()%> : <%=attr.getDocumentation()%>
 }*/
                     }
 /*{     * Vide la Collection de <%=attr.getName()%>.
      *)
-    public abstract void clear<%=Util.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException;
+    public abstract void clear<%=GeneratorUtil.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException;
 
 }*/
                 } else {
-                    String assocAttrName = GeneratorUtil.getAssocAttrName(attr);
+                    String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr);
                     if (log.isTraceEnabled()) { log.trace("assocAttrName: " + assocAttrName); }
-                	methods.add("void add"+Util.capitalize(assocAttrName)+"Of"+clazz.getName()+"(String topiaId, "+attr.getAssociationClass().getName()+" "+Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())+")");
-                	methods.add("void addAll"+Util.capitalize(assocAttrName)+"Of"+clazz.getName()+"(String topiaId, "+(attr.isOrdered()?"java.util.List":"java.util.Collection")+"<"+attr.getAssociationClass().getName()+"> "+Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())+")");
-                	methods.add("void set"+Util.capitalize(assocAttrName)+"Of"+clazz.getName()+"(String topiaId, "+(attr.isOrdered()?"java.util.List":"java.util.Collection")+"<"+attr.getAssociationClass().getName()+"> "+Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())+")");
-                	methods.add("void remove"+Util.capitalize(assocAttrName)+"Of"+clazz.getName()+"(String topiaId, "+attr.getAssociationClass().getName()+" "+Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())+")");
-                	methods.add("void clear"+Util.capitalize(assocAttrName)+"Of"+clazz.getName()+"(String topiaId)");
+                	methods.add("void add"+GeneratorUtil.capitalize(assocAttrName)+"Of"+clazz.getName()+"(String topiaId, "+attr.getAssociationClass().getName()+" "+GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())+")");
+                	methods.add("void addAll"+GeneratorUtil.capitalize(assocAttrName)+"Of"+clazz.getName()+"(String topiaId, "+(attr.isOrdered()?"java.util.List":"java.util.Collection")+"<"+attr.getAssociationClass().getName()+"> "+GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())+")");
+                	methods.add("void set"+GeneratorUtil.capitalize(assocAttrName)+"Of"+clazz.getName()+"(String topiaId, "+(attr.isOrdered()?"java.util.List":"java.util.Collection")+"<"+attr.getAssociationClass().getName()+"> "+GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())+")");
+                	methods.add("void remove"+GeneratorUtil.capitalize(assocAttrName)+"Of"+clazz.getName()+"(String topiaId, "+attr.getAssociationClass().getName()+" "+GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())+")");
+                	methods.add("void clear"+GeneratorUtil.capitalize(assocAttrName)+"Of"+clazz.getName()+"(String topiaId)");
 /*{    /**
-     * @param <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> L'instance de <%=attr.getAssociationClass().getName()%> à ajouter.
+     * @param <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> L'instance de <%=attr.getAssociationClass().getName()%> à ajouter.
      *)
-    public abstract void add<%=Util.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId, <%=attr.getAssociationClass().getQualifiedName()%> <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>) throws TopiaException;
+    public abstract void add<%=GeneratorUtil.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId, <%=attr.getAssociationClass().getQualifiedName()%> <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>) throws TopiaException;
 
     /** 
-     * @param <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> Les instances de <%=attr.getAssociationClass().getName()%> à ajouter.
+     * @param <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> Les instances de <%=attr.getAssociationClass().getName()%> à ajouter.
      *)
-    public abstract void addAll<%=Util.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId, <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>) throws TopiaException;
+    public abstract void addAll<%=GeneratorUtil.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId, <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>) throws TopiaException;
 
     /**
-     * @param <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> La Collection de <%=attr.getAssociationClass().getName()%> à positionner.
+     * @param <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> La Collection de <%=attr.getAssociationClass().getName()%> à positionner.
      *)
-    public abstract void set<%=Util.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId, <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>) throws TopiaException;
+    public abstract void set<%=GeneratorUtil.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId, <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>) throws TopiaException;
 
     /** 
-     * @param <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> L'instance de <%=attr.getAssociationClass().getName()%> à retirer.
+     * @param <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> L'instance de <%=attr.getAssociationClass().getName()%> à retirer.
      *)
-    public abstract void remove<%=Util.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId, <%=attr.getAssociationClass().getQualifiedName()%> <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>) throws TopiaException;
+    public abstract void remove<%=GeneratorUtil.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId, <%=attr.getAssociationClass().getQualifiedName()%> <%=GeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%>) throws TopiaException;
 
     /**
      * Vide la Collection de <%=attr.getAssociationClass().getName()%>.
      *)
-    public abstract void clear<%=Util.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException;
+    public abstract void clear<%=GeneratorUtil.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException;
 
 }*/
                 }
@@ -559,43 +559,43 @@
                 if (!attr.hasAssociationClass()) {
 /*{    /**
 }*/
-                    if (GeneratorUtil.hasDocumentation(attr)) {
-                    	methods.add((attr.isOrdered()?"java.util.List":"java.util.Collection")+"<"+attr.getType()+"> get"+Util.capitalize(attr.getName())+"Of"+clazz.getName()+"(String topiaId)");
-                    	methods.add("int size"+Util.capitalize(attr.getName())+"Of"+clazz.getName()+"(String topiaId)");
+                    if (TopiaGeneratorUtil.hasDocumentation(attr)) {
+                    	methods.add((attr.isOrdered()?"java.util.List":"java.util.Collection")+"<"+attr.getType()+"> get"+GeneratorUtil.capitalize(attr.getName())+"Of"+clazz.getName()+"(String topiaId)");
+                    	methods.add("int size"+GeneratorUtil.capitalize(attr.getName())+"Of"+clazz.getName()+"(String topiaId)");
                     	
 /*{     * <%=attr.getName()%> : <%=attr.getDocumentation()%>
 }*/
                     }
 /*{     * @return La Liste de <%=attr.getName()%>.
      *)
-    public abstract <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> get<%=Util.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException;
+    public abstract <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> get<%=GeneratorUtil.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException;
 
     /**
      * @return Le nombre d'éléments de la collection <%=attr.getName()%>.
      *)
-    public abstract int size<%=Util.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException;
+    public abstract int size<%=GeneratorUtil.capitalize(attr.getName())%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException;
 
 }*/
                 } else {
-                    String assocAttrName = GeneratorUtil.getAssocAttrName(attr);
+                    String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr);
                     if (log.isTraceEnabled()) { log.trace("assocAttrName: " + assocAttrName); }
-                    methods.add((attr.isOrdered()?"java.util.List":"java.util.Collection")+"<"+attr.getAssociationClass().getName()+"> get"+Util.capitalize(assocAttrName)+"Of"+clazz.getName()+"Of"+clazz.getName()+"(String topiaId)");
-                    methods.add(attr.getAssociationClass().getName()+" get"+Util.capitalize(assocAttrName)+"Of"+clazz.getName()+"(String topiaId, "+attr.getType()+" value)");
-                    methods.add("int size"+Util.capitalize(assocAttrName)+"Of"+clazz.getName()+"(String topiaId)");
+                    methods.add((attr.isOrdered()?"java.util.List":"java.util.Collection")+"<"+attr.getAssociationClass().getName()+"> get"+GeneratorUtil.capitalize(assocAttrName)+"Of"+clazz.getName()+"Of"+clazz.getName()+"(String topiaId)");
+                    methods.add(attr.getAssociationClass().getName()+" get"+GeneratorUtil.capitalize(assocAttrName)+"Of"+clazz.getName()+"(String topiaId, "+attr.getType()+" value)");
+                    methods.add("int size"+GeneratorUtil.capitalize(assocAttrName)+"Of"+clazz.getName()+"(String topiaId)");
 /*{    /**
      * @return La liste des attributs <%=attr.getAssociationClass().getName()%>.
      *)
-    public abstract <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> get<%=Util.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException;
+    public abstract <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> get<%=GeneratorUtil.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException;
 
     /**
      * @return L'attribut <%=attr.getAssociationClass().getName()%> associé à la valeur <code>value</code> de l'attribut <%=attr.getName()%>.
      *)
-    public abstract <%=attr.getAssociationClass().getQualifiedName()%> get<%=Util.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId, <%=attr.getType()%> value) throws TopiaException;
+    public abstract <%=attr.getAssociationClass().getQualifiedName()%> get<%=GeneratorUtil.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId, <%=attr.getType()%> value) throws TopiaException;
 
     /**
      * @return Le nombre d'éléments de la collection <%=attr.getName()%>.
      *)
-    public abstract int size<%=Util.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException;
+    public abstract int size<%=GeneratorUtil.capitalize(assocAttrName)%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException;
 
 }*/
                 }
@@ -630,7 +630,7 @@
             String method = op.getReturnType()+ " "+op.getName()+"(";
 /*{    /**
 }*/
-            if (GeneratorUtil.hasDocumentation(op)) {
+            if (TopiaGeneratorUtil.hasDocumentation(op)) {
 /*{     * <%=op.getName()%> : <%=op.getDocumentation()%>
 }*/
             }
@@ -671,17 +671,17 @@
     }
 
     private void generateAssociationAccessors(Writer output, ObjectModelClass clazz, String name, String type) throws IOException {
-        methods.add("=> "+"void set"+Util.capitalize(name)+"Of"+clazz.getName()+"(String topiaId, "+type+" value)");
-        methods.add("=> "+type+" get"+Util.capitalize(name)+"Of"+clazz.getName()+"(String topiaId)");
+        methods.add("=> "+"void set"+GeneratorUtil.capitalize(name)+"Of"+clazz.getName()+"(String topiaId, "+type+" value)");
+        methods.add("=> "+type+" get"+GeneratorUtil.capitalize(name)+"Of"+clazz.getName()+"(String topiaId)");
 /*{    /**
      * @param value La valeur de l'attribut <%=name%> à positionner.
      *)
-    public abstract void set<%=Util.capitalize(name)%>Of<%=clazz.getName()%>(String topiaId, <%=type%> value) throws TopiaException;
+    public abstract void set<%=GeneratorUtil.capitalize(name)%>Of<%=clazz.getName()%>(String topiaId, <%=type%> value) throws TopiaException;
 
     /**
      * @return La valeur de l'attribut <%=name%>.
      *)
-    public abstract <%=type%> get<%=Util.capitalize(name)%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException;
+    public abstract <%=type%> get<%=GeneratorUtil.capitalize(name)%>Of<%=clazz.getName()%>(String topiaId) throws TopiaException;
 
 }*/
     }

Modified: topia/branches/generators-refactoring/topia-ui/src/main/java/org/codelutin/topia/generator/TapestryWebGenerator.java
===================================================================
--- topia/branches/generators-refactoring/topia-ui/src/main/java/org/codelutin/topia/generator/TapestryWebGenerator.java	2009-01-29 10:53:27 UTC (rev 1327)
+++ topia/branches/generators-refactoring/topia-ui/src/main/java/org/codelutin/topia/generator/TapestryWebGenerator.java	2009-01-29 11:18:00 UTC (rev 1328)
@@ -30,7 +30,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.codelutin.generator.MonitorWriter;
 import org.codelutin.generator.StateModelGenerator;
-import org.codelutin.generator.Util;
+import org.codelutin.generator.GeneratorUtil;
 import org.codelutin.generator.models.state.StateModel;
 import org.codelutin.generator.models.state.StateModelComplexState;
 import org.codelutin.generator.models.state.StateModelSimpleState;
@@ -105,7 +105,7 @@
 	 * @return name
 	 */
 	protected String getNameFromState(StateModelState state) {
-		return "Abstract" +  Util.toUpperCaseFirstLetter(state.getName());
+		return "Abstract" +  GeneratorUtil.toUpperCaseFirstLetter(state.getName());
 	}
 	
 	/**
@@ -202,7 +202,7 @@
 	 * @throws IOException
 	 */
 	protected void generateFromSimpleState(Writer output, StateModelStateChart chart, StateModelState state) throws IOException {
-        //String copyright = GeneratorUtil.getCopyright(model);
+        //String copyright = GeneratorGeneratorUtil.getCopyright(model);
 	    String copyright = model.getTagValue("copyright");
         if (copyright != null && !copyright.isEmpty()) {
 /*{<%=copyright%>
@@ -256,21 +256,21 @@
 /*{
     /* linked state "<%=toState.getName()%>" *)
     @InjectPage
-    private <%=Util.toUpperCaseFirstLetter(toInitState.getName())%> <%=Util.toLowerCaseFirstLetter(toInitState.getName())%>;
+    private <%=GeneratorUtil.toUpperCaseFirstLetter(toInitState.getName())%> <%=GeneratorUtil.toLowerCaseFirstLetter(toInitState.getName())%>;
 }*/
 				// l'attribut etant prive, il faut un getter
 /*{
 	/* getter for state "<%=toState.getName()%>" *)
-	protected <%=Util.toUpperCaseFirstLetter(toInitState.getName())%> get<%=Util.toUpperCaseFirstLetter(toInitState.getName())%>() {
-		return <%=Util.toLowerCaseFirstLetter(toInitState.getName())%>;
+	protected <%=GeneratorUtil.toUpperCaseFirstLetter(toInitState.getName())%> get<%=GeneratorUtil.toUpperCaseFirstLetter(toInitState.getName())%>() {
+		return <%=GeneratorUtil.toLowerCaseFirstLetter(toInitState.getName())%>;
 	}
 }*/
 				}
 /*{
 	/* transition on <%=transition.getEvent()%> event *)
-	public Object onActionFrom<%=Util.toUpperCaseFirstLetter(transition.getEvent())%>() {
+	public Object onActionFrom<%=GeneratorUtil.toUpperCaseFirstLetter(transition.getEvent())%>() {
 		enterUseCase();
-		return <%=Util.toLowerCaseFirstLetter(toInitState.getName())%>;
+		return <%=GeneratorUtil.toLowerCaseFirstLetter(toInitState.getName())%>;
 	}
 }*/
 			}
@@ -287,26 +287,26 @@
 /*{
     /* linked state "<%=simpleToState.getName()%>" *)
 	@InjectPage
-	private <%=Util.toUpperCaseFirstLetter(simpleToState.getName())%> <%=Util.toLowerCaseFirstLetter(simpleToState.getName())%>;
+	private <%=GeneratorUtil.toUpperCaseFirstLetter(simpleToState.getName())%> <%=GeneratorUtil.toLowerCaseFirstLetter(simpleToState.getName())%>;
 }*/
 					// l'attribut etant prive, il faut un getter
 /*{
 	/* getter for state "<%=simpleToState.getName()%>" *)
-	protected <%=Util.toUpperCaseFirstLetter(simpleToState.getName())%> get<%=Util.toUpperCaseFirstLetter(simpleToState.getName())%>() {
-		return <%=Util.toLowerCaseFirstLetter(simpleToState.getName())%>;
+	protected <%=GeneratorUtil.toUpperCaseFirstLetter(simpleToState.getName())%> get<%=GeneratorUtil.toUpperCaseFirstLetter(simpleToState.getName())%>() {
+		return <%=GeneratorUtil.toLowerCaseFirstLetter(simpleToState.getName())%>;
 	}
 }*/
 					}
 				} // isFinal
 /*{
 	/* transition on "<%=transition.getEvent()%>" event *)
-	public Object onActionFrom<%=Util.toUpperCaseFirstLetter(transition.getEvent())%>() {
+	public Object onActionFrom<%=GeneratorUtil.toUpperCaseFirstLetter(transition.getEvent())%>() {
 }*/
 				if(simpleToState.isFinal()) {
 /*{		return leaveUseCase();
 }*/
 				} else {
-/*{		return <%=Util.toLowerCaseFirstLetter(simpleToState.getName())%>;
+/*{		return <%=GeneratorUtil.toLowerCaseFirstLetter(simpleToState.getName())%>;
 }*/
 				}
 /*{    }

    

[Topia-commits] r1328 - in topia/branches/generators-refactoring: topia-soa/src/main/java/org/codelutin/topia/generator topia-ui/src/main/java/org/codelutin/topia/generator

thimel＠users.labs.libre-entreprise.org