Index: lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelArgumentsImpl.java diff -u lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelArgumentsImpl.java:1.1 lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelArgumentsImpl.java:1.2 --- lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelArgumentsImpl.java:1.1 Tue Aug 10 17:00:48 2004 +++ lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelArgumentsImpl.java Wed Aug 11 16:27:42 2004 @@ -23,9 +23,9 @@ * * @author Benjamin Poussin * Copyright Code Lutin -* @version $Revision: 1.1 $ +* @version $Revision: 1.2 $ * -* Mise a jour: $Date: 2004/08/10 17:00:48 $ +* Mise a jour: $Date: 2004/08/11 16:27:42 $ * par : $Author: mazelier $ */ @@ -71,7 +71,7 @@ String argString = "["; for(Iterator i = arguments.iterator(); i.hasNext();){ Object arg = i.next(); - argString = argString + ", " + arg.toString(); + argString = argString + " " + arg.toString(); } argString = argString + "]"; return argString; Index: lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelChildImpl.java diff -u lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelChildImpl.java:1.1 lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelChildImpl.java:1.2 --- lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelChildImpl.java:1.1 Tue Aug 10 17:00:48 2004 +++ lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelChildImpl.java Wed Aug 11 16:27:42 2004 @@ -23,9 +23,9 @@ * * @author Benjamin Poussin * Copyright Code Lutin -* @version $Revision: 1.1 $ +* @version $Revision: 1.2 $ * -* Mise a jour: $Date: 2004/08/10 17:00:48 $ +* Mise a jour: $Date: 2004/08/11 16:27:42 $ * par : $Author: mazelier $ */ @@ -84,9 +84,11 @@ * @return a string representation of the object */ public String toString(){ - String childString = "[ child : "; - childString = childString + object.toString() + ", \n"; - childString = childString + "constraint : " + constraint.toString() + "]"; + String childString = "["; + childString = childString + " child : " + object.toString() + " \n"; + if(constraint!=null) + childString = childString + "constraint : " + constraint.toString() + " \n"; + childString = childString + "]"; return childString; } Index: lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelConstraintImpl.java diff -u lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelConstraintImpl.java:1.1 lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelConstraintImpl.java:1.2 --- lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelConstraintImpl.java:1.1 Tue Aug 10 17:00:48 2004 +++ lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelConstraintImpl.java Wed Aug 11 16:27:42 2004 @@ -23,9 +23,9 @@ * * @author Benjamin Poussin * Copyright Code Lutin -* @version $Revision: 1.1 $ +* @version $Revision: 1.2 $ * -* Mise a jour: $Date: 2004/08/10 17:00:48 $ +* Mise a jour: $Date: 2004/08/11 16:27:42 $ * par : $Author: mazelier $ */ @@ -73,7 +73,11 @@ * @return a string representation of the object */ public String toString(){ - return value.toString(); + if (value != null){ + return value.toString(); + }else{ + return null; + } } } // UIModelConstraintImpl Index: lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelEventImpl.java diff -u lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelEventImpl.java:1.1 lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelEventImpl.java:1.2 --- lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelEventImpl.java:1.1 Tue Aug 10 17:00:48 2004 +++ lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelEventImpl.java Wed Aug 11 16:27:42 2004 @@ -23,9 +23,9 @@ * * @author Benjamin Poussin * Copyright Code Lutin -* @version $Revision: 1.1 $ +* @version $Revision: 1.2 $ * -* Mise a jour: $Date: 2004/08/10 17:00:48 $ +* Mise a jour: $Date: 2004/08/11 16:27:42 $ * par : $Author: mazelier $ */ @@ -125,10 +125,10 @@ * @return a string representation of the object */ public String toString(){ - String eventString = "[ addMethod : " + addMethod + ", \n"; - eventString = eventString + "source " + source + ", \n"; - eventString = eventString + "action " + action + ", \n"; - eventString = eventString + "handler " + handler + ", \n"; + String eventString = "[ addMethod : " + addMethod + ", "; + eventString = eventString + "source " + source + ", "; + eventString = eventString + "action " + action + ", "; + eventString = eventString + "handler " + handler + ", "; eventString = eventString + "argument : " + argument + " ]"; return eventString; } Index: lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelImpl.java diff -u lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelImpl.java:1.1 lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelImpl.java:1.2 --- lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelImpl.java:1.1 Tue Aug 10 17:00:48 2004 +++ lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelImpl.java Wed Aug 11 16:27:42 2004 @@ -24,9 +24,9 @@ * * @author Benjamin Poussin * Copyright Code Lutin -* @version $Revision: 1.1 $ +* @version $Revision: 1.2 $ * -* Mise a jour: $Date: 2004/08/10 17:00:48 $ +* Mise a jour: $Date: 2004/08/11 16:27:42 $ * par : $Author: mazelier $ */ @@ -127,9 +127,9 @@ * @return a string representation of the object */ public String toString(){ - String modelString = "[ version : " + version + ", \n"; - modelString = modelString + "package " + packageName + ", \n"; - modelString = modelString + "root : " + root.toString() + " ]"; + String modelString = "version : " + version + ", "; + modelString = modelString + "package : " + packageName + ", "; + modelString = modelString + "root : " + root.toString(); return modelString; } 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.1 lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelObjectImpl.java:1.2 --- lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelObjectImpl.java:1.1 Tue Aug 10 17:00:48 2004 +++ lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelObjectImpl.java Wed Aug 11 16:27:42 2004 @@ -23,9 +23,9 @@ * * @author Benjamin Poussin * Copyright Code Lutin -* @version $Revision: 1.1 $ +* @version $Revision: 1.2 $ * -* Mise a jour: $Date: 2004/08/10 17:00:48 $ +* Mise a jour: $Date: 2004/08/11 16:27:42 $ * par : $Author: mazelier $ */ @@ -274,30 +274,29 @@ * @return a string representation of the object */ public String toString(){ - String objectString = "[ type : " + type + ", \n"; - objectString = objectString + "[ name : " + getName() + ", \n"; + String objectString = "\n[ type : " + type + ", "; + objectString = objectString + " name : " + getName() + ", "; + objectString = objectString + " arguments : " + arguments.toString(); - objectString = objectString + "[ arguments : " + arguments.toString() + ", \n"; - - objectString = objectString + "[ properties : " + "\n"; + objectString = objectString + " properties : "; for(Iterator i = properties.iterator(); i.hasNext();){ Object prop = i.next(); - objectString = objectString + ", \n" + prop.toString(); + objectString = objectString + " " + prop.toString(); } - objectString = objectString + "[ events : " + "\n"; + objectString = objectString + " events : "; for(Iterator i = events.iterator(); i.hasNext();){ Object event = i.next(); - objectString = objectString + ", \n" + event.toString(); + objectString = objectString + " " + event.toString(); } - objectString = objectString + "[ children : " + "\n"; + objectString = objectString + " children : "; for(Iterator i = children.iterator(); i.hasNext();){ Object child = i.next(); - objectString = objectString + ", \n" + child.toString(); + objectString = objectString + " " + child.toString(); } - objectString = objectString + "]"; + objectString = objectString + "]\n"; return objectString; } Index: lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelPropertyImpl.java diff -u lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelPropertyImpl.java:1.1 lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelPropertyImpl.java:1.2 --- lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelPropertyImpl.java:1.1 Tue Aug 10 17:00:48 2004 +++ lutingenerator/src/java/org/codelutin/generator/models/ui/impl/UIModelPropertyImpl.java Wed Aug 11 16:27:42 2004 @@ -23,9 +23,9 @@ * * @author Benjamin Poussin * Copyright Code Lutin -* @version $Revision: 1.1 $ +* @version $Revision: 1.2 $ * -* Mise a jour: $Date: 2004/08/10 17:00:48 $ +* Mise a jour: $Date: 2004/08/11 16:27:42 $ * par : $Author: mazelier $ */ @@ -181,8 +181,8 @@ * @return a string representation of the object */ public String toString(){ - String propertyString = "[ name : " + getName() + ", \n"; - propertyString = propertyString + "[ arguments : " + arguments.toString() + " ]"; + String propertyString = "[ name : " + getName() + ", "; + propertyString = propertyString + " arguments : " + arguments.toString() + " ]"; return propertyString; }