Index: topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityAttributesPanel.java
diff -u topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityAttributesPanel.java:1.4 topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityAttributesPanel.java:1.5
--- topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityAttributesPanel.java:1.4	Fri Jul 16 16:19:35 2004
+++ topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityAttributesPanel.java	Tue Jul 20 16:02:25 2004
@@ -23,9 +23,9 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
  *
- * Mise a jour: $Date: 2004/07/16 16:19:35 $
+ * Mise a jour: $Date: 2004/07/20 16:02:25 $
  * par : $Author: mazelier $
  */
 
@@ -37,6 +37,9 @@
 
 import org.codelutin.generator.ObjectModelGeneratorWithCapitalizeName;
 import org.codelutin.generator.models.object.ObjectModelClass;
+import org.codelutin.generator.models.object.ObjectModelAttribute;
+
+import java.util.Iterator;
 
 /**
 * Ce generateur permet de generer la classe avec le panel des attributs de
@@ -63,25 +66,31 @@
 
 package <%=clazz.getPackageName()%>.ui;
 
-import javax.naming.Context;
+import org.codelutin.topia.TopiaContext;
 
-public class <%=capitalizeName(clazz)%>AttributesPanelPanel extends <%=capitalizeName(clazz)%>TablePanelUI {
+public class <%=capitalizeName(clazz)%>AttributesPanelPanel extends <%=capitalizeName(clazz)%>AttributesPanelUI {
 
     public <%=capitalizeName(clazz)%>AttributesPanelPanel(){
         init();
     }
-    public <%=capitalizeName(clazz)%>AttributesPanelPanel(Context context){
+
+    public <%=capitalizeName(clazz)%>AttributesPanelPanel(TopiaContext context){
+        setContext(context);
         init();
-        this.context = context;
     }
+}*/
 
-    public Context getContext(){
-        return context;
-    }
+    for(Iterator i=clazz.getAttributes().iterator(); i.hasNext();) {
+    ObjectModelAttribute att = (ObjectModelAttribute)i.next();
+/*{
 
-    public void setContext(Context context){
-        this.context = context;
+    public void on_add<%=capitalizeName(att)%>Entities(){
+        // TODO a implanter
+        System.out.println("on_add<%=capitalizeName(att)%>Entities");
+    }
+}*/
     }
+/*{
 }
 }*/
         }

Index: topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityAttributesUIModel.java
diff -u topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityAttributesUIModel.java:1.4 topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityAttributesUIModel.java:1.5
--- topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityAttributesUIModel.java:1.4	Fri Jul 16 16:19:35 2004
+++ topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityAttributesUIModel.java	Tue Jul 20 16:02:25 2004
@@ -23,9 +23,9 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
  *
- * Mise a jour: $Date: 2004/07/16 16:19:35 $
+ * Mise a jour: $Date: 2004/07/20 16:02:25 $
  * par : $Author: mazelier $
  */
 
@@ -85,6 +85,48 @@
       <children>
   }*/
   int counterArguments = 1;
+  for(Iterator i=clazz.getSuperclasses().iterator(); i.hasNext();) {
+      ObjectModelClass parent = (ObjectModelClass)i.next();
+/*{
+
+      <child>
+        <object class="<%=parent.getPackageName()%>.ui.<%=capitalizeName(parent)%>AttributesPanelPanel">
+          <properties>
+            <property name="name">
+              <arguments>
+                <string><%=capitalizeName(parent)%>Attributes</string>
+              </arguments>
+            </property>
+          </properties>
+        </object>
+        <layout>
+          <object class="java.awt.GridBagConstraints">
+            <arguments>
+              <int>0</int>
+              <int><%=counterArguments%></int>
+              <int>3</int>
+              <int>1</int>
+              <double>0.0</double>
+              <double>0.0</double>
+              <int>10</int>
+              <int>1</int>
+              <object class="java.awt.Insets">
+                <arguments>
+                  <int>0</int>
+                  <int>0</int>
+                  <int>0</int>
+                  <int>0</int>
+                </arguments>
+              </object>
+              <int>0</int>
+              <int>0</int>
+            </arguments>
+          </object>
+        </layout>
+      </child>
+}*/
+      counterArguments++;
+  }
   for(Iterator i=clazz.getAttributes().iterator(); i.hasNext();) {
       ObjectModelAttribute att = (ObjectModelAttribute)i.next();
   /*{
@@ -224,16 +266,10 @@
          }else{
 /*{
          <object class="javax.swing.JComboBox">
+           <arguments>
+             <object class="org.codelutin.topia.ui.swing.TopiaComboBoxModel"/>
+           </arguments>
 }*/
-//           <arguments>
-//             <object class="org.codelutin.topia.ui.swing.TopiaComboBoxModel">
-//               <arguments>
-//                 <object class="javax.naming.Context"/>
-//                 <object class="org.codelutin.topia.TopiaQuery"/>
-//               </arguments>
-//             </object>
-//           </arguments>
-
          }
 /*{
              <properties>
@@ -243,82 +279,76 @@
                  </arguments>
                </property>
              </properties>
+           </object>
+           <layout>
+             <object class="java.awt.GridBagConstraints">
+               <arguments>
+                 <int>1</int>
+                 <int><%=counterArguments%></int>
+                 <int>1</int>
+                 <int>1</int>
+                 <double>1.0</double>
+                 <double>1.0</double>
+                 <int>10</int>
+                 <int>1</int>
+                 <object class="java.awt.Insets">
+                   <arguments>
+                     <int>0</int>
+                     <int>0</int>
+                     <int>0</int>
+                     <int>0</int>
+                   </arguments>
+                 </object>
+                 <int>0</int>
+                 <int>0</int>
+               </arguments>
+             </object>
+           </layout>
+         </child>
 }*/
        if (att.getMaxMultiplicity()>1 || att.getMaxMultiplicity()==-1){
 /*{
-             <children>
-               <child>
-                 <object class="javax.swing.JButton">
-                   <properties>
-                     <property name="name">
-                       <arguments>
-                         <string>add<%=capitalizeName(att)%>Entities</string>
-                       </arguments>
-                     </property>
-                     <property name="text">
-                       <arguments>
-                         <string>Add</string>
-                       </arguments>
-                     </property>
+         <child>
+           <object class="javax.swing.JButton">
+             <properties>
+               <property name="name">
+                 <arguments>
+                   <string>add<%=capitalizeName(att)%>Entities</string>
+                 </arguments>
+               </property>
+               <property name="text">
+                 <arguments>
+                   <string>Add</string>
+                 </arguments>
+               </property>
 }*/
         ObjectModelAttribute attRev = att.getReverseAttribute();
         if (attRev != null && attRev.getMinMultiplicity()>=1){
 /*{
-                     <property name="enabled">
-                       <arguments>
-                         <boolean>false</boolean>
-                       </arguments>
-                     </property>
+               <property name="enabled">
+                 <arguments>
+                   <boolean>false</boolean>
+                 </arguments>
+               </property>
 }*/
         }
 /*{
-                   </properties>
-                   <events>
-                     <event addmethod="addActionListener" source="java.awt.event.ActionListener" action="actionPerformed" handler="on_add<%=capitalizeName(att)%>Entities"/>
-                   </events>
-                 </object>
-                 <layout>
-                   <object class="java.awt.GridBagConstraints">
-                     <arguments>
-                       <int>2</int>
-                       <int><%=counterArguments%></int>
-                       <int>1</int>
-                       <int>1</int>
-                       <double>0.0</double>
-                       <double>0.0</double>
-                       <int>10</int>
-                       <int>0</int>
-                       <object class="java.awt.Insets">
-                         <arguments>
-                           <int>0</int>
-                           <int>0</int>
-                           <int>0</int>
-                           <int>0</int>
-                         </arguments>
-                       </object>
-                       <int>0</int>
-                       <int>0</int>
-                     </arguments>
-                   </object>
-                 </layout>
-               </child>
-             </children>
-    }*/
-       }
-
-    /*{
+             </properties>
+             <events>
+               <event addmethod="addActionListener" source="java.awt.event.ActionListener" action="actionPerformed" handler="on_add<%=capitalizeName(att)%>Entities"/>
+             </events>
            </object>
            <layout>
              <object class="java.awt.GridBagConstraints">
                <arguments>
-                 <int>1</int>
+                 <int>2</int>
                  <int><%=counterArguments%></int>
                  <int>1</int>
                  <int>1</int>
-                 <double>1.0</double>
-                 <double>1.0</double>
+                 <double>0.0</double>
+                 <double>0.0</double>
                  <int>10</int>
-                 <int>1</int>
+                 <int>0</int>
                  <object class="java.awt.Insets">
                    <arguments>
                      <int>0</int>
@@ -334,6 +364,7 @@
            </layout>
          </child>
     }*/
+       }
     }
 
     /**

Index: topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityPanel.java
diff -u topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityPanel.java:1.4 topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityPanel.java:1.5
--- topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityPanel.java:1.4	Fri Jul 16 16:19:35 2004
+++ topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityPanel.java	Tue Jul 20 16:02:25 2004
@@ -23,9 +23,9 @@
 *
 * @author Benjamin Poussin <poussin@codelutin.com>
 * Copyright Code Lutin
-* @version $Revision: 1.4 $
+* @version $Revision: 1.5 $
 *
-* Mise a jour: $Date: 2004/07/16 16:19:35 $
+* Mise a jour: $Date: 2004/07/20 16:02:25 $
 * par : $Author: mazelier $
 */
 
@@ -34,10 +34,8 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.Writer;
-import java.util.Iterator;
 
 import org.codelutin.generator.ObjectModelGeneratorWithCapitalizeName;
-import org.codelutin.generator.models.object.ObjectModelAttribute;
 import org.codelutin.generator.models.object.ObjectModelClass;
 
 
@@ -69,7 +67,8 @@
 
 package <%=clazz.getPackageName()%>.ui;
 
-import javax.naming.Context;
+import org.codelutin.topia.TopiaContext;
+import org.codelutin.topia.TopiaQuery;
 }*/
             }
 /*{
@@ -80,9 +79,9 @@
         init();
     }
 
-    public <%=capitalizeName(clazz)%>Panel(Context context){
+    public <%=capitalizeName(clazz)%>Panel(TopiaContext context){
+        setContext(context);
         init();
-        this.context=context;
     }
 
     public void on_save(){
@@ -104,26 +103,6 @@
         // TODO a implanter
         System.out.println("on_search");
     }
-
-    public Context getContext(){
-        return context;
-    }
-
-    public void setContext(Context context){
-        this.context = context;
-    }
-}*/
-
-for(Iterator i=clazz.getAttributes().iterator(); i.hasNext();) {
-    ObjectModelAttribute att = (ObjectModelAttribute)i.next();
-/*{
-    public void on_add<%=capitalizeName(att)%>Entities(){
-        // TODO a implanter
-        System.out.println("on_add<%=capitalizeName(att)%>Entities");
-    }
-}*/
-}
-/*{
 }
 }*/
         }

Index: topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityTablePanel.java
diff -u topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityTablePanel.java:1.4 topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityTablePanel.java:1.5
--- topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityTablePanel.java:1.4	Fri Jul 16 16:19:35 2004
+++ topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityTablePanel.java	Tue Jul 20 16:02:25 2004
@@ -23,9 +23,9 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
  *
- * Mise a jour: $Date: 2004/07/16 16:19:35 $
+ * Mise a jour: $Date: 2004/07/20 16:02:25 $
  * par : $Author: mazelier $
  */
 
@@ -63,7 +63,8 @@
 
 package <%=clazz.getPackageName()%>.ui;
 
-import javax.naming.Context;
+import org.codelutin.topia.TopiaContext;
+import org.codelutin.topia.TopiaQuery;
 
 public class <%=capitalizeName(clazz)%>TablePanelPanel extends <%=capitalizeName(clazz)%>TablePanelUI {
 
@@ -71,17 +72,9 @@
         init();
     }
 
-    public <%=capitalizeName(clazz)%>TablePanelPanel(Context context){
+    public <%=capitalizeName(clazz)%>TablePanelPanel(TopiaContext context){
+        setContext(context);
         init();
-        this.context = context;
-    }
-
-    public Context getContext(){
-        return context;
-    }
-
-    public void setContext(Context context){
-        this.context = context;
     }
 }
 }*/

Index: topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityTableUIModel.java
diff -u topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityTableUIModel.java:1.4 topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityTableUIModel.java:1.5
--- topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityTableUIModel.java:1.4	Fri Jul 16 16:19:35 2004
+++ topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityTableUIModel.java	Tue Jul 20 16:02:25 2004
@@ -23,9 +23,9 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
  *
- * Mise a jour: $Date: 2004/07/16 16:19:35 $
+ * Mise a jour: $Date: 2004/07/20 16:02:25 $
  * par : $Author: mazelier $
  */
 
@@ -84,19 +84,12 @@
       <child>
         <object class="javax.swing.JScrollPane">
           <arguments>
-            <object class="javax.swing.JTable"/>
-}*/
-//              <arguments>
-//                <object class="org.codelutin.topia.ui.swing.TopiaTableModel">
-//                  <arguments>
-//                    <object class="java.naming.Context"/>
-//                    <object class="org.codelutin.topia.TopiaQuery"/>
-//                  </arguments>
-//                </object>
-
-//              </arguments>
-//            </object>
-/*{       </arguments>
+            <object class="javax.swing.JTable">
+              <arguments>
+                <object class="org.codelutin.topia.ui.swing.TopiaTableModel"/>
+              </arguments>
+            </object>
+          </arguments>
           <properties>
             <property name="name">
               <arguments>

Index: topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityUIModel.java
diff -u topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityUIModel.java:1.4 topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityUIModel.java:1.5
--- topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityUIModel.java:1.4	Fri Jul 16 16:19:35 2004
+++ topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityUIModel.java	Tue Jul 20 16:02:25 2004
@@ -23,9 +23,9 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
  *
- * Mise a jour: $Date: 2004/07/16 16:19:35 $
+ * Mise a jour: $Date: 2004/07/20 16:02:25 $
  * par : $Author: mazelier $
  */
 
@@ -86,26 +86,23 @@
           <string><%=clazz.getName()%>Panel</string>
         </arguments>
       </property>
-
 }*/
-//String title = clazz.getName();
-//generateBorderPanel(output, clazz, title);
+String title = clazz.getName();
+generateBorderPanel(output, clazz, title);
 /*{
     </properties>
     <children>
       <child>
         <object class="<%=clazz.getPackageName()%>.ui.<%=capitalizeName(clazz)%>AttributesPanelPanel">
-}*/
-//          <arguments>
-//            <object class="javax.naming.Context"/>
-//          </arguments>
-/*{
           <properties>
             <property name="name">
               <arguments>
-                <string><%=capitalizeName(clazz)%>AttributesPanel</string>
+                <string><%=capitalizeName(clazz)%>AttributesPanelPanel</string>
               </arguments>
             </property>
+}*/
+generateBorderPanel(output, clazz, "Attributes");
+/*{
           </properties>
         </object>
         <layout>
@@ -134,7 +131,7 @@
         </layout>
       </child>
       <child>
-        <object class="org.codelutin.topia.ui.ButtonsPanel">
+        <object class="org.codelutin.topia.ui.ManagementButtonsPanel">
           <properties>
             <property name="name">
               <arguments>
@@ -170,17 +167,15 @@
       </child>
       <child>
         <object class="<%=clazz.getPackageName()%>.ui.<%=capitalizeName(clazz)%>TablePanelPanel">
-}*/
-//          <arguments>
-//            <object class="javax.naming.Context"/>
-//          </arguments>
-/*{
           <properties>
             <property name="name">
               <arguments>
-                <string><%=capitalizeName(clazz)%>TablePanel</string>
+                <string><%=capitalizeName(clazz)%>TablePanelPanel</string>
               </arguments>
             </property>
+}*/
+generateBorderPanel(output, clazz, "Table");
+/*{
           </properties>
         </object>
         <layout>
@@ -188,8 +183,8 @@
             <arguments>
               <int>0</int>
               <int>1</int>
-              <int>1</int>
               <int>2</int>
+              <int>1</int>
               <double>1.0</double>
               <double>1.0</double>
               <int>10</int>
@@ -223,14 +218,14 @@
 /*{
       <property name="border">
         <arguments>
-          <object class="javax.swing.TitledBorder">
+          <object class="javax.swing.border.TitledBorder">
             <arguments>
-              <object class="javax.swing.EtchedBorder">
+              <object class="javax.swing.border.EtchedBorder">
                 <arguments>
                   <int>0</int>
                 </arguments>
               </object>
-              <string><%=capitalizeName(clazz)%></string>
+              <string><%=name%></string>
               <int>0</int>
               <int>0</int>
             </arguments>

Index: topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToUIModelGenerator.java
diff -u topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToUIModelGenerator.java:1.4 topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToUIModelGenerator.java:1.5
--- topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToUIModelGenerator.java:1.4	Fri Jul 16 16:19:35 2004
+++ topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToUIModelGenerator.java	Tue Jul 20 16:02:25 2004
@@ -23,9 +23,9 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
  *
- * Mise a jour: $Date: 2004/07/16 16:19:35 $
+ * Mise a jour: $Date: 2004/07/20 16:02:25 $
  * par : $Author: mazelier $
  */
 
@@ -36,7 +36,6 @@
 
 import org.codelutin.generator.ObjectModelGenerator;
 import org.codelutin.generator.models.object.ObjectModel;
-import org.codelutin.topia.ui.ButtonsPanel;
 import javax.swing.JPanel;
 
 /**
@@ -64,6 +63,10 @@
         gen = new ObjectModelToEntityTableUIModel();
         gen.generate(model, destDir);
 
+        System.out.println("Generation de ObjectModelToEntitySelectionUIModel");
+        gen = new ObjectModelToEntitySelectionUIModel();
+        gen.generate(model, destDir);
+
         System.out.println("Generation de ObjectModelToEntityUIModel");
         gen = new ObjectModelToEntityUIModel();
         gen.generate(model, destDir);
@@ -74,6 +77,10 @@
 
         System.out.println("Generation de ObjectModelToEntityTablePanel");
         gen = new ObjectModelToEntityTablePanel();
+        gen.generate(model, destDir);
+
+        System.out.println("Generation de ObjectModelToEntitySelectionPanel");
+        gen = new ObjectModelToEntitySelectionPanel();
         gen.generate(model, destDir);
 
         System.out.println("Generation de ObjectModelToEntityPanel");

Index: topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToWidgetsXML.java
diff -u topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToWidgetsXML.java:1.3 topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToWidgetsXML.java:1.4
--- topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToWidgetsXML.java:1.3	Thu Jul 15 14:37:59 2004
+++ topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToWidgetsXML.java	Tue Jul 20 16:02:25 2004
@@ -23,10 +23,10 @@
 *
 * @author Benjamin Poussin <poussin@codelutin.com>
 * Copyright Code Lutin
-* @version $Revision: 1.3 $
+* @version $Revision: 1.4 $
 *
-* Mise a jour: $Date: 2004/07/15 14:37:59 $
-* par : $Author: bpoussin $
+* Mise a jour: $Date: 2004/07/20 16:02:25 $
+* par : $Author: mazelier $
 */
 
 package org.codelutin.topia.ui.generators;
@@ -76,6 +76,8 @@
 /*{
 
     <widget shelf="<%if (model.getName()!=null){ %> <%=model.getName()%> <%}else{%> UserPanel <%}%> " class="<%=clazz.getPackageName()%>.ui.<%=capitalizeName(clazz)%>Panel"/>
+
+    <widget shelf="<%if (model.getName()!=null){%><%=model.getName()%>Selection<%}else{%> UserPanel <%}%>" class="<%=clazz.getPackageName()%>.ui.<%=capitalizeName(clazz)%>SelectionPanel"/>
 }*/
 
     }

Index: topia/src/java/org/codelutin/topia/ui/generators/UIModelToUISwingGenerator.java
diff -u topia/src/java/org/codelutin/topia/ui/generators/UIModelToUISwingGenerator.java:1.3 topia/src/java/org/codelutin/topia/ui/generators/UIModelToUISwingGenerator.java:1.4
--- topia/src/java/org/codelutin/topia/ui/generators/UIModelToUISwingGenerator.java:1.3	Fri Jul 16 16:19:35 2004
+++ topia/src/java/org/codelutin/topia/ui/generators/UIModelToUISwingGenerator.java	Tue Jul 20 16:02:25 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/07/16 16:19:35 $
+* Mise a jour: $Date: 2004/07/20 16:02:25 $
 * par : $Author: mazelier $
 */
 
@@ -43,7 +43,7 @@
 import org.codelutin.generator.models.ui.UIModelObject;
 import org.codelutin.generator.models.ui.UIModelProperty;
 
-import javax.naming.Context;
+import org.codelutin.topia.TopiaContext;
 
 /**
 * Classe qui permet de generer une classe java a partir d'un uimodel
@@ -105,9 +105,10 @@
 // ------------- Imports
 /*{
 
-import org.codelutin.topia.TopiaException;
 import org.codelutin.i18n.I18n;
 
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import java.util.ArrayList;
 import java.util.Iterator;
 
@@ -117,9 +118,16 @@
 import javax.swing.RootPaneContainer;
 import java.beans.EventHandler;
 
-import javax.naming.Context;
+import org.codelutin.topia.TopiaException;
+import org.codelutin.topia.TopiaContext;
+import org.codelutin.topia.ui.swing.TopiaComboBoxModel;
+import org.codelutin.topia.ui.swing.TopiaTableModel;
+import org.codelutin.topia.TopiaElement;
 
 public abstract class <%=capitalizeName(object)%>UI extends <%=object.getType()%> implements <%=capitalizeName(object)%>UICallback {
+
+    protected TopiaContext context = null;
+    private ArrayList listModel = new ArrayList();
 }*/
         //creation des constructeurs selon le type de l'objet
         if (object.getType().equals("javax.swing.JDialog")){
@@ -167,8 +175,24 @@
          generateConstraintStatement(output, object);
 
 /*{
-    protected Context context = null;
-    abstract public Context getContext();
+
+    public TopiaContext getContext(){
+        return context;
+    }
+
+    public void setContext(TopiaContext context){
+        this.context = context;
+        for(Iterator i = listModel.iterator(); i.hasNext();){
+            Object modelObject = i.next();
+            if (modelObject instanceof TopiaElement){
+                try{
+                    ((TopiaElement)modelObject).setContext(context);
+                }catch(Exception eee){
+                    Logger.getLogger("UIModelToUISwingGenerator").log(Level.WARNING, "Impossible de mettre a jour le context "+context +" dans le modele "+ modelObject, eee);
+                }
+            }
+        }
+    }
 }*/
     }
 
@@ -184,7 +208,7 @@
             // appel a l'entete de la classe
             generateForRoot(output, object);
 
-        }else if (!(object instanceof Context)){
+        }else if (!(object instanceof TopiaContext)){
             objectName = "__" + object.getName() + "__";
 /*{
 
@@ -194,6 +218,7 @@
 
         // test si deja instancier
         if(<%=objectName%> == null){
+
 }*/
              generateCreationStatement(output, object);
              generateAllStatement(output, object);
@@ -228,7 +253,7 @@
                 if (arg instanceof UIModelObject){
 
                     UIModelObject objectArg = (UIModelObject)arg;
-                    if (objectArg.getType().equals("javax.naming.Context")){
+                    if (objectArg.getType().equals("org.codelutin.topia.TopiaContext")){
                         /*{getContext()}*/
                     }else if (objectArg.getName() != null) {
                         /*{__<%=objectArg.getName()%>__}*/
@@ -306,6 +331,11 @@
              <%=object.getType()%> result = new <%=object.getType()%>(}*/generateArgumentStatement(output, object);/*{);
 }*/
         }
+/*{
+             if(result instanceof TopiaElement){
+                 listModel.add(result);
+             }
+}*/
     }
 
     /**
@@ -335,9 +365,16 @@
                     if (arg instanceof UIModelObject){
 
                         UIModelObject objectArg = (UIModelObject)arg;
+                        if (objectArg.getName()!=null){
 /*{
+
              result.set<%=capitalizeName(property)%>(<%=index%>get<%=capitalizeName(objectArg)%>());
 }*/
+                        }else{
+/*{
+             result.set<%=capitalizeName(property)%>(<%=index%>}*/generateInstanciationObject(output, objectArg);/*{);
+}*/
+                        }
                     // cas ou la propriete est de type string
                     }else if (arg instanceof String){
 /*{