Index: topia/src/java/org/codelutin/topia/generators/ui/swing/UIModelToSwingMetaGenerator.java diff -u topia/src/java/org/codelutin/topia/generators/ui/swing/UIModelToSwingMetaGenerator.java:1.3 topia/src/java/org/codelutin/topia/generators/ui/swing/UIModelToSwingMetaGenerator.java:1.4 --- topia/src/java/org/codelutin/topia/generators/ui/swing/UIModelToSwingMetaGenerator.java:1.3 Fri Aug 6 17:48:52 2004 +++ topia/src/java/org/codelutin/topia/generators/ui/swing/UIModelToSwingMetaGenerator.java Wed Sep 8 15:47:17 2004 @@ -23,10 +23,10 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.3 $ + * @version $Revision: 1.4 $ * - * Mise a jour: $Date: 2004/08/06 17:48:52 $ - * par : $Author: bpoussin $ + * Mise a jour: $Date: 2004/09/08 15:47:17 $ + * par : $Author: mazelier $ */ package org.codelutin.topia.generators.ui.swing; @@ -39,6 +39,7 @@ import org.codelutin.generator.models.ui.UIModel; import java.util.logging.Logger; import java.util.logging.Level; + public class UIModelToSwingMetaGenerator extends UIModelGenerator { // UIModelToSwingGenerator Index: topia/src/java/org/codelutin/topia/generators/ui/swing/UIModelToUICallbackSwingGenerator.java diff -u topia/src/java/org/codelutin/topia/generators/ui/swing/UIModelToUICallbackSwingGenerator.java:1.2 topia/src/java/org/codelutin/topia/generators/ui/swing/UIModelToUICallbackSwingGenerator.java:1.3 --- topia/src/java/org/codelutin/topia/generators/ui/swing/UIModelToUICallbackSwingGenerator.java:1.2 Fri Aug 6 17:48:52 2004 +++ topia/src/java/org/codelutin/topia/generators/ui/swing/UIModelToUICallbackSwingGenerator.java Wed Sep 8 15:47:17 2004 @@ -23,10 +23,10 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ * - * Mise a jour: $Date: 2004/08/06 17:48:52 $ - * par : $Author: bpoussin $ + * Mise a jour: $Date: 2004/09/08 15:47:17 $ + * par : $Author: mazelier $ */ package org.codelutin.topia.generators.ui.swing; @@ -61,7 +61,6 @@ * Methode qui permet de generer une interface UICallback a partir de UIModel */ public String getFilenameForUIModel(UIModel model) { - return model.getPackage().replace('.', File.separatorChar) + File.separatorChar + capitalizeName(model.getRoot()) + "UICallback.java"; } @@ -71,7 +70,7 @@ public void generateFromUIModel(Writer output, UIModel model) throws IOException { // ------------- File Header - if (!model.getPackage().equals("")) { + if (model.getPackage()!=null) { /*{ /** * Generated: by ToPIA Framework 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.2 topia/src/java/org/codelutin/topia/generators/ui/swing/UIModelToUISwingGenerator.java:1.3 --- topia/src/java/org/codelutin/topia/generators/ui/swing/UIModelToUISwingGenerator.java:1.2 Fri Aug 6 17:48:52 2004 +++ topia/src/java/org/codelutin/topia/generators/ui/swing/UIModelToUISwingGenerator.java Wed Sep 8 15:47:17 2004 @@ -23,10 +23,10 @@ * * @author Benjamin Poussin * Copyright Code Lutin -* @version $Revision: 1.2 $ +* @version $Revision: 1.3 $ * -* Mise a jour: $Date: 2004/08/06 17:48:52 $ -* par : $Author: bpoussin $ +* Mise a jour: $Date: 2004/09/08 15:47:17 $ +* par : $Author: mazelier $ */ package org.codelutin.topia.generators.ui.swing; @@ -39,10 +39,7 @@ import org.codelutin.generator.Generator; 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; +import org.codelutin.generator.models.ui.*; import org.codelutin.topia.TopiaContext; @@ -219,6 +216,7 @@ }else if (!(object instanceof TopiaContext)){ objectName = "__" + object.getName() + "__"; + /*{ // declaration de l'objet @@ -267,7 +265,7 @@ }else if (objectArg.getName() != null) { /*{__<%=objectArg.getName()%>__}*/ }else{ - generateInstanciationObject(output, (UIModelObject)arg); + generateInstanciationObject(output, objectArg); } }else if (arg instanceof String){ String argString = (String)arg; @@ -362,50 +360,52 @@ for(Iterator i=properties.iterator(); i.hasNext();){ UIModelProperty property = (UIModelProperty) i.next(); - Object arg = property.getValue(); String propertyName = property.getName(); - if (! propertyName.equals("layout")){ - try{ - // cas ou la propriete est indexee - String index = (property.isIndexed()) ? new String(property.getIndex()+", "):""; + Object arg = property.getValue(); + + if(arg!=null){ + if (! propertyName.equals("layout")){ + try{ + // cas ou la propriete est indexee + String index = (property.isIndexed()) ? new String(property.getIndex()+", "):""; - // cas ou la propriete est un objet - if (arg instanceof UIModelObject){ + // cas ou la propriete est un objet + if (arg instanceof UIModelObject){ - UIModelObject objectArg = (UIModelObject)arg; - if (objectArg.getName()!=null){ + UIModelObject objectArg = (UIModelObject)arg; + if (objectArg.getName()!=null){ /*{ result.set<%=capitalizeName(property)%>(<%=index%>get<%=capitalizeName(objectArg)%>()); }*/ - }else{ + }else{ /*{ result.set<%=capitalizeName(property)%>(<%=index%>}*/generateInstanciationObject(output, objectArg);/*{); }*/ - } - // cas ou la propriete est de type string - }else if (arg instanceof String){ + } + // cas ou la propriete est de type string + }else if (arg instanceof String){ /*{ result.set<%=capitalizeName(property)%>(<%=index%>"<%=property.getStringValue()%>"); }*/ - // cas ou la propriete est de type char - }else if (arg instanceof Character){ + // cas ou la propriete est de type char + }else if (arg instanceof Character){ /*{ result.set<%=capitalizeName(property)%>(<%=index%>'<%=property.getCharValue()%>'); }*/ - }else{ + }else{ /*{ result.set<%=capitalizeName(property)%>(<%=index%><%=property.getValue().toString()%>); }*/ + } + }catch(Exception eee){ + System.out.println("Impossible d'acceder a l'index de la propriete " + propertyName); + System.out.println(eee); } - }catch(Exception eee){ - System.out.println("Impossible d'acceder a l'index de la propriete " + propertyName); - System.out.println(eee); - } - }else if (arg instanceof UIModelObject){ - UIModelObject objectArg = (UIModelObject)arg; + }else if (arg instanceof UIModelObject){ + UIModelObject objectArg = (UIModelObject)arg; /*{ if (result instanceof RootPaneContainer){ ((RootPaneContainer)result).getContentPane().setLayout(new <%= objectArg.getType()%>(}*/generateArgumentStatement(output, objectArg);/*{)); @@ -413,6 +413,7 @@ ((Container)result).setLayout(new <%= objectArg.getType()%>(}*/generateArgumentStatement(output, objectArg);/*{)); } }*/ + } } } } @@ -449,7 +450,9 @@ ArrayList children = new ArrayList(); }*/ for(Iterator i=object.getChildren().iterator(); i.hasNext();){ - UIModelObject objectChild = (UIModelObject) i.next(); + + UIModelChild child = (UIModelChild) i.next(); + UIModelObject objectChild = child.getObject(); /*{ children.add(get<%=capitalizeName(objectChild)%>()); @@ -474,11 +477,14 @@ public ArrayList get<%=capitalizeName(object)%>Constraints() { ArrayList constraints = new ArrayList(); }*/ + for(Iterator i=object.getChildren().iterator(); i.hasNext();){ // recuperation de l'objet de l'enfant - UIModelObject objectChild = (UIModelObject) i.next(); + UIModelChild child = (UIModelChild) i.next(); + UIModelObject objectChild = (UIModelObject) child.getObject(); + // recuperation de la constrainte pour cet objet - Object objectConstraint = objectChild.getConstraint().getValue(); + Object objectConstraint = child.getConstraint().getValue(); if (objectConstraint instanceof UIModelObject) { UIModelObject constraint = (UIModelObject)objectConstraint;