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.8 topia/src/java/org/codelutin/topia/generators/ui/swing/UIModelToUISwingGenerator.java:1.9
--- topia/src/java/org/codelutin/topia/generators/ui/swing/UIModelToUISwingGenerator.java:1.8	Tue Sep 28 10:14:49 2004
+++ topia/src/java/org/codelutin/topia/generators/ui/swing/UIModelToUISwingGenerator.java	Wed Sep 29 15:17:46 2004
@@ -23,9 +23,9 @@
 *
 * @author Benjamin Poussin <poussin@codelutin.com>
 * Copyright Code Lutin
-* @version $Revision: 1.8 $
+* @version $Revision: 1.9 $
 *
-* Mise a jour: $Date: 2004/09/28 10:14:49 $
+* Mise a jour: $Date: 2004/09/29 15:17:46 $
 * par : $Author: mazelier $
 */
 
@@ -358,11 +358,15 @@
 }*/
         }
 /*{
-             if(result instanceof TopiaElement){
-                 listModel.add(result);
+             {
+                 Object objectResult = (Object)result;
+                 if(objectResult instanceof TopiaElement){
+                     listModel.add(result);
+                 }
              }
 }*/
-    }
+
+}
 
     /**
     * Methode pour modifier les prorpietes de l'objet selon les valeurs definies dans
@@ -428,12 +432,16 @@
                 }else if (arg instanceof UIModelObject){
                     UIModelObject objectArg = (UIModelObject)arg;
 /*{
-             if (result instanceof RootPaneContainer){
+    {
+             Object objectResult = (Object)result;
+             if (objectResult instanceof RootPaneContainer){
                  ((RootPaneContainer)result).getContentPane().setLayout(new <%= objectArg.getType()%>(}*/generateArgumentStatement(output, objectArg);/*{));
-             }else if (result instanceof Container) {
+             }else if (objectResult instanceof Container) {
                  ((Container)result).setLayout(new <%= objectArg.getType()%>(}*/generateArgumentStatement(output, objectArg);/*{));
              }
+    }
 }*/
+
                 }
             }
         }
@@ -449,28 +457,22 @@
         for(Iterator i=events.iterator(); i.hasNext();){
 
             UIModelEvent event = (UIModelEvent) i.next();
-            System.out.println("****");
-            System.out.println("event.getSource() "+ event.getSource());
-            System.out.println("event.getHandler() " + event.getHandler()); System.out.println("event.getArgument() " + event.getArgument()); System.out.println("event.getAction() " + event.getAction());
-            System.out.println("event.getAddMethod() " + event.getAddMethod());
-            System.out.println("****");
-
 
     if (event.getAction()!=null && event.getArgument()!=null){
 /*{
-             Object l = EventHandler.create(<%=event.getSource()%>.class, result, "<%=event.getHandler()%>", "<%=event.getArgument()%>", "<%=event.getAction()%>");
+             Object l = EventHandler.create(<%=event.getSource()%>.class, this, "<%=event.getHandler()%>", "<%=event.getArgument()%>", "<%=event.getAction()%>");
 
              result.<%=event.getAddMethod()%>((<%=event.getSource()%>)l);
 }*/
     }else if (event.getAction()==null && event.getArgument()!=null){
 /*{
-             Object l = EventHandler.create(<%=event.getSource()%>.class, result, "<%=event.getHandler()%>", "<%=event.getArgument()%>");
+             Object l = EventHandler.create(<%=event.getSource()%>.class, this, "<%=event.getHandler()%>", "<%=event.getArgument()%>");
 
              result.<%=event.getAddMethod()%>((<%=event.getSource()%>)l);
 }*/
     }else if (event.getAction()==null && event.getArgument()==null){
 /*{
-             Object l = EventHandler.create(<%=event.getSource()%>.class, result, "<%=event.getHandler()%>");
+             Object l = EventHandler.create(<%=event.getSource()%>.class, this, "<%=event.getHandler()%>");
 
              result.<%=event.getAddMethod()%>((<%=event.getSource()%>)l);
 }*/
@@ -575,20 +577,18 @@
 
              // ajout des enfants avec leur contrainte
              Iterator iConstraints = constraints.iterator();
-             for(Iterator iChilds = childs.iterator(); iChilds.hasNext(); ){
+             for(Iterator iChilds = childs.iterator(); iChilds.hasNext();){
                 Component c = (Component)iChilds.next();
-                if (result instanceof RootPaneContainer) {
-                    ((RootPaneContainer)result).getContentPane().add(c, iConstraints.next());
-                }else{
-                    result.add(c, iConstraints.next());
+                {
+                    Object objectResult = (Object)result;
+                    if (objectResult instanceof RootPaneContainer) {
+                        Object constraint  = iConstraints.next();
+                        ((RootPaneContainer)objectResult).getContentPane().add(c, constraint);
+                    }else{
+                        Object constraint  = iConstraints.next();
+                        result.add(c, constraint);
+                    }
                 }
-}*/
-              if (object.getType().equals("javax.swing.JTabbedPane")){
-/*{
-                result.setTitleAt(i, c.getName());
-}*/
-               }
-/*{
              }
 }*/