Author: tchemit Date: 2013-11-24 09:44:06 +0100 (Sun, 24 Nov 2013) New Revision: 2752 Url: http://nuiton.org/projects/jaxx/repository/revisions/2752 Log: improve jaxx demo code Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemoModel.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoModel.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemoModel.java trunk/jaxx-demo/src/main/java/jaxx/demo/entities/AbstractDemoBean.java trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Identity.java trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Model.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/DefaultDemoUIModel.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/DemoUIModel.java Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java 2013-11-24 08:43:43 UTC (rev 2751) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java 2013-11-24 08:44:06 UTC (rev 2752) @@ -33,9 +33,9 @@ import org.jdesktop.beans.AbstractBean; import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ArgumentsParserException; +import org.nuiton.config.ConfigOptionDef; import org.nuiton.util.Version; import org.nuiton.util.VersionUtil; -import org.nuiton.config.ConfigOptionDef; import javax.swing.KeyStroke; import java.awt.Color; @@ -134,7 +134,7 @@ try { applicationConfig.parse(args); } catch (ArgumentsParserException e) { - throw new IllegalStateException("Could not parse configuration",e); + throw new IllegalStateException("Could not parse configuration", e); } } @@ -210,8 +210,8 @@ } public boolean isFullScreen() { - Boolean result = applicationConfig.getOptionAsBoolean(Option.FULL_SCREEN.key); - return result != null && result; + boolean result = applicationConfig.getOptionAsBoolean(Option.FULL_SCREEN.key); + return result; } public Locale getLocale() { @@ -254,9 +254,8 @@ } public void setFullscreen(boolean fullscreen) { - Object oldValue = null; applicationConfig.setOption(Option.FULL_SCREEN.key, fullscreen + ""); - firePropertyChange(PROPERTY_FULLSCREEN, oldValue, fullscreen); + firePropertyChange(PROPERTY_FULLSCREEN, null, fullscreen); } public void setLocale(Locale newLocale) { Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemoModel.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemoModel.java 2013-11-24 08:43:43 UTC (rev 2751) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemoModel.java 2013-11-24 08:44:06 UTC (rev 2752) @@ -25,29 +25,24 @@ package jaxx.demo.component.jaxx.editor; -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; +import org.jdesktop.beans.AbstractSerializableBean; /** * @author tchemit <chemit@codelutin.com> * @since 1.5 */ -public class NumberEditorDemoModel { +public class NumberEditorDemoModel extends AbstractSerializableBean { public static final String INTEGER_PROPERTY = "integerProperty"; public static final String FLOAT_PROPERTY = "floatProperty"; - protected PropertyChangeSupport p; + private static final long serialVersionUID = 1L; protected int integerProperty; protected float floatProperty; - public NumberEditorDemoModel() { - p = new PropertyChangeSupport(this); - } - public float getFloatProperty() { return floatProperty; } @@ -59,28 +54,12 @@ public void setFloatProperty(float floatProperty) { float old = this.floatProperty; this.floatProperty = floatProperty; - p.firePropertyChange(FLOAT_PROPERTY, old, floatProperty); + firePropertyChange(FLOAT_PROPERTY, old, floatProperty); } public void setIntegerProperty(int integerProperty) { int old = this.integerProperty; this.integerProperty = integerProperty; - p.firePropertyChange(INTEGER_PROPERTY, old, integerProperty); + firePropertyChange(INTEGER_PROPERTY, old, integerProperty); } - - public void addPropertyChangeListener(PropertyChangeListener listener) { - p.addPropertyChangeListener(listener); - } - - public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { - p.addPropertyChangeListener(propertyName, listener); - } - - public void removePropertyChangeListener(PropertyChangeListener listener) { - p.removePropertyChangeListener(listener); - } - - public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { - p.removePropertyChangeListener(propertyName, listener); - } } Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoHandler.java 2013-11-24 08:43:43 UTC (rev 2751) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoHandler.java 2013-11-24 08:44:06 UTC (rev 2752) @@ -4,7 +4,7 @@ * Created on 11/22/13. * * @author Tony CHEMIT <chemit@codelutin.com> - * @since 2.5.31 + * @since 2.6 */ public class SimpleTimeEditorDemoHandler { } Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoModel.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoModel.java 2013-11-24 08:43:43 UTC (rev 2751) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoModel.java 2013-11-24 08:44:06 UTC (rev 2752) @@ -33,7 +33,7 @@ * Model of a bean using the {@link SimpleTimeEditor}. * * @author Tony CHEMIT <chemit@codelutin.com> - * @since 2.5.31 + * @since 2.6 */ public class SimpleTimeEditorDemoModel extends AbstractSerializableBean { Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemoModel.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemoModel.java 2013-11-24 08:43:43 UTC (rev 2751) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemoModel.java 2013-11-24 08:44:06 UTC (rev 2752) @@ -25,9 +25,8 @@ package jaxx.demo.component.jaxx.editor; import jaxx.runtime.swing.editor.TimeEditor; +import org.jdesktop.beans.AbstractSerializableBean; -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; import java.util.Date; /** @@ -36,18 +35,14 @@ * @author tchemit <chemit@codelutin.com> * @since 2.2 */ -public class TimeEditorDemoModel { +public class TimeEditorDemoModel extends AbstractSerializableBean { public static final String TIME_PROPERTY = "time"; - protected final PropertyChangeSupport p; + private static final long serialVersionUID = 1L; protected Date time; - public TimeEditorDemoModel() { - p = new PropertyChangeSupport(this); - } - public Date getTime() { return time; } @@ -55,25 +50,7 @@ public void setTime(Date time) { Date old = this.time; this.time = time; - p.firePropertyChange(TIME_PROPERTY, old, time); + firePropertyChange(TIME_PROPERTY, old, time); } - public void addPropertyChangeListener(PropertyChangeListener listener) { - p.addPropertyChangeListener(listener); - } - - public void addPropertyChangeListener(String propertyName, - PropertyChangeListener listener) { - p.addPropertyChangeListener(propertyName, listener); - } - - public void removePropertyChangeListener(PropertyChangeListener listener) { - p.removePropertyChangeListener(listener); - } - - public void removePropertyChangeListener(String propertyName, - PropertyChangeListener listener) { - p.removePropertyChangeListener(propertyName, listener); - } - } Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/entities/AbstractDemoBean.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/entities/AbstractDemoBean.java 2013-11-24 08:43:43 UTC (rev 2751) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/entities/AbstractDemoBean.java 2013-11-24 08:44:06 UTC (rev 2752) @@ -24,9 +24,7 @@ */ package jaxx.demo.entities; -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; -import java.io.Serializable; +import org.jdesktop.beans.AbstractSerializableBean; import static org.nuiton.i18n.I18n.n_; @@ -36,7 +34,7 @@ * @author tchemit <chemit@codelutin.com> * @since 2.2 */ -public abstract class AbstractDemoBean implements Serializable { +public abstract class AbstractDemoBean extends AbstractSerializableBean { static { n_("jaxxdemo.common.id"); @@ -53,14 +51,10 @@ protected String image; - protected final PropertyChangeSupport p; - public AbstractDemoBean() { - p = new PropertyChangeSupport(this); } protected AbstractDemoBean(String id, String image) { - this(); this.id = id; this.image = image; } @@ -85,24 +79,4 @@ this.image = image; firePropertyChange(PROPERTY_IMAGE, oldValue, image); } - - public void addPropertyChangeListener(PropertyChangeListener listener) { - p.addPropertyChangeListener(listener); - } - - public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { - p.addPropertyChangeListener(propertyName, listener); - } - - public void removePropertyChangeListener(PropertyChangeListener listener) { - p.removePropertyChangeListener(listener); - } - - public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { - p.removePropertyChangeListener(propertyName, listener); - } - - protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) { - p.firePropertyChange(propertyName, oldValue, newValue); - } } Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Identity.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Identity.java 2013-11-24 08:43:43 UTC (rev 2751) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Identity.java 2013-11-24 08:44:06 UTC (rev 2752) @@ -25,12 +25,11 @@ package jaxx.demo.entities; -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; +import org.jdesktop.beans.AbstractSerializableBean; + import java.io.File; -import java.io.Serializable; -public class Identity implements Serializable { +public class Identity extends AbstractSerializableBean { private static final long serialVersionUID = 1L; @@ -46,29 +45,7 @@ protected File dir = new File("/tmp"); - protected final PropertyChangeSupport p; - public Identity() { - p = new PropertyChangeSupport(this); - } - - public void addPropertyChangeListener(PropertyChangeListener listener) { - p.addPropertyChangeListener(listener); - } - - public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { - p.addPropertyChangeListener(propertyName, listener); - } - - public void removePropertyChangeListener(PropertyChangeListener listener) { - p.removePropertyChangeListener(listener); - } - - public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { - p.removePropertyChangeListener(propertyName, listener); - } - - public String getFirstName() { return firstName; } @@ -96,36 +73,36 @@ public void setFirstName(String firstName) { String oldFirstName = this.firstName; this.firstName = firstName; - p.firePropertyChange("firstName", oldFirstName, firstName); + firePropertyChange("firstName", oldFirstName, firstName); } public void setLastName(String lastName) { String oldLastName = this.lastName; this.lastName = lastName; - p.firePropertyChange("lastName", oldLastName, lastName); + firePropertyChange("lastName", oldLastName, lastName); } public void setEmail(String email) { String oldEmail = this.email; this.email = email; - p.firePropertyChange("email", oldEmail, email); + firePropertyChange("email", oldEmail, email); } public void setAge(int age) { int oldAge = this.age; this.age = age; - p.firePropertyChange("age", oldAge, age); + firePropertyChange("age", oldAge, age); } public void setConfig(File config) { File oldConfig = this.config; this.config = config; - p.firePropertyChange("config", oldConfig, config); + firePropertyChange("config", oldConfig, config); } public void setDir(File dir) { File oldDir = this.dir; this.dir = dir; - p.firePropertyChange("dir", oldDir, dir); + firePropertyChange("dir", oldDir, dir); } } Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Model.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Model.java 2013-11-24 08:43:43 UTC (rev 2751) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Model.java 2013-11-24 08:44:06 UTC (rev 2752) @@ -25,41 +25,18 @@ package jaxx.demo.entities; -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; +import org.jdesktop.beans.AbstractSerializableBean; -public class Model { +public class Model extends AbstractSerializableBean { + private static final long serialVersionUID = 1L; + protected String text = "text"; protected String text2 = "text2"; protected int ratio = 51; - - PropertyChangeSupport p; - - public Model() { - p = new PropertyChangeSupport(this); - } - - public void addPropertyChangeListener(PropertyChangeListener listener) { - p.addPropertyChangeListener(listener); - } - - public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { - p.addPropertyChangeListener(propertyName, listener); - } - - public void removePropertyChangeListener(PropertyChangeListener listener) { - p.removePropertyChangeListener(listener); - } - - public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { - p.removePropertyChangeListener(propertyName, listener); - } - - public String getText() { return text; } @@ -75,18 +52,18 @@ public void setText(String text) { String oldText = this.text; this.text = text; - p.firePropertyChange("text", oldText, text); + firePropertyChange("text", oldText, text); } public void setText2(String text2) { String oldText2 = this.text2; this.text2 = text2; - p.firePropertyChange("text2", oldText2, text2); + firePropertyChange("text2", oldText2, text2); } public void setRatio(int ratio) { int oldRatio = this.ratio; this.ratio = ratio; - p.firePropertyChange("ratio", oldRatio, ratio); + firePropertyChange("ratio", oldRatio, ratio); } } Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/DefaultDemoUIModel.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/DefaultDemoUIModel.java 2013-11-24 08:43:43 UTC (rev 2751) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/DefaultDemoUIModel.java 2013-11-24 08:44:06 UTC (rev 2752) @@ -26,10 +26,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jdesktop.beans.AbstractSerializableBean; import javax.swing.JToggleButton; -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; import java.io.File; /** @@ -37,13 +36,12 @@ * * @author tchemit <chemit@codelutin.com> * @version $Revision$ - * <p/> - * Mise a jour: $Date$ par : - * $Author$ */ -public class DefaultDemoUIModel implements DemoUIModel { +public class DefaultDemoUIModel extends AbstractSerializableBean implements DemoUIModel { + private static final long serialVersionUID = 1L; + protected File file; protected File file1; @@ -64,8 +62,6 @@ public static final String PROPERTY_FILE = "file"; - protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); - protected static final Log log = LogFactory.getLog(DefaultDemoUIModel.class); /*---------------------------------------------------------------------------------*/ @@ -141,30 +137,4 @@ firePropertyChange(PROPERTY_T1, oldValue, newValue); } - @Override - public void firePropertyChange(String name, Object oldValue, Object newValue) { - pcs.firePropertyChange(name, oldValue, newValue); - } - - @Override - public void addPropertyChangeListener(PropertyChangeListener listener) { - pcs.addPropertyChangeListener(listener); - } - - @Override - public void addPropertyChangeListener(String property, PropertyChangeListener listener) { - pcs.addPropertyChangeListener(property, listener); - } - - @Override - public void removePropertyChangeListener(PropertyChangeListener listener) { - pcs.removePropertyChangeListener(listener); - } - - @Override - public void removePropertyChangeListener(String property, PropertyChangeListener listener) { - pcs.removePropertyChangeListener(property, listener); - } - - } Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/DemoUIModel.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/DemoUIModel.java 2013-11-24 08:43:43 UTC (rev 2751) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/DemoUIModel.java 2013-11-24 08:44:06 UTC (rev 2752) @@ -55,16 +55,16 @@ void setFile(File newValue); - /** - * All <code>JAXXObject</code> implements are capable of broadcasting <code>PropertyChangeEvent</code>, and - * furthermore (for technical reasons) must allow code in outside packages, specifically the JAXX runtime, - * to trigger these events. - * - * @param name the name of the property which changed - * @param oldValue the old value of the property - * @param newValue the new value of the property - */ - void firePropertyChange(String name, Object oldValue, Object newValue); +// /** +// * All <code>JAXXObject</code> implements are capable of broadcasting <code>PropertyChangeEvent</code>, and +// * furthermore (for technical reasons) must allow code in outside packages, specifically the JAXX runtime, +// * to trigger these events. +// * +// * @param name the name of the property which changed +// * @param oldValue the old value of the property +// * @param newValue the new value of the property +// */ +// void firePropertyChange(String name, Object oldValue, Object newValue); /** * Register a general {@link PropertyChangeListener}.