Index: topia2/src/java/org/codelutin/topia/framework/TopiaFiresSupport.java diff -u topia2/src/java/org/codelutin/topia/framework/TopiaFiresSupport.java:1.1 topia2/src/java/org/codelutin/topia/framework/TopiaFiresSupport.java:1.2 --- topia2/src/java/org/codelutin/topia/framework/TopiaFiresSupport.java:1.1 Mon Oct 23 15:01:58 2006 +++ topia2/src/java/org/codelutin/topia/framework/TopiaFiresSupport.java Tue Oct 24 07:51:53 2006 @@ -24,7 +24,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaContext; import org.codelutin.topia.TopiaException; import org.codelutin.topia.TopiaVetoException; import org.codelutin.topia.event.TopiaEntityEvent; @@ -64,7 +63,8 @@ public class TopiaFiresSupport { static private Log log = LogFactory.getLog(TopiaFiresSupport.class); - + static Object NO_CHANGE = new Object(); + /* Pour la transaction */ protected ListenerSet transactionListeners = new ListenerSet(); protected ListenerSet transactionVetoables = new ListenerSet(); @@ -82,7 +82,7 @@ try { context.getFiresSupport().currentTransactionEvent = new TopiaTransactionEvent(context); for(Iterator l=transactionVetoables.iterator(); l.hasNext();) { - l.next().beginTransaction(currentTransactionEvent); + l.next().beginTransaction(context.getFiresSupport().currentTransactionEvent); } } catch (Exception eee) { throw new TopiaVetoException(eee); @@ -262,7 +262,7 @@ log.debug("fireOnPreRead"); } try { - vetoables.fireVetoableChange(propertyName, value, value); + vetoables.fireVetoableChange(propertyName, value, NO_CHANGE); } catch (Exception eee) { throw new TopiaVetoException(eee); } @@ -275,7 +275,7 @@ log.debug("fireOnPostRead"); } try { - listeners.firePropertyChange(propertyName, value, value); + listeners.firePropertyChange(propertyName, value, NO_CHANGE); } catch (Exception eee) { if (log.isErrorEnabled()) { log.error("Can't fireOnPostRead", eee); @@ -291,7 +291,7 @@ log.debug("fireOnPostRead"); } try { - listeners.fireIndexedPropertyChange(propertyName, index, value, value); + listeners.fireIndexedPropertyChange(propertyName, index, value, NO_CHANGE); } catch (Exception eee) { if (log.isErrorEnabled()) { log.error("Can't fireOnPostRead" , eee);