Index: lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelImpl.java
diff -u lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelImpl.java:1.2 lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelImpl.java:1.3
--- lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelImpl.java:1.2	Wed Aug 11 16:27:42 2004
+++ lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelImpl.java	Thu Aug 19 15:25:51 2004
@@ -24,9 +24,9 @@
 *
 * @author Benjamin Poussin <poussin@codelutin.com>
 * Copyright Code Lutin
-* @version $Revision: 1.2 $
+* @version $Revision: 1.3 $
 *
-* Mise a jour: $Date: 2004/08/11 16:27:42 $
+* Mise a jour: $Date: 2004/08/19 15:25:51 $
 * par : $Author: mazelier $
 */
 
@@ -35,13 +35,17 @@
 import org.codelutin.generator.models.ui.UIModel;
 import org.codelutin.generator.models.ui.UIModelObject;
 import java.util.Collection;
+import java.util.HashMap;
 
 public class UIModelImpl implements UIModel{ // UIModelImpl
 
     protected String version = null;
     protected String packageName = null;
     protected UIModelObject root = null;
-    protected Collection objects = null;
+    /** Contient tous les objets du model.
+    *   key: nom de l'objet; value: l'objet
+    */
+    protected HashMap objects = new HashMap();
 
     /**
     * Changes the version of this model
@@ -69,14 +73,6 @@
     }
 
     /**
-    * Changes all objects defined in this model.
-    * @param  objects - all objects defined
-    */
-    public void setObjects(Collection objects) {
-        this.objects = objects;
-    }
-
-    /**
     * Returns the version of this model.
     *
     * @return the version of this model.
@@ -111,7 +107,7 @@
     * @return a Collection containing all UIModelObjects for this ui model.
     */
     public Collection getObjects() {
-        return objects;
+        return objects.values();
     }
 
     /**
@@ -120,7 +116,9 @@
     *
     */
     public void addObject(UIModelObject object){
-        objects.add(object);
+        if(object.getName() != null){
+            objects.put(object.getName(), object);
+        }
     }
 
     /**

Index: lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelObjectImpl.java
diff -u lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelObjectImpl.java:1.2 lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelObjectImpl.java:1.3
--- lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelObjectImpl.java:1.2	Wed Aug 11 16:27:42 2004
+++ lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelObjectImpl.java	Thu Aug 19 15:25:51 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/08/11 16:27:42 $
+* Mise a jour: $Date: 2004/08/19 15:25:51 $
 * par : $Author: mazelier $
 */
 
@@ -43,7 +43,7 @@
     protected UIModelObject parent = null;
 
     protected String type = null;
-
+    protected String name = null;
     protected UIModelConstraint constraint = null;
 
     protected UIModelArguments arguments = null;
@@ -154,13 +154,12 @@
     * @return the name of this object.
     */
     public String getName() {
-        UIModelProperty propName = getProperty("name");
-        if(propName!=null){
-            return getProperty("name").getStringValue();
-        }else{
-            return null;
+        if (name == null){
+            UIModelProperty propName = getProperty("name");
+            if(propName!=null)
+                name = getProperty("name").getStringValue();
         }
-
+        return name;
     }
 
     /**