Index: topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToEntityPanel.java
diff -u topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToEntityPanel.java:1.6 topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToEntityPanel.java:1.7
--- topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToEntityPanel.java:1.6	Tue Jun 29 15:59:06 2004
+++ topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToEntityPanel.java	Wed Jun 30 13:40:36 2004
@@ -23,25 +23,23 @@
 *
 * @author Benjamin Poussin <poussin@codelutin.com>
 * Copyright Code Lutin
-* @version $Revision: 1.6 $
+* @version $Revision: 1.7 $
 *
-* Mise a jour: $Date: 2004/06/29 15:59:06 $
-* par : $Author: mazelier $
+* Mise a jour: $Date: 2004/06/30 13:40:36 $
+* par : $Author: pineau $
 */
 
 package org.codelutin.topia.generators.ui;
 
-import org.codelutin.topia.generators.Util;
-import org.codelutin.generator.ObjectModelGeneratorWithCapitalizeName;
-import org.codelutin.generator.models.object.ObjectModel;
-import org.codelutin.generator.models.object.ObjectModelClass;
-import org.codelutin.generator.models.object.ObjectModelAttribute;
-
 import java.io.File;
-import java.io.Writer;
 import java.io.IOException;
-import java.util.ArrayList;
+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;
+import org.codelutin.topia.generators.Util;
 
 public class ObjectModelToEntityPanel extends ObjectModelGeneratorWithCapitalizeName { // ObjectModelToEntityPanel
 

Index: topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToWidgetsXML.java
diff -u topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToWidgetsXML.java:1.4 topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToWidgetsXML.java:1.5
--- topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToWidgetsXML.java:1.4	Fri Jun 25 16:11:20 2004
+++ topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToWidgetsXML.java	Wed Jun 30 13:40:36 2004
@@ -23,21 +23,22 @@
 *
 * @author Benjamin Poussin <poussin@codelutin.com>
 * Copyright Code Lutin
-* @version $Revision: 1.4 $
+* @version $Revision: 1.5 $
 *
-* Mise a jour: $Date: 2004/06/25 16:11:20 $
-* par : $Author: mazelier $
+* Mise a jour: $Date: 2004/06/30 13:40:36 $
+* par : $Author: pineau $
 */
 
 package org.codelutin.topia.generators.ui;
 
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Iterator;
+
 import org.codelutin.generator.ObjectModelGeneratorWithCapitalizeName;
 import org.codelutin.generator.models.object.ObjectModel;
 import org.codelutin.generator.models.object.ObjectModelClass;
-import java.io.Writer;
-import java.io.IOException;
 import org.codelutin.topia.generators.Util;
-import java.util.Iterator;
 
 /**
 * Cette classe permet de generer un fichier xml de type Buix, ainsi ce fichier

Index: topia/src/java/org/codelutin/topia/generators/ui/UIModelToUISwingGenerator.java
diff -u topia/src/java/org/codelutin/topia/generators/ui/UIModelToUISwingGenerator.java:1.9 topia/src/java/org/codelutin/topia/generators/ui/UIModelToUISwingGenerator.java:1.10
--- topia/src/java/org/codelutin/topia/generators/ui/UIModelToUISwingGenerator.java:1.9	Tue Jun 29 15:59:06 2004
+++ topia/src/java/org/codelutin/topia/generators/ui/UIModelToUISwingGenerator.java	Wed Jun 30 13:40:36 2004
@@ -23,26 +23,26 @@
 *
 * @author Benjamin Poussin <poussin@codelutin.com>
 * Copyright Code Lutin
-* @version $Revision: 1.9 $
+* @version $Revision: 1.10 $
 *
-* Mise a jour: $Date: 2004/06/29 15:59:06 $
-* par : $Author: mazelier $
+* Mise a jour: $Date: 2004/06/30 13:40:36 $
+* par : $Author: pineau $
 */
 
 package org.codelutin.topia.generators.ui;
 
-import org.codelutin.generator.models.ui.*;
-import org.codelutin.generator.UIModelGeneratorWithCapitalizeName;
-import org.codelutin.topia.generators.Util;
-
-import java.io.Writer;
-import java.io.IOException;
 import java.io.File;
-
+import java.io.IOException;
+import java.io.Writer;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Iterator;
 
+import org.codelutin.generator.UIModelGeneratorWithCapitalizeName;
+import org.codelutin.generator.models.ui.UIModel;
+import org.codelutin.generator.models.ui.UIModelEvent;
+import org.codelutin.generator.models.ui.UIModelObject;
+import org.codelutin.generator.models.ui.UIModelProperty;
+
 /**
 * Classe qui permet de generer une classe java a partir d'un uimodel
 * Cette classe etend le generator present dans lutingenerator
@@ -50,8 +50,9 @@
 */
 public class UIModelToUISwingGenerator extends UIModelGeneratorWithCapitalizeName { //UIModelToUISwingGenerator
 
-    private String objectName;
-    private static int nbAnonymousObject = 0;
+    protected String objectName;
+    protected static int nbAnonymousObject = 0;
+    
     /**
     * Methode qui permet de generer une classe UI a partir de UIModel
     *

Index: topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToEntityUIModel.java
diff -u topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToEntityUIModel.java:1.16 topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToEntityUIModel.java:1.17
--- topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToEntityUIModel.java:1.16	Tue Jun 29 15:59:06 2004
+++ topia/src/java/org/codelutin/topia/generators/ui/ObjectModelToEntityUIModel.java	Wed Jun 30 13:40:36 2004
@@ -23,24 +23,23 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.16 $
+ * @version $Revision: 1.17 $
  *
- * Mise a jour: $Date: 2004/06/29 15:59:06 $
- * par : $Author: mazelier $
+ * Mise a jour: $Date: 2004/06/30 13:40:36 $
+ * par : $Author: pineau $
  */
 
 package org.codelutin.topia.generators.ui;
 
-import org.codelutin.topia.generators.Util;
-import org.codelutin.generator.ObjectModelGeneratorWithCapitalizeName;
-import org.codelutin.generator.models.object.ObjectModelClass;
-import org.codelutin.generator.models.object.ObjectModelAttribute;
-
 import java.io.File;
-import java.io.Writer;
 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;
+import org.codelutin.topia.generators.Util;
 
 
 /**

Index: topia/src/java/org/codelutin/topia/generators/ui/UIModelToUICallbackSwingGenerator.java
diff -u topia/src/java/org/codelutin/topia/generators/ui/UIModelToUICallbackSwingGenerator.java:1.7 topia/src/java/org/codelutin/topia/generators/ui/UIModelToUICallbackSwingGenerator.java:1.8
--- topia/src/java/org/codelutin/topia/generators/ui/UIModelToUICallbackSwingGenerator.java:1.7	Tue Jun 29 15:59:06 2004
+++ topia/src/java/org/codelutin/topia/generators/ui/UIModelToUICallbackSwingGenerator.java	Wed Jun 30 13:40:36 2004
@@ -23,24 +23,23 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
  *
- * Mise a jour: $Date: 2004/06/29 15:59:06 $
- * par : $Author: mazelier $
+ * Mise a jour: $Date: 2004/06/30 13:40:36 $
+ * par : $Author: pineau $
  */
 
 package org.codelutin.topia.generators.ui;
 
-import java.io.Writer;
-import java.io.IOException;
 import java.io.File;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Iterator;
 
-import org.codelutin.generator.models.ui.*;
-import org.codelutin.generator.models.ui.xml.*;
 import org.codelutin.generator.UIModelGeneratorWithCapitalizeName;
-
-import java.util.Iterator;
-import org.codelutin.topia.generators.Util;
+import org.codelutin.generator.models.ui.UIModel;
+import org.codelutin.generator.models.ui.UIModelEvent;
+import org.codelutin.generator.models.ui.UIModelObject;
 
 /**
 * Classe qui permet de generer une interface a partir d'un uimodel