This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git commit a4c11c0003a498cf4c07d63854fe6df5ef3b0a17 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 30 15:53:49 2014 +0100 refs #3074 rename NumberEditor --- .../component/jaxx/editor/NumberEditorDemo.jaxx | 18 ++++++------ ...{NumberEditor2Demo.css => NumberEditorDemo.css} | 2 +- ...umberEditor2Demo.jaxx => NumberEditorDemo.jaxx} | 10 +++---- ...moHandler.java => NumberEditorDemoHandler.java} | 8 ++--- ...r2DemoModel.java => NumberEditorDemoModel.java} | 2 +- .../main/java/jaxx/demo/tree/DemoDataProvider.java | 18 +++++------- ...umberCellEditor2.java => NumberCellEditor.java} | 14 ++++----- .../number/{NumberEditor2.css => NumberEditor.css} | 0 .../{NumberEditor2.jaxx => NumberEditor.jaxx} | 2 +- ...rEditor2Config.java => NumberEditorConfig.java} | 2 +- ...ditor2Handler.java => NumberEditorHandler.java} | 34 +++++++++++----------- ...berEditor2Model.java => NumberEditorModel.java} | 14 ++++----- 12 files changed, 61 insertions(+), 63 deletions(-) diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx index 594b78ae..af20e9f 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx @@ -83,15 +83,15 @@ void $afterCompleteSetup() { </row> <row> <cell> - <NumberEditor id='editor' - constructorParams='this' - bean='{demoModel}' - property='{useFloat.isSelected() ? "floatProperty" : "integerProperty"}' - useFloat='{useFloat.isSelected()}' - useSign='{useSign.isSelected()}' - autoPopup='{autoPopup.isSelected()}' - showPopupButton='{showPopupButton.isSelected()}' - showReset='{showResetButton.isSelected()}'/> + <jaxx.runtime.swing.editor.NumberEditor id='editor' + constructorParams='this' + bean='{demoModel}' + property='{useFloat.isSelected() ? "floatProperty" : "integerProperty"}' + useFloat='{useFloat.isSelected()}' + useSign='{useSign.isSelected()}' + autoPopup='{autoPopup.isSelected()}' + showPopupButton='{showPopupButton.isSelected()}' + showReset='{showResetButton.isSelected()}'/> </cell> </row> <row> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditor2Demo.css b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemo.css similarity index 99% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditor2Demo.css rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemo.css index 281503f..ee037a7 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditor2Demo.css +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemo.css @@ -20,7 +20,7 @@ * #L% */ -NumberEditor2 { +NumberEditor { bean: {model}; autoPopup:{autoPopupButton.isSelected()}; showPopupButton:{showPopupButton.isSelected()}; diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditor2Demo.jaxx b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemo.jaxx similarity index 86% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditor2Demo.jaxx rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemo.jaxx index 66f9cd9..0ec83fb 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditor2Demo.jaxx +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemo.jaxx @@ -23,12 +23,12 @@ <jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> - org.nuiton.jaxx.widgets.number.NumberEditor2 + org.nuiton.jaxx.widgets.number.NumberEditor static org.nuiton.i18n.I18n.t </import> - <NumberEditor2DemoModel id='model' initializer="getContextValue(NumberEditor2DemoModel.class)"/> + <jaxx.demo.component.jaxx.widgets.number.NumberEditorDemoModel id='model' initializer="getContextValue(NumberEditorDemoModel.class)"/> <Table insets='0' fill='both' weightx='1' constraints='BorderLayout.NORTH'> <!-- config --> @@ -90,9 +90,9 @@ <row> <cell> <JPanel layout="{new GridLayout()}"> - <NumberEditor2 id='integerEditor' constructorParams='this'/> - <NumberEditor2 id='floatEditor' constructorParams='this'/> - <NumberEditor2 id='doubleEditor' constructorParams='this'/> + <org.nuiton.jaxx.widgets.number.NumberEditor id='integerEditor' constructorParams='this'/> + <org.nuiton.jaxx.widgets.number.NumberEditor id='floatEditor' constructorParams='this'/> + <org.nuiton.jaxx.widgets.number.NumberEditor id='doubleEditor' constructorParams='this'/> </JPanel> </cell> </row> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditor2DemoHandler.java b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemoHandler.java similarity index 83% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditor2DemoHandler.java rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemoHandler.java index f58441b..c053d2d 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditor2DemoHandler.java +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemoHandler.java @@ -30,12 +30,12 @@ import jaxx.runtime.spi.UIHandler; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class NumberEditor2DemoHandler implements UIHandler<NumberEditor2Demo> { +public class NumberEditorDemoHandler implements UIHandler<NumberEditorDemo> { @Override - public void beforeInit(NumberEditor2Demo ui) { + public void beforeInit(NumberEditorDemo ui) { - NumberEditor2DemoModel model = new NumberEditor2DemoModel(); + NumberEditorDemoModel model = new NumberEditorDemoModel(); model.setIntegerNumber(10); model.setFloatNumber(-10.10f); model.setDoubleNumber(-0.0001d); @@ -45,7 +45,7 @@ public class NumberEditor2DemoHandler implements UIHandler<NumberEditor2Demo> { } @Override - public void afterInit(NumberEditor2Demo ui) { + public void afterInit(NumberEditorDemo ui) { ui.integerEditor.init(); ui.floatEditor.init(); diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditor2DemoModel.java b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemoModel.java similarity index 96% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditor2DemoModel.java rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemoModel.java index fe794cf..b1c80c0 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditor2DemoModel.java +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemoModel.java @@ -30,7 +30,7 @@ import org.jdesktop.beans.AbstractSerializableBean; * @author Tony Chemit - chemit@codelutin.com * @since 2.17 */ -public class NumberEditor2DemoModel extends AbstractSerializableBean { +public class NumberEditorDemoModel extends AbstractSerializableBean { private static final long serialVersionUID = 1L; diff --git a/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java b/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java index f28609c..7f5e635 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java +++ b/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java @@ -30,16 +30,15 @@ import jaxx.demo.component.jaxx.editor.BeanFilterableComboBoxDemo; import jaxx.demo.component.jaxx.editor.ComboEditorDemo; import jaxx.demo.component.jaxx.editor.DatePickerDemo; import jaxx.demo.component.jaxx.editor.FileEditorDemo; -import jaxx.demo.component.jaxx.widgets.select.FilterableDoubleListDemo; import jaxx.demo.component.jaxx.editor.I18nEditorDemo; import jaxx.demo.component.jaxx.editor.ListSelectorDemo; -import jaxx.demo.component.jaxx.widgets.number.NumberEditor2Demo; -import jaxx.demo.component.jaxx.editor.NumberEditorDemo; import jaxx.demo.component.jaxx.editor.SimpleTimeEditorDemo; -import jaxx.demo.component.jaxx.editor.TimeEditorDemo; -import jaxx.demo.component.jaxx.widgets.datetime.DateTimeEditorDemo; import jaxx.demo.component.jaxx.editor.gis.CoordinateDemo; +import jaxx.demo.component.jaxx.widgets.datetime.DateTimeEditorDemo; +import jaxx.demo.component.jaxx.widgets.datetime.TimeEditorDemo; import jaxx.demo.component.jaxx.widgets.gis.CoordinatesEditorDemo; +import jaxx.demo.component.jaxx.widgets.number.NumberEditorDemo; +import jaxx.demo.component.jaxx.widgets.select.FilterableDoubleListDemo; import jaxx.demo.component.swing.HidorButtonDemo; import jaxx.demo.component.swing.JButtonDemo; import jaxx.demo.component.swing.JCheckBoxDemo; @@ -167,7 +166,7 @@ public class DemoDataProvider implements NavDataProvider { ); addMapping(n("jaxxdemo.component.jaxx.widgets.number"), - NumberEditor2Demo.class + NumberEditorDemo.class ); addMapping(n("jaxxdemo.component.jaxx.widgets.select"), @@ -180,14 +179,13 @@ public class DemoDataProvider implements NavDataProvider { addMapping(n("jaxxdemo.component.jaxx.widgets.datetime"), DateTimeEditorDemo.class, - jaxx.demo.component.jaxx.widgets.datetime.TimeEditorDemo.class + TimeEditorDemo.class ); addMapping(n("jaxxdemo.component.jaxx.editor"), - TimeEditorDemo.class, + jaxx.demo.component.jaxx.editor.TimeEditorDemo.class, SimpleTimeEditorDemo.class, - NumberEditor2Demo.class, - NumberEditorDemo.class, + jaxx.demo.component.jaxx.editor.NumberEditorDemo.class, ComboEditorDemo.class, I18nEditorDemo.class, DatePickerDemo.class, diff --git a/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberCellEditor2.java b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberCellEditor.java similarity index 90% rename from jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberCellEditor2.java rename to jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberCellEditor.java index 7a370cd..1fefe0c 100644 --- a/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberCellEditor2.java +++ b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberCellEditor.java @@ -39,16 +39,16 @@ import java.awt.event.FocusListener; * @author Tony Chemit - chemit@codelutin.com * @since 2.17 */ -public class NumberCellEditor2<E extends Number> extends AbstractCellEditor +public class NumberCellEditor<E extends Number> extends AbstractCellEditor implements TableCellEditor, FocusListener, AncestorListener { private static final long serialVersionUID = 1L; - protected final NumberEditor2 numberEditor; + protected final NumberEditor numberEditor; /** constructor */ - public NumberCellEditor2(Class<E> type, boolean useSign) { - numberEditor = new NumberEditor2(); + public NumberCellEditor(Class<E> type, boolean useSign) { + numberEditor = new NumberEditor(); numberEditor.getTextField().setHorizontalAlignment(SwingConstants.RIGHT); numberEditor.getTextField().setBorder(null); numberEditor.getTextField().addFocusListener(this); @@ -73,13 +73,13 @@ public class NumberCellEditor2<E extends Number> extends AbstractCellEditor return numberEditor; } - public NumberEditor2 getNumberEditor() { + public NumberEditor getNumberEditor() { return numberEditor; } @Override public E getCellEditorValue() { - NumberEditor2Model model = numberEditor.getModel(); + NumberEditorModel model = numberEditor.getModel(); return (E) model.getNumberValue(); } @@ -127,7 +127,7 @@ public class NumberCellEditor2<E extends Number> extends AbstractCellEditor // numberEditor.setModelText(""); // force binding, I do not know why the textfield text is not emptied // if we do not force it - numberEditor.applyDataBinding(NumberEditor2.BINDING_TEXT_FIELD_TEXT); + numberEditor.applyDataBinding(NumberEditor.BINDING_TEXT_FIELD_TEXT); } return result; } diff --git a/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2.css b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor.css similarity index 100% rename from jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2.css rename to jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor.css diff --git a/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2.jaxx b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor.jaxx similarity index 98% rename from jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2.jaxx rename to jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor.jaxx index a8f3bc6..1e60114 100644 --- a/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2.jaxx +++ b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor.jaxx @@ -38,7 +38,7 @@ </import> - <NumberEditor2Model id="model" initializer="getContextValue(NumberEditor2Model.class)"/> + <NumberEditorModel id="model" initializer="getContextValue(NumberEditorModel.class)"/> <!-- autoPopup property --> <Boolean id='autoPopup' javaBean='false'/> diff --git a/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2Config.java b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditorConfig.java similarity index 97% rename from jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2Config.java rename to jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditorConfig.java index b9470ec..2bd5d71 100644 --- a/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2Config.java +++ b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditorConfig.java @@ -32,7 +32,7 @@ import java.io.Serializable; * @author Tony Chemit - chemit@codelutin.com * @since 2.17 */ -public class NumberEditor2Config implements Serializable { +public class NumberEditorConfig implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2Handler.java b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditorHandler.java similarity index 93% rename from jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2Handler.java rename to jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditorHandler.java index 91d8bae..25c18ae 100644 --- a/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2Handler.java +++ b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditorHandler.java @@ -57,10 +57,10 @@ import java.util.regex.Pattern; * @author Tony Chemit - chemit@codelutin.com * @since 2.17 */ -public class NumberEditor2Handler implements UIHandler<NumberEditor2> { +public class NumberEditorHandler implements UIHandler<NumberEditor> { /** Logger. */ - private static final Log log = LogFactory.getLog(NumberEditor2Handler.class); + private static final Log log = LogFactory.getLog(NumberEditorHandler.class); protected final static ImmutableSet<Class<?>> INT_CLASSES = ImmutableSet.copyOf(Sets.<Class<?>>newHashSet( byte.class, @@ -74,7 +74,7 @@ public class NumberEditor2Handler implements UIHandler<NumberEditor2> { private static final String VALIDATE_PROPERTY = "validate"; - protected NumberEditor2 ui; + protected NumberEditor ui; protected Pattern numberPattern; @@ -83,15 +83,15 @@ public class NumberEditor2Handler implements UIHandler<NumberEditor2> { private static Map<Class<?>, NumberParserFormatter<?>> numberFactories; @Override - public void beforeInit(NumberEditor2 ui) { + public void beforeInit(NumberEditor ui) { this.ui = ui; - NumberEditor2Model model = new NumberEditor2Model(new NumberEditor2Config()); + NumberEditorModel model = new NumberEditorModel(new NumberEditorConfig()); ui.setContextValue(model); } @Override - public void afterInit(NumberEditor2 ui) { + public void afterInit(NumberEditor ui) { // nothing to do here, everything is done in init method } @@ -176,7 +176,7 @@ public class NumberEditor2Handler implements UIHandler<NumberEditor2> { public void setTextValue(String newText) { - NumberEditor2Model model = ui.getModel(); + NumberEditorModel model = ui.getModel(); boolean textValid; @@ -265,9 +265,9 @@ public class NumberEditor2Handler implements UIHandler<NumberEditor2> { protected void init() { - NumberEditor2Model model = ui.getModel(); + NumberEditorModel model = ui.getModel(); - NumberEditor2Config config = model.getConfig(); + NumberEditorConfig config = model.getConfig(); Class<?> numberType = config.getNumberType(); @@ -321,7 +321,7 @@ public class NumberEditor2Handler implements UIHandler<NumberEditor2> { { // list when number pattern changed to recompute it - model.addPropertyChangeListener(NumberEditor2Model.PROPERTY_NUMBER_PATTERN, new PropertyChangeListener() { + model.addPropertyChangeListener(NumberEditorModel.PROPERTY_NUMBER_PATTERN, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { @@ -341,7 +341,7 @@ public class NumberEditor2Handler implements UIHandler<NumberEditor2> { }); // listen when numberValue changed (should be from outside) to convert to textValue - model.addPropertyChangeListener(NumberEditor2Model.PROPERTY_NUMBER_VALUE, new PropertyChangeListener() { + model.addPropertyChangeListener(NumberEditorModel.PROPERTY_NUMBER_VALUE, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { @@ -353,7 +353,7 @@ public class NumberEditor2Handler implements UIHandler<NumberEditor2> { }); // listen when textValue changed to convert to number value - model.addPropertyChangeListener(NumberEditor2Model.PROPERTY_TEXT_VALUE, new PropertyChangeListener() { + model.addPropertyChangeListener(NumberEditorModel.PROPERTY_TEXT_VALUE, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { @@ -383,8 +383,8 @@ public class NumberEditor2Handler implements UIHandler<NumberEditor2> { // When model number changed, let's push it back in bean model.addPropertyChangeListener( - NumberEditor2Model.PROPERTY_NUMBER_VALUE, - new MutateOnConditionalPropertyChangeListener<NumberEditor2Model>(model, mutator, model.canUpdateBeanNumberValuePredicate())); + NumberEditorModel.PROPERTY_NUMBER_VALUE, + new MutateOnConditionalPropertyChangeListener<NumberEditorModel>(model, mutator, model.canUpdateBeanNumberValuePredicate())); } } @@ -392,7 +392,7 @@ public class NumberEditor2Handler implements UIHandler<NumberEditor2> { { // Add some listeners on ui - ui.addPropertyChangeListener(NumberEditor2.PROPERTY_SHOW_POPUP_BUTTON, new PropertyChangeListener() { + ui.addPropertyChangeListener(NumberEditor.PROPERTY_SHOW_POPUP_BUTTON, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { @@ -402,7 +402,7 @@ public class NumberEditor2Handler implements UIHandler<NumberEditor2> { } }); - ui.addPropertyChangeListener(NumberEditor2.PROPERTY_AUTO_POPUP, new PropertyChangeListener() { + ui.addPropertyChangeListener(NumberEditor.PROPERTY_AUTO_POPUP, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { @@ -412,7 +412,7 @@ public class NumberEditor2Handler implements UIHandler<NumberEditor2> { } }); - ui.addPropertyChangeListener(NumberEditor2.PROPERTY_POPUP_VISIBLE, new PropertyChangeListener() { + ui.addPropertyChangeListener(NumberEditor.PROPERTY_POPUP_VISIBLE, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { diff --git a/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2Model.java b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditorModel.java similarity index 91% rename from jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2Model.java rename to jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditorModel.java index c168b7c..3aa9995 100644 --- a/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2Model.java +++ b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditorModel.java @@ -35,7 +35,7 @@ import java.io.Serializable; * @author Tony Chemit - chemit@codelutin.com * @since 2.17 */ -public class NumberEditor2Model extends AbstractSerializableBean implements ModelToBean { +public class NumberEditorModel extends AbstractSerializableBean implements ModelToBean { private static final long serialVersionUID = 1L; @@ -47,7 +47,7 @@ public class NumberEditor2Model extends AbstractSerializableBean implements Mode public static final String PROPERTY_NUMBER_PATTERN = "numberPattern"; - private final NumberEditor2Config config; + private final NumberEditorConfig config; /** Optional bean where to push data. */ protected Serializable bean; @@ -80,11 +80,11 @@ public class NumberEditor2Model extends AbstractSerializableBean implements Mode */ protected boolean numberValueIsAdjusting; - public NumberEditor2Model(NumberEditor2Config config) { + public NumberEditorModel(NumberEditorConfig config) { this.config = config; } - NumberEditor2Config getConfig() { + NumberEditorConfig getConfig() { return config; } @@ -186,10 +186,10 @@ public class NumberEditor2Model extends AbstractSerializableBean implements Mode return numberValueIsAdjusting; } - protected Predicate<NumberEditor2Model> canUpdateBeanNumberValuePredicate() { - return new Predicate<NumberEditor2Model>() { + protected Predicate<NumberEditorModel> canUpdateBeanNumberValuePredicate() { + return new Predicate<NumberEditorModel>() { @Override - public boolean apply(NumberEditor2Model input) { + public boolean apply(NumberEditorModel input) { return true; } }; -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.