Index: topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java
diff -u topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java:1.23 topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java:1.24
--- topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java:1.23	Mon Oct 23 13:52:30 2006
+++ topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java	Mon Oct 23 15:01:58 2006
@@ -24,10 +24,10 @@
 * Created: 12 déc. 2005
 *
 * @author Arnaud Thimel <thimel@codelutin.com>
-* @version $Revision: 1.23 $
+* @version $Revision: 1.24 $
 *
-* Mise a jour: $Date: 2006/10/23 13:52:30 $
-* par : $Author: bpoussin $
+* Mise a jour: $Date: 2006/10/23 15:01:58 $
+* par : $Author: ruchaud $
 */
 
 package org.codelutin.topia.generator;
@@ -318,17 +318,18 @@
      *)
     public void set<%=Util.capitalize(attr.getName())%>(<%=attr.getType()%> value) {
         <%=attr.getType()%> _oldValue = this.<%=attr.getName()%>;
-        fireOnModifyVetoable("<%=attr.getName()%>", _oldValue, value);
+        fireOnPreWrite("<%=attr.getName()%>", _oldValue, value);
         this.<%=attr.getName()%> = value;
-        fireOnModifyProperty("<%=attr.getName()%>", _oldValue, value);
+        fireOnPostWrite("<%=attr.getName()%>", _oldValue, value);
     }
 
     /* (non-Javadoc)
      * @see <%=clazz.getQualifiedName()%>#get<%=Util.capitalize(attr.getName())%>()
      *)
     public <%=attr.getType()%> get<%=Util.capitalize(attr.getName())%>() {
+        fireOnPreRead("<%=attr.getName()%>", <%=attr.getName()%>);
         <%=attr.getType()%> result = <%=attr.getName()%>;
-        result = fireOnReadVetoable("<%=attr.getName()%>", result);
+        fireOnPostRead("<%=attr.getName()%>", <%=attr.getName()%>);
         return result;
     }
 
@@ -342,7 +343,7 @@
     public void set<%=Util.capitalize(assocAttrName)%>(<%=attr.getAssociationClass().getQualifiedName()%> association) {
         <%=attr.getAssociationClass().getQualifiedName()%> _oldValue = this.<%=Util.toLowerCaseFirstLetter(assocAttrName)%>;
         this.<%=Util.toLowerCaseFirstLetter(assocAttrName)%> = association;
-        fireOnModifyProperty("<%=Util.toLowerCaseFirstLetter(assocAttrName)%>", _oldValue, association);
+        fireOnPostWrite("<%=Util.toLowerCaseFirstLetter(assocAttrName)%>", _oldValue, association);
     }
 
     /* (non-Javadoc)
@@ -375,7 +376,7 @@
                         }
                     }
 /*{        this.<%=attr.getName()%>.add(<%=attr.getName()%>);
-        fireOnModifyIndexedProperty("<%=attr.getName()%>", this.<%=attr.getName()%>.size(), null, <%=attr.getName()%>);
+        fireOnPostWrite("<%=attr.getName()%>", this.<%=attr.getName()%>.size(), null, <%=attr.getName()%>);
     }
 
     /* (non-Javadoc)
@@ -399,7 +400,7 @@
 // FIXME
         <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getType()%>> _oldValue = <%=attr.getName()%>;
         <%=attr.getName()%> = values;
-        fireOnModifyProperty("<%=attr.getName()%>", _oldValue, values);
+        fireOnPostWrite("<%=attr.getName()%>", _oldValue, values);
     }
 
     /* (non-Javadoc)
@@ -420,7 +421,7 @@
 }*/
                         }
                     }
-/*{        fireOnModifyIndexedProperty("<%=attr.getName()%>", this.<%=attr.getName()%>.size()+1, value, null);
+/*{        fireOnPostWrite("<%=attr.getName()%>", this.<%=attr.getName()%>.size()+1, value, null);
     }
 
     /* (non-Javadoc)
@@ -448,7 +449,7 @@
                     }                    
 /*{        java.util.List _oldValue = new java.util.ArrayList(this.<%=attr.getName()%>);
         this.<%=attr.getName()%>.clear();
-        fireOnModifyProperty("<%=attr.getName()%>", _oldValue, this.<%=attr.getName()%>);
+        fireOnPostWrite("<%=attr.getName()%>", _oldValue, this.<%=attr.getName()%>);
     }
 
 }*/
@@ -469,7 +470,7 @@
 }*/
                     }
 /*{        this.<%=Util.toLowerCaseFirstLetter(assocAttrName)%>.add(value);
-        fireOnModifyIndexedProperty("<%=Util.toLowerCaseFirstLetter(assocAttrName)%>", this.<%=Util.toLowerCaseFirstLetter(assocAttrName)%>.size(), null, value);
+        fireOnPostWrite("<%=Util.toLowerCaseFirstLetter(assocAttrName)%>", this.<%=Util.toLowerCaseFirstLetter(assocAttrName)%>.size(), null, value);
     }
 
     /* (non-Javadoc)
@@ -493,7 +494,7 @@
 // FIXME
         <%=(attr.isOrdered()?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>> _oldValue = <%=Util.toLowerCaseFirstLetter(assocAttrName)%>;
         <%=Util.toLowerCaseFirstLetter(assocAttrName)%> = values;
-        fireOnModifyProperty("Util.toLowerCaseFirstLetter(assocAttrName)%>", _oldValue, values);
+        fireOnPostWrite("Util.toLowerCaseFirstLetter(assocAttrName)%>", _oldValue, values);
     }
 
     /* (non-Javadoc)
@@ -509,7 +510,7 @@
 /*{        value.set<%=Util.capitalize(reverse.getName())%>(null);
 }*/
                     }
-/*{        fireOnModifyIndexedProperty("<%=Util.toLowerCaseFirstLetter(assocAttrName)%>", this.<%=Util.toLowerCaseFirstLetter(assocAttrName)%>.size()+1, value, null);
+/*{        fireOnPostWrite("<%=Util.toLowerCaseFirstLetter(assocAttrName)%>", this.<%=Util.toLowerCaseFirstLetter(assocAttrName)%>.size()+1, value, null);
     }
 
     /* (non-Javadoc)
@@ -529,7 +530,7 @@
                     }
 /*{        java.util.List _oldValue = new java.util.ArrayList(this.<%=Util.toLowerCaseFirstLetter(assocAttrName)%>);
         this.<%=Util.toLowerCaseFirstLetter(assocAttrName)%>.clear();
-        fireOnModifyProperty("<%=Util.toLowerCaseFirstLetter(assocAttrName)%>", _oldValue, null);
+        fireOnPostWrite("<%=Util.toLowerCaseFirstLetter(assocAttrName)%>", _oldValue, null);
     }
 
 }*/
@@ -648,7 +649,7 @@
     public void set<%=Util.capitalize(name)%>(<%=type%> value) {
         <%=type%> _oldValue = this.<%=Util.toLowerCaseFirstLetter(name)%>;
         this.<%=Util.toLowerCaseFirstLetter(name)%> = value;
-        fireOnModifyProperty("<%=name%>", _oldValue, value);
+        fireOnPostWrite("<%=name%>", _oldValue, value);
     }
 
     /**