[topia] branch feature/3484 updated (02cd977 -> fdab302)
This is an automated email from the git hooks/post-receive script. New change to branch feature/3484 in repository topia. See http://git.nuiton.org/topia.git from 02cd977 refs #3484 ListenableEntity added to the generated interface only if necessary new fdab302 refs #3484 ListenableBean now has understandable names The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit fdab3024088ccc17a4facca1ab06e8122a912f61 Author: Arnaud Thimel <thimel@codelutin.com> Date: Thu Sep 4 17:20:04 2014 +0200 refs #3484 ListenableBean now has understandable names Summary of changes: .../persistence/internal/EntityListenerTest.java | 4 +- .../{ListenableEntity.java => ListenableBean.java} | 110 +++++------ .../persistence/internal/AbstractTopiaEntity.java | 216 ++++++++++++--------- .../org/nuiton/topia/templates/DTOTransformer.java | 16 +- .../nuiton/topia/templates/EntityTransformer.java | 4 +- 5 files changed, 195 insertions(+), 155 deletions(-) rename topia-persistence/src/main/java/org/nuiton/topia/persistence/{ListenableEntity.java => ListenableBean.java} (70%) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/3484 in repository topia. See http://git.nuiton.org/topia.git commit fdab3024088ccc17a4facca1ab06e8122a912f61 Author: Arnaud Thimel <thimel@codelutin.com> Date: Thu Sep 4 17:20:04 2014 +0200 refs #3484 ListenableBean now has understandable names --- .../persistence/internal/EntityListenerTest.java | 4 +- .../{ListenableEntity.java => ListenableBean.java} | 110 +++++------ .../persistence/internal/AbstractTopiaEntity.java | 216 ++++++++++++--------- .../org/nuiton/topia/templates/DTOTransformer.java | 16 +- .../nuiton/topia/templates/EntityTransformer.java | 4 +- 5 files changed, 195 insertions(+), 155 deletions(-) diff --git a/topia-it/src/test/java/org/nuiton/topia/persistence/internal/EntityListenerTest.java b/topia-it/src/test/java/org/nuiton/topia/persistence/internal/EntityListenerTest.java index 5535764..b1a5fe9 100644 --- a/topia-it/src/test/java/org/nuiton/topia/persistence/internal/EntityListenerTest.java +++ b/topia-it/src/test/java/org/nuiton/topia/persistence/internal/EntityListenerTest.java @@ -137,7 +137,7 @@ public class EntityListenerTest { final Set<PropertyChangeEvent> handler = Sets.newHashSet(); Person person = dao.create(Person.PROPERTY_NAME, "azerty"); - person.addPropertyChangeListener(Person.PROPERTY_FIRSTNAME, new PropertyChangeListener() { + person.addPostWriteListener(Person.PROPERTY_FIRSTNAME, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { handler.add(evt); @@ -162,7 +162,7 @@ public class EntityListenerTest { final Set<PropertyChangeEvent> handler = Sets.newHashSet(); Person person = new PersonImpl(); - person.addPropertyChangeListener(Person.PROPERTY_FIRSTNAME, new PropertyChangeListener() { + person.addPostWriteListener(Person.PROPERTY_FIRSTNAME, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { handler.add(evt); diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/ListenableEntity.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/ListenableBean.java similarity index 70% rename from topia-persistence/src/main/java/org/nuiton/topia/persistence/ListenableEntity.java rename to topia-persistence/src/main/java/org/nuiton/topia/persistence/ListenableBean.java index b6c2627..e6f635e 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/ListenableEntity.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/ListenableBean.java @@ -6,158 +6,158 @@ import java.beans.VetoableChangeListener; /** * @author Arnaud Thimel (Code Lutin) */ -public interface ListenableEntity { +public interface ListenableBean { //------------------------------------------------------------------------// - //-- PropertyListener (read) methods -------------------------------------// + //-- Pre Read (VetoableChangeListener) methods ---------------------------// //------------------------------------------------------------------------// /** - * Adds a {@link java.beans.PropertyChangeListener} on any property reading. + * Adds a {@link java.beans.VetoableChangeListener} on any property reading. * * @param listener the listener to register - * @see java.beans.PropertyChangeSupport + * @see java.beans.VetoableChangeSupport */ - void addPropertyListener(PropertyChangeListener listener); + void addPreReadListener(VetoableChangeListener listener); /** - * Adds a {@link java.beans.PropertyChangeListener} on the given property reading. + * Adds a {@link java.beans.VetoableChangeListener} on the given property reading. * * @param propertyName the property name to listen * @param listener the listener to register - * @see java.beans.PropertyChangeSupport + * @see java.beans.VetoableChangeSupport */ - void addPropertyListener(String propertyName, PropertyChangeListener listener); + void addPreReadListener(String propertyName, VetoableChangeListener listener); /** - * Remove the given {@link java.beans.PropertyChangeListener} registered for any property reading. + * Remove the given {@link java.beans.VetoableChangeListener} registered for any property reading. * * @param listener the listener to unregister - * @see java.beans.PropertyChangeSupport + * @see java.beans.VetoableChangeSupport */ - void removePropertyListener(PropertyChangeListener listener); + void removePreReadListener(VetoableChangeListener listener); /** - * Remove the given {@link java.beans.PropertyChangeListener} registered the given property reading. + * Remove the given {@link java.beans.VetoableChangeListener} registered the given property reading. * * @param propertyName the property name to unregister reading * @param listener the listener to unregister - * @see java.beans.PropertyChangeSupport + * @see java.beans.VetoableChangeSupport */ - void removePropertyListener(String propertyName, PropertyChangeListener listener); + void removePreReadListener(String propertyName, VetoableChangeListener listener); //------------------------------------------------------------------------// - //-- PropertyChangeListener (write) methods ------------------------------// + //-- Post Read (PropertyChangeListener) methods --------------------------// //------------------------------------------------------------------------// /** - * Adds a {@link java.beans.PropertyChangeListener} on any property writing. + * Adds a {@link java.beans.PropertyChangeListener} on any property reading. * * @param listener the listener to register * @see java.beans.PropertyChangeSupport */ - void addPropertyChangeListener(PropertyChangeListener listener); + void addPostReadListener(PropertyChangeListener listener); /** - * Adds a {@link java.beans.PropertyChangeListener} on the given property writing. + * Adds a {@link java.beans.PropertyChangeListener} on the given property reading. * * @param propertyName the property name to listen * @param listener the listener to register * @see java.beans.PropertyChangeSupport */ - void addPropertyChangeListener(String propertyName, PropertyChangeListener listener); + void addPostReadListener(String propertyName, PropertyChangeListener listener); /** - * Remove the given {@link java.beans.PropertyChangeListener} registered for any property writing. + * Remove the given {@link java.beans.PropertyChangeListener} registered for any property reading. * * @param listener the listener to unregister * @see java.beans.PropertyChangeSupport */ - void removePropertyChangeListener(PropertyChangeListener listener); + void removePostReadListener(PropertyChangeListener listener); /** - * Remove the given {@link java.beans.PropertyChangeListener} registered the given property writing. + * Remove the given {@link java.beans.PropertyChangeListener} registered the given property reading. * - * @param propertyName the property name to unregister writing + * @param propertyName the property name to unregister reading * @param listener the listener to unregister * @see java.beans.PropertyChangeSupport */ - void removePropertyChangeListener(String propertyName, PropertyChangeListener listener); + void removePostReadListener(String propertyName, PropertyChangeListener listener); //------------------------------------------------------------------------// - //-- VetoableListener (read) methods -------------------------------------// + //-- Pre Write (VetoableChangeListener) methods --------------------------// //------------------------------------------------------------------------// /** - * Adds a {@link java.beans.VetoableChangeListener} on any property reading. + * Adds a {@link java.beans.VetoableChangeListener} on any property writing. * - * @param vetoable the listener to register + * @param listener the listener to register * @see java.beans.VetoableChangeSupport */ - void addVetoableListener(VetoableChangeListener vetoable); + void addPreWriteListener(VetoableChangeListener listener); /** - * Adds a {@link java.beans.VetoableChangeListener} on the given property reading. + * Adds a {@link java.beans.VetoableChangeListener} on the given property writing. * * @param propertyName the property name to listen - * @param vetoable the listener to register + * @param listener the listener to register * @see java.beans.VetoableChangeSupport */ - void addVetoableListener(String propertyName, VetoableChangeListener vetoable); + void addPreWriteListener(String propertyName, VetoableChangeListener listener); /** - * Remove the given {@link java.beans.VetoableChangeListener} registered for any property reading. + * Remove the given {@link java.beans.VetoableChangeListener} registered for any property writing. * - * @param vetoable the listener to unregister + * @param listener the listener to unregister * @see java.beans.VetoableChangeSupport */ - void removeVetoableListener(VetoableChangeListener vetoable); + void removePreWriteListener(VetoableChangeListener listener); /** - * Remove the given {@link java.beans.VetoableChangeListener} registered the given property reading. + * Remove the given {@link java.beans.VetoableChangeListener} registered the given property writing. * - * @param propertyName the property name to unregister reading - * @param vetoable the listener to unregister + * @param propertyName the property name to unregister writing + * @param listener the listener to unregister * @see java.beans.VetoableChangeSupport */ - void removeVetoableListener(String propertyName, VetoableChangeListener vetoable); + void removePreWriteListener(String propertyName, VetoableChangeListener listener); //------------------------------------------------------------------------// - //-- VetoableChangeListener (write) methods ------------------------------// + //-- Post Write (PropertyChangeListener) methods -------------------------// //------------------------------------------------------------------------// /** - * Adds a {@link java.beans.VetoableChangeListener} on any property writing. + * Adds a {@link java.beans.PropertyChangeListener} on any property writing. * - * @param vetoable the listener to register - * @see java.beans.VetoableChangeSupport + * @param listener the listener to register + * @see java.beans.PropertyChangeSupport */ - void addVetoableChangeListener(VetoableChangeListener vetoable); + void addPostWriteListener(PropertyChangeListener listener); /** - * Adds a {@link java.beans.VetoableChangeListener} on the given property writing. + * Adds a {@link java.beans.PropertyChangeListener} on the given property writing. * * @param propertyName the property name to listen - * @param vetoable the listener to register - * @see java.beans.VetoableChangeSupport + * @param listener the listener to register + * @see java.beans.PropertyChangeSupport */ - void addVetoableChangeListener(String propertyName, VetoableChangeListener vetoable); + void addPostWriteListener(String propertyName, PropertyChangeListener listener); /** - * Remove the given {@link java.beans.VetoableChangeListener} registered for any property writing. + * Remove the given {@link java.beans.PropertyChangeListener} registered for any property writing. * - * @param vetoable the listener to unregister - * @see java.beans.VetoableChangeSupport + * @param listener the listener to unregister + * @see java.beans.PropertyChangeSupport */ - void removeVetoableChangeListener(VetoableChangeListener vetoable); + void removePostWriteListener(PropertyChangeListener listener); /** - * Remove the given {@link java.beans.VetoableChangeListener} registered the given property writing. + * Remove the given {@link java.beans.PropertyChangeListener} registered the given property writing. * * @param propertyName the property name to unregister writing - * @param vetoable the listener to unregister - * @see java.beans.VetoableChangeSupport + * @param listener the listener to unregister + * @see java.beans.PropertyChangeSupport */ - void removeVetoableChangeListener(String propertyName, VetoableChangeListener vetoable); + void removePostWriteListener(String propertyName, PropertyChangeListener listener); } diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaEntity.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaEntity.java index c79a53f..fa2de3b 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaEntity.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaEntity.java @@ -26,7 +26,7 @@ package org.nuiton.topia.persistence.internal; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityContextable; -import org.nuiton.topia.persistence.ListenableEntity; +import org.nuiton.topia.persistence.ListenableBean; import org.nuiton.topia.persistence.internal.support.TopiaFiresSupport; import java.beans.PropertyChangeListener; @@ -41,13 +41,13 @@ import com.google.common.base.Objects; /** * Base class of each entity. It contains the common attributes and a part of the entities event support. * <p/> - * This class does not realize {@link org.nuiton.topia.persistence.ListenableEntity} but it implements its methods to + * This class does not realize {@link org.nuiton.topia.persistence.ListenableBean} but it implements its methods to * lighten base implementation. * * @author poussin <poussin@codelutin.com> * @author Arnaud Thimel (Code Lutin) */ -public abstract class AbstractTopiaEntity implements TopiaEntity { +public abstract class AbstractTopiaEntity implements TopiaEntity, ListenableBean { private static final long serialVersionUID = -7458577454878852241L; @@ -73,13 +73,13 @@ public abstract class AbstractTopiaEntity implements TopiaEntity { */ transient protected WeakReference<TopiaFiresSupport> firesSupport; - transient protected PropertyChangeSupport readListeners; + transient protected VetoableChangeSupport preReadListeners; - transient protected PropertyChangeSupport writeListeners; + transient protected PropertyChangeSupport postReadListeners; - transient protected VetoableChangeSupport readVetoables; + transient protected VetoableChangeSupport preWriteListeners; - transient protected VetoableChangeSupport writeVetoables; + transient protected PropertyChangeSupport postWriteListeners; public void setFiresSupport(TopiaFiresSupport firesSupport) { this.firesSupport = new WeakReference<TopiaFiresSupport>(firesSupport); @@ -107,55 +107,55 @@ public abstract class AbstractTopiaEntity implements TopiaEntity { } /** - * Initialize {@link #readListeners} at first use or after deserialisation. + * Initialize {@link #postReadListeners} at first use or after deserialisation. * * @param create indicates if the PropertyChangeSupport can be created if it does not exist - * @return readListeners + * @return postReadListeners */ - protected PropertyChangeSupport getReadPropertyChangeSupport(boolean create) { - if (readListeners == null && create) { - readListeners = new PropertyChangeSupport(this); + protected PropertyChangeSupport getPostReadListeners(boolean create) { + if (postReadListeners == null && create) { + postReadListeners = new PropertyChangeSupport(this); } - return readListeners; + return postReadListeners; } /** - * Initialize {@link #writeListeners} at first use or after deserialisation. + * Initialize {@link #postWriteListeners} at first use or after deserialisation. * * @param create indicates if the PropertyChangeSupport can be created if it does not exist - * @return writeListeners + * @return postWriteListeners */ - protected PropertyChangeSupport getWritePropertyChangeSupport(boolean create) { - if (writeListeners == null && create) { - writeListeners = new PropertyChangeSupport(this); + protected PropertyChangeSupport getPostWriteListeners(boolean create) { + if (postWriteListeners == null && create) { + postWriteListeners = new PropertyChangeSupport(this); } - return writeListeners; + return postWriteListeners; } /** - * Initialize {@link #readVetoables} at first use or after deserialisation. + * Initialize {@link #preReadListeners} at first use or after deserialisation. * * @param create indicates if the VetoableChangeSupport can be created if it does not exist * @return readVetoables */ - protected VetoableChangeSupport getReadVetoableChangeSupport(boolean create) { - if (readVetoables == null && create) { - readVetoables = new VetoableChangeSupport(this); + protected VetoableChangeSupport getPreReadListeners(boolean create) { + if (preReadListeners == null && create) { + preReadListeners = new VetoableChangeSupport(this); } - return readVetoables; + return preReadListeners; } /** - * Initialize {@link #writeVetoables} at first use or after deserialisation. + * Initialize {@link #preWriteListeners} at first use or after deserialisation. * * @param create indicates if the VetoableChangeSupport can be created if it does not exist - * @return writeVetoables + * @return preWriteListeners */ - protected VetoableChangeSupport getWriteVetoableChangeSupport(boolean create) { - if (writeVetoables == null && create) { - writeVetoables = new VetoableChangeSupport(this); + protected VetoableChangeSupport getPreWriteListeners(boolean create) { + if (preWriteListeners == null && create) { + preWriteListeners = new VetoableChangeSupport(this); } - return writeVetoables; + return preWriteListeners; } @Override @@ -237,134 +237,174 @@ public abstract class AbstractTopiaEntity implements TopiaEntity { } protected void fireOnPreRead(String propertyName, Object value) { - VetoableChangeSupport vetoableChangeSupport = getReadVetoableChangeSupport(false); - if (vetoableChangeSupport != null) { + VetoableChangeSupport listeners = getPreReadListeners(false); + if (listeners != null) { TopiaFiresSupport topiaFiresSupport = getFiresSupport(); - topiaFiresSupport.fireOnPreRead(vetoableChangeSupport, + topiaFiresSupport.fireOnPreRead(listeners, this, propertyName, value); } } protected void fireOnPostRead(String propertyName, Object value) { - PropertyChangeSupport propertyChangeSupport = getReadPropertyChangeSupport(false); - if (propertyChangeSupport != null) { + PropertyChangeSupport listeners = getPostReadListeners(false); + if (listeners != null) { TopiaFiresSupport topiaFiresSupport = getFiresSupport(); - topiaFiresSupport.fireOnPostRead(propertyChangeSupport, + topiaFiresSupport.fireOnPostRead(listeners, this, propertyName, value); } } protected void fireOnPostRead(String propertyName, int index, Object value) { - PropertyChangeSupport propertyChangeSupport = getReadPropertyChangeSupport(false); - if (propertyChangeSupport != null) { + PropertyChangeSupport listeners = getPostReadListeners(false); + if (listeners != null) { TopiaFiresSupport topiaFiresSupport = getFiresSupport(); - topiaFiresSupport.fireOnPostRead(propertyChangeSupport, + topiaFiresSupport.fireOnPostRead(listeners, this, propertyName, index, value); } } protected void fireOnPreWrite(String propertyName, Object oldValue, Object newValue) { - VetoableChangeSupport vetoableChangeSupport = getWriteVetoableChangeSupport(false); - if (vetoableChangeSupport != null) { + VetoableChangeSupport listeners = getPreWriteListeners(false); + if (listeners != null) { TopiaFiresSupport topiaFiresSupport = getFiresSupport(); - topiaFiresSupport.fireOnPreWrite(vetoableChangeSupport, + topiaFiresSupport.fireOnPreWrite(listeners, this, propertyName, oldValue, newValue); } } protected void fireOnPostWrite(String propertyName, Object oldValue, Object newValue) { - PropertyChangeSupport propertyChangeSupport = getWritePropertyChangeSupport(false); - if (propertyChangeSupport != null) { + PropertyChangeSupport listeners = getPostWriteListeners(false); + if (listeners != null) { TopiaFiresSupport topiaFiresSupport = getFiresSupport(); topiaFiresSupport.fireOnPostWrite( - propertyChangeSupport, this, propertyName, oldValue, newValue); + listeners, this, propertyName, oldValue, newValue); } } protected void fireOnPostWrite(String propertyName, int index, Object oldValue, Object newValue) { - PropertyChangeSupport propertyChangeSupport = getWritePropertyChangeSupport(false); - if (propertyChangeSupport != null) { + PropertyChangeSupport listeners = getPostWriteListeners(false); + if (listeners != null) { TopiaFiresSupport topiaFiresSupport = getFiresSupport(); topiaFiresSupport.fireOnPostWrite( - propertyChangeSupport, this, propertyName, index, oldValue, + listeners, this, propertyName, index, oldValue, newValue); } } - public void addPropertyChangeListener(String propertyName, - PropertyChangeListener listener) { - getWritePropertyChangeSupport(true).addPropertyChangeListener(propertyName, listener); + @Override + public void addPreReadListener(String propertyName, + VetoableChangeListener listener) { + getPreReadListeners(true).addVetoableChangeListener(propertyName, listener); } - public void addPropertyChangeListener(PropertyChangeListener listener) { - getWritePropertyChangeSupport(true).addPropertyChangeListener(listener); + @Override + public void addPreReadListener(VetoableChangeListener listener) { + getPreReadListeners(true).addVetoableChangeListener(listener); } - public void addVetoableChangeListener(String propertyName, - VetoableChangeListener vetoable) { - getWriteVetoableChangeSupport(true).addVetoableChangeListener(propertyName, vetoable); + @Override + public void removePreReadListener(String propertyName, + VetoableChangeListener listener) { + VetoableChangeSupport listeners = getPreReadListeners(false); + if (listeners != null) { + listeners.removeVetoableChangeListener(propertyName, listener); + } } - public void addVetoableChangeListener(VetoableChangeListener vetoable) { - getWriteVetoableChangeSupport(true).addVetoableChangeListener(vetoable); + @Override + public void removePreReadListener(VetoableChangeListener listener) { + VetoableChangeSupport listeners = getPreReadListeners(false); + if (listeners != null) { + listeners.removeVetoableChangeListener(listener); + } } - public void removePropertyChangeListener(String propertyName, - PropertyChangeListener listener) { - getWritePropertyChangeSupport(true).removePropertyChangeListener(propertyName, listener); + @Override + public void addPostReadListener(String propertyName, + PropertyChangeListener listener) { + getPostReadListeners(true).addPropertyChangeListener(propertyName, listener); } - public void removePropertyChangeListener(PropertyChangeListener listener) { - getWritePropertyChangeSupport(true).removePropertyChangeListener(listener); + @Override + public void addPostReadListener(PropertyChangeListener listener) { + getPostReadListeners(true).addPropertyChangeListener(listener); } - public void removeVetoableChangeListener(String propertyName, - VetoableChangeListener vetoable) { - getWriteVetoableChangeSupport(true).removeVetoableChangeListener(propertyName, vetoable); + @Override + public void removePostReadListener(String propertyName, + PropertyChangeListener listener) { + PropertyChangeSupport listeners = getPostReadListeners(false); + if (listeners != null) { + listeners.removePropertyChangeListener(propertyName, listener); + } } - public void removeVetoableChangeListener(VetoableChangeListener vetoable) { - getWriteVetoableChangeSupport(true).removeVetoableChangeListener(vetoable); + @Override + public void removePostReadListener(PropertyChangeListener listener) { + PropertyChangeSupport listeners = getPostReadListeners(false); + if (listeners != null) { + listeners.removePropertyChangeListener(listener); + } } - public void addPropertyListener(String propertyName, - PropertyChangeListener listener) { - getReadPropertyChangeSupport(true).addPropertyChangeListener(propertyName, listener); + @Override + public void addPreWriteListener(String propertyName, + VetoableChangeListener listener) { + getPreWriteListeners(true).addVetoableChangeListener(propertyName, listener); } - public void addPropertyListener(PropertyChangeListener listener) { - getReadPropertyChangeSupport(true).addPropertyChangeListener(listener); + @Override + public void addPreWriteListener(VetoableChangeListener listener) { + getPreWriteListeners(true).addVetoableChangeListener(listener); } - public void addVetoableListener(String propertyName, - VetoableChangeListener vetoable) { - getReadVetoableChangeSupport(true).addVetoableChangeListener(propertyName, vetoable); + @Override + public void removePreWriteListener(String propertyName, + VetoableChangeListener listener) { + VetoableChangeSupport listeners = getPreWriteListeners(false); + if (listeners != null) { + listeners.removeVetoableChangeListener(propertyName, listener); + } } - public void addVetoableListener(VetoableChangeListener vetoable) { - getReadVetoableChangeSupport(true).addVetoableChangeListener(vetoable); + @Override + public void removePreWriteListener(VetoableChangeListener listener) { + VetoableChangeSupport listeners = getPreWriteListeners(false); + if (listeners != null) { + listeners.removeVetoableChangeListener(listener); + } } - public void removePropertyListener(String propertyName, - PropertyChangeListener listener) { - getReadPropertyChangeSupport(true).removePropertyChangeListener(propertyName, listener); + @Override + public void addPostWriteListener(String propertyName, + PropertyChangeListener listener) { + getPostWriteListeners(true).addPropertyChangeListener(propertyName, listener); } - public void removePropertyListener(PropertyChangeListener listener) { - getReadPropertyChangeSupport(true).removePropertyChangeListener(listener); + @Override + public void addPostWriteListener(PropertyChangeListener listener) { + getPostWriteListeners(true).addPropertyChangeListener(listener); } - public void removeVetoableListener(String propertyName, - VetoableChangeListener vetoable) { - getReadVetoableChangeSupport(true).removeVetoableChangeListener(propertyName, vetoable); + @Override + public void removePostWriteListener(String propertyName, + PropertyChangeListener listener) { + PropertyChangeSupport listeners = getPostWriteListeners(false); + if (listeners != null) { + listeners.removePropertyChangeListener(propertyName, listener); + } } - public void removeVetoableListener(VetoableChangeListener vetoable) { - getReadVetoableChangeSupport(true).removeVetoableChangeListener(vetoable); + @Override + public void removePostWriteListener(PropertyChangeListener listener) { + PropertyChangeSupport listeners = getPostWriteListeners(false); + if (listeners != null) { + listeners.removePropertyChangeListener(listener); + } } } diff --git a/topia-templates/src/main/java/org/nuiton/topia/templates/DTOTransformer.java b/topia-templates/src/main/java/org/nuiton/topia/templates/DTOTransformer.java index c854d73..3a2f376 100644 --- a/topia-templates/src/main/java/org/nuiton/topia/templates/DTOTransformer.java +++ b/topia-templates/src/main/java/org/nuiton/topia/templates/DTOTransformer.java @@ -219,37 +219,37 @@ public class DTOTransformer extends ObjectModelTransformerToJava { protected void addOperations(ObjectModelClass result, ObjectModelClass clazz) { ObjectModelOperation op; - op = addOperation(result, "addPropertyChangeListener", "void", ObjectModelJavaModifier.PUBLIC); + op = addOperation(result, "addPostWriteListener", "void", ObjectModelJavaModifier.PUBLIC); addParameter(op, PropertyChangeListener.class, "listener"); setOperationBody(op, "" /*{ - p.addPropertyChangeListener(listener); + p.addPostWriteListener(listener); }*/ ); - op = addOperation(result, "addPropertyChangeListener", "void", ObjectModelJavaModifier.PUBLIC); + op = addOperation(result, "addPostWriteListener", "void", ObjectModelJavaModifier.PUBLIC); addParameter(op, String.class, "propertyName"); addParameter(op, PropertyChangeListener.class, "listener"); setOperationBody(op, "" /*{ - p.addPropertyChangeListener(propertyName, listener); + p.addPostWriteListener(propertyName, listener); }*/ ); - op = addOperation(result, "removePropertyChangeListener", "void", ObjectModelJavaModifier.PUBLIC); + op = addOperation(result, "removePostWriteListener", "void", ObjectModelJavaModifier.PUBLIC); addParameter(op, PropertyChangeListener.class, "listener"); setOperationBody(op, "" /*{ - p.removePropertyChangeListener(listener); + p.removePostWriteListener(listener); }*/ ); - op = addOperation(result, "removePropertyChangeListener", "void", ObjectModelJavaModifier.PUBLIC); + op = addOperation(result, "removePostWriteListener", "void", ObjectModelJavaModifier.PUBLIC); addParameter(op, String.class, "propertyName"); addParameter(op, PropertyChangeListener.class, "listener"); setOperationBody(op, "" /*{ - p.removePropertyChangeListener(propertyName, listener); + p.removePostWriteListener(propertyName, listener); }*/ ); /* diff --git a/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java b/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java index 07c07a2..168edde 100644 --- a/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java +++ b/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java @@ -47,7 +47,7 @@ import org.nuiton.eugene.models.object.ObjectModelParameter; import org.nuiton.eugene.models.object.xml.ObjectModelInterfaceImpl; import org.nuiton.topia.persistence.TopiaDao; import org.nuiton.topia.persistence.TopiaEntityVisitor; -import org.nuiton.topia.persistence.ListenableEntity; +import org.nuiton.topia.persistence.ListenableBean; import org.nuiton.topia.persistence.internal.AbstractTopiaEntity; import org.nuiton.topia.persistence.TopiaDaoSupplier; import org.nuiton.topia.persistence.TopiaException; @@ -294,7 +294,7 @@ public class EntityTransformer extends ObjectModelTransformerToJava { if (topiaTagValues.isGeneratePropertyChangeSupport(input, model)) { addInterface(interfaceAlreadyDone, outputInterface, - ListenableEntity.class); + ListenableBean.class); } } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm