Index: lutingenerator/src/java/org/codelutin/generator/models/ui/UIModel.java
diff -u lutingenerator/src/java/org/codelutin/generator/models/ui/UIModel.java:1.5 lutingenerator/src/java/org/codelutin/generator/models/ui/UIModel.java:1.6
--- lutingenerator/src/java/org/codelutin/generator/models/ui/UIModel.java:1.5	Tue Aug 10 17:00:48 2004
+++ lutingenerator/src/java/org/codelutin/generator/models/ui/UIModel.java	Fri May 25 16:14:19 2007
@@ -26,10 +26,10 @@
 * Created: Jun 2, 2004
 *
 * @author pineau
-* @version $Revision: 1.5 $
+* @version $Revision: 1.6 $
 *
-* Last update : $Date: 2004/08/10 17:00:48 $
-* by : $Author: mazelier $
+* Last update : $Date: 2007/05/25 16:14:19 $
+* by : $Author: chatellier $
 *
 * Abstraction for the root node of ui model trees.
 * This an entry point for browsing an ui model tree.
@@ -66,7 +66,7 @@
     *
     * @return a Collection containing all UIModelObjects for this ui model.
     */
-    public abstract Collection getObjects();
+    public abstract Collection<UIModelObject> getObjects();
 
     /**
     * Method used to add objects in this model

Index: lutingenerator/src/java/org/codelutin/generator/models/ui/UIModelArguments.java
diff -u lutingenerator/src/java/org/codelutin/generator/models/ui/UIModelArguments.java:1.1 lutingenerator/src/java/org/codelutin/generator/models/ui/UIModelArguments.java:1.2
--- lutingenerator/src/java/org/codelutin/generator/models/ui/UIModelArguments.java:1.1	Mon Jun  7 16:10:18 2004
+++ lutingenerator/src/java/org/codelutin/generator/models/ui/UIModelArguments.java	Fri May 25 16:14:19 2007
@@ -23,15 +23,16 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
  *
- * Mise a jour: $Date: 2004/06/07 16:10:18 $
- * par : $Author: mazelier $
+ * Mise a jour: $Date: 2007/05/25 16:14:19 $
+ * par : $Author: chatellier $
  */
 
 package org.codelutin.generator.models.ui;
 
-import java.util.ArrayList;
+import java.util.List;
+
 
 
 public interface UIModelArguments { // UIModelArguments
@@ -40,7 +41,7 @@
     * Returns a arguments list.
     * @return a arguments list.
     */
-    public abstract ArrayList getArguments();
+    public abstract List<Object> getArguments();
 
 } // UIModelArguments
 

Index: lutingenerator/src/java/org/codelutin/generator/models/ui/UIModelObject.java
diff -u lutingenerator/src/java/org/codelutin/generator/models/ui/UIModelObject.java:1.4 lutingenerator/src/java/org/codelutin/generator/models/ui/UIModelObject.java:1.5
--- lutingenerator/src/java/org/codelutin/generator/models/ui/UIModelObject.java:1.4	Tue Jun  8 12:33:36 2004
+++ lutingenerator/src/java/org/codelutin/generator/models/ui/UIModelObject.java	Fri May 25 16:14:19 2007
@@ -25,10 +25,10 @@
 * Created: Jun 2, 2004
 *
 * @author pineau
-* @version $Revision: 1.4 $
+* @version $Revision: 1.5 $
 *
-* Last update : $Date: 2004/06/08 12:33:36 $
-* by : $Author: mazelier $
+* Last update : $Date: 2007/05/25 16:14:19 $
+* by : $Author: chatellier $
 */
 public interface UIModelObject {
 
@@ -67,7 +67,7 @@
     *
     * @return a Collection containing all arguments for this object.
     */
-    public abstract Collection getArguments();
+    public abstract Collection<Object> getArguments();
 
     /**
     * Returns all properties defined on this object.
@@ -75,7 +75,7 @@
     *
     * @return a Collection containing all UIModelProperty for this object.
     */
-    public abstract Collection getProperties();
+    public abstract Collection<UIModelProperty> getProperties();
 
     /**
     * Returns the property defined on this object.
@@ -91,7 +91,7 @@
     *
     * @return a Collection containing all UIModelEvents for this object.
     */
-    public abstract Collection getEvents();
+    public abstract Collection<UIModelEvent> getEvents();
 
     /**
     * Returns all children defined on this object.
@@ -99,7 +99,7 @@
     *
     * @return a Collection containing all UIModelChildren for this object.
     */
-    public abstract Collection getChildren();
+    public abstract Collection<UIModelChild> getChildren();
 
 
     /**