Index: lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelObjectImpl.java diff -u lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelObjectImpl.java:1.3 lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelObjectImpl.java:1.4 --- lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelObjectImpl.java:1.3 Thu Aug 19 15:25:51 2004 +++ lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelObjectImpl.java Thu Sep 23 08:38:43 2004 @@ -23,14 +23,15 @@ * * @author Benjamin Poussin * Copyright Code Lutin -* @version $Revision: 1.3 $ +* @version $Revision: 1.4 $ * -* Mise a jour: $Date: 2004/08/19 15:25:51 $ +* Mise a jour: $Date: 2004/09/23 08:38:43 $ * par : $Author: mazelier $ */ package org.codelutin.generator.models.ui.impl; +import org.codelutin.generator.GeneratorException; import org.codelutin.generator.models.ui.*; import java.util.Collection; import java.util.Iterator; @@ -157,7 +158,7 @@ if (name == null){ UIModelProperty propName = getProperty("name"); if(propName!=null) - name = getProperty("name").getStringValue(); + name = propName.getStringValue(); } return name; } @@ -228,17 +229,22 @@ * @param String the name of the property which must be returned * @return a UIModelProperty for this object with the . */ - public UIModelProperty getProperty(String name){ + public UIModelProperty getProperty(String propName){ Iterator i = properties.iterator(); UIModelPropertyImpl prop = null; boolean find = false; while (i.hasNext() && find==false){ prop = (UIModelPropertyImpl)i.next(); - if(name.equals(prop.getName())){ + if(propName.equals(prop.getName())){ find=true; } } - return prop; + if(find==true){ + return prop; + }else{ + return null; + //throw new GeneratorException("L'objet "+ type +" n'a pas de propriete "+ propName); + } } /**