Index: topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java diff -u topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java:1.24 topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java:1.25 --- topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java:1.24 Mon Oct 23 15:01:58 2006 +++ topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java Tue Oct 31 07:57:43 2006 @@ -24,9 +24,9 @@ * Created: 12 déc. 2005 * * @author Arnaud Thimel -* @version $Revision: 1.24 $ +* @version $Revision: 1.25 $ * -* Mise a jour: $Date: 2006/10/23 15:01:58 $ +* Mise a jour: $Date: 2006/10/31 07:57:43 $ * par : $Author: ruchaud $ */ @@ -342,6 +342,7 @@ *) public void set<%=Util.capitalize(assocAttrName)%>(<%=attr.getAssociationClass().getQualifiedName()%> association) { <%=attr.getAssociationClass().getQualifiedName()%> _oldValue = this.<%=Util.toLowerCaseFirstLetter(assocAttrName)%>; + fireOnPreWrite("<%=Util.toLowerCaseFirstLetter(assocAttrName)%>", _oldValue, association); this.<%=Util.toLowerCaseFirstLetter(assocAttrName)%> = association; fireOnPostWrite("<%=Util.toLowerCaseFirstLetter(assocAttrName)%>", _oldValue, association); } @@ -361,6 +362,7 @@ * @see <%=clazz.getQualifiedName()%>#add<%=Util.capitalize(attr.getName())%>(<%=attr.getType()%>) *) public void add<%=Util.capitalize(attr.getName())%>(<%=attr.getType()%> <%=Util.toLowerCaseFirstLetter(attr.getName())%>) { + fireOnPreWrite("<%=attr.getName()%>", null, <%=attr.getName()%>); if (this.<%=attr.getName()%> == null) { this.<%=attr.getName()%> = new java.util.ArrayList<<%=attr.getType()%>>(); } @@ -399,6 +401,7 @@ // addAll<%=Util.capitalize(attr.getName())%>(values); // FIXME <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> _oldValue = <%=attr.getName()%>; + fireOnPreWrite("<%=attr.getName()%>", _oldValue, values); <%=attr.getName()%> = values; fireOnPostWrite("<%=attr.getName()%>", _oldValue, values); } @@ -407,6 +410,7 @@ * @see <%=clazz.getQualifiedName()%>#remove<%=Util.capitalize(attr.getName())%>(<%=attr.getType()%>) *) public void remove<%=Util.capitalize(attr.getName())%>(<%=attr.getType()%> value) { + fireOnPreWrite("<%=attr.getName()%>", value, null); if ((this.<%=attr.getName()%> == null) || (!this.<%=attr.getName()%>.remove(value))) { throw new IllegalArgumentException("List does not contain given element"); } @@ -448,6 +452,7 @@ }*/ } /*{ java.util.List _oldValue = new java.util.ArrayList(this.<%=attr.getName()%>); + fireOnPreWrite("<%=attr.getName()%>", _oldValue, this.<%=attr.getName()%>); this.<%=attr.getName()%>.clear(); fireOnPostWrite("<%=attr.getName()%>", _oldValue, this.<%=attr.getName()%>); } @@ -460,6 +465,7 @@ * @see <%=clazz.getQualifiedName()%>#add<%=Util.capitalize(assocAttrName)%>(<%=attr.getAssociationClass().getQualifiedName()%>) *) public void add<%=Util.capitalize(assocAttrName)%>(<%=attr.getAssociationClass().getQualifiedName()%> value) { + fireOnPreWrite("<%=Util.toLowerCaseFirstLetter(assocAttrName)%>", null, value); if (this.<%=Util.toLowerCaseFirstLetter(assocAttrName)%> == null) { this.<%=Util.toLowerCaseFirstLetter(assocAttrName)%> = new java.util.ArrayList<<%=attr.getAssociationClass().getQualifiedName()%>>(); } @@ -493,6 +499,7 @@ // addAll<%=Util.capitalize(assocAttrName)%>(values); // FIXME <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> _oldValue = <%=Util.toLowerCaseFirstLetter(assocAttrName)%>; + fireOnPreWrite("Util.toLowerCaseFirstLetter(assocAttrName)%>", _oldValue, values); <%=Util.toLowerCaseFirstLetter(assocAttrName)%> = values; fireOnPostWrite("Util.toLowerCaseFirstLetter(assocAttrName)%>", _oldValue, values); } @@ -501,6 +508,7 @@ * @see <%=clazz.getQualifiedName()%>#remove<%=Util.capitalize(assocAttrName)%>(<%=attr.getAssociationClass().getQualifiedName()%>) *) public void remove<%=Util.capitalize(assocAttrName)%>(<%=attr.getAssociationClass().getQualifiedName()%> value) { + fireOnPreWrite("<%=Util.toLowerCaseFirstLetter(assocAttrName)%>", value, null); if ((this.<%=Util.toLowerCaseFirstLetter(assocAttrName)%> == null) || (!this.<%=Util.toLowerCaseFirstLetter(assocAttrName)%>.remove(value))) { throw new IllegalArgumentException("List does not contain given element"); } @@ -529,6 +537,7 @@ }*/ } /*{ java.util.List _oldValue = new java.util.ArrayList(this.<%=Util.toLowerCaseFirstLetter(assocAttrName)%>); + fireOnPreWrite("<%=Util.toLowerCaseFirstLetter(assocAttrName)%>", _oldValue, null); this.<%=Util.toLowerCaseFirstLetter(assocAttrName)%>.clear(); fireOnPostWrite("<%=Util.toLowerCaseFirstLetter(assocAttrName)%>", _oldValue, null); } @@ -648,6 +657,7 @@ *) public void set<%=Util.capitalize(name)%>(<%=type%> value) { <%=type%> _oldValue = this.<%=Util.toLowerCaseFirstLetter(name)%>; + fireOnPreWrite("<%=name%>", _oldValue, value); this.<%=Util.toLowerCaseFirstLetter(name)%> = value; fireOnPostWrite("<%=name%>", _oldValue, value); }