Index: topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityAttributesPanel.java
diff -u topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityAttributesPanel.java:1.5 topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityAttributesPanel.java:1.6
--- topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityAttributesPanel.java:1.5	Tue Jul 20 16:02:25 2004
+++ topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityAttributesPanel.java	Wed Jul 21 16:09:10 2004
@@ -23,9 +23,9 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
  *
- * Mise a jour: $Date: 2004/07/20 16:02:25 $
+ * Mise a jour: $Date: 2004/07/21 16:09:10 $
  * par : $Author: mazelier $
  */
 
@@ -35,7 +35,7 @@
 import java.io.IOException;
 import java.io.Writer;
 
-import org.codelutin.generator.ObjectModelGeneratorWithCapitalizeName;
+import org.codelutin.generator.AbstractObjectModelGenerator;
 import org.codelutin.generator.models.object.ObjectModelClass;
 import org.codelutin.generator.models.object.ObjectModelAttribute;
 
@@ -45,7 +45,7 @@
 * Ce generateur permet de generer la classe avec le panel des attributs de
 * chaque entite
 */
-public class ObjectModelToEntityAttributesPanel extends ObjectModelGeneratorWithCapitalizeName{ // ObjectModelToEntityAttributesPanel
+public class ObjectModelToEntityAttributesPanel extends AbstractObjectModelGenerator{ // ObjectModelToEntityAttributesPanel
 
      public String getFilenameForClass(ObjectModelClass clazz) {
         return (clazz.getPackageName() + ".ui.")

Index: topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityAttributesUIModel.java
diff -u topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityAttributesUIModel.java:1.5 topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityAttributesUIModel.java:1.6
--- topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityAttributesUIModel.java:1.5	Tue Jul 20 16:02:25 2004
+++ topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityAttributesUIModel.java	Wed Jul 21 16:09:10 2004
@@ -23,9 +23,9 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
  *
- * Mise a jour: $Date: 2004/07/20 16:02:25 $
+ * Mise a jour: $Date: 2004/07/21 16:09:10 $
  * par : $Author: mazelier $
  */
 
@@ -36,7 +36,7 @@
 import java.io.Writer;
 import java.util.Iterator;
 
-import org.codelutin.generator.ObjectModelGeneratorWithCapitalizeName;
+import org.codelutin.generator.AbstractObjectModelGenerator;
 import org.codelutin.generator.models.object.ObjectModelAttribute;
 import org.codelutin.generator.models.object.ObjectModelClass;
 import java.util.ArrayList;
@@ -46,7 +46,7 @@
 * Ce generateur permet de generer un panel de saisie
 * avec l'ensemble des attributs de la classe
 */
-public class ObjectModelToEntityAttributesUIModel extends ObjectModelGeneratorWithCapitalizeName{ // ObjectModelToEntityAttributesUIModel
+public class ObjectModelToEntityAttributesUIModel extends AbstractObjectModelGenerator{ // ObjectModelToEntityAttributesUIModel
 
  public String getFilenameForClass(ObjectModelClass clazz) {
         // put .uimodel file in uimodel directory
@@ -225,7 +225,7 @@
                  <double>1.0</double>
                  <double>1.0</double>
                  <int>10</int>
-                 <int>1</int>
+                 <int>2</int>
                  <object class="java.awt.Insets">
                    <arguments>
                      <int>0</int>
@@ -288,9 +288,9 @@
                  <int>1</int>
                  <int>1</int>
                  <double>1.0</double>
-                 <double>1.0</double>
+                 <double>0.0</double>
                  <int>10</int>
-                 <int>1</int>
+                 <int>2</int>
                  <object class="java.awt.Insets">
                    <arguments>
                      <int>0</int>
@@ -445,7 +445,7 @@
                  <double>1.0</double>
                  <double>1.0</double>
                  <int>10</int>
-                 <int>1</int>
+                 <int>0</int>
                  <object class="java.awt.Insets">
                    <arguments>
                      <int>0</int>

Index: topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityPanel.java
diff -u topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityPanel.java:1.5 topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityPanel.java:1.6
--- topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityPanel.java:1.5	Tue Jul 20 16:02:25 2004
+++ topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityPanel.java	Wed Jul 21 16:09:10 2004
@@ -23,9 +23,9 @@
 *
 * @author Benjamin Poussin <poussin@codelutin.com>
 * Copyright Code Lutin
-* @version $Revision: 1.5 $
+* @version $Revision: 1.6 $
 *
-* Mise a jour: $Date: 2004/07/20 16:02:25 $
+* Mise a jour: $Date: 2004/07/21 16:09:10 $
 * par : $Author: mazelier $
 */
 
@@ -35,14 +35,14 @@
 import java.io.IOException;
 import java.io.Writer;
 
-import org.codelutin.generator.ObjectModelGeneratorWithCapitalizeName;
+import org.codelutin.generator.AbstractObjectModelGenerator;
 import org.codelutin.generator.models.object.ObjectModelClass;
 
 
 /**
 * Ce generateur permet de generer la classe avec l'ensemble des methodes a implanter
 */
-public class ObjectModelToEntityPanel extends ObjectModelGeneratorWithCapitalizeName { // ObjectModelToEntityPanel
+public class ObjectModelToEntityPanel extends AbstractObjectModelGenerator { // ObjectModelToEntityPanel
 
     public String getFilenameForClass(ObjectModelClass clazz) {
         return (clazz.getPackageName() + ".ui.")

Index: topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntitySelectionPanel.java
diff -u topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntitySelectionPanel.java:1.1 topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntitySelectionPanel.java:1.2
--- topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntitySelectionPanel.java:1.1	Tue Jul 20 16:03:22 2004
+++ topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntitySelectionPanel.java	Wed Jul 21 16:09:10 2004
@@ -23,9 +23,9 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
  *
- * Mise a jour: $Date: 2004/07/20 16:03:22 $
+ * Mise a jour: $Date: 2004/07/21 16:09:10 $
  * par : $Author: mazelier $
  */
 
@@ -35,15 +35,14 @@
 import java.io.IOException;
 import java.io.Writer;
 
-import org.codelutin.generator.ObjectModelGeneratorWithCapitalizeName;
+import org.codelutin.generator.AbstractObjectModelGenerator;
 import org.codelutin.generator.models.object.ObjectModelClass;
 
 /**
 * Ce generateur permet de generer la classe avec l'ensemble
 * des methodes a implanter pour le panel de selection
 */
-public class ObjectModelToEntitySelectionPanel
-extends ObjectModelGeneratorWithCapitalizeName { // ObjectModelToEntitySelectionPanel
+public class ObjectModelToEntitySelectionPanel extends AbstractObjectModelGenerator { // ObjectModelToEntitySelectionPanel
 
     public String getFilenameForClass(ObjectModelClass clazz) {
         return (clazz.getPackageName() + ".ui.")

Index: topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntitySelectionUIModel.java
diff -u topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntitySelectionUIModel.java:1.1 topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntitySelectionUIModel.java:1.2
--- topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntitySelectionUIModel.java:1.1	Tue Jul 20 16:03:22 2004
+++ topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntitySelectionUIModel.java	Wed Jul 21 16:09:10 2004
@@ -23,9 +23,9 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
  *
- * Mise a jour: $Date: 2004/07/20 16:03:22 $
+ * Mise a jour: $Date: 2004/07/21 16:09:10 $
  * par : $Author: mazelier $
  */
 
@@ -35,7 +35,7 @@
 import java.io.IOException;
 import java.io.Writer;
 
-import org.codelutin.generator.ObjectModelGeneratorWithCapitalizeName;
+import org.codelutin.generator.AbstractObjectModelGenerator;
 import org.codelutin.generator.models.object.ObjectModelClass;
 
 
@@ -43,8 +43,7 @@
 * Ce generateur permet de generer l'interface de selection de champs
 * se trouvant dans une table
 */
-public class ObjectModelToEntitySelectionUIModel
-extends ObjectModelGeneratorWithCapitalizeName{ // ObjectModelToEntitySelectionUIModel
+public class ObjectModelToEntitySelectionUIModel extends AbstractObjectModelGenerator{ // ObjectModelToEntitySelectionUIModel
 
     public String getFilenameForClass(ObjectModelClass clazz) {
         // put .uimodel file in uimodel directory
@@ -133,9 +132,6 @@
                 <string><%=capitalizeName(clazz)%>ButtonsPanel</string>
               </arguments>
             </property>
-}*/
-generateBorderPanel(output, clazz, "");
-/*{
           </properties>
         </object>
         <layout>
@@ -146,7 +142,7 @@
               <int>1</int>
               <int>1</int>
               <double>1.0</double>
-              <double>1.0</double>
+              <double>0.3</double>
               <int>10</int>
               <int>1</int>
               <object class="java.awt.Insets">
@@ -169,31 +165,6 @@
 }*/
         }
     }
-
-   /**
-   * Genere le border du panel
-   */
-   public void generateBorderPanel(Writer output, ObjectModelClass clazz,
-   String name) throws IOException {
-/*{
-      <property name="border">
-        <arguments>
-          <object class="javax.swing.border.TitledBorder">
-            <arguments>
-              <object class="javax.swing.border.EtchedBorder">
-                <arguments>
-                  <int>0</int>
-                </arguments>
-              </object>
-              <string><%=name%></string>
-              <int>0</int>
-              <int>0</int>
-            </arguments>
-          </object>
-        </arguments>
-      </property>
-}*/
-   }
 
 } // ObjectModelToEntitySelectionUIModel
 

Index: topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityTablePanel.java
diff -u topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityTablePanel.java:1.5 topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityTablePanel.java:1.6
--- topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityTablePanel.java:1.5	Tue Jul 20 16:02:25 2004
+++ topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityTablePanel.java	Wed Jul 21 16:09:10 2004
@@ -23,9 +23,9 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
  *
- * Mise a jour: $Date: 2004/07/20 16:02:25 $
+ * Mise a jour: $Date: 2004/07/21 16:09:10 $
  * par : $Author: mazelier $
  */
 
@@ -35,14 +35,14 @@
 import java.io.IOException;
 import java.io.Writer;
 
-import org.codelutin.generator.ObjectModelGeneratorWithCapitalizeName;
+import org.codelutin.generator.AbstractObjectModelGenerator;
 import org.codelutin.generator.models.object.ObjectModelClass;
 
 /**
 * Ce generateur permet de generer la classe avec le panel compose de
 * la JTable compose des attributs des differentes entites
 */
-public class ObjectModelToEntityTablePanel extends ObjectModelGeneratorWithCapitalizeName{ // ObjectModelToEntityTablePanel
+public class ObjectModelToEntityTablePanel extends AbstractObjectModelGenerator{ // ObjectModelToEntityTablePanel
 
     public String getFilenameForClass(ObjectModelClass clazz) {
         return (clazz.getPackageName() + ".ui.")

Index: topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityTableUIModel.java
diff -u topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityTableUIModel.java:1.5 topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityTableUIModel.java:1.6
--- topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityTableUIModel.java:1.5	Tue Jul 20 16:02:25 2004
+++ topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityTableUIModel.java	Wed Jul 21 16:09:10 2004
@@ -23,9 +23,9 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
  *
- * Mise a jour: $Date: 2004/07/20 16:02:25 $
+ * Mise a jour: $Date: 2004/07/21 16:09:10 $
  * par : $Author: mazelier $
  */
 
@@ -36,7 +36,7 @@
 import java.io.Writer;
 import java.util.Iterator;
 
-import org.codelutin.generator.ObjectModelGeneratorWithCapitalizeName;
+import org.codelutin.generator.AbstractObjectModelGenerator;
 import org.codelutin.generator.models.object.ObjectModelAttribute;
 import org.codelutin.generator.models.object.ObjectModelClass;
 
@@ -44,7 +44,7 @@
 * Ce generateur permet de generer un panel compose d'une table pour permettre la
 * recherche, selection d'element
 */
-public class ObjectModelToEntityTableUIModel extends ObjectModelGeneratorWithCapitalizeName{ // ObjectModelToEntityTableUIModel
+public class ObjectModelToEntityTableUIModel extends AbstractObjectModelGenerator{ // ObjectModelToEntityTableUIModel
 
     public String getFilenameForClass(ObjectModelClass clazz) {
         // put .uimodel file in uimodel directory

Index: topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityUIModel.java
diff -u topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityUIModel.java:1.5 topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityUIModel.java:1.6
--- topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityUIModel.java:1.5	Tue Jul 20 16:02:25 2004
+++ topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToEntityUIModel.java	Wed Jul 21 16:09:10 2004
@@ -23,9 +23,9 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
  *
- * Mise a jour: $Date: 2004/07/20 16:02:25 $
+ * Mise a jour: $Date: 2004/07/21 16:09:10 $
  * par : $Author: mazelier $
  */
 
@@ -36,7 +36,7 @@
 import java.io.Writer;
 import java.util.Iterator;
 
-import org.codelutin.generator.ObjectModelGeneratorWithCapitalizeName;
+import org.codelutin.generator.AbstractObjectModelGenerator;
 import org.codelutin.generator.models.object.ObjectModelAttribute;
 import org.codelutin.generator.models.object.ObjectModelClass;
 
@@ -45,7 +45,7 @@
 * Ce generateur permet de generer l'interface globale (saisie, modification,
 * recherche, suppression des Entities)
 */
-public class ObjectModelToEntityUIModel extends ObjectModelGeneratorWithCapitalizeName { // ObjectModelToEntityUIModel
+public class ObjectModelToEntityUIModel extends AbstractObjectModelGenerator { // ObjectModelToEntityUIModel
 
     public String getFilenameForClass(ObjectModelClass clazz) {
         // put .uimodel file in uimodel directory
@@ -209,31 +209,6 @@
 }*/
         }
     }
-
-   /**
-   * Genere le border du panel
-   */
-   public void generateBorderPanel(Writer output, ObjectModelClass clazz,
-   String name) throws IOException {
-/*{
-      <property name="border">
-        <arguments>
-          <object class="javax.swing.border.TitledBorder">
-            <arguments>
-              <object class="javax.swing.border.EtchedBorder">
-                <arguments>
-                  <int>0</int>
-                </arguments>
-              </object>
-              <string><%=name%></string>
-              <int>0</int>
-              <int>0</int>
-            </arguments>
-          </object>
-        </arguments>
-      </property>
-}*/
-   }
 
 } // ObjectModelToEntityUIModel
 

Index: topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToWidgetsXML.java
diff -u topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToWidgetsXML.java:1.4 topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToWidgetsXML.java:1.5
--- topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToWidgetsXML.java:1.4	Tue Jul 20 16:02:25 2004
+++ topia/src/java/org/codelutin/topia/ui/generators/ObjectModelToWidgetsXML.java	Wed Jul 21 16:09:10 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/07/20 16:02:25 $
+* Mise a jour: $Date: 2004/07/21 16:09:10 $
 * par : $Author: mazelier $
 */
 
@@ -35,7 +35,7 @@
 import java.io.Writer;
 import java.util.Iterator;
 
-import org.codelutin.generator.ObjectModelGeneratorWithCapitalizeName;
+import org.codelutin.generator.AbstractObjectModelGenerator;
 import org.codelutin.generator.models.object.ObjectModel;
 import org.codelutin.generator.models.object.ObjectModelClass;
 
@@ -44,7 +44,7 @@
 * pourra etre charge et le panel genere dans Topia pourra apparaitre dans la palette
 * de Buix
 */
-public class ObjectModelToWidgetsXML extends ObjectModelGeneratorWithCapitalizeName{ // ObjectModelToWidgetsXML
+public class ObjectModelToWidgetsXML extends AbstractObjectModelGenerator{ // ObjectModelToWidgetsXML
 
     public String getFilenameForModel(ObjectModel model) {
         return  model.getName()+"-widgets.xml";
@@ -75,7 +75,7 @@
         if(! Util.isEntity(clazz)) return;
 /*{
 
-    <widget shelf="<%if (model.getName()!=null){ %> <%=model.getName()%> <%}else{%> UserPanel <%}%> " class="<%=clazz.getPackageName()%>.ui.<%=capitalizeName(clazz)%>Panel"/>
+    <widget shelf="<%if (model.getName()!=null){ %><%=model.getName()%><%}else{%> UserPanel <%}%> " class="<%=clazz.getPackageName()%>.ui.<%=capitalizeName(clazz)%>Panel"/>
 
     <widget shelf="<%if (model.getName()!=null){%><%=model.getName()%>Selection<%}else{%> UserPanel <%}%>" class="<%=clazz.getPackageName()%>.ui.<%=capitalizeName(clazz)%>SelectionPanel"/>
 }*/