From 32e8ac5fae9875873f72b1d3c8c00b7cf9108d2a Mon Sep 17 00:00:00 2001 From: Shai Almog <67850168+shai-almog@users.noreply.github.com> Date: Fri, 17 Oct 2025 19:26:16 +0300 Subject: [PATCH] Add Spotless target and reformat UiBinding --- .../com/codename1/properties/UiBinding.java | 1975 +++++++++-------- maven/core-unittests/pom.xml | 15 + 2 files changed, 1004 insertions(+), 986 deletions(-) diff --git a/CodenameOne/src/com/codename1/properties/UiBinding.java b/CodenameOne/src/com/codename1/properties/UiBinding.java index 020fda285e..79fd5dbb87 100644 --- a/CodenameOne/src/com/codename1/properties/UiBinding.java +++ b/CodenameOne/src/com/codename1/properties/UiBinding.java @@ -6,18 +6,18 @@ * published by the Free Software Foundation. Codename One designates this * particular file as subject to the "Classpath" exception as provided * by Oracle in the LICENSE file that accompanied this code. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Codename One through http://www.codenameone.com/ if you + * + * Please contact Codename One through http://www.codenameone.com/ if you * need additional information or have any questions. */ @@ -37,7 +37,6 @@ import com.codename1.ui.events.DataChangedListener; import com.codename1.ui.spinner.Picker; import com.codename1.ui.table.AbstractTableModel; -import com.codename1.ui.table.TableModel; import com.codename1.ui.util.EventDispatcher; import com.codename1.ui.validation.Constraint; import java.util.ArrayList; @@ -49,1111 +48,1115 @@ import java.util.Set; /** - *

The binding framework can implicitly bind UI elements to properties, this allow seamless - * model to UI mapping. Most cases allow simple binding by just using the - * {@link #bind(com.codename1.properties.Property, com.codename1.ui.Component)} method - * to seamlessly update a property/component based on changes.

- * - *

It contains the following base concepts:

- * - *
    - *
  1. {@link com.codename1.properties.UiBinding.ObjectConverter} - a converter converts - * from one type to another. E.g. if we want a {@link com.codename1.ui.TextArea} to map - * to an {@code Integer} property we'd use an - * {@link com.codename1.properties.UiBinding.IntegerConverter} to indicate the desired - * destination value. - *
  2. {@link com.codename1.properties.UiBinding.ComponentAdapter} - takes two - * {@link com.codename1.properties.UiBinding.ObjectConverter} to convert to/from the - * component & property. It provides the API for event binding and value extraction/setting - * on the component. - *
  3. {@link com.codename1.properties.UiBinding.Binding} - the commit mode - *
  4. {@link #bind(com.codename1.properties.Property, com.codename1.ui.Component) - - * the {@code bind} helper methods allow us to bind a component easily without exposure - * to these complexities. - *
+ * The binding framework can implicitly bind UI elements to properties, this allow seamless model to + * UI mapping. Most cases allow simple binding by just using the {@link + * #bind(com.codename1.properties.Property, com.codename1.ui.Component)} method to seamlessly update + * a property/component based on changes. + * + *

It contains the following base concepts: + * + *

1. {@link com.codename1.properties.UiBinding.ObjectConverter} - a converter converts from one + * type to another. E.g. if we want a {@link com.codename1.ui.TextArea} to map to an {@code Integer} + * property we'd use an {@link com.codename1.properties.UiBinding.IntegerConverter} to indicate the + * desired destination value. + * + *

2. {@link com.codename1.properties.UiBinding.ComponentAdapter} - takes two {@link + * com.codename1.properties.UiBinding.ObjectConverter} to convert to/from the component and + * property. It provides the API for event binding and value extraction/setting on the component. + * + *

3. {@link com.codename1.properties.UiBinding.Binding} - the commit mode. + * + *

4. {@link #bind(com.codename1.properties.Property, com.codename1.ui.Component)} - the {@code + * bind} helper methods allow us to bind a component easily without exposure to these complexities. * * @author Shai Almog */ -public class UiBinding { - private boolean autoCommit = true; +public class UiBinding { + private boolean autoCommit = true; + + /** + * Default value for auto-commit mode, in auto-commit mode changes to the component/property are + * instantly reflected otherwise {@link com.codename1.properties.UiBinding.CommitMode#commit()} + * should be invoked explicitly + * + * @param b true to enable auto commit mode + */ + public void setAutoCommit(boolean b) { + autoCommit = b; + } + + /** + * Is auto-commit mode on by default see {@link #setAutoCommit(boolean)} + * + * @return true if auto-commit is on + */ + public boolean isAutoCommit() { + return autoCommit; + } + + /** + * Binding allows us to have commit/auto-commit mode. This allows changes to properties to reflect + * immediately or only when committed, e.g. if a {@code Form} has "OK" & "Cancel" buttons you + * might want to do a commit on OK. We also provide a "rollback" method to reset to the original + * property values. + * + *

{@code UiBinding} has a boolean auto commit flag that can be toggled to set the default for + * new bindings. + * + *

Binding also provides the ability to disengage a "binding" between a property and a UI + * component + */ + public abstract class Binding { + private boolean autoCommit = UiBinding.this.autoCommit; /** - * Default value for auto-commit mode, in auto-commit mode changes to the component/property - * are instantly reflected otherwise {@link com.codename1.properties.UiBinding.CommitMode#commit()} - * should be invoked explicitly - * @param b true to enable auto commit mode + * Toggles auto-commit mode and overrides the {@code UiBinding} autocommit default. Autocommit + * instantly reflects changes to the property or component values. + * + * @param b true to enable auto-commit */ public void setAutoCommit(boolean b) { - autoCommit = b; + autoCommit = b; } /** - * Is auto-commit mode on by default see {@link #setAutoCommit(boolean)} - * @return true if auto-commit is on + * Gets the autocommit value see {@link #setAutoCommit(boolean)} + * + * @return true if autocommit is on */ public boolean isAutoCommit() { - return autoCommit; + return autoCommit; } - + /** - *

Binding allows us to have commit/auto-commit mode. This allows changes to properties - * to reflect immediately or only when committed, e.g. if a {@code Form} has "OK" & - * "Cancel" buttons you might want to do a commit on OK. We also provide a "rollback" method to - * reset to the original property values.

- *

- * {@code UiBinding} has a boolean auto commit flag that can be toggled to set the default for new - * bindings. - *

- *

- * Binding also provides the ability to disengage a "binding" between a property and a UI component - *

+ * Set the value from the component into the property, note that this will throw an exception if + * autocommit is on */ - public abstract class Binding { - private boolean autoCommit = UiBinding.this.autoCommit; - - /** - * Toggles auto-commit mode and overrides the {@code UiBinding} autocommit default. - * Autocommit instantly reflects changes to the property or component values. - * @param b true to enable auto-commit - */ - public void setAutoCommit(boolean b) { - autoCommit = b; - } - - /** - * Gets the autocommit value see {@link #setAutoCommit(boolean)} - * @return true if autocommit is on - */ - public boolean isAutoCommit() { - return autoCommit; - } - - /** - * Set the value from the component into the property, note that this will throw an exception if - * autocommit is on - */ - public abstract void commit(); - - /** - * Sets the value from the property into the component, note that this will throw an exception if - * autocommit is on - */ - public abstract void rollback(); - - /** - * Clears the listeners and disengages binding, this can be important for GC as binding - * can keep object references in RAM - */ - public abstract void disconnect(); - } - + public abstract void commit(); + /** - * Allows us to unbind the property from binding, this is equivalent to calling - * {@link com.codename1.properties.UiBinding.Binding#disconnect()} on all - * bindings... - * - * @param prop the property + * Sets the value from the property into the component, note that this will throw an exception + * if autocommit is on */ - public static void unbind(PropertyBase prop) { - if(prop.getListeners() != null) { - for(Object l : prop.getListeners()) { - if(l instanceof Binding) { - ((Binding)l).disconnect(); - - // prevent a concurrent modification exception by returning and recursing - unbind(prop); - return; - } - } - } - } - + public abstract void rollback(); + /** - * Unbinds all the properties within the business object - * @param po the business object + * Clears the listeners and disengages binding, this can be important for GC as binding can keep + * object references in RAM */ - public static void unbind(PropertyBusinessObject po) { - for(PropertyBase pb : po.getPropertyIndex()) { - unbind(pb); + public abstract void disconnect(); + } + + /** + * Allows us to unbind the property from binding, this is equivalent to calling {@link + * com.codename1.properties.UiBinding.Binding#disconnect()} on all bindings... + * + * @param prop the property + */ + public static void unbind(PropertyBase prop) { + if (prop.getListeners() != null) { + for (Object l : prop.getListeners()) { + if (l instanceof Binding) { + ((Binding) l).disconnect(); + + // prevent a concurrent modification exception by returning and recursing + unbind(prop); + return; } + } } - - /** - * Object converter can convert an object from one type to another e.g. a String to an integer an - * array to a list model. Use this object converter to keep source/values the same e.g. when converting - * using a {@link com.codename1.properties.UiBinding.TextAreaAdapter} to a String property. - */ - public static class ObjectConverter { - /** - * Converts an object of source type to the type matching this class, the default - * implementation does nothing and can be used as a stand-in - * @param source an object or null - * @return null or a new object instance - */ - public Object convert(Object source) { - return source; - } + } + + /** + * Unbinds all the properties within the business object + * + * @param po the business object + */ + public static void unbind(PropertyBusinessObject po) { + for (PropertyBase pb : po.getPropertyIndex()) { + unbind(pb); } - + } + + /** + * Object converter can convert an object from one type to another e.g. a String to an integer an + * array to a list model. Use this object converter to keep source/values the same e.g. when + * converting using a {@link com.codename1.properties.UiBinding.TextAreaAdapter} to a String + * property. + */ + public static class ObjectConverter { /** - * Converts the source value to a String + * Converts an object of source type to the type matching this class, the default implementation + * does nothing and can be used as a stand-in + * + * @param source an object or null + * @return null or a new object instance */ - public static class StringConverter extends ObjectConverter { - @Override - public Object convert(Object source) { - if(source == null) { - return null; - } - return source.toString(); - } + public Object convert(Object source) { + return source; } + } - /** - * Converts the source value to an Integer - */ - public static class IntegerConverter extends ObjectConverter { - @Override - public Object convert(Object source) { - if(source == null) { - return null; - } - return Util.toIntValue(source); - } + /** Converts the source value to a String. */ + public static class StringConverter extends ObjectConverter { + @Override + public Object convert(Object source) { + if (source == null) { + return null; + } + return source.toString(); } + } - /** - * Converts the source value to a Date - */ - public static class DateConverter extends ObjectConverter { - @Override - public Object convert(Object source) { - if(source == null) { - return null; - } - if(source instanceof Date) { - return (Date)source; - } - return new Date(Util.toLongValue(source)); - } + /** Converts the source value to an Integer. */ + public static class IntegerConverter extends ObjectConverter { + @Override + public Object convert(Object source) { + if (source == null) { + return null; + } + return Util.toIntValue(source); } - - /** - * Converts the source value to a Long - */ - public static class LongConverter extends ObjectConverter { - @Override - public Object convert(Object source) { - if(source == null) { - return null; - } - return Util.toLongValue(source); - } + } + + /** Converts the source value to a Date. */ + public static class DateConverter extends ObjectConverter { + @Override + public Object convert(Object source) { + if (source == null) { + return null; + } + if (source instanceof Date) { + return (Date) source; + } + return new Date(Util.toLongValue(source)); + } + } + + /** Converts the source value to a Long. */ + public static class LongConverter extends ObjectConverter { + @Override + public Object convert(Object source) { + if (source == null) { + return null; + } + return Util.toLongValue(source); + } + } + + /** Converts the source value to a Float. */ + public static class FloatConverter extends ObjectConverter { + @Override + public Object convert(Object source) { + if (source == null) { + return null; + } + return Util.toFloatValue(source); + } + } + + /** Converts the source value to a Double. */ + public static class DoubleConverter extends ObjectConverter { + @Override + public Object convert(Object source) { + if (source == null) { + return null; + } + return Util.toDoubleValue(source); + } + } + + /** Converts the source value to a Boolean. */ + public static class BooleanConverter extends ObjectConverter { + @Override + public Object convert(Object source) { + if (source == null) { + return null; + } + if (source instanceof Boolean) { + return ((Boolean) source).booleanValue(); + } + if (source instanceof String) { + String s = ((String) source).toLowerCase(); + return s.indexOf("true") > 0 || s.indexOf("yes") > 0 || s.indexOf("1") > 0; + } + return Util.toIntValue(source) > 0; + } + } + + /** + * Maps values to other values for conversion in a similar way to a Map this is pretty useful for + * API's like picker where we have a list of Strings and we might want a list of other objects to + * match every string + */ + public static class MappingConverter extends ObjectConverter { + private Map m; + + public MappingConverter(Map m) { + this.m = m; } - + + @Override + public Object convert(Object source) { + if (source == null) { + return null; + } + return m.get(source); + } + } + + /** Adapters can be extended to allow any component to bind to a property via a converter */ + public abstract static class ComponentAdapter { + /** Used by the subclass to convert values from the component to the property */ + protected final ObjectConverter toPropertyType; + + /** Used by the subclass to convert values from the property to the component */ + protected final ObjectConverter toComponentType; + /** - * Converts the source value to a Float + * Subclasses usually provide the toComponentType and allow their callers to define the + * toPropertyType + * + * @param toPropertyType Used by the subclass to convert values from the component to the + * property + * @param toComponentType Used by the subclass to convert values from the property to the + * component */ - public static class FloatConverter extends ObjectConverter { - @Override - public Object convert(Object source) { - if(source == null) { - return null; - } - return Util.toFloatValue(source); - } + public ComponentAdapter(ObjectConverter toPropertyType, ObjectConverter toComponentType) { + this.toPropertyType = toPropertyType; + this.toComponentType = toComponentType; } /** - * Converts the source value to a Double + * Assigns the value from the property into the component + * + * @param value the value that was returned from the property get method + * @param cmp the component instance */ - public static class DoubleConverter extends ObjectConverter { - @Override - public Object convert(Object source) { - if(source == null) { - return null; - } - return Util.toDoubleValue(source); - } - } - + public abstract void assignTo(PropertyType value, ComponentType cmp); + /** - * Converts the source value to a Boolean + * Returns the value for the set method of the property from the given component + * + * @param cmp the component + * @return the value we can place into the set method */ - public static class BooleanConverter extends ObjectConverter { - @Override - public Object convert(Object source) { - if(source == null) { - return null; - } - if(source instanceof Boolean) { - return ((Boolean)source).booleanValue(); - } - if(source instanceof String) { - String s = ((String)source).toLowerCase(); - return s.indexOf("true") > 0 || s.indexOf("yes") > 0 || s.indexOf("1") > 0; - } - return Util.toIntValue(source) > 0; - } - } + public abstract PropertyType getFrom(ComponentType cmp); /** - * Maps values to other values for conversion in a similar way to a Map this is pretty - * useful for API's like picker where we have a list of Strings and we might want a list - * of other objects to match every string + * Binds an action listener to changes in the component + * + * @param cmp the component + * @param l listener */ - public static class MappingConverter extends ObjectConverter { - private Map m; - public MappingConverter(Map m) { - this.m = m; - } - - @Override - public Object convert(Object source) { - if(source == null) { - return null; - } - return m.get(source); - } - } - + public abstract void bindListener(ComponentType cmp, ActionListener l); + /** - * Adapters can be extended to allow any component to bind to a property via a converter + * Removes the action listener from changes in the component + * + * @param cmp the component + * @param l listener */ - public abstract static class ComponentAdapter { - /** - * Used by the subclass to convert values from the component to the property - */ - protected final ObjectConverter toPropertyType; - - /** - * Used by the subclass to convert values from the property to the component - */ - protected final ObjectConverter toComponentType; - - /** - * Subclasses usually provide the toComponentType and allow their callers to define - * the toPropertyType - * @param toPropertyType Used by the subclass to convert values from the component to - * the property - * @param toComponentType Used by the subclass to convert values from the property to - * the component - */ - public ComponentAdapter(ObjectConverter toPropertyType, ObjectConverter toComponentType) { - this.toPropertyType = toPropertyType; - this.toComponentType = toComponentType; - } - - /** - * Assigns the value from the property into the component - * @param value the value that was returned from the property get method - * @param cmp the component instance - */ - public abstract void assignTo(PropertyType value, ComponentType cmp); - - /** - * Returns the value for the set method of the property from the given component - * @param cmp the component - * @return the value we can place into the set method - */ - public abstract PropertyType getFrom(ComponentType cmp); - - /** - * Binds an action listener to changes in the component - * @param cmp the component - * @param l listener - */ - public abstract void bindListener(ComponentType cmp, ActionListener l); - - /** - * Removes the action listener from changes in the component - * @param cmp the component - * @param l listener - */ - public abstract void removeListener(ComponentType cmp, ActionListener l); - } - + public abstract void removeListener(ComponentType cmp, ActionListener l); + } + + /** + * Adapts a {@link com.codename1.ui.TextArea} (and it's subclass {@link + * com.codename1.ui.TextField} to binding + * + * @param the type of the property generic + */ + public static class TextAreaAdapter + extends ComponentAdapter { /** - * Adapts a {@link com.codename1.ui.TextArea} (and it's subclass - * {@link com.codename1.ui.TextField} to binding - * @param the type of the property generic + * Constructs a new binding + * + * @param toPropertyType the conversion logic to the property */ - public static class TextAreaAdapter extends ComponentAdapter { - /** - * Constructs a new binding - * @param toPropertyType the conversion logic to the property - */ - public TextAreaAdapter(ObjectConverter toPropertyType) { - super(toPropertyType, new StringConverter()); - } + public TextAreaAdapter(ObjectConverter toPropertyType) { + super(toPropertyType, new StringConverter()); + } - /** - * Constructs a new binding assuming a String property - */ - public TextAreaAdapter() { - super(new ObjectConverter(), new ObjectConverter()); - } + /** Constructs a new binding assuming a String property */ + public TextAreaAdapter() { + super(new ObjectConverter(), new ObjectConverter()); + } - @Override - public void assignTo(PropertyType value, TextArea cmp) { - cmp.setText((String)toComponentType.convert(value)); - } + @Override + public void assignTo(PropertyType value, TextArea cmp) { + cmp.setText((String) toComponentType.convert(value)); + } - @Override - public PropertyType getFrom(TextArea cmp) { - return (PropertyType)toPropertyType.convert(cmp.getText()); - } + @Override + public PropertyType getFrom(TextArea cmp) { + return (PropertyType) toPropertyType.convert(cmp.getText()); + } - @Override - public void bindListener(TextArea cmp, ActionListener l) { - cmp.addActionListener(l); - } + @Override + public void bindListener(TextArea cmp, ActionListener l) { + cmp.addActionListener(l); + } - @Override - public void removeListener(TextArea cmp, ActionListener l) { - cmp.removeActionListener(l); - } + @Override + public void removeListener(TextArea cmp, ActionListener l) { + cmp.removeActionListener(l); } + } + /** + * Adapts a {@link com.codename1.ui.TextComponent} to binding + * + * @param the type of the property generic + */ + public static class TextComponentAdapter + extends ComponentAdapter { /** - * Adapts a {@link com.codename1.ui.TextComponent} to binding - * @param the type of the property generic + * Constructs a new binding + * + * @param toPropertyType the conversion logic to the property */ - public static class TextComponentAdapter extends ComponentAdapter { - /** - * Constructs a new binding - * @param toPropertyType the conversion logic to the property - */ - public TextComponentAdapter(ObjectConverter toPropertyType) { - super(toPropertyType, new StringConverter()); - } + public TextComponentAdapter(ObjectConverter toPropertyType) { + super(toPropertyType, new StringConverter()); + } - /** - * Constructs a new binding assuming a String property - */ - public TextComponentAdapter() { - super(new ObjectConverter(), new ObjectConverter()); - } + /** Constructs a new binding assuming a String property */ + public TextComponentAdapter() { + super(new ObjectConverter(), new ObjectConverter()); + } - @Override - public void assignTo(PropertyType value, TextComponent cmp) { - cmp.getField().setText((String)toComponentType.convert(value)); - } + @Override + public void assignTo(PropertyType value, TextComponent cmp) { + cmp.getField().setText((String) toComponentType.convert(value)); + } - @Override - public PropertyType getFrom(TextComponent cmp) { - return (PropertyType)toPropertyType.convert(cmp.getText()); - } + @Override + public PropertyType getFrom(TextComponent cmp) { + return (PropertyType) toPropertyType.convert(cmp.getText()); + } - @Override - public void bindListener(TextComponent cmp, ActionListener l) { - cmp.getField().addActionListener(l); - } + @Override + public void bindListener(TextComponent cmp, ActionListener l) { + cmp.getField().addActionListener(l); + } - @Override - public void removeListener(TextComponent cmp, ActionListener l) { - cmp.getField().removeActionListener(l); - } + @Override + public void removeListener(TextComponent cmp, ActionListener l) { + cmp.getField().removeActionListener(l); } - + } + + /** + * Adapts a {@link com.codename1.ui.CheckBox} or {@link com.codename1.ui.RadioButton} to binding + * + * @param the type of the property generic + */ + public static class CheckBoxRadioSelectionAdapter + extends ComponentAdapter { /** - * Adapts a {@link com.codename1.ui.CheckBox} or - * {@link com.codename1.ui.RadioButton} to binding - * @param the type of the property generic + * Constructs a new binding + * + * @param toPropertyType the conversion logic to the property */ - public static class CheckBoxRadioSelectionAdapter extends ComponentAdapter { - /** - * Constructs a new binding - * @param toPropertyType the conversion logic to the property - */ - public CheckBoxRadioSelectionAdapter(ObjectConverter toPropertyType) { - super(toPropertyType, new BooleanConverter()); - } + public CheckBoxRadioSelectionAdapter(ObjectConverter toPropertyType) { + super(toPropertyType, new BooleanConverter()); + } - @Override - public void assignTo(PropertyType value, Button cmp) { - if(cmp instanceof CheckBox) { - ((CheckBox)cmp).setSelected((Boolean)toComponentType.convert(value)); - } else { - ((RadioButton)cmp).setSelected((Boolean)toComponentType.convert(value)); - } - } + @Override + public void assignTo(PropertyType value, Button cmp) { + if (cmp instanceof CheckBox) { + ((CheckBox) cmp).setSelected((Boolean) toComponentType.convert(value)); + } else { + ((RadioButton) cmp).setSelected((Boolean) toComponentType.convert(value)); + } + } - @Override - public PropertyType getFrom(Button cmp) { - return (PropertyType)toPropertyType.convert(cmp.isSelected()); - } + @Override + public PropertyType getFrom(Button cmp) { + return (PropertyType) toPropertyType.convert(cmp.isSelected()); + } - @Override - public void bindListener(Button cmp, ActionListener l) { - cmp.addActionListener(l); - } + @Override + public void bindListener(Button cmp, ActionListener l) { + cmp.addActionListener(l); + } - @Override - public void removeListener(Button cmp, ActionListener l) { - cmp.removeActionListener(l); - } + @Override + public void removeListener(Button cmp, ActionListener l) { + cmp.removeActionListener(l); } + } + + /** + * Adapts a set of {@link com.codename1.ui.RadioButton} to a selection within a list of values + * + * @param the type of the property generic + */ + public static class RadioListAdapter + extends ComponentAdapter { + private final PropertyType[] values; /** - * Adapts a set of {@link com.codename1.ui.RadioButton} to a selection within a list of values - * @param the type of the property generic + * Constructs a new binding + * + * @param toPropertyType the conversion logic to the property + * @param values potential values for the selection */ - public static class RadioListAdapter extends ComponentAdapter { - private final PropertyType[] values; - - /** - * Constructs a new binding - * @param toPropertyType the conversion logic to the property - * @param values potential values for the selection - */ - public RadioListAdapter(ObjectConverter toPropertyType, PropertyType... values) { - super(toPropertyType, null); - this.values = values; - } + public RadioListAdapter(ObjectConverter toPropertyType, PropertyType... values) { + super(toPropertyType, null); + this.values = values; + } - @Override - public void assignTo(PropertyType value, RadioButton[] cmp) { - for(int iter = 0 ; iter < values.length ; iter++) { - if(values[iter].equals(value)) { - cmp[iter].setSelected(true); - return; - } - } - - } + @Override + public void assignTo(PropertyType value, RadioButton[] cmp) { + for (int iter = 0; iter < values.length; iter++) { + if (values[iter].equals(value)) { + cmp[iter].setSelected(true); + return; + } + } + } - @Override - public PropertyType getFrom(RadioButton[] cmp) { - for(int iter = 0 ; iter < values.length ; iter++) { - if(cmp[iter].isSelected()) { - return values[iter]; - } - } - return null; - } + @Override + public PropertyType getFrom(RadioButton[] cmp) { + for (int iter = 0; iter < values.length; iter++) { + if (cmp[iter].isSelected()) { + return values[iter]; + } + } + return null; + } - @Override - public void bindListener(RadioButton[] cmp, ActionListener l) { - for(RadioButton r : cmp) { - r.addActionListener(l); - } - } + @Override + public void bindListener(RadioButton[] cmp, ActionListener l) { + for (RadioButton r : cmp) { + r.addActionListener(l); + } + } - @Override - public void removeListener(RadioButton[] cmp, ActionListener l) { - for(RadioButton r : cmp) { - r.removeActionListener(l); - } - } + @Override + public void removeListener(RadioButton[] cmp, ActionListener l) { + for (RadioButton r : cmp) { + r.removeActionListener(l); + } } - - private static ObjectConverter pickerTypeToConverter(int type) { - switch(type) { - case Display.PICKER_TYPE_DATE: - case Display.PICKER_TYPE_DATE_AND_TIME: - return new DateConverter(); - case Display.PICKER_TYPE_TIME: - return new IntegerConverter(); - case Display.PICKER_TYPE_STRINGS: - return new StringConverter(); - } - throw new IllegalArgumentException("Unsupported picker type: " + type); + } + + private static ObjectConverter pickerTypeToConverter(int type) { + switch (type) { + case Display.PICKER_TYPE_DATE: + case Display.PICKER_TYPE_DATE_AND_TIME: + return new DateConverter(); + case Display.PICKER_TYPE_TIME: + return new IntegerConverter(); + case Display.PICKER_TYPE_STRINGS: + return new StringConverter(); } + throw new IllegalArgumentException("Unsupported picker type: " + type); + } + /** + * Adapts a {@link com.codename1.ui.spinner.Picker} to binding + * + * @param the type of the property generic + */ + public static class PickerAdapter extends ComponentAdapter { /** - * Adapts a {@link com.codename1.ui.spinner.Picker} to binding - * @param the type of the property generic + * Constructs a new binding + * + * @param toPropertyType the conversion logic to the property + * @param pickerType the type of the picker */ - public static class PickerAdapter extends ComponentAdapter { - /** - * Constructs a new binding - * @param toPropertyType the conversion logic to the property - * @param pickerType the type of the picker - */ - public PickerAdapter(ObjectConverter toPropertyType, int pickerType) { - super(toPropertyType, pickerTypeToConverter(pickerType)); - } + public PickerAdapter(ObjectConverter toPropertyType, int pickerType) { + super(toPropertyType, pickerTypeToConverter(pickerType)); + } - /** - * Constructs a new binding for mapping back and forth of a String Picker - * @param toPropertyType map to convert objects forth - * @param toComponentType map to convert objects back - */ - public PickerAdapter(MappingConverter toPropertyType, MappingConverter toComponentType) { - super(toPropertyType, toComponentType); - } - - @Override - public void assignTo(PropertyType value, Picker cmp) { - switch(cmp.getType()) { - case Display.PICKER_TYPE_DATE: - case Display.PICKER_TYPE_DATE_AND_TIME: - cmp.setDate((Date)toComponentType.convert(value)); - break; - case Display.PICKER_TYPE_TIME: - cmp.setTime((Integer)toComponentType.convert(value)); - break; - case Display.PICKER_TYPE_STRINGS: - if(value instanceof Integer) { - cmp.setSelectedStringIndex((Integer)toComponentType.convert(value)); - } else { - cmp.setSelectedString((String)toComponentType.convert(value)); - } - break; - } - } + /** + * Constructs a new binding for mapping back and forth of a String Picker + * + * @param toPropertyType map to convert objects forth + * @param toComponentType map to convert objects back + */ + public PickerAdapter(MappingConverter toPropertyType, MappingConverter toComponentType) { + super(toPropertyType, toComponentType); + } - @Override - public PropertyType getFrom(Picker cmp) { - switch(cmp.getType()) { - case Display.PICKER_TYPE_DATE: - case Display.PICKER_TYPE_DATE_AND_TIME: - return (PropertyType)toPropertyType.convert(cmp.getDate()); - case Display.PICKER_TYPE_TIME: - return (PropertyType)toPropertyType.convert(cmp.getTime()); - case Display.PICKER_TYPE_STRINGS: - if(toPropertyType instanceof IntegerConverter) { - return (PropertyType)new Integer(cmp.getSelectedStringIndex()); - } - return (PropertyType)toPropertyType.convert(cmp.getSelectedString()); - } - throw new RuntimeException("Illegal state for picker binding"); - } + @Override + public void assignTo(PropertyType value, Picker cmp) { + switch (cmp.getType()) { + case Display.PICKER_TYPE_DATE: + case Display.PICKER_TYPE_DATE_AND_TIME: + cmp.setDate((Date) toComponentType.convert(value)); + break; + case Display.PICKER_TYPE_TIME: + cmp.setTime((Integer) toComponentType.convert(value)); + break; + case Display.PICKER_TYPE_STRINGS: + if (value instanceof Integer) { + cmp.setSelectedStringIndex((Integer) toComponentType.convert(value)); + } else { + cmp.setSelectedString((String) toComponentType.convert(value)); + } + break; + } + } - @Override - public void bindListener(Picker cmp, ActionListener l) { - cmp.addActionListener(l); - } + @Override + public PropertyType getFrom(Picker cmp) { + switch (cmp.getType()) { + case Display.PICKER_TYPE_DATE: + case Display.PICKER_TYPE_DATE_AND_TIME: + return (PropertyType) toPropertyType.convert(cmp.getDate()); + case Display.PICKER_TYPE_TIME: + return (PropertyType) toPropertyType.convert(cmp.getTime()); + case Display.PICKER_TYPE_STRINGS: + if (toPropertyType instanceof IntegerConverter) { + return (PropertyType) new Integer(cmp.getSelectedStringIndex()); + } + return (PropertyType) toPropertyType.convert(cmp.getSelectedString()); + } + throw new RuntimeException("Illegal state for picker binding"); + } - @Override - public void removeListener(Picker cmp, ActionListener l) { - cmp.removeActionListener(l); - } + @Override + public void bindListener(Picker cmp, ActionListener l) { + cmp.addActionListener(l); } - - - private ObjectConverter getPropertyConverter(PropertyBase prop) { - Class gt = prop.getGenericType(); - if(gt == null || gt == String.class) { - return new StringConverter(); - } - if(gt == Integer.class) { - return new IntegerConverter(); - } - if(gt == Long.class) { - return new LongConverter(); - } - if(gt == Double.class) { - return new DoubleConverter(); - } - if(gt == Float.class) { - return new FloatConverter(); - } - if(gt == Boolean.class) { - return new BooleanConverter(); - } - if(gt == Date.class) { - return new DateConverter(); - } - throw new RuntimeException("Unsupported property converter: " + gt.getName()); + + @Override + public void removeListener(Picker cmp, ActionListener l) { + cmp.removeActionListener(l); } - - class GroupBinding extends Binding { - private List allBindings; - public GroupBinding(List allBindings) { - this.allBindings = allBindings; - } - - @Override - public void setAutoCommit(boolean b) { - super.setAutoCommit(b); - for(Binding bb : allBindings) { - bb.setAutoCommit(b); - } - } + } - @Override - public void commit() { - for(Binding bb : allBindings) { - bb.commit(); - } - } + private ObjectConverter getPropertyConverter(PropertyBase prop) { + Class gt = prop.getGenericType(); + if (gt == null || gt == String.class) { + return new StringConverter(); + } + if (gt == Integer.class) { + return new IntegerConverter(); + } + if (gt == Long.class) { + return new LongConverter(); + } + if (gt == Double.class) { + return new DoubleConverter(); + } + if (gt == Float.class) { + return new FloatConverter(); + } + if (gt == Boolean.class) { + return new BooleanConverter(); + } + if (gt == Date.class) { + return new DateConverter(); + } + throw new RuntimeException("Unsupported property converter: " + gt.getName()); + } - @Override - public void rollback() { - for(Binding bb : allBindings) { - bb.rollback(); - } - } + class GroupBinding extends Binding { + private List allBindings; - @Override - public void disconnect() { - for(Binding bb : allBindings) { - bb.disconnect(); - } - } + public GroupBinding(List allBindings) { + this.allBindings = allBindings; + } + + @Override + public void setAutoCommit(boolean b) { + super.setAutoCommit(b); + for (Binding bb : allBindings) { + bb.setAutoCommit(b); + } + } + + @Override + public void commit() { + for (Binding bb : allBindings) { + bb.commit(); + } + } + + @Override + public void rollback() { + for (Binding bb : allBindings) { + bb.rollback(); + } + } + + @Override + public void disconnect() { + for (Binding bb : allBindings) { + bb.disconnect(); + } + } + } + + GroupBinding createGroupBinding(List allBindings) { + return new GroupBinding(allBindings); + } + + /** + * Binds a hierarchy of Components to a business object by searching the tree and collecting the + * bindings. Components are associated with properties based on their name attribute + * + * @param obj the business object with the properties to bind + * @param cnt a container that will be recursed for binding + * @return a Binding object that manipulates all of the individual bindings at once + */ + public Binding bind(final PropertyBusinessObject obj, final Container cnt) { + ArrayList allBindings = new ArrayList(); + bind(obj, cnt, allBindings); + + return new GroupBinding(allBindings); + } + + private void bind( + final PropertyBusinessObject obj, final Container cnt, ArrayList allBindings) { + for (Component cmp : cnt) { + if (cmp instanceof Container && ((Container) cmp).getLeadComponent() == null) { + bind(obj, ((Container) cmp), allBindings); + continue; + } + String n = cmp.getName(); + if (n != null) { + PropertyBase b = obj.getPropertyIndex().get(n); + if (b != null) { + allBindings.add(bind(b, cmp)); + } + } + } + } + + /** + * Binds the given property to the selected value from the set based on the multiple components. + * This is useful for binding multiple radio buttons to a single property value based on selection + * + * @param prop the property + * @param values the values that can be used + * @param cmps the components + * @return a binding object that allows us to toggle auto commit mode, commit/rollback and unbind + */ + public Binding bindGroup( + final PropertyBase prop, final Object[] values, final Component... cmps) { + ObjectConverter cnv = getPropertyConverter(prop); + if (cmps[0] instanceof RadioButton) { + RadioButton[] rb = new RadioButton[cmps.length]; + System.arraycopy(cmps, 0, rb, 0, cmps.length); + return bindImpl(prop, rb, new RadioListAdapter(cnv, values)); + } + throw new RuntimeException("Unsupported binding type: " + cmps[0].getClass().getName()); + } + + /** + * Binds the given property to the component using default adapters + * + * @param prop the property + * @param cmp the component + * @return a binding object that allows us to toggle auto commit mode, commit/rollback and unbind + */ + public Binding bind(final PropertyBase prop, final Component cmp) { + ObjectConverter cnv = getPropertyConverter(prop); + if (cmp instanceof TextArea) { + return bind(prop, cmp, new TextAreaAdapter(cnv)); + } + if (cmp instanceof TextComponent) { + return bind(prop, cmp, new TextComponentAdapter(cnv)); + } + if (cmp instanceof CheckBox) { + return bind(prop, cmp, new CheckBoxRadioSelectionAdapter(cnv)); + } + if (cmp instanceof RadioButton) { + return bind(prop, cmp, new CheckBoxRadioSelectionAdapter(cnv)); } - - GroupBinding createGroupBinding(List allBindings) { - return new GroupBinding(allBindings); + if (cmp instanceof Picker) { + return bind(prop, cmp, new PickerAdapter(cnv, ((Picker) cmp).getType())); } - + throw new RuntimeException("Unsupported binding type: " + cmp.getClass().getName()); + } + + /** + * Binds the given property to the component using a custom adapter class + * + * @param prop the property + * @param cmp the component + * @param adapt an implementation of {@link com.codename1.properties.UiBinding.ComponentAdapter} + * that allows us to define the way the component maps to/from the property + * @return a binding object that allows us to toggle auto commit mode, commit/rollback and unbind + */ + public Binding bind(final PropertyBase prop, final Component cmp, final ComponentAdapter adapt) { + return bindImpl(prop, cmp, adapt); + } + + /** + * Implements table model binding, this is implemented as a class to allow additional features + * such as adding/removing rows + */ + public static class BoundTableModel extends AbstractTableModel { + private List objects; + private CollectionProperty objectProperty; + private PropertyBusinessObject prototype; + private Set exclude = new HashSet(); + private List included; + private PropertyBase[] columnOrder; + private Set uneditable = new HashSet(); + private EventDispatcher listeners = new EventDispatcher(); + /** - * Binds a hierarchy of Components to a business object by searching the tree and collecting - * the bindings. Components are associated with properties based on their name attribute - * @param obj the business object with the properties to bind - * @param cnt a container that will be recursed for binding - * @return a Binding object that manipulates all of the individual bindings at once + * Creates a table model with the business objects + * + * @param objects the objects of the model + * @param prototype the type by which we determine the structure of the table */ - public Binding bind(final PropertyBusinessObject obj, final Container cnt) { - ArrayList allBindings = new ArrayList(); - bind(obj, cnt, allBindings); - - return new GroupBinding(allBindings); - } - - private void bind(final PropertyBusinessObject obj, final Container cnt, ArrayList allBindings) { - for(Component cmp : cnt) { - if(cmp instanceof Container && ((Container)cmp).getLeadComponent() == null) { - bind(obj, ((Container)cmp), allBindings); - continue; - } - String n = cmp.getName(); - if(n != null) { - PropertyBase b = obj.getPropertyIndex().get(n); - if(b != null) { - allBindings.add(bind(b, cmp)); - } - } - } + public BoundTableModel( + List objects, PropertyBusinessObject prototype) { + this.objects = objects; + this.prototype = prototype; } /** - * Binds the given property to the selected value from the set based on the multiple components. - * This is useful for binding multiple radio buttons to a single property value based on selection - * @param prop the property - * @param values the values that can be used - * @param cmps the components - * @return a binding object that allows us to toggle auto commit mode, commit/rollback and unbind + * Creates a table model with the business objects + * + * @param objectProperty the objects of the model + * @param prototype the type by which we determine the structure of the table */ - public Binding bindGroup(final PropertyBase prop, final Object[] values, final Component... cmps) { - ObjectConverter cnv = getPropertyConverter(prop); - if(cmps[0] instanceof RadioButton) { - RadioButton[] rb = new RadioButton[cmps.length]; - System.arraycopy(cmps, 0, rb, 0, cmps.length); - return bindImpl(prop, rb, new RadioListAdapter(cnv, values)); - } - throw new RuntimeException("Unsupported binding type: " + cmps[0].getClass().getName()); + public BoundTableModel(CollectionProperty objectProperty, PropertyBusinessObject prototype) { + this.objectProperty = objectProperty; + this.prototype = prototype; } - /** - * Binds the given property to the component using default adapters - * @param prop the property - * @param cmp the component - * @return a binding object that allows us to toggle auto commit mode, commit/rollback and unbind + * The properties that are ignored + * + * @param b the property to ignore */ - public Binding bind(final PropertyBase prop, final Component cmp) { - ObjectConverter cnv = getPropertyConverter(prop); - if(cmp instanceof TextArea) { - return bind(prop, cmp, new TextAreaAdapter(cnv)); - } - if(cmp instanceof TextComponent) { - return bind(prop, cmp, new TextComponentAdapter(cnv)); - } - if(cmp instanceof CheckBox) { - return bind(prop, cmp, new CheckBoxRadioSelectionAdapter(cnv)); - } - if(cmp instanceof RadioButton) { - return bind(prop, cmp, new CheckBoxRadioSelectionAdapter(cnv)); - } - if(cmp instanceof Picker) { - return bind(prop, cmp, new PickerAdapter(cnv, ((Picker)cmp).getType())); - } - throw new RuntimeException("Unsupported binding type: " + cmp.getClass().getName()); + public void excludeProperty(PropertyBase b) { + exclude.add(b.getName()); + if (included == null) { + included = new ArrayList(); + for (PropertyBase pb : prototype.getPropertyIndex()) { + included.add(pb.getName()); + } + } + included.remove(b.getName()); } - + /** - * Binds the given property to the component using a custom adapter class - * @param prop the property - * @param cmp the component - * @param adapt an implementation of {@link com.codename1.properties.UiBinding.ComponentAdapter} - * that allows us to define the way the component maps to/from the property - * @return a binding object that allows us to toggle auto commit mode, commit/rollback and unbind + * Sets the order of the columns explicitly + * + * @param columnOrder the order of the columns based on the prototype */ - public Binding bind(final PropertyBase prop, final Component cmp, final ComponentAdapter adapt) { - return bindImpl(prop, cmp, adapt); - } - - + public void setColumnOrder(PropertyBase... columnOrder) { + this.columnOrder = columnOrder; + } + /** - * Implements table model binding, this is implemented as a class to allow - * additional features such as adding/removing rows + * Makes the property editable or uneditable + * + * @param pb the property base + * @param editable true for editable (the default) */ - public static class BoundTableModel extends AbstractTableModel { - private List objects; - private CollectionProperty objectProperty; - private PropertyBusinessObject prototype; - private Set exclude = new HashSet(); - private List included; - private PropertyBase[] columnOrder; - private Set uneditable = new HashSet(); - private EventDispatcher listeners = new EventDispatcher(); - - /** - * Creates a table model with the business objects - * @param objects the objects of the model - * @param prototype the type by which we determine the structure of the table - */ - public BoundTableModel(List objects, - PropertyBusinessObject prototype) { - this.objects = objects; - this.prototype = prototype; - } + public void setEditable(PropertyBase pb, boolean editable) { + if (editable) { + uneditable.remove(pb.getName()); + } else { + uneditable.add(pb.getName()); + } + } - /** - * Creates a table model with the business objects - * @param objectProperty the objects of the model - * @param prototype the type by which we determine the structure of the table - */ - public BoundTableModel(CollectionProperty objectProperty, - PropertyBusinessObject prototype) { - this.objectProperty = objectProperty; - this.prototype = prototype; - } - - /** - * The properties that are ignored - * @param b the property to ignore - */ - public void excludeProperty(PropertyBase b) { - exclude.add(b.getName()); - if(included == null) { - included = new ArrayList(); - for(PropertyBase pb : prototype.getPropertyIndex()) { - included.add(pb.getName()); - } - } - included.remove(b.getName()); - } - - /** - * Sets the order of the columns explicitly - * @param columnOrder the order of the columns based on the prototype - */ - public void setColumnOrder(PropertyBase... columnOrder) { - this.columnOrder = columnOrder; - } - - /** - * Makes the property editable or uneditable - * @param pb the property base - * @param editable true for editable (the default) - */ - public void setEditable(PropertyBase pb, boolean editable) { - if(editable) { - uneditable.remove(pb.getName()); - } else { - uneditable.add(pb.getName()); - } - } - - /** - * {@inheritDoc} - */ - @Override - public int getRowCount() { - if(objects != null) { - return objects.size(); - } - return objectProperty.size(); - } + /** {@inheritDoc} */ + @Override + public int getRowCount() { + if (objects != null) { + return objects.size(); + } + return objectProperty.size(); + } - /** - * Adds a new business object to the table - * @param index the index of the addition - * @param b the business object - */ - public void addRow(int index, PropertyBusinessObject b) { - if(objects != null) { - ((List)objects).add(index, b); - } else { - if(objectProperty instanceof ListProperty) { - ((ListProperty)objectProperty).add(index, b); - } else { - objectProperty.add(b); - } - } - for(int col = 0 ; col < getColumnCount() ; col++) { - listeners.fireDataChangeEvent(col, index); - } - } - - /** - * Removes the row at the given index - * @param index the position in the table - */ - public void removeRow(int index) { - if(objects != null) { - objects.remove(index); - } else { - if(objectProperty instanceof ListProperty) { - ((ListProperty)objectProperty).remove(index); - } else { - Iterator i = objectProperty.iterator(); - for(int iter = 0 ; iter < index - 1 ; iter++) { - i.next(); - } - i.remove(); - } - } - listeners.fireDataChangeEvent(Integer.MIN_VALUE, Integer.MIN_VALUE); - } - - /** - * {@inheritDoc} - */ - @Override - public int getColumnCount() { - if(columnOrder != null) { - return columnOrder.length; - } - return prototype.getPropertyIndex().getSize() - exclude.size(); - } - - private PropertyBase getProperty(int index) { - if(included != null) { - return prototype.getPropertyIndex().get(included.get(index)); - } - return prototype.getPropertyIndex().get(index); - } - - @Override - public String getColumnName(int i) { - if(columnOrder != null) { - return columnOrder[i].getLabel(); - } - return getProperty(i).getLabel(); - } + /** + * Adds a new business object to the table + * + * @param index the index of the addition + * @param b the business object + */ + public void addRow(int index, PropertyBusinessObject b) { + if (objects != null) { + ((List) objects).add(index, b); + } else { + if (objectProperty instanceof ListProperty) { + ((ListProperty) objectProperty).add(index, b); + } else { + objectProperty.add(b); + } + } + for (int col = 0; col < getColumnCount(); col++) { + listeners.fireDataChangeEvent(col, index); + } + } - @Override - public boolean isCellEditable(int row, int column) { - if(columnOrder != null && columnOrder.length > 0) { - return !uneditable.contains(columnOrder[column].getName()); - } - return !uneditable.contains(getProperty(column).getName()); - } - - private PropertyBusinessObject getRow(int row) { - if(objects != null) { - return objects.get(row); - } else { - if(objectProperty instanceof ListProperty) { - return (PropertyBusinessObject)((ListProperty)objectProperty).get(row); - } else { - Iterator i = objectProperty.iterator(); - for(int iter = 0 ; iter < row - 1 ; iter++) { - i.next(); - } - return (PropertyBusinessObject)i.next(); - } - } - } + /** + * Removes the row at the given index + * + * @param index the position in the table + */ + public void removeRow(int index) { + if (objects != null) { + objects.remove(index); + } else { + if (objectProperty instanceof ListProperty) { + ((ListProperty) objectProperty).remove(index); + } else { + Iterator i = objectProperty.iterator(); + for (int iter = 0; iter < index - 1; iter++) { + i.next(); + } + i.remove(); + } + } + listeners.fireDataChangeEvent(Integer.MIN_VALUE, Integer.MIN_VALUE); + } - @Override - public Object getValueAt(int row, int column) { - PropertyBusinessObject pb = getRow(row); - String n; - if(columnOrder != null) { - n = columnOrder[column].getName(); - } else { - n = getProperty(column).getName(); - } - return pb.getPropertyIndex().get(n).get(); - } + /** {@inheritDoc} */ + @Override + public int getColumnCount() { + if (columnOrder != null) { + return columnOrder.length; + } + return prototype.getPropertyIndex().getSize() - exclude.size(); + } - @Override - public Class getCellType(int row, int column) { - PropertyBusinessObject pb = getRow(row); - String n; - if(columnOrder != null) { - n = columnOrder[column].getName(); - } else { - n = getProperty(column).getName(); - } - return pb.getPropertyIndex().get(n).getGenericType(); - } + private PropertyBase getProperty(int index) { + if (included != null) { + return prototype.getPropertyIndex().get(included.get(index)); + } + return prototype.getPropertyIndex().get(index); + } - private PropertyBase getPropertyAt(int row, int column) { - PropertyBusinessObject pb = getRow(row); - String n; - if(columnOrder != null) { - n = columnOrder[column].getName(); - } else { - n = getProperty(column).getName(); - } - return pb.getPropertyIndex().get(n); - } + @Override + public String getColumnName(int i) { + if (columnOrder != null) { + return columnOrder[i].getLabel(); + } + return getProperty(i).getLabel(); + } - /** - * {@inheritDoc} - */ - @Override - public String[] getMultipleChoiceOptions(int row, int column) { - return (String[])getPropertyAt(row, column). - getClientProperty("multipleChoiceOptions"); - } - - /** - * Sets the multiple choice option for a string entry, this is useful - * if a string property can have one of several values. It will be - * rendered as a picker in the table - * - * @param prop the property - * @param values the supported values - */ - public void setMultipleChoiceOptions(PropertyBase prop, String... values) { - prop.putClientProperty("multipleChoiceOptions", values); - } + @Override + public boolean isCellEditable(int row, int column) { + if (columnOrder != null && columnOrder.length > 0) { + return !uneditable.contains(columnOrder[column].getName()); + } + return !uneditable.contains(getProperty(column).getName()); + } - /** - * {@inheritDoc} - */ - @Override - public Constraint getValidationConstraint(int row, int column) { - return (Constraint)getPropertyAt(row, column). - getClientProperty("validationConstraint"); - } - - /** - * Sets a validator constraint on the table - * - * @param prop the property matching the constraint - * @param c the constraint value - */ - public void setValidationConstraint(PropertyBase prop, Constraint c) { - prop.putClientProperty("validationConstraint", c); - } - - @Override - public void setValueAt(int row, int column, Object o) { - PropertyBusinessObject pb = getRow(row); - String n; - if(columnOrder != null) { - n = columnOrder[column].getName(); - } else { - n = getProperty(column).getName(); - } - pb.getPropertyIndex().get(n).setImpl(o); - listeners.fireDataChangeEvent(column, row); - } + private PropertyBusinessObject getRow(int row) { + if (objects != null) { + return objects.get(row); + } else { + if (objectProperty instanceof ListProperty) { + return (PropertyBusinessObject) ((ListProperty) objectProperty).get(row); + } else { + Iterator i = objectProperty.iterator(); + for (int iter = 0; iter < row - 1; iter++) { + i.next(); + } + return (PropertyBusinessObject) i.next(); + } + } + } - @Override - public void addDataChangeListener(DataChangedListener d) { - listeners.addListener(d); - } + @Override + public Object getValueAt(int row, int column) { + PropertyBusinessObject pb = getRow(row); + String n; + if (columnOrder != null) { + n = columnOrder[column].getName(); + } else { + n = getProperty(column).getName(); + } + return pb.getPropertyIndex().get(n).get(); + } - @Override - public void removeDataChangeListener(DataChangedListener d) { - listeners.removeListener(d); - } + @Override + public Class getCellType(int row, int column) { + PropertyBusinessObject pb = getRow(row); + String n; + if (columnOrder != null) { + n = columnOrder[column].getName(); + } else { + n = getProperty(column).getName(); + } + return pb.getPropertyIndex().get(n).getGenericType(); } - - /** - * Creates a table model which is implicitly bound to the properties - * @param objects list of business objects - * @param prototype the type by which we determine the structure of the table - * @return a bound table model that can be used in the {@code Table} class - */ - public BoundTableModel createTableModel(List objects, - PropertyBusinessObject prototype) { - return new BoundTableModel(objects, prototype); + + private PropertyBase getPropertyAt(int row, int column) { + PropertyBusinessObject pb = getRow(row); + String n; + if (columnOrder != null) { + n = columnOrder[column].getName(); + } else { + n = getProperty(column).getName(); + } + return pb.getPropertyIndex().get(n); } - /** - * Creates a table model which is implicitly bound to the properties - * @param objects list of business objects - * @param prototype the type by which we determine the structure of the table - * @return a bound table model that can be used in the {@code Table} class - */ - public BoundTableModel createTableModel(CollectionProperty objects, - PropertyBusinessObject prototype) { - return new BoundTableModel(objects, prototype); + /** {@inheritDoc} */ + @Override + public String[] getMultipleChoiceOptions(int row, int column) { + return (String[]) getPropertyAt(row, column).getClientProperty("multipleChoiceOptions"); } - - private Binding bindImpl(final PropertyBase prop, final Object cmp, final ComponentAdapter adapt) { - adapt.assignTo(prop.get(), cmp); - - class BindingImpl extends Binding implements PropertyChangeListener, ActionListener { - private boolean lock; - - public void actionPerformed(ActionEvent evt) { - if(isAutoCommit()) { - if(lock) { - return; - } - lock = true; - ((Property)prop).set(adapt.getFrom(cmp)); - lock = false; - } - } - - public void propertyChanged(PropertyBase p) { - if(isAutoCommit()) { - if(lock) { - return; - } - lock = true; - adapt.assignTo(prop.get(), cmp); - lock = false; - } - } - - @Override - public void commit() { - if(isAutoCommit()) { - throw new RuntimeException("Can't commit in autocommit mode"); - } - ((Property)prop).set(adapt.getFrom(cmp)); - } - - @Override - public void rollback() { - if(isAutoCommit()) { - throw new RuntimeException("Can't rollback in autocommit mode"); - } - adapt.assignTo(prop.get(), cmp); - } - - @Override - public void disconnect() { - adapt.removeListener(cmp, this); - prop.removeChangeListener(this); - } - } - BindingImpl b = new BindingImpl(); - adapt.bindListener(cmp, b); - prop.addChangeListener(b); - return b; - } - + /** - * Changes to the text area are automatically reflected to the given property and visa versa - * @param prop the property value - * @param ta the text area - * @deprecated this code was experimental we will use the more generic Adapter/bind framework + * Sets the multiple choice option for a string entry, this is useful if a string property can + * have one of several values. It will be rendered as a picker in the table + * + * @param prop the property + * @param values the supported values */ - public void bindString(Property prop, TextArea ta) { - bind(prop, ta); + public void setMultipleChoiceOptions(PropertyBase prop, String... values) { + prop.putClientProperty("multipleChoiceOptions", values); + } + + /** {@inheritDoc} */ + @Override + public Constraint getValidationConstraint(int row, int column) { + return (Constraint) getPropertyAt(row, column).getClientProperty("validationConstraint"); } /** - * Changes to the text area are automatically reflected to the given property and visa versa - * @param prop the property value - * @param ta the text area - * @deprecated this code was experimental we will use the more generic Adapter/bind framework + * Sets a validator constraint on the table + * + * @param prop the property matching the constraint + * @param c the constraint value */ - public void bindInteger(Property prop, TextArea ta) { - bind(prop, ta); + public void setValidationConstraint(PropertyBase prop, Constraint c) { + prop.putClientProperty("validationConstraint", c); + } + + @Override + public void setValueAt(int row, int column, Object o) { + PropertyBusinessObject pb = getRow(row); + String n; + if (columnOrder != null) { + n = columnOrder[column].getName(); + } else { + n = getProperty(column).getName(); + } + pb.getPropertyIndex().get(n).setImpl(o); + listeners.fireDataChangeEvent(column, row); + } + + @Override + public void addDataChangeListener(DataChangedListener d) { + listeners.addListener(d); + } + + @Override + public void removeDataChangeListener(DataChangedListener d) { + listeners.removeListener(d); } + } + + /** + * Creates a table model which is implicitly bound to the properties + * + * @param objects list of business objects + * @param prototype the type by which we determine the structure of the table + * @return a bound table model that can be used in the {@code Table} class + */ + public BoundTableModel createTableModel( + List objects, PropertyBusinessObject prototype) { + return new BoundTableModel(objects, prototype); + } + + /** + * Creates a table model which is implicitly bound to the properties + * + * @param objects list of business objects + * @param prototype the type by which we determine the structure of the table + * @return a bound table model that can be used in the {@code Table} class + */ + public BoundTableModel createTableModel( + CollectionProperty objects, + PropertyBusinessObject prototype) { + return new BoundTableModel(objects, prototype); + } + + private Binding bindImpl( + final PropertyBase prop, final Object cmp, final ComponentAdapter adapt) { + adapt.assignTo(prop.get(), cmp); + + class BindingImpl extends Binding + implements PropertyChangeListener, ActionListener { + private boolean lock; + + public void actionPerformed(ActionEvent evt) { + if (isAutoCommit()) { + if (lock) { + return; + } + lock = true; + ((Property) prop).set(adapt.getFrom(cmp)); + lock = false; + } + } + + public void propertyChanged(PropertyBase p) { + if (isAutoCommit()) { + if (lock) { + return; + } + lock = true; + adapt.assignTo(prop.get(), cmp); + lock = false; + } + } + + @Override + public void commit() { + if (isAutoCommit()) { + throw new RuntimeException("Can't commit in autocommit mode"); + } + ((Property) prop).set(adapt.getFrom(cmp)); + } + + @Override + public void rollback() { + if (isAutoCommit()) { + throw new RuntimeException("Can't rollback in autocommit mode"); + } + adapt.assignTo(prop.get(), cmp); + } + + @Override + public void disconnect() { + adapt.removeListener(cmp, this); + prop.removeChangeListener(this); + } + } + BindingImpl b = new BindingImpl(); + adapt.bindListener(cmp, b); + prop.addChangeListener(b); + return b; + } + + /** + * Changes to the text area are automatically reflected to the given property and visa versa + * + * @param prop the property value + * @param ta the text area + * @deprecated this code was experimental we will use the more generic Adapter/bind framework + */ + public void bindString(Property prop, TextArea ta) { + bind(prop, ta); + } + + /** + * Changes to the text area are automatically reflected to the given property and visa versa + * + * @param prop the property value + * @param ta the text area + * @deprecated this code was experimental we will use the more generic Adapter/bind framework + */ + public void bindInteger(Property prop, TextArea ta) { + bind(prop, ta); + } } diff --git a/maven/core-unittests/pom.xml b/maven/core-unittests/pom.xml index b57143f67f..d0ee986655 100644 --- a/maven/core-unittests/pom.xml +++ b/maven/core-unittests/pom.xml @@ -121,6 +121,21 @@ + + com.diffplug.spotless + spotless-maven-plugin + 2.43.0 + + + + ${project.basedir}/../../CodenameOne/src/**/*.java + + + 1.17.0 + + + +