Index: topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToEntityPanel.java
diff -u topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToEntityPanel.java:1.4 topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToEntityPanel.java:1.5
--- topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToEntityPanel.java:1.4	Mon Jun 21 09:51:17 2004
+++ topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToEntityPanel.java	Wed Jun 23 15:44:25 2004
@@ -23,10 +23,10 @@
 *
 * @author Benjamin Poussin <poussin@codelutin.com>
 * Copyright Code Lutin
-* @version $Revision: 1.4 $
+* @version $Revision: 1.5 $
 *
-* Mise a jour: $Date: 2004/06/21 09:51:17 $
-* par : $Author: bpoussin $
+* Mise a jour: $Date: 2004/06/23 15:44:25 $
+* par : $Author: mazelier $
 */
 
 package org.codelutin.topia.generators.ui;
@@ -51,6 +51,7 @@
     throws IOException {
         if(Util.isEntity(clazz)){
             if (!"".equals(clazz.getPackageName())) {
+
 /*{
 package <%=clazz.getPackageName()%>.ui;
 
@@ -62,22 +63,20 @@
 
     public class <%=clazz.getName()%>Panel extends <%=clazz.getName()%>PanelUI {
 
-      protected TopiaContext context = null;
+        public <%=clazz.getName()%>Panel(){
+            init();
+        }
+
 
-      public <%=clazz.getName()%>Panel(TopiaContext context){
-        this.context = context;
-        init();
-      }
-
-      public void on_save(){
-          // TODO a implanter
-          System.out.println("on_save");
-      }
-
-      public void on_cancel(){
-          // TODO a implanter
-          System.out.println("on_cancel");
-      }
+        public void on_save(){
+            // TODO a implanter
+            System.out.println("on_save");
+        }
+
+        public void on_cancel(){
+            // TODO a implanter
+            System.out.println("on_cancel");
+        }
     }
 }*/
         }

Index: topia/src/java/org/codelutin/topia/generators/ui/UIModelToUISwingGenerator.java
diff -u topia/src/java/org/codelutin/topia/generators/ui/UIModelToUISwingGenerator.java:1.6 topia/src/java/org/codelutin/topia/generators/ui/UIModelToUISwingGenerator.java:1.7
--- topia/src/java/org/codelutin/topia/generators/ui/UIModelToUISwingGenerator.java:1.6	Mon Jun 21 10:10:25 2004
+++ topia/src/java/org/codelutin/topia/generators/ui/UIModelToUISwingGenerator.java	Wed Jun 23 15:44:25 2004
@@ -23,10 +23,10 @@
 *
 * @author Benjamin Poussin <poussin@codelutin.com>
 * Copyright Code Lutin
-* @version $Revision: 1.6 $
+* @version $Revision: 1.7 $
 *
-* Mise a jour: $Date: 2004/06/21 10:10:25 $
-* par : $Author: bpoussin $
+* Mise a jour: $Date: 2004/06/23 15:44:25 $
+* par : $Author: mazelier $
 */
 
 package org.codelutin.topia.generators.ui;
@@ -341,7 +341,9 @@
             }else if (arg instanceof UIModelObject){
                 UIModelObject objectArg = (UIModelObject)arg;
 /*{
-             if (result instanceof Container) {
+              if (result instanceof RootPaneContainer){
+                  ((RootPaneContainer)result).getContentPane().setLayout(new <%= objectArg.getType()%>(}*/generateArgumentStatement(output, objectArg);/*{));
+              }else if (result instanceof Container) {
                  ((Container)result).setLayout(new <%= objectArg.getType()%>(}*/generateArgumentStatement(output, objectArg);/*{));
              }
 }*/