Index: topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java diff -u topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java:1.10 topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java:1.11 --- topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java:1.10 Mon Jan 23 13:51:52 2006 +++ topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java Tue Feb 7 19:57:02 2006 @@ -24,10 +24,10 @@ * Created: 12 déc. 2005 * * @author Arnaud Thimel -* @version $Revision: 1.10 $ +* @version $Revision: 1.11 $ * -* Mise a jour: $Date: 2006/01/23 13:51:52 $ -* par : $Author: bpoussin $ +* Mise a jour: $Date: 2006/02/07 19:57:02 $ +* par : $Author: thimel $ */ package org.codelutin.topia.generator; @@ -177,7 +177,9 @@ * @see <%=clazz.getQualifiedName()%>#set<%=Util.capitalize(attr.getName())%>(<%=attr.getType()%>) *) public void set<%=Util.capitalize(attr.getName())%>(<%=attr.getType()%> value) { + <%=attr.getType()%> _oldValue = this.<%=attr.getName()%>; this.<%=attr.getName()%> = value; + fireOnModifyProperty("<%=attr.getName()%>", _oldValue, value); } /* (non-Javadoc) @@ -195,7 +197,9 @@ * @see <%=clazz.getQualifiedName()%>#set<%=Util.capitalize(assocAttrName)%>(<%=attr.getAssociationClass().getQualifiedName()%>) *) public void set<%=Util.capitalize(assocAttrName)%>(<%=attr.getAssociationClass().getQualifiedName()%> association) { + <%=attr.getAssociationClass().getQualifiedName()%> _oldValue = this.<%=Util.toLowerCaseFirstLetter(attr.getName())%>; this.<%=Util.toLowerCaseFirstLetter(attr.getName())%> = association; + fireOnModifyProperty("<%=attr.getName()%>", _oldValue, association); } /* (non-Javadoc) @@ -227,6 +231,7 @@ } } /*{ this.<%=attr.getName()%>.add(<%=attr.getName()%>); + fireOnModifyIndexedProperty("<%=attr.getName()%>", this.<%=attr.getName()%>.size(), null, <%=attr.getName()%>); } /* (non-Javadoc) @@ -248,7 +253,9 @@ // clear<%=Util.capitalize(attr.getName())%>(); // addAll<%=Util.capitalize(attr.getName())%>(values); // FIXME + <%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> _oldValue = <%=attr.getName()%>; <%=attr.getName()%> = values; + fireOnModifyProperty("<%=attr.getName()%>", _oldValue, values); } /* (non-Javadoc) @@ -268,7 +275,8 @@ }*/ } } -/*{ } +/*{ fireOnModifyIndexedProperty("<%=attr.getName()%>", this.<%=attr.getName()%>.size()+1, value, null); + } /* (non-Javadoc) * @see <%=clazz.getQualifiedName()%>#clear<%=Util.capitalize(attr.getName())%>() @@ -292,7 +300,9 @@ /*{ } }*/ } -/*{ this.<%=attr.getName()%>.clear(); +/*{ java.util.List _oldValue = new java.util.ArrayList(this.<%=attr.getName()%>); + this.<%=attr.getName()%>.clear(); + fireOnModifyProperty("<%=attr.getName()%>", _oldValue, null); } }*/ @@ -315,6 +325,7 @@ }*/ } /*{ this.<%=Util.toLowerCaseFirstLetter(attr.getName())%>.add(value); + fireOnModifyIndexedProperty("<%=attr.getName()%>", this.<%=Util.toLowerCaseFirstLetter(attr.getName())%>.size(), null, value); } /* (non-Javadoc) @@ -336,7 +347,9 @@ // clear<%=Util.capitalize(assocAttrName)%>(); // addAll<%=Util.capitalize(assocAttrName)%>(values); // FIXME + <%=(GeneratorUtil.isOrdered(attr)?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> _oldValue = <%=Util.toLowerCaseFirstLetter(attr.getName())%>; <%=Util.toLowerCaseFirstLetter(attr.getName())%> = values; + fireOnModifyProperty("<%=attr.getName()%>", _oldValue, values); } /* (non-Javadoc) @@ -351,7 +364,8 @@ /*{ value.set<%=Util.capitalize(attr.getReverseAttribute().getName())%>(null); }*/ } -/*{ } +/*{ fireOnModifyIndexedProperty("<%=attr.getName()%>", this.<%=attr.getName()%>.size()+1, value, null); + } /* (non-Javadoc) * @see <%=clazz.getQualifiedName()%>#clear<%=Util.capitalize(assocAttrName)%>() @@ -367,7 +381,9 @@ } }*/ } -/*{ this.<%=Util.toLowerCaseFirstLetter(attr.getName())%>.clear(); +/*{ java.util.List _oldValue = new java.util.ArrayList(this.<%=Util.toLowerCaseFirstLetter(attr.getName())%>); + this.<%=Util.toLowerCaseFirstLetter(attr.getName())%>.clear(); + fireOnModifyProperty("<%=attr.getName()%>", _oldValue, null); } }*/ @@ -481,7 +497,9 @@ * @param value La valeur de l'attribut <%=name%> à positionner. *) public void set<%=Util.capitalize(name)%>(<%=type%> value) { + <%=type%> _oldValue = this.<%=Util.toLowerCaseFirstLetter(name)%>; this.<%=Util.toLowerCaseFirstLetter(name)%> = value; + fireOnModifyProperty("<%=name%>", _oldValue, value); } /**