Index: topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToEntityPanel.java
diff -u topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToEntityPanel.java:1.2 topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToEntityPanel.java:1.3
--- topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToEntityPanel.java:1.2	Wed Jun  9 10:58:37 2004
+++ topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToEntityPanel.java	Fri Jun 11 15:37:37 2004
@@ -23,9 +23,9 @@
 *
 * @author Benjamin Poussin <poussin@codelutin.com>
 * Copyright Code Lutin
-* @version $Revision: 1.2 $
+* @version $Revision: 1.3 $
 *
-* Mise a jour: $Date: 2004/06/09 10:58:37 $
+* Mise a jour: $Date: 2004/06/11 15:37:37 $
 * par : $Author: mazelier $
 */
 
@@ -52,7 +52,10 @@
         if(Util.isEntity(clazz)){
             if (!"".equals(clazz.getPackageName())) {
 /*{
-    package <%=Util.getParentPackageName(clazz.getPackageName())%>.ui;
+package <%=clazz.getPackageName()%>.ui;
+
+import org.codelutin.topia.TopiaContext;
+import org.codelutin.topia.TopiaException;
 }*/
             }
 /*{

Index: topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToEntityUIModel.java
diff -u topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToEntityUIModel.java:1.8 topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToEntityUIModel.java:1.9
--- topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToEntityUIModel.java:1.8	Thu Jun 10 14:08:51 2004
+++ topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToEntityUIModel.java	Fri Jun 11 15:37:37 2004
@@ -23,9 +23,9 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
  *
- * Mise a jour: $Date: 2004/06/10 14:08:51 $
+ * Mise a jour: $Date: 2004/06/11 15:37:37 $
  * par : $Author: mazelier $
  */
 
@@ -48,7 +48,7 @@
 public class ObjectModelToEntityUIModel extends ObjectModelGenerator { // ObjectModelToEntityUIModel
 
     public String getFilenameForClass(ObjectModelClass clazz) {
-        return (clazz.getPackageName() + ".ui.")
+        return (Util.getParentPackageName(clazz.getPackageName()) + ".ui.")
         .replace('.', File.separatorChar)
         + clazz.getName() + ".uimodel";
     }
@@ -63,8 +63,8 @@
  | http://www.codelutin.com
  +-->
 
-<uimodel version="1.0"<%if (!"".equals(clazz.getPackageName())) {
-    %> package="<%=clazz.getPackageName()%>.ui"<% } %>>
+<uimodel version="1.0"<%if (!"".equals(Util.getParentPackageName(clazz.getPackageName()))) {
+    %> package="<%=Util.getParentPackageName(clazz.getPackageName())%>.ui"<% } %>>
   <object class="javax.swing.JPanel">
     <properties>
       <property name="layout">

Index: topia/src/java/org/codelutin/topia/generators/ui/UIModelToUICallbackSwingGenerator.java
diff -u topia/src/java/org/codelutin/topia/generators/ui/UIModelToUICallbackSwingGenerator.java:1.3 topia/src/java/org/codelutin/topia/generators/ui/UIModelToUICallbackSwingGenerator.java:1.4
--- topia/src/java/org/codelutin/topia/generators/ui/UIModelToUICallbackSwingGenerator.java:1.3	Thu Jun 10 14:08:51 2004
+++ topia/src/java/org/codelutin/topia/generators/ui/UIModelToUICallbackSwingGenerator.java	Fri Jun 11 15:37:37 2004
@@ -23,9 +23,9 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
  *
- * Mise a jour: $Date: 2004/06/10 14:08:51 $
+ * Mise a jour: $Date: 2004/06/11 15:37:37 $
  * par : $Author: mazelier $
  */
 
@@ -65,33 +65,42 @@
         // ------------- File Header
         if (!model.getPackage().equals("")) {
 /*{
-<!--
- | Generated: by ToPIA Framework
- | Copyright Code Lutin
- | http://www.codelutin.com
- +-->
-     package <%=model.getPackage()%>;
+// | Generated: by ToPIA Framework
+// | Copyright Code Lutin
+// | http://www.codelutin.com
+
+
+package <%=Util.getParentPackageName(model.getPackage())%>.ui;
+
 }*/
         }
         // ------------- Imports
 /*{
-     import org.codelutin.topia.TopiaException;
+import org.codelutin.topia.TopiaException;
 
-     public interface <%= Util.toUpperCaseFirstLetter(model.getRoot().getName()) %>UICallback {
+    public interface <%=Util.toUpperCaseFirstLetter(model.getRoot().getName())%>UICallback {
 }*/
         // generation des signatures des handlers de l'objet
         for(Iterator o = model.getObjects().iterator(); o.hasNext();) {
             UIModelObject object = (UIModelObject)o.next();
             for(Iterator i = object.getEvents().iterator(); i.hasNext();){
                  UIModelEvent event = (UIModelEvent)i.next();
+                 if (event.getArgument()==null){
+/*{
+
+        public void <%= event.getHandler() %>();
+}*/
+                 }else{
 /*{
+
         public void <%= event.getHandler() %>(<%= event.getArgument() %>);
 }*/
+                 }
             }
         }
 // accolade de fin d'interface
 /*{
-     }
+    }
 }*/
     }
 } // UIModelToUICallbackSwingGenerator

Index: topia/src/java/org/codelutin/topia/generators/ui/UIModelToUISwingGenerator.java
diff -u topia/src/java/org/codelutin/topia/generators/ui/UIModelToUISwingGenerator.java:1.3 topia/src/java/org/codelutin/topia/generators/ui/UIModelToUISwingGenerator.java:1.4
--- topia/src/java/org/codelutin/topia/generators/ui/UIModelToUISwingGenerator.java:1.3	Thu Jun 10 14:08:51 2004
+++ topia/src/java/org/codelutin/topia/generators/ui/UIModelToUISwingGenerator.java	Fri Jun 11 15:37:37 2004
@@ -23,9 +23,9 @@
 *
 * @author Benjamin Poussin <poussin@codelutin.com>
 * Copyright Code Lutin
-* @version $Revision: 1.3 $
+* @version $Revision: 1.4 $
 *
-* Mise a jour: $Date: 2004/06/10 14:08:51 $
+* Mise a jour: $Date: 2004/06/11 15:37:37 $
 * par : $Author: mazelier $
 */
 
@@ -90,11 +90,11 @@
 // ------------- File Header
         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;
 }*/
         }
@@ -106,6 +106,9 @@
     import java.util.ArrayList;
     import java.awt.Component;
     import javax.swing.RootPaneContainer;
+    import java.util.Iterator;
+    import java.beans.EventHandler;
+    import java.awt.Container;
 
     public abstract class <%=Util.toUpperCaseFirstLetter(object.getName())%>UI extends <%=object.getType()%> implements <%=Util.toUpperCaseFirstLetter(object.getName())%>UICallback {
 }*/
@@ -139,7 +142,7 @@
 
 /*{
      public void init() {
-         Component result = this;
+         <%=Util.toUpperCaseFirstLetter(object.getName())%>UI result = this;
 }*/
 
          generateAllStatement(output, object);
@@ -342,7 +345,9 @@
             }else if (arg instanceof UIModelObject){
                 UIModelObject objectArg = (UIModelObject)arg;
 /*{
-              result.setLayout(new <%= objectArg.getType()%>(<%=generateArgumentStatement(output, objectArg)%>));
+              if (result instanceof Container) {
+                  ((Container)result).setLayout(new <%= objectArg.getType()%>(<%=generateArgumentStatement(output, objectArg)%>));
+              }
 }*/
             }
         }
@@ -434,6 +439,15 @@
     }
 
     /**
+    * Methode pour "construire" l'objet anonyme comme les constraints ou leurs arguments
+    */
+
+    public void generateInstanciationObject(Writer output, UIModelObject object)
+    throws IOException {
+
+    }
+
+    /**
     * Methode pour "construire" l'objet (events, properties, child ...)
     */
     public void generateAllStatement(Writer output, UIModelObject object)
@@ -451,7 +465,7 @@
               for(Iterator iChilds = childs.iterator(); iChilds.hasNext(); ){
                  Component c = (Component)iChilds.next();
                  if (result instanceof RootPaneContainer) {
-                     result.getContentPane().add(c, iConstraints.next());
+                     ((RootPaneContainer)result).getContentPane().add(c, iConstraints.next());
                  }else{
                      result.add(c, iConstraints.next());
                  }