Index: topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityAttributesPanel.java
diff -u topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityAttributesPanel.java:1.3 topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityAttributesPanel.java:1.4
--- topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityAttributesPanel.java:1.3	Thu Jul 15 14:37:59 2004
+++ topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityAttributesPanel.java	Fri Jul 16 16:19:35 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/16 16:19:35 $
+ * par : $Author: mazelier $
  */
 
 package org.codelutin.topia.ui.generators;
@@ -63,10 +63,24 @@
 
 package <%=clazz.getPackageName()%>.ui;
 
+import javax.naming.Context;
+
 public class <%=capitalizeName(clazz)%>AttributesPanelPanel extends <%=capitalizeName(clazz)%>TablePanelUI {
 
     public <%=capitalizeName(clazz)%>AttributesPanelPanel(){
         init();
+    }
+    public <%=capitalizeName(clazz)%>AttributesPanelPanel(Context 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/ObjectModelToEntityAttributesUIModel.java
diff -u topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityAttributesUIModel.java:1.3 topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityAttributesUIModel.java:1.4
--- topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityAttributesUIModel.java:1.3	Thu Jul 15 14:37:59 2004
+++ topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityAttributesUIModel.java	Fri Jul 16 16:19:35 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/16 16:19:35 $
+ * par : $Author: mazelier $
  */
 
 package org.codelutin.topia.ui.generators;
@@ -225,6 +225,15 @@
 /*{
          <object class="javax.swing.JComboBox">
 }*/
+//           <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>

Index: topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityPanel.java
diff -u topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityPanel.java:1.3 topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityPanel.java:1.4
--- topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityPanel.java:1.3	Thu Jul 15 14:37:59 2004
+++ topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityPanel.java	Fri Jul 16 16:19:35 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/16 16:19:35 $
+* par : $Author: mazelier $
 */
 
 package org.codelutin.topia.ui.generators;
@@ -40,6 +40,7 @@
 import org.codelutin.generator.models.object.ObjectModelAttribute;
 import org.codelutin.generator.models.object.ObjectModelClass;
 
+
 /**
 * Ce generateur permet de generer la classe avec l'ensemble des methodes a implanter
 */
@@ -67,6 +68,8 @@
 *)
 
 package <%=clazz.getPackageName()%>.ui;
+
+import javax.naming.Context;
 }*/
             }
 /*{
@@ -77,6 +80,11 @@
         init();
     }
 
+    public <%=capitalizeName(clazz)%>Panel(Context context){
+        init();
+        this.context=context;
+    }
+
     public void on_save(){
         // TODO a implanter
         System.out.println("on_save");
@@ -97,6 +105,13 @@
         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();) {

Index: topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityTablePanel.java
diff -u topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityTablePanel.java:1.3 topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityTablePanel.java:1.4
--- topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityTablePanel.java:1.3	Thu Jul 15 14:37:59 2004
+++ topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityTablePanel.java	Fri Jul 16 16:19:35 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/16 16:19:35 $
+ * par : $Author: mazelier $
  */
 
 package org.codelutin.topia.ui.generators;
@@ -63,10 +63,25 @@
 
 package <%=clazz.getPackageName()%>.ui;
 
+import javax.naming.Context;
+
 public class <%=capitalizeName(clazz)%>TablePanelPanel extends <%=capitalizeName(clazz)%>TablePanelUI {
 
     public <%=capitalizeName(clazz)%>TablePanelPanel(){
         init();
+    }
+
+    public <%=capitalizeName(clazz)%>TablePanelPanel(Context 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.3 topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityTableUIModel.java:1.4
--- topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityTableUIModel.java:1.3	Thu Jul 15 14:37:59 2004
+++ topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityTableUIModel.java	Fri Jul 16 16:19:35 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/16 16:19:35 $
+ * par : $Author: mazelier $
  */
 
 package org.codelutin.topia.ui.generators;
@@ -85,7 +85,18 @@
         <object class="javax.swing.JScrollPane">
           <arguments>
             <object class="javax.swing.JTable"/>
-          </arguments>
+}*/
+//              <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>
           <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.3 topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityUIModel.java:1.4
--- topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityUIModel.java:1.3	Thu Jul 15 14:37:59 2004
+++ topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityUIModel.java	Fri Jul 16 16:19:35 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/16 16:19:35 $
+ * par : $Author: mazelier $
  */
 
 package org.codelutin.topia.ui.generators;
@@ -95,6 +95,11 @@
     <children>
       <child>
         <object class="<%=clazz.getPackageName()%>.ui.<%=capitalizeName(clazz)%>AttributesPanelPanel">
+}*/
+//          <arguments>
+//            <object class="javax.naming.Context"/>
+//          </arguments>
+/*{
           <properties>
             <property name="name">
               <arguments>
@@ -165,6 +170,11 @@
       </child>
       <child>
         <object class="<%=clazz.getPackageName()%>.ui.<%=capitalizeName(clazz)%>TablePanelPanel">
+}*/
+//          <arguments>
+//            <object class="javax.naming.Context"/>
+//          </arguments>
+/*{
           <properties>
             <property name="name">
               <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.3 topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToUIModelGenerator.java:1.4
--- topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToUIModelGenerator.java:1.3	Thu Jul 15 16:29:19 2004
+++ topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToUIModelGenerator.java	Fri Jul 16 16:19:35 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/15 16:29:19 $
+ * Mise a jour: $Date: 2004/07/16 16:19:35 $
  * par : $Author: mazelier $
  */
 
@@ -36,6 +36,8 @@
 
 import org.codelutin.generator.ObjectModelGenerator;
 import org.codelutin.generator.models.object.ObjectModel;
+import org.codelutin.topia.ui.ButtonsPanel;
+import javax.swing.JPanel;
 
 /**
 * Meta generateur qui applique les generateurs pour la generation des interface
@@ -77,7 +79,6 @@
         System.out.println("Generation de ObjectModelToEntityPanel");
         gen = new ObjectModelToEntityPanel();
         gen.generate(model, destDir);
-
 
     }
 

Index: topia/src/java/org/codelutin/topia/ui/generators/UIModelToSwingGenerator.java
diff -u topia/src/java/org/codelutin/topia/ui/generators/UIModelToSwingGenerator.java:1.2 topia/src/java/org/codelutin/topia/ui/generators/UIModelToSwingGenerator.java:1.3
--- topia/src/java/org/codelutin/topia/ui/generators/UIModelToSwingGenerator.java:1.2	Thu Jul 15 14:37:59 2004
+++ topia/src/java/org/codelutin/topia/ui/generators/UIModelToSwingGenerator.java	Fri Jul 16 16:19:35 2004
@@ -23,10 +23,10 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
  *
- * Mise a jour: $Date: 2004/07/15 14:37:59 $
- * par : $Author: bpoussin $
+ * Mise a jour: $Date: 2004/07/16 16:19:35 $
+ * par : $Author: mazelier $
  */
 
 package org.codelutin.topia.ui.generators;
@@ -54,6 +54,7 @@
         System.out.println("Generation de UIModelToUISwingGenerator");
         gen = new UIModelToUISwingGenerator();
         gen.generate(model, destDir);
+
     }
 
 } // UIModelToSwingGenerator

Index: topia/src/java/org/codelutin/topia/ui/generators/UIModelToUISwingGenerator.java
diff -u topia/src/java/org/codelutin/topia/ui/generators/UIModelToUISwingGenerator.java:1.2 topia/src/java/org/codelutin/topia/ui/generators/UIModelToUISwingGenerator.java:1.3
--- topia/src/java/org/codelutin/topia/ui/generators/UIModelToUISwingGenerator.java:1.2	Thu Jul 15 14:05:40 2004
+++ topia/src/java/org/codelutin/topia/ui/generators/UIModelToUISwingGenerator.java	Fri Jul 16 16:19:35 2004
@@ -23,10 +23,10 @@
 *
 * @author Benjamin Poussin <poussin@codelutin.com>
 * Copyright Code Lutin
-* @version $Revision: 1.2 $
+* @version $Revision: 1.3 $
 *
-* Mise a jour: $Date: 2004/07/15 14:05:40 $
-* par : $Author: bpoussin $
+* Mise a jour: $Date: 2004/07/16 16:19:35 $
+* par : $Author: mazelier $
 */
 
 package org.codelutin.topia.ui.generators;
@@ -43,6 +43,8 @@
 import org.codelutin.generator.models.ui.UIModelObject;
 import org.codelutin.generator.models.ui.UIModelProperty;
 
+import javax.naming.Context;
+
 /**
 * Classe qui permet de generer une classe java a partir d'un uimodel
 * Cette classe etend le generator present dans lutingenerator
@@ -115,6 +117,8 @@
 import javax.swing.RootPaneContainer;
 import java.beans.EventHandler;
 
+import javax.naming.Context;
+
 public abstract class <%=capitalizeName(object)%>UI extends <%=object.getType()%> implements <%=capitalizeName(object)%>UICallback {
 }*/
         //creation des constructeurs selon le type de l'objet
@@ -161,6 +165,11 @@
          generateChildStatement(output, object);
          // creation de la methode qui permettra de recuperer les constraints des enfants de cet objet
          generateConstraintStatement(output, object);
+
+/*{
+    protected Context context = null;
+    abstract public Context getContext();
+}*/
     }
 
     /**
@@ -175,7 +184,7 @@
             // appel a l'entete de la classe
             generateForRoot(output, object);
 
-        }else{
+        }else if (!(object instanceof Context)){
             objectName = "__" + object.getName() + "__";
 /*{
 
@@ -219,12 +228,13 @@
                 if (arg instanceof UIModelObject){
 
                     UIModelObject objectArg = (UIModelObject)arg;
-                    if (objectArg.getName() != null) {
+                    if (objectArg.getType().equals("javax.naming.Context")){
+                        /*{getContext()}*/
+                    }else if (objectArg.getName() != null) {
                         /*{__<%=objectArg.getName()%>__}*/
                     }else{
                         generateInstanciationObject(output, (UIModelObject)arg);
                     }
-
                 }else if (arg instanceof String){
                     String argString = (String)arg;
                     /*{"<%=argString%>"}*/