This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 63a362b9a9a04d1f9b70650b9a4232d2c78efe13 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 20 13:03:07 2015 +0100 clean code --- .../ui/swing/util/AbstractTuttiBeanUIModel.java | 6 ++-- .../ui/swing/util/computable/ComputableData.java | 42 +++++++--------------- 2 files changed, 14 insertions(+), 34 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiBeanUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiBeanUIModel.java index d92e6f7..1e58eb6 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiBeanUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiBeanUIModel.java @@ -24,7 +24,7 @@ package fr.ifremer.tutti.ui.swing.util; import fr.ifremer.tutti.persistence.entities.TuttiEntity; import org.jdesktop.beans.AbstractSerializableBean; -import org.nuiton.jaxx.application.listener.PropagatePropertyChangeListener; +import org.nuiton.jaxx.application.bean.JavaBeanObject; import org.nuiton.util.CollectionUtil; import org.nuiton.util.beans.Binder; @@ -37,12 +37,10 @@ import java.util.List; * @author tchemit <chemit@codelutin.com> * @since 0.1 */ -public abstract class AbstractTuttiBeanUIModel<E, B extends AbstractTuttiBeanUIModel<E, B>> extends AbstractSerializableBean implements TuttiEntity, PropagatePropertyChangeListener.PropagatePropertyChange { +public abstract class AbstractTuttiBeanUIModel<E, B extends AbstractTuttiBeanUIModel<E, B>> extends AbstractSerializableBean implements TuttiEntity, JavaBeanObject { private static final long serialVersionUID = 1L; -// public static final String PROPERTY_ID = "id"; - public static final String PROPERTY_MODIFY = "modify"; public static final String PROPERTY_VALID = "valid"; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableData.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableData.java index 6f878b1..5fc6f1b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableData.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableData.java @@ -24,7 +24,8 @@ package fr.ifremer.tutti.ui.swing.util.computable; import fr.ifremer.tutti.util.Numbers; import org.jdesktop.beans.AbstractSerializableBean; -import org.nuiton.jaxx.application.listener.PropagatePropertyChangeListener; +import org.nuiton.jaxx.application.bean.JavaBeanObject; +import org.nuiton.jaxx.application.bean.JavaBeanObjectPropagateChangeListener; /** @@ -33,7 +34,7 @@ import org.nuiton.jaxx.application.listener.PropagatePropertyChangeListener; * @author kmorin <kmorin@codelutin.com> * @since 1.0 */ -public class ComputableData<N extends Number> extends AbstractSerializableBean { +public class ComputableData<N extends Number> extends AbstractSerializableBean implements JavaBeanObject { public static final String PROPERTY_DATA = "data"; @@ -82,10 +83,9 @@ public class ComputableData<N extends Number> extends AbstractSerializableBean { @Override public String toString() { String result = null; - if (data != null) { - result = data.toString(); - } else if (computedData != null) { - result = computedData.toString(); + N dataOrComputedData = getDataOrComputedData(); + if (dataOrComputedData != null) { + result = dataOrComputedData.toString(); } return result; } @@ -99,32 +99,14 @@ public class ComputableData<N extends Number> extends AbstractSerializableBean { * @since 1.2 */ public void addPropagateListener(String propertyName, - PropagatePropertyChangeListener.PropagatePropertyChange otherBean) { + JavaBeanObject otherBean) { - PropagatePropertyChangeListener.listenAndPropagate(this, - otherBean, - PROPERTY_DATA, - propertyName); + JavaBeanObjectPropagateChangeListener.listenAndPropagate(this, otherBean, PROPERTY_DATA, propertyName); + } -// PropagatePropertyChangeListener listener = new PropagatePropertyChangeListener(propertyName, otherBean); -// addPropertyChangeListener(PROPERTY_DATA, listener); + @Override + public void firePropertyChanged(String propertyName, Object oldValue, Object newValue) { + super.firePropertyChange(propertyName, oldValue, newValue); } -// private static class PropagateProperyChangeListener implements PropertyChangeListener { -// -// private String propertyName; -// -// private AbstractTuttiBeanUIModel otherBean; -// -// public PropagatePropertyChangeLstener(String propertyName, -// AbstractTuttiBeanUIModel otherBean) { -// this.propertyName = propertyName; -// this.otherBean = otherBean; -// } -// -// @Override -// public void propertyChange(PropertyChangeEvent evt) { -// otherBean.firePropertyChanged(propertyName, evt.getOldValue(), evt.getNewValue()); -// } -// } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.