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.7 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.7 Wed Sep 22 15:46:30 2004 +++ topia/src/java/org/codelutin/topia/generators/ui/swing/UIModelToUISwingGenerator.java Tue Sep 28 10:14:49 2004 @@ -23,9 +23,9 @@ * * @author Benjamin Poussin * Copyright Code Lutin -* @version $Revision: 1.7 $ +* @version $Revision: 1.8 $ * -* Mise a jour: $Date: 2004/09/22 15:46:30 $ +* Mise a jour: $Date: 2004/09/28 10:14:49 $ * par : $Author: mazelier $ */ @@ -144,11 +144,23 @@ } public <%=capitalizeName(object)%>UI(Dialog owner){ - super(owner, I18n._("<%=object.getProperty("title").getStringValue()%>"), <%=object.getProperty("modal").getBooleanValue()%>); +}*/ + if(object.getProperty("title")!=null && object.getProperty("modal")!=null){ +/*{ + super(owner, I18n._("<%=object.getProperty("title").getStringValue()%>"), <%=object.getProperty("modal").getBooleanValue()%>); +}*/ + } +/*{ } public <%=capitalizeName(object)%>UI(Frame owner){ +}*/ + if(object.getProperty("title")!=null && object.getProperty("modal")!=null){ +/*{ super(owner, I18n._("<%=object.getProperty("title").getStringValue()%>"), <%=object.getProperty("modal").getBooleanValue()%>); +}*/ + } +/*{ } }*/ @@ -156,7 +168,14 @@ /*{ public <%=capitalizeName(object)%>UI(){ - super(I18n._("<%=object.getProperty("title").getStringValue()%>")); + super(); +}*/ + if(object.getProperty("title")!=null){ +/*{ + setTitle("<%=object.getProperty("title").getStringValue()%>"); +}*/ + } +/*{ } }*/ } @@ -264,7 +283,7 @@ /*{getContext()}*/ }else if (objectArg.getName() != null) { /*{__<%=objectArg.getName()%>__}*/ - }else{ + }else if (objectArg.getType()!=null){ generateInstanciationObject(output, objectArg); } }else if (arg instanceof String){ @@ -374,15 +393,17 @@ if (arg instanceof UIModelObject){ UIModelObject objectArg = (UIModelObject)arg; - if (objectArg.getName()!=null){ + if (objectArg.getType()!=null){ + 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){ @@ -508,9 +529,11 @@ if (objectConstraint instanceof UIModelObject) { UIModelObject constraint = (UIModelObject)objectConstraint; + if(constraint.getType()!=null){ /*{ constraints.add(}*/generateInstanciationObject(output, constraint);/*{); }*/ + } }else if (objectConstraint instanceof String) { /*{ constraints.add("<%=child.getConstraint().getStringValue()%>");