Index: topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToEntityUIModel.java
diff -u topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToEntityUIModel.java:1.14 topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToEntityUIModel.java:1.15
--- topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToEntityUIModel.java:1.14	Tue Jun 22 19:01:06 2004
+++ topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToEntityUIModel.java	Fri Jun 25 16:11:20 2004
@@ -23,15 +23,15 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.14 $
+ * @version $Revision: 1.15 $
  *
- * Mise a jour: $Date: 2004/06/22 19:01:06 $
- * par : $Author: bpoussin $
+ * Mise a jour: $Date: 2004/06/25 16:11:20 $
+ * par : $Author: mazelier $
  */
 
 package org.codelutin.topia.generators.ui;
 
-import org.codelutin.generator.ObjectModelGenerator;
+import org.codelutin.generator.ObjectModelGeneratorWithCapitalizeName;
 import org.codelutin.generator.models.object.ObjectModelClass;
 import org.codelutin.generator.models.object.ObjectModelAttribute;
 import java.io.File;
@@ -45,7 +45,7 @@
 * modification des Entities.
 * @todo a implanter comme il faut
 */
-public class ObjectModelToEntityUIModel extends ObjectModelGenerator { // ObjectModelToEntityUIModel
+public class ObjectModelToEntityUIModel extends ObjectModelGeneratorWithCapitalizeName { // ObjectModelToEntityUIModel
 
     public String getFilenameForClass(ObjectModelClass clazz) {
         // put .uimodel file in uimodel directory
@@ -91,7 +91,7 @@
             </property>
             <property name="text">
               <arguments>
-                <string><%=Util.capitalize(clazz.getName())%></string>
+                <string><%=capitalizeName(clazz)%></string>
               </arguments>
             </property>
           </properties>
@@ -139,7 +139,7 @@
             </property>
             <property name="text">
               <arguments>
-                <string><%=Util.capitalize(att.getName())%></string>
+                <string><%=capitalizeName(att)%></string>
               </arguments>
             </property>
           </properties>

Index: topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToWidgetsXML.java
diff -u topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToWidgetsXML.java:1.3 topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToWidgetsXML.java:1.4
--- topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToWidgetsXML.java:1.3	Thu Jun 24 16:13:58 2004
+++ topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToWidgetsXML.java	Fri Jun 25 16:11:20 2004
@@ -23,15 +23,15 @@
 *
 * @author Benjamin Poussin <poussin@codelutin.com>
 * Copyright Code Lutin
-* @version $Revision: 1.3 $
+* @version $Revision: 1.4 $
 *
-* Mise a jour: $Date: 2004/06/24 16:13:58 $
+* Mise a jour: $Date: 2004/06/25 16:11:20 $
 * par : $Author: mazelier $
 */
 
 package org.codelutin.topia.generators.ui;
 
-import org.codelutin.generator.ObjectModelGenerator;
+import org.codelutin.generator.ObjectModelGeneratorWithCapitalizeName;
 import org.codelutin.generator.models.object.ObjectModel;
 import org.codelutin.generator.models.object.ObjectModelClass;
 import java.io.Writer;
@@ -44,7 +44,7 @@
 * pourra etre charge et le panel genere dans Topia pourra apparaitre dans la palette
 * de Buix
 */
-public class ObjectModelToWidgetsXML extends ObjectModelGenerator{ // ObjectModelToWidgetsXML
+public class ObjectModelToWidgetsXML extends ObjectModelGeneratorWithCapitalizeName{ // ObjectModelToWidgetsXML
 
     public String getFilenameForModel(ObjectModel model) {
         return  model.getName()+"-widgets.xml";
@@ -72,7 +72,7 @@
         if(! Util.isEntity(clazz)) return;
 /*{
 
-    <widget shelf="<%if (model.getName()!=null){ %> <%=model.getName()%> <%}else{%> UserPanel <%}%> " class="<%=clazz.getPackageName()%>.ui.<%=clazz.getName()%>Panel"/>
+    <widget shelf="<%if (model.getName()!=null){ %> <%=model.getName()%> <%}else{%> UserPanel <%}%> " class="<%=clazz.getPackageName()%>.ui.<%=capitalizeName(clazz)%>Panel"/>
 }*/
 
     }

Index: topia/src/java/org/codelutin/topia/generators/ui/UIModelToUICallbackSwingGenerator.java
diff -u topia/src/java/org/codelutin/topia/generators/ui/UIModelToUICallbackSwingGenerator.java:1.5 topia/src/java/org/codelutin/topia/generators/ui/UIModelToUICallbackSwingGenerator.java:1.6
--- topia/src/java/org/codelutin/topia/generators/ui/UIModelToUICallbackSwingGenerator.java:1.5	Mon Jun 21 10:10:25 2004
+++ topia/src/java/org/codelutin/topia/generators/ui/UIModelToUICallbackSwingGenerator.java	Fri Jun 25 16:11:20 2004
@@ -23,10 +23,10 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
  *
- * Mise a jour: $Date: 2004/06/21 10:10:25 $
- * par : $Author: bpoussin $
+ * Mise a jour: $Date: 2004/06/25 16:11:20 $
+ * par : $Author: mazelier $
  */
 
 package org.codelutin.topia.generators.ui;
@@ -37,7 +37,7 @@
 
 import org.codelutin.generator.models.ui.*;
 import org.codelutin.generator.models.ui.xml.*;
-import org.codelutin.generator.UIModelGenerator;
+import org.codelutin.generator.UIModelGeneratorWithCapitalizeName;
 
 import java.util.Iterator;
 import org.codelutin.topia.generators.Util;
@@ -47,14 +47,14 @@
 * Cette classe etend le generator present dans lutingenerator
 * @see UIModel
 */
-public class UIModelToUICallbackSwingGenerator extends UIModelGenerator { // UIModelToUICallbackSwingGenerator
+public class UIModelToUICallbackSwingGenerator extends UIModelGeneratorWithCapitalizeName { // UIModelToUICallbackSwingGenerator
 
     /**
     * Methode qui permet de generer une interface UICallback a partir de UIModel
     */
     public String getFilenameForUIModel(UIModel model) {
-        String name = model.getRoot().getName();
-        return model.getPackage().replace('.', File.separatorChar) + File.separatorChar + Util.capitalize(name) + "UICallback.java";
+
+        return model.getPackage().replace('.', File.separatorChar) + File.separatorChar + capitalizeName(model.getRoot()) + "UICallback.java";
     }
 
     /**
@@ -78,7 +78,7 @@
 /*{
 import org.codelutin.topia.TopiaException;
 
-    public interface <%=Util.capitalize(model.getRoot().getName())%>UICallback {
+    public interface <%=capitalizeName(model.getRoot())%>UICallback {
 }*/
         // generation des signatures des handlers de l'objet
         for(Iterator o = model.getObjects().iterator(); o.hasNext();) {

Index: topia/src/java/org/codelutin/topia/generators/ui/UIModelToUISwingGenerator.java
diff -u topia/src/java/org/codelutin/topia/generators/ui/UIModelToUISwingGenerator.java:1.7 topia/src/java/org/codelutin/topia/generators/ui/UIModelToUISwingGenerator.java:1.8
--- topia/src/java/org/codelutin/topia/generators/ui/UIModelToUISwingGenerator.java:1.7	Wed Jun 23 15:44:25 2004
+++ topia/src/java/org/codelutin/topia/generators/ui/UIModelToUISwingGenerator.java	Fri Jun 25 16:11:20 2004
@@ -23,16 +23,16 @@
 *
 * @author Benjamin Poussin <poussin@codelutin.com>
 * Copyright Code Lutin
-* @version $Revision: 1.7 $
+* @version $Revision: 1.8 $
 *
-* Mise a jour: $Date: 2004/06/23 15:44:25 $
+* Mise a jour: $Date: 2004/06/25 16:11:20 $
 * par : $Author: mazelier $
 */
 
 package org.codelutin.topia.generators.ui;
 
 import org.codelutin.generator.models.ui.*;
-import org.codelutin.generator.UIModelGenerator;
+import org.codelutin.generator.UIModelGeneratorWithCapitalizeName;
 import org.codelutin.topia.generators.Util;
 
 import java.io.Writer;
@@ -48,7 +48,7 @@
 * Cette classe etend le generator present dans lutingenerator
 * @see UIModel
 */
-public class UIModelToUISwingGenerator extends UIModelGenerator { //UIModelToUISwingGenerator
+public class UIModelToUISwingGenerator extends UIModelGeneratorWithCapitalizeName { //UIModelToUISwingGenerator
 
     private String objectName;
     private static int nbAnonymousObject = 0;
@@ -57,9 +57,8 @@
     *
     */
     public String getFilenameForUIModel(UIModel model) {
-        String name = model.getRoot().getName();
         return model.getPackage().replace('.', File.separatorChar)
-        + File.separatorChar + Util.capitalize(name) + "UI.java";
+        + File.separatorChar + capitalizeName(model.getRoot()) + "UI.java";
     }
 
     /**
@@ -91,11 +90,13 @@
         if (!object.getModel().getPackage().equals("")) {
 /*{
 
-// Generated: by ToPIA Framework
-// Copyright Code Lutin
-// http://www.codelutin.com
+/** Generated: by ToPIA Framework
+*   Copyright Code Lutin
+*   http://www.codelutin.com
+*)
 
 package <%=Util.getParentPackageName(object.getModel().getPackage())%>.ui;
+package <%=object.getModel().getPackage()%>.ui;
 }*/
         }
 
@@ -103,37 +104,43 @@
 /*{
 
 import org.codelutin.topia.TopiaException;
+//import org.codelutin.i18n.I18n;
+
 import java.util.ArrayList;
+import java.util.Iterator;
+
 import java.awt.Component;
+import java.awt.Container;
+
 import javax.swing.RootPaneContainer;
-import java.util.Iterator;
 import java.beans.EventHandler;
-import java.awt.Container;
 
-public abstract class <%=Util.capitalize(object.getName())%>UI extends <%=object.getType()%> implements <%=Util.capitalize(object.getName())%>UICallback {
+
+
+public abstract class <%=capitalizeName(object)%>UI extends <%=object.getType()%> implements <%=capitalizeName(object)%>UICallback {
 }*/
         //creation des constructeurs selon le type de l'objet
         if (object.getType().equals("javax.swing.JDialog")){
 /*{
 
-    public <%=Util.capitalize(object.getName())%>UI(){
+    public <%=capitalizeName(object)%>UI(){
         this((Frame)null);
     }
 
-    public <%=Util.capitalize(object.getName())%>UI(Dialog owner){
-        super(owner, i18n._("<%=object.getProperty("title").getStringValue()%>"),                      <%=object.getProperty("modal").getBooleanValue()%>);
+    public <%=capitalizeName(object)%>UI(Dialog owner){
+        super(owner, I18n._("<%=object.getProperty("title").getStringValue()%>"),                      <%=object.getProperty("modal").getBooleanValue()%>);
     }
 
-    public <%=Util.capitalize(object.getName())%>UI(Frame owner){
-        super(owner, i18n._("<%=object.getProperty("title").getStringValue()%>"), <%=object.getProperty("modal").getBooleanValue()%>);
+    public <%=capitalizeName(object)%>UI(Frame owner){
+        super(owner, I18n._("<%=object.getProperty("title").getStringValue()%>"), <%=object.getProperty("modal").getBooleanValue()%>);
     }
 }*/
 
         }else if (object.getType().equals("javax.swing.JFrame")){
 /*{
 
-    public <%=Util.capitalize(object.getName())%>UI(){
-        super(i18n._("<%=object.getProperty("title").getStringValue()%>"));
+    public <%=capitalizeName(object)%>UI(){
+        super(I18n._("<%=object.getProperty("title").getStringValue()%>"));
     }
 }*/
         }
@@ -142,7 +149,7 @@
 
 /*{
     public void init() {
-        <%=Util.capitalize(object.getName())%>UI result = this;
+        <%=capitalizeName(object)%>UI result = this;
 }*/
 
          generateAllStatement(output, object);
@@ -175,7 +182,7 @@
 
     // declaration de l'objet
     private <%=object.getType()%> <%=objectName%> = null;
-    public <%=object.getType()%> get<%=Util.capitalize(object.getName())%>() {
+    public <%=object.getType()%> get<%=capitalizeName(object)%>() {
 
         // test si deja instancier
         if(<%=objectName%> == null){
@@ -248,7 +255,7 @@
         if (args.size() == 0 ){
 /*{
 
-    public <%=Util.capitalize(object.getName())%>UI(){
+    public <%=capitalizeName(object)%>UI(){
         super();
     }
 
@@ -256,7 +263,7 @@
         }else{
 /*{
 
-    public <%=Util.capitalize(object.getName())%>UI( }*/
+    public <%=capitalizeName(object)%>UI( }*/
     generateArgumentStatement(output, object);
     /*{  ){
          super(}*/generateArgumentStatement(output, object);/*{);
@@ -316,22 +323,22 @@
 
                         UIModelObject objectArg = (UIModelObject)arg;
 /*{
-             result.set<%=Util.capitalize(propertyName)%>(<%=index%>get<%=Util.capitalize(objectArg.getName())%>());
+             result.set<%=capitalizeName(property)%>(<%=index%>get<%=capitalizeName(objectArg)%>());
 }*/
                     // cas ou la propriete est de type string
                     }else if (arg instanceof String){
 /*{
-             result.set<%=Util.capitalize(propertyName)%>(<%=index%>"<%=property.getStringValue()%>");
+             result.set<%=capitalizeName(property)%>(<%=index%>"<%=property.getStringValue()%>");
 }*/
 
                     // cas ou la propriete est de type char
                     }else if (arg instanceof Character){
 /*{
-             result.set<%=Util.capitalize(propertyName)%>(<%=index%>'<%=property.getCharValue()%>');
+             result.set<%=capitalizeName(property)%>(<%=index%>'<%=property.getCharValue()%>');
 }*/
                     }else{
 /*{
-             result.set<%=Util.capitalize(propertyName)%>(<%=index%><%=property.getValue().toString()%>);
+             result.set<%=capitalizeName(property)%>(<%=index%><%=property.getValue().toString()%>);
 }*/
                     }
                 }catch(Exception eee){
@@ -379,14 +386,14 @@
 
 /*{
 
-    public ArrayList get<%=Util.capitalize(object.getName())%>Childs() {
+    public ArrayList get<%=capitalizeName(object)%>Childs() {
         ArrayList children = new ArrayList();
 }*/
         for(Iterator i=object.getChildren().iterator(); i.hasNext();){
             UIModelObject objectChild = (UIModelObject) i.next();
 
 /*{
-        children.add(get<%=Util.capitalize(objectChild.getName())%>());
+        children.add(get<%=capitalizeName(objectChild)%>());
 }*/
         }
 /*{
@@ -405,7 +412,7 @@
 
 /*{
 
-    public ArrayList get<%=Util.capitalize(object.getName())%>Constraints() {
+    public ArrayList get<%=capitalizeName(object)%>Constraints() {
         ArrayList constraints = new ArrayList();
 }*/
         for(Iterator i=object.getChildren().iterator(); i.hasNext();){
@@ -450,8 +457,8 @@
 /*{
 
              // recuperation des differentes donnees concernant l'objet
-             ArrayList childs = get<%=Util.capitalize(object.getName())%>Childs();
-             ArrayList constraints = get<%=Util.capitalize(object.getName())%>Constraints();
+             ArrayList childs = get<%=capitalizeName(object)%>Childs();
+             ArrayList constraints = get<%=capitalizeName(object)%>Constraints();
 
              // ajout des enfants avec leur contrainte
              Iterator iConstraints = constraints.iterator();