Index: topia/src/java/org/codelutin/topia/generators/ui/swing/ObjectModelToEntityAttributesPanel.java
diff -u topia/src/java/org/codelutin/topia/generators/ui/swing/ObjectModelToEntityAttributesPanel.java:1.4 topia/src/java/org/codelutin/topia/generators/ui/swing/ObjectModelToEntityAttributesPanel.java:1.5
--- topia/src/java/org/codelutin/topia/generators/ui/swing/ObjectModelToEntityAttributesPanel.java:1.4	Thu Sep  2 15:45:37 2004
+++ topia/src/java/org/codelutin/topia/generators/ui/swing/ObjectModelToEntityAttributesPanel.java	Thu Sep 16 15:55:03 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/09/02 15:45:37 $
+ * Mise a jour: $Date: 2004/09/16 15:55:03 $
  * par : $Author: mazelier $
  */
 
@@ -83,10 +83,12 @@
 public class <%=capitalizeName(clazz)%>AttributesPanelPanel extends <%=capitalizeName(clazz)%>AttributesPanelUI {
 
     public <%=capitalizeName(clazz)%>AttributesPanelPanel(){
+        super();
         init();
     }
 
     public <%=capitalizeName(clazz)%>AttributesPanelPanel(TopiaContext context){
+        super();
         setContext(context);
         init();
     }

Index: topia/src/java/org/codelutin/topia/generators/ui/swing/ObjectModelToEntityPanel.java
diff -u topia/src/java/org/codelutin/topia/generators/ui/swing/ObjectModelToEntityPanel.java:1.3 topia/src/java/org/codelutin/topia/generators/ui/swing/ObjectModelToEntityPanel.java:1.4
--- topia/src/java/org/codelutin/topia/generators/ui/swing/ObjectModelToEntityPanel.java:1.3	Fri Sep 10 15:37:35 2004
+++ topia/src/java/org/codelutin/topia/generators/ui/swing/ObjectModelToEntityPanel.java	Thu Sep 16 15:55:03 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/09/10 15:37:35 $
+* Mise a jour: $Date: 2004/09/16 15:55:03 $
 * par : $Author: mazelier $
 */
 
@@ -40,6 +40,7 @@
 import org.codelutin.generator.models.object.ObjectModelClass;
 import org.codelutin.generator.models.object.ObjectModelAttribute;
 import org.codelutin.topia.generators.ui.Util;
+import org.codelutin.topia.TopiaException;
 
 import java.util.Iterator;
 
@@ -82,8 +83,11 @@
 import org.codelutin.topia.TopiaContext;
 import org.codelutin.topia.TopiaQuery;
 import org.codelutin.topia.TopiaPersistenceService;
+import org.codelutin.util.StringUtil;
 
-import <%=clazz.getPackageName()%>.<%=capitalizeName(clazz)%>;
+import javax.swing.JList;
+
+import <%=clazz.getPackageName()%>.*;
 }*/
             }
 /*{
@@ -93,45 +97,50 @@
     protected <%=capitalizeName(clazz)%> entity = null;
 
     public <%=capitalizeName(clazz)%>Panel(){
+        super();
         init();
     }
 
-    public void setEntity(<%=capitalizeName(clazz)%> entity){
+    public void setEntity(<%=capitalizeName(clazz)%> entity) throws java.io.IOException, org.codelutin.topia.TopiaException {
         this.entity = entity;
         load();
     }
 
     public <%=capitalizeName(clazz)%>Panel(TopiaContext context){
+        super();
         setContext(context);
         init();
     }
 
-    public void on_save(){
+    public void on_save() throws org.codelutin.topia.TopiaException{
         // TODO a implanter
         System.out.println("on_save");
         if(entity == null){
+
             TopiaPersistenceService ps = context.getPersistenceService(<%=capitalizeName(clazz)%>.class);
             entity = (<%=capitalizeName(clazz)%>)ps.create();
+
         }
 }*/
         for(Iterator i=clazz.getSuperclasses().iterator(); i.hasNext();) {
            ObjectModelClass parent = (ObjectModelClass)i.next();
-           setAttributes(output, parent);
+           saveFields(output, parent, clazz);
         }
-        setAttributes(output, clazz);
+
 /*{
     }
 
-    public void on_delete(){
+    public void on_delete()throws org.codelutin.topia.TopiaException, java.io.IOException {
         System.out.println("on_delete");
         if(entity != null){
             entity.remove();
+
             entity = null;
             load();
         }
     }
 
-    public void on_cancel(){
+    public void on_cancel() throws java.io.IOException, org.codelutin.topia.TopiaException{
         System.out.println("on_cancel");
         load();
     }
@@ -142,47 +151,197 @@
     }
 
 
-    protected void load(){
+    protected void load() throws java.io.IOException, org.codelutin.topia.TopiaException{
         //inverse du save
-        <%for(Iterator i=clazz.getAttributes().iterator(); i.hasNext();) {
-           ObjectModelAttribute att = (ObjectModelAttribute)i.next();%>
-          if(entity != null){
-            get<%=capitalizeName(att)%>Editor().setText(entity.get<%=capitalizeName(att)%>());
-          }else{
-            get<%=capitalizeName(att)%>Editor().setText("");
-          }
-        <%}%>
+}*/
+        for(Iterator i=clazz.getSuperclasses().iterator(); i.hasNext();) {
+           ObjectModelClass parent = (ObjectModelClass)i.next();
+           cancelFields(output, parent, clazz);
+        }
+/*{
     }
 }
 }*/
         }
     }
 
+    protected void cancelFields(Writer output, ObjectModelClass parent, ObjectModelClass clazz) throws IOException{
 
-    protected void setAttributes(Writer output, ObjectModelClass clazz) throws IOException{
-        for(Iterator i=clazz.getAttributes().iterator(); i.hasNext();) {
-           ObjectModelAttribute att = (ObjectModelAttribute)i.next();
+        if(parent!=clazz){
+           for(Iterator i=parent.getAttributes().iterator(); i.hasNext();) {
+               ObjectModelAttribute att = (ObjectModelAttribute)i.next();
 
-           if(att.referenceClassifier()){
-               if(att.getMaxMultiplicity()>1 || att.getMaxMultiplicity()==-1){
+               if(att.referenceClassifier()){
+                   if(att.getMaxMultiplicity()>1 || att.getMaxMultiplicity()==-1){
+/*{
+    {
+          <%=Util.getAttributeType(att)%> collection = entity.get<%=capitalizeName(att)%>();
+          Object[] itemsArray = collection.toArray();
+          JList list = new JList(itemsArray);
+          get<%=capitalizeName(clazz)%>AttributesPanelPanel().get<%=capitalizeName(parent)%>Attributes().get<%=capitalizeName(att)%>Editor().getViewport().setView(list);
+    }
+}*/
+                   }else{
+/*{
+          get<%=capitalizeName(clazz)%>AttributesPanelPanel().get<%=capitalizeName(parent)%>Attributes().get<%=capitalizeName(att)%>Editor().setSelectedItem(entity.get<%=capitalizeName(att)%>());
+}*/
+                   }
+               }else if(att.getType().equalsIgnoreCase("boolean")){
 /*{
-          entity.set<%=capitalizeName(att)%>(get<%=capitalizeName(att)%>Editor().getSelectedValue());
+          get<%=capitalizeName(clazz)%>AttributesPanelPanel().get<%=capitalizeName(parent)%>Attributes().get<%=capitalizeName(att)%>Editor().setSelected(entity.get<%=capitalizeName(att)%>());
+}*/
+               }else if(att.getType().equalsIgnoreCase("float") ||
+               att.getType().equalsIgnoreCase("long") ||
+               att.getType().equalsIgnoreCase("short") ||
+               att.getType().equalsIgnoreCase("int") ||
+               att.getType().equalsIgnoreCase("double") ||
+               att.getType().equalsIgnoreCase("byte") ||
+               att.getType().equalsIgnoreCase("char")){
+/*{
+          get<%=capitalizeName(clazz)%>AttributesPanelPanel().get<%=capitalizeName(parent)%>Attributes().get<%=capitalizeName(att)%>Editor().setText(""+entity.get<%=capitalizeName(att)%>());
 }*/
                }else{
 /*{
-          entity.set<%=capitalizeName(att)%>(get<%=capitalizeName(att)%>Editor().getSelectedItem());
+          get<%=capitalizeName(clazz)%>AttributesPanelPanel().get<%=capitalizeName(parent)%>Attributes().get<%=capitalizeName(att)%>Editor().setText(entity.get<%=capitalizeName(att)%>().toString());
 }*/
                }
-           }else if(att.getType().equalsIgnoreCase("boolean")){
+           }
+        }else{
+           for(Iterator i=clazz.getAttributes().iterator(); i.hasNext();) {
+               ObjectModelAttribute att = (ObjectModelAttribute)i.next();
+               if(att.referenceClassifier()){
+                   if(att.getMaxMultiplicity()>1 || att.getMaxMultiplicity()==-1){
 /*{
-          entity.set<%=capitalizeName(att)%>(get<%=capitalizeName(att)%>Editor().isSelected());
+    {
+          <%=Util.getAttributeType(att)%> collection = entity.get<%=capitalizeName(att)%>();
+          Object[] itemsArray = collection.toArray();
+          JList list = new JList(itemsArray);
+          get<%=capitalizeName(clazz)%>AttributesPanelPanel().get<%=capitalizeName(att)%>Editor().getViewport().setView(list);
+    }
 }*/
-           }else{
+                   }else{
 /*{
-          entity.set<%=capitalizeName(att)%>(get<%=capitalizeName(att)%>Editor().getText());
+          get<%=capitalizeName(clazz)%>AttributesPanelPanel().get<%=capitalizeName(att)%>Editor().setSelectedItem(entity.get<%=capitalizeName(att)%>());
 }*/
+                   }
+               }else if(att.getType().equalsIgnoreCase("boolean")){
+/*{
+          get<%=capitalizeName(clazz)%>AttributesPanelPanel().get<%=capitalizeName(att)%>Editor().setSelected(entity.get<%=capitalizeName(att)%>());
+}*/
+               }else if(att.getType().equalsIgnoreCase("float") ||
+               att.getType().equalsIgnoreCase("long") ||
+               att.getType().equalsIgnoreCase("short") ||
+               att.getType().equalsIgnoreCase("int") ||
+               att.getType().equalsIgnoreCase("double") ||
+               att.getType().equalsIgnoreCase("byte") ||
+               att.getType().equalsIgnoreCase("char")){
+/*{
+          get<%=capitalizeName(clazz)%>AttributesPanelPanel().get<%=capitalizeName(att)%>Editor().setText(""+entity.get<%=capitalizeName(att)%>());
+}*/
+               }else{
+/*{
+          get<%=capitalizeName(clazz)%>AttributesPanelPanel().get<%=capitalizeName(att)%>Editor().setText(entity.get<%=capitalizeName(att)%>().toString());
+}*/
+               }
            }
         }
+    }
+
+    protected void saveFields(Writer output, ObjectModelClass parent, ObjectModelClass clazz) throws IOException{
+
+       if(parent!=clazz){
+           for(Iterator i=parent.getAttributes().iterator(); i.hasNext();) {
+               ObjectModelAttribute att = (ObjectModelAttribute)i.next();
+
+               if(att.referenceClassifier()){
+                   if(att.getMaxMultiplicity()>1 || att.getMaxMultiplicity()==-1){
+/*{
+    {
+          JList list = (JList)get<%=capitalizeName(clazz)%>AttributesPanelPanel().get<%=capitalizeName(parent)%>Attributes().get<%=capitalizeName(att)%>Editor().getViewport().getView();
+          java.util.ArrayList itemsArray = new java.util.ArrayList();
+          for(int i = 0; i < list.getModel().getSize(); i++) {
+              itemsArray.add(list.getModel().getElementAt(i));
+          }
+          entity.add<%=capitalizeName(att)%>(itemsArray);
+    }
+}*/
+                   }else{
+/*{
+          entity.set<%=capitalizeName(att)%>((<%=att.getType()%>)get<%=capitalizeName(clazz)%>AttributesPanelPanel().get<%=capitalizeName(parent)%>Attributes().get<%=capitalizeName(att)%>Editor().getSelectedItem());
+}*/
+                   }
+               }else if(att.getType().equalsIgnoreCase("float") ||
+                        att.getType().equalsIgnoreCase("long") ||
+                        att.getType().equalsIgnoreCase("short") ||
+                        att.getType().equalsIgnoreCase("int") ||
+                        att.getType().equalsIgnoreCase("double") ||
+                        att.getType().equalsIgnoreCase("byte") ||
+                        att.getType().equalsIgnoreCase("char")){
+
+                   String type = org.codelutin.generator.Util.toUpperCaseFirstLetter(att.getType());
+/*{
+        {
+            String value = get<%=capitalizeName(clazz)%>AttributesPanelPanel().get<%=capitalizeName(parent)%>Attributes().get<%=capitalizeName(att)%>Editor().getText();
+            entity.set<%=capitalizeName(att)%>(StringUtil.to<%=type%>(value));
+        }
+}*/
+               }else if(att.getType().equalsIgnoreCase("boolean")){
+/*{
+          entity.set<%=capitalizeName(att)%>(get<%=capitalizeName(clazz)%>AttributesPanelPanel().get<%=capitalizeName(parent)%>Attributes().get<%=capitalizeName(att)%>Editor().isSelected());
+}*/
+               }else{
+/*{
+          entity.set<%=capitalizeName(att)%>(new <%=att.getType()%>(get<%=capitalizeName(clazz)%>AttributesPanelPanel().get<%=capitalizeName(parent)%>Attributes().get<%=capitalizeName(att)%>Editor().getText()));
+}*/
+               }
+           }
+       }else{
+           for(Iterator i=clazz.getAttributes().iterator(); i.hasNext();) {
+               ObjectModelAttribute att = (ObjectModelAttribute)i.next();
+               if(att.referenceClassifier()){
+                   if(att.getMaxMultiplicity()>1 || att.getMaxMultiplicity()==-1){
+/*{
+    {
+          JList list = (JList)get<%=capitalizeName(clazz)%>AttributesPanelPanel().get<%=capitalizeName(att)%>Editor().getViewport().getView();
+          java.util.ArrayList itemsArray = new java.util.ArrayList();
+          for(int i = 0; i < list.getModel().getSize(); i++) {
+              itemsArray.add(list.getModel().getElementAt(i));
+          }
+          entity.add<%=capitalizeName(att)%>(itemsArray);
+    }
+}*/
+                   }else{
+/*{
+          entity.set<%=capitalizeName(att)%>((<%=att.getType()%>)get<%=capitalizeName(clazz)%>AttributesPanelPanel().get<%=capitalizeName(att)%>Editor().getSelectedItem());
+}*/
+                   }
+               }else if(att.getType().equalsIgnoreCase("float") ||
+                        att.getType().equalsIgnoreCase("long") ||
+                        att.getType().equalsIgnoreCase("short") ||
+                        att.getType().equalsIgnoreCase("int") ||
+                        att.getType().equalsIgnoreCase("double") ||
+                        att.getType().equalsIgnoreCase("byte") ||
+                        att.getType().equalsIgnoreCase("char")){
+
+                   String type = org.codelutin.generator.Util.toUpperCaseFirstLetter(att.getType());
+/*{
+        {
+            String value = get<%=capitalizeName(clazz)%>AttributesPanelPanel().get<%=capitalizeName(att)%>Editor().getText();
+            entity.set<%=capitalizeName(att)%>(StringUtil.to<%=type%>(value));
+        }
+}*/
+               }else if(att.getType().equalsIgnoreCase("boolean")){
+/*{
+          entity.set<%=capitalizeName(att)%>(get<%=capitalizeName(clazz)%>AttributesPanelPanel().get<%=capitalizeName(att)%>Editor().isSelected());
+}*/
+               }else{
+/*{
+          entity.set<%=capitalizeName(att)%>(new <%=att.getType()%>(get<%=capitalizeName(clazz)%>AttributesPanelPanel().get<%=capitalizeName(att)%>Editor().getText()));
+}*/
+               }
+
+           }
+       }
     }
 } // ObjectModelToEntityPanel
 

Index: topia/src/java/org/codelutin/topia/generators/ui/swing/ObjectModelToEntitySelectionPanel.java
diff -u topia/src/java/org/codelutin/topia/generators/ui/swing/ObjectModelToEntitySelectionPanel.java:1.3 topia/src/java/org/codelutin/topia/generators/ui/swing/ObjectModelToEntitySelectionPanel.java:1.4
--- topia/src/java/org/codelutin/topia/generators/ui/swing/ObjectModelToEntitySelectionPanel.java:1.3	Thu Sep  2 15:45:37 2004
+++ topia/src/java/org/codelutin/topia/generators/ui/swing/ObjectModelToEntitySelectionPanel.java	Thu Sep 16 15:55:03 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/09/02 15:45:37 $
+ * Mise a jour: $Date: 2004/09/16 15:55:03 $
  * par : $Author: mazelier $
  */
 
@@ -84,10 +84,12 @@
 public class <%=capitalizeName(clazz)%>SelectionPanel extends <%=capitalizeName(clazz)%>SelectionPanelUI {
 
     public <%=capitalizeName(clazz)%>SelectionPanel(){
+        super();
         init();
     }
 
     public <%=capitalizeName(clazz)%>SelectionPanel(TopiaContext context){
+        super();
         setContext(context);
         init();
     }

Index: topia/src/java/org/codelutin/topia/generators/ui/swing/ObjectModelToEntityTablePanel.java
diff -u topia/src/java/org/codelutin/topia/generators/ui/swing/ObjectModelToEntityTablePanel.java:1.2 topia/src/java/org/codelutin/topia/generators/ui/swing/ObjectModelToEntityTablePanel.java:1.3
--- topia/src/java/org/codelutin/topia/generators/ui/swing/ObjectModelToEntityTablePanel.java:1.2	Fri Aug  6 17:48:52 2004
+++ topia/src/java/org/codelutin/topia/generators/ui/swing/ObjectModelToEntityTablePanel.java	Thu Sep 16 15:55:03 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/08/06 17:48:52 $
- * par : $Author: bpoussin $
+ * Mise a jour: $Date: 2004/09/16 15:55:03 $
+ * par : $Author: mazelier $
  */
 
 package org.codelutin.topia.generators.ui.swing;
@@ -79,10 +79,12 @@
 public class <%=capitalizeName(clazz)%>TablePanelPanel extends <%=capitalizeName(clazz)%>TablePanelUI {
 
     public <%=capitalizeName(clazz)%>TablePanelPanel(){
+        super();
         init();
     }
 
     public <%=capitalizeName(clazz)%>TablePanelPanel(TopiaContext context){
+        super();
         setContext(context);
         init();
     }

Index: topia/src/java/org/codelutin/topia/generators/ui/swing/UIModelToUISwingGenerator.java
diff -u topia/src/java/org/codelutin/topia/generators/ui/swing/UIModelToUISwingGenerator.java:1.4 topia/src/java/org/codelutin/topia/generators/ui/swing/UIModelToUISwingGenerator.java:1.5
--- topia/src/java/org/codelutin/topia/generators/ui/swing/UIModelToUISwingGenerator.java:1.4	Fri Sep 10 15:37:35 2004
+++ topia/src/java/org/codelutin/topia/generators/ui/swing/UIModelToUISwingGenerator.java	Thu Sep 16 15:55:03 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/09/10 15:37:35 $
+* Mise a jour: $Date: 2004/09/16 15:55:03 $
 * par : $Author: mazelier $
 */
 
@@ -481,8 +481,7 @@
         for(Iterator i=object.getChildren().iterator(); i.hasNext();){
             // recuperation de l'objet de l'enfant
             UIModelChild child = (UIModelChild) i.next();
-            System.out.println("child " + child);
-            System.out.println("constraint "+ child.getConstraint());
+
             if(child.getConstraint()!=null){
                 // recuperation de la constrainte pour cet objet
                 Object objectConstraint = child.getConstraint().getValue();
@@ -494,7 +493,7 @@
 }*/
                 }else if (objectConstraint instanceof String) {
 /*{
-        constraints.add(<%=child.getConstraint().getStringValue()%>);
+        constraints.add("<%=child.getConstraint().getStringValue()%>");
 }*/
                 }
             }else{