Index: lutingenerator/src/java/org/codelutin/generator/models/ui/javaxml/JavaXMLParser.java diff -u lutingenerator/src/java/org/codelutin/generator/models/ui/javaxml/JavaXMLParser.java:1.6 lutingenerator/src/java/org/codelutin/generator/models/ui/javaxml/JavaXMLParser.java:1.7 --- lutingenerator/src/java/org/codelutin/generator/models/ui/javaxml/JavaXMLParser.java:1.6 Thu Sep 23 08:38:43 2004 +++ lutingenerator/src/java/org/codelutin/generator/models/ui/javaxml/JavaXMLParser.java Tue Sep 28 14:47:08 2004 @@ -23,9 +23,9 @@ * * @author Benjamin Poussin * Copyright Code Lutin -* @version $Revision: 1.6 $ +* @version $Revision: 1.7 $ * -* Mise a jour: $Date: 2004/09/23 08:38:43 $ +* Mise a jour: $Date: 2004/09/28 14:47:08 $ * par : $Author: mazelier $ */ @@ -195,26 +195,30 @@ for(Iterator i = listPrimitivElement.iterator(); i.hasNext();){ Element element = (Element)i.next(); String type = element.getQualifiedName(); - String valueString = element.getText(); - Object value = valueString; - if(type.equals("int")){ - value = new Integer(valueString); - }else if (type.equals("float")){ - value = new Float(valueString); - }else if (type.equals("double")){ - value = new Double(valueString); - }else if (type.equals("long")){ - value = new Long(valueString); - }else if (type.equals("short")){ - value = new Short(valueString); - }else if (type.equals("boolean")){ - value = new Boolean(valueString); - }else if (type.equals("byte")){ - value = new Byte(valueString); - }else if (type.equals("object")){ - value = parseObject(element, parent); + // pour eviter le cas ou l'element est de type + if (!type.equals("null")){ + String valueString = element.getText(); + Object value = valueString; + if(type.equals("int")){ + value = new Integer(valueString); + }else if (type.equals("float")){ + value = new Float(valueString); + }else if (type.equals("double")){ + value = new Double(valueString); + }else if (type.equals("long")){ + value = new Long(valueString); + }else if (type.equals("short")){ + value = new Short(valueString); + }else if (type.equals("boolean")){ + value = new Boolean(valueString); + }else if (type.equals("byte")){ + value = new Byte(valueString); + }else if (type.equals("object")){ + value = parseObject(element, parent); + } + result.addArgument(value); } - result.addArgument(value); + } return result; } @@ -312,7 +316,7 @@ // selectionner l'enfant qui possede le meme id que l'idref // cet enfant se trouve dans les descendants du noeud root if(childElem.attributeValue("idref") != null){ - childElem = (Element)rootElement.selectSingleNode("descendant::[@id=\""+id+"\"]"); + childElem = (Element)rootElement.selectSingleNode("descendant::object[@id=\""+id+"\"]"); } UIModelObjectImpl child = parseObject(childElem, parent); id = childElem.attributeValue("id");