[hibernate-commits] Hibernate SVN: r15043 - in core/trunk/core/src/main/java/org/hibernate: event and 1 other directory.

Author: d.plentz Date: 2008-08-12 13:50:46 -0400 (Tue, 12 Aug 2008) New Revision: 15043 Modified: core/trunk/core/src/main/java/org/hibernate/action/EntityDeleteAction.java core/trunk/core/src/main/java/org/hibernate/action/EntityIdentityInsertAction.java core/trunk/core/src/main/java/org/hibernate/action/EntityInsertAction.java core/trunk/core/src/main/java/org/hibernate/action/EntityUpdateAction.java core/trunk/core/src/main/java/org/hibernate/event/PreDeleteEvent.java core/trunk/core/src/main/java/org/hibernate/event/PreInsertEvent.java core/trunk/core/src/main/java/org/hibernate/event/PreUpdateEvent.java Log: [HHH-2926] Pre*Event must inherit AbstractEvent Modified: core/trunk/core/src/main/java/org/hibernate/action/EntityDeleteAction.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/action/EntityDeleteAction.java 2008-08-12 17:21:04 UTC (rev 15042) +++ core/trunk/core/src/main/java/org/hibernate/action/EntityDeleteAction.java 2008-08-12 17:50:46 UTC (rev 15043) @@ -127,7 +127,7 @@ .getPreDeleteEventListeners(); boolean veto = false; if (preListeners.length>0) { - PreDeleteEvent preEvent = new PreDeleteEvent( getInstance(), getId(), state, getPersister() ); + PreDeleteEvent preEvent = new PreDeleteEvent( getInstance(), getId(), state, getPersister() ,(EventSource) getSession() ); for ( int i = 0; i < preListeners.length; i++ ) { veto = preListeners[i].onPreDelete(preEvent) || veto; } Modified: core/trunk/core/src/main/java/org/hibernate/action/EntityIdentityInsertAction.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/action/EntityIdentityInsertAction.java 2008-08-12 17:21:04 UTC (rev 15042) +++ core/trunk/core/src/main/java/org/hibernate/action/EntityIdentityInsertAction.java 2008-08-12 17:50:46 UTC (rev 15043) @@ -137,7 +137,7 @@ .getPreInsertEventListeners(); boolean veto = false; if (preListeners.length>0) { - PreInsertEvent preEvent = new PreInsertEvent( getInstance(), null, state, getPersister(), getSession() ); + PreInsertEvent preEvent = new PreInsertEvent( getInstance(), null, state, getPersister(), (EventSource)getSession() ); for ( int i = 0; i < preListeners.length; i++ ) { veto = preListeners[i].onPreInsert(preEvent) || veto; } Modified: core/trunk/core/src/main/java/org/hibernate/action/EntityInsertAction.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/action/EntityInsertAction.java 2008-08-12 17:21:04 UTC (rev 15042) +++ core/trunk/core/src/main/java/org/hibernate/action/EntityInsertAction.java 2008-08-12 17:50:46 UTC (rev 15043) @@ -173,7 +173,7 @@ .getPreInsertEventListeners(); boolean veto = false; if (preListeners.length>0) { - PreInsertEvent preEvent = new PreInsertEvent( getInstance(), getId(), state, getPersister(), getSession() ); + PreInsertEvent preEvent = new PreInsertEvent( getInstance(), getId(), state, getPersister(), (EventSource)getSession() ); for ( int i = 0; i < preListeners.length; i++ ) { veto = preListeners[i].onPreInsert(preEvent) || veto; } Modified: core/trunk/core/src/main/java/org/hibernate/action/EntityUpdateAction.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/action/EntityUpdateAction.java 2008-08-12 17:21:04 UTC (rev 15042) +++ core/trunk/core/src/main/java/org/hibernate/action/EntityUpdateAction.java 2008-08-12 17:50:46 UTC (rev 15043) @@ -231,7 +231,7 @@ state, previousState, getPersister(), - getSession() + (EventSource)getSession() ); for ( int i = 0; i < preListeners.length; i++ ) { veto = preListeners[i].onPreUpdate(preEvent) || veto; Modified: core/trunk/core/src/main/java/org/hibernate/event/PreDeleteEvent.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/event/PreDeleteEvent.java 2008-08-12 17:21:04 UTC (rev 15042) +++ core/trunk/core/src/main/java/org/hibernate/event/PreDeleteEvent.java 2008-08-12 17:50:46 UTC (rev 15043) @@ -33,7 +33,7 @@ * * @author Gavin King */ -public class PreDeleteEvent { +public class PreDeleteEvent extends AbstractEvent { private Object entity; private EntityPersister persister; private Serializable id; @@ -56,8 +56,10 @@ Object entity, Serializable id, Object[] deletedState, - EntityPersister persister + EntityPersister persister, + EventSource source ) { + super(source); this.entity = entity; this.persister = persister; this.id = id; Modified: core/trunk/core/src/main/java/org/hibernate/event/PreInsertEvent.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/event/PreInsertEvent.java 2008-08-12 17:21:04 UTC (rev 15042) +++ core/trunk/core/src/main/java/org/hibernate/event/PreInsertEvent.java 2008-08-12 17:50:46 UTC (rev 15043) @@ -27,28 +27,26 @@ import java.io.Serializable; import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.engine.SessionImplementor; /** * Occurs before inserting an item in the datastore * * @author Gavin King */ -public class PreInsertEvent { +public class PreInsertEvent extends AbstractEvent { private Object entity; private EntityPersister persister; private Object[] state; private Serializable id; - private SessionImplementor source; public PreInsertEvent( Object entity, Serializable id, Object[] state, EntityPersister persister, - SessionImplementor source + EventSource source ) { - this.source = source; + super(source); this.entity = entity; this.id = id; this.state = state; @@ -67,7 +65,4 @@ public Object[] getState() { return state; } - public SessionImplementor getSource() { - return source; - } } Modified: core/trunk/core/src/main/java/org/hibernate/event/PreUpdateEvent.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/event/PreUpdateEvent.java 2008-08-12 17:21:04 UTC (rev 15042) +++ core/trunk/core/src/main/java/org/hibernate/event/PreUpdateEvent.java 2008-08-12 17:50:46 UTC (rev 15043) @@ -27,20 +27,18 @@ import java.io.Serializable; import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.engine.SessionImplementor; /** * Occurs before updating the datastore * * @author Gavin King */ -public class PreUpdateEvent { +public class PreUpdateEvent extends AbstractEvent { private Object entity; private EntityPersister persister; private Object[] state; private Object[] oldState; private Serializable id; - private SessionImplementor source; public PreUpdateEvent( Object entity, @@ -48,9 +46,9 @@ Object[] state, Object[] oldState, EntityPersister persister, - SessionImplementor source + EventSource source ) { - this.source = source; + super(source); this.entity = entity; this.id = id; this.state = state; @@ -73,7 +71,4 @@ public Object[] getState() { return state; } - public SessionImplementor getSource() { - return source; - } }