This is an automated email from the git hooks/post-receive script. New commit to branch feature/3074 in repository jaxx. See http://git.nuiton.org/jaxx.git commit 3f5d85c7b88dab2fb280d6245f6d2a9c6b0c71ba Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 23 18:50:27 2014 +0100 add demo for NumberEditor2 --- .../component/jaxx/editor/NumberEditor2Demo.css | 94 ++++++++++++++++++ .../component/jaxx/editor/NumberEditor2Demo.jaxx | 110 +++++++++++++++++++++ .../jaxx/editor/NumberEditor2DemoHandler.java | 34 +++++++ .../jaxx/editor/NumberEditor2DemoModel.java | 50 ++++++++++ .../main/java/jaxx/demo/tree/DemoDataProvider.java | 14 +-- .../main/resources/i18n/jaxx-demo_en_GB.properties | 6 ++ .../main/resources/i18n/jaxx-demo_es_ES.properties | 6 ++ .../main/resources/i18n/jaxx-demo_fr_FR.properties | 6 ++ jaxx-demo/src/main/resources/log4j.properties | 1 + 9 files changed, 315 insertions(+), 6 deletions(-) diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor2Demo.css b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor2Demo.css new file mode 100644 index 0000000..64fabf5 --- /dev/null +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor2Demo.css @@ -0,0 +1,94 @@ + +NumberEditor2 { + bean: {model}; + autoPopup:{autoPopupButton.isSelected()}; + showPopupButton:{showPopupButton.isSelected()}; + showReset:{showResetButton.isSelected()}; +} + +#numberEditorConfigurationPanel { + border:{new TitledBorder(t("jaxxdemo.numbereditor.configuration"))}; +} + +#showPopupButton { + text:"jaxxdemo.numbereditor.showPopupButton"; + selected:true; +} + +#showResetButton { + text:"jaxxdemo.numbereditor.showReset"; + selected:true; +} + +#autoPopupButton { + text:"jaxxdemo.numbereditor.autoPopup"; + selected:false; +} + +#integerNumberConfig { + text:"jaxxdemo.numbereditor.integerNumberConfig"; + labelFor:{integerNumberPattern}; +} + +#floatNumberConfig { + text:"jaxxdemo.numbereditor.floatNumberConfig"; + labelFor:{floatNumberPattern}; +} + +#doubleNumberConfig { + text:"jaxxdemo.numbereditor.doubleNumberConfig"; + labelFor:{doubleNumberPattern}; +} + +#integerNumberEnabled { + selected:true; +} + +#floatNumberEnabled { + selected:true; +} + +#doubleNumberEnabled { + selected:true; +} + + +#integerEditor { + property:integerNumber; + numberValue: {model.getIntegerNumber()}; + numberType:{Integer.class}; + numberPattern:{integerNumberPattern.getText()}; + enabled:{integerNumberEnabled.isSelected()}; +} + +#floatEditor { + property:floatNumber; + numberValue: {model.getFloatNumber()}; + numberType:{Float.class}; + numberPattern:{floatNumberPattern.getText()}; + enabled:{floatNumberEnabled.isSelected()}; +} + +#doubleEditor { + property:doubleNumber; + numberValue: {model.getDoubleNumber()}; + numberType:{Double.class}; + numberPattern:{doubleNumberPattern.getText()}; + enabled:{doubleNumberEnabled.isSelected()}; +} + +#resultPanel { + border:{new TitledBorder(t("jaxxdemo.numbereditor.model"))}; +} + +#resultInteger{ + text:{t("jaxxdemo.numbereditor.model.integer", model.getIntegerNumber())}; +} + +#resultFloat{ + text:{t("jaxxdemo.numbereditor.model.float", model.getFloatNumber())}; +} + +#resultDouble{ + text:{t("jaxxdemo.numbereditor.model.double", model.getDoubleNumber())}; +} \ No newline at end of file diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor2Demo.jaxx b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor2Demo.jaxx new file mode 100644 index 0000000..3207c79 --- /dev/null +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor2Demo.jaxx @@ -0,0 +1,110 @@ +<!-- + #%L + JAXX :: Demo + %% + Copyright (C) 2008 - 2014 Code Lutin, Tony Chemit + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program 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 Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --> + +<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> + + <import> + org.nuiton.jaxx.widgets.editor.number.NumberEditor2 + static org.nuiton.i18n.I18n.t + </import> + + <NumberEditor2DemoModel id='model' initializer="getContextValue(NumberEditor2DemoModel.class)"/> + + <Table insets='0' fill='both' weightx='1' constraints='BorderLayout.NORTH'> + <!-- config --> + <row> + <cell> + <Table id='numberEditorConfigurationPanel' insets='1' fill='both' weightx='1'> + <row> + <cell columns="3"> + <JCheckBox id='showPopupButton'/> + </cell> + </row> + <row> + <cell columns="3"> + <JCheckBox id='showResetButton'/> + </cell> + </row> + <row> + <cell columns="3"> + <JCheckBox id='autoPopupButton'/> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel id='integerNumberConfig'/> + </cell> + <cell weightx="1" fill="both"> + <JTextField id='integerNumberPattern' text='{"-?\\d{0,3}"}'/> + </cell> + <cell anchor="east"> + <JCheckBox id='integerNumberEnabled'/> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel id='floatNumberConfig'/> + </cell> + <cell weightx="1" fill="both"> + <JTextField id='floatNumberPattern' text='{"\\d{0,1}.\\d{0,2}"}'/> + </cell> + <cell anchor="east"> + <JCheckBox id='floatNumberEnabled'/> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel id='doubleNumberConfig'/> + </cell> + <cell weightx="1" fill="both"> + <JTextField id='doubleNumberPattern' text='{"-?\\d{0,4}.\\d{0,6}"}'/> + </cell> + <cell anchor="east"> + <JCheckBox id='doubleNumberEnabled'/> + </cell> + </row> + </Table> + </cell> + </row> + <!-- editors --> + <row> + <cell> + <JPanel layout="{new GridLayout()}"> + <NumberEditor2 id='integerEditor' constructorParams='this'/> + <NumberEditor2 id='floatEditor' constructorParams='this'/> + <NumberEditor2 id='doubleEditor' constructorParams='this'/> + </JPanel> + </cell> + </row> + <!-- result --> + <row> + <cell> + <JPanel id='resultPanel' layout='{new GridLayout(0,1)}'> + <JLabel id='resultInteger'/> + <JLabel id='resultFloat'/> + <JLabel id='resultDouble'/> + </JPanel> + </cell> + </row> + </Table> +</jaxx.demo.DemoPanel> + diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor2DemoHandler.java b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor2DemoHandler.java new file mode 100644 index 0000000..26129ee --- /dev/null +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor2DemoHandler.java @@ -0,0 +1,34 @@ +package jaxx.demo.component.jaxx.editor; + +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 11/23/14. + * + * @author Tony Chemit - chemit@codelutin.com + * @since XXX + */ +public class NumberEditor2DemoHandler implements UIHandler<NumberEditor2Demo> { + + @Override + public void beforeInit(NumberEditor2Demo ui) { + + NumberEditor2DemoModel model = new NumberEditor2DemoModel(); + model.setIntegerNumber(10); + model.setFloatNumber(-10.10f); + model.setDoubleNumber(-0.0001d); + + ui.setContextValue(model); + + } + + @Override + public void afterInit(NumberEditor2Demo ui) { + + ui.integerEditor.init(); + ui.floatEditor.init(); + ui.doubleEditor.init(); + + } + +} diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor2DemoModel.java b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor2DemoModel.java new file mode 100644 index 0000000..4291267 --- /dev/null +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor2DemoModel.java @@ -0,0 +1,50 @@ +package jaxx.demo.component.jaxx.editor; + +import org.jdesktop.beans.AbstractSerializableBean; + +/** + * Created on 11/23/14. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 2.17 + */ +public class NumberEditor2DemoModel extends AbstractSerializableBean { + + private static final long serialVersionUID = 1L; + + protected Integer integerNumber; + + protected Float floatNumber; + + protected Double doubleNumber; + + public Integer getIntegerNumber() { + return integerNumber; + } + + public void setIntegerNumber(Integer integerNumber) { + Number oldValue = getIntegerNumber(); + this.integerNumber = integerNumber; + firePropertyChange("integerNumber", oldValue, integerNumber); + } + + public Float getFloatNumber() { + return floatNumber; + } + + public void setFloatNumber(Float floatNumber) { + Number oldValue = getFloatNumber(); + this.floatNumber = floatNumber; + firePropertyChange("floatNumber", oldValue, floatNumber); + } + + public Double getDoubleNumber() { + return doubleNumber; + } + + public void setDoubleNumber(Double doubleNumber) { + Number oldValue = getDoubleNumber(); + this.doubleNumber = doubleNumber; + firePropertyChange("doubleNumber", oldValue, doubleNumber); + } +} 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 08f7081..1237f83 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java +++ b/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java @@ -25,17 +25,20 @@ package jaxx.demo.tree; import jaxx.demo.component.jaxx.BoxedDecoratorDemo; import jaxx.demo.component.jaxx.StatusMessagePanelDemo; import jaxx.demo.component.jaxx.editor.BeanComboBoxDemo; +import jaxx.demo.component.jaxx.editor.BeanDoubleListDemo; +import jaxx.demo.component.jaxx.editor.BeanFilterableComboBoxDemo; import jaxx.demo.component.jaxx.editor.ComboEditorDemo; -import jaxx.demo.component.jaxx.editor.datetime.DateTimeEditorDemo; -import jaxx.demo.component.jaxx.editor.gis.CoordinateDemo; -import jaxx.demo.component.jaxx.editor.gis.CoordinatesEditorDemo; import jaxx.demo.component.jaxx.editor.DatePickerDemo; import jaxx.demo.component.jaxx.editor.FileEditorDemo; import jaxx.demo.component.jaxx.editor.I18nEditorDemo; import jaxx.demo.component.jaxx.editor.ListSelectorDemo; +import jaxx.demo.component.jaxx.editor.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.editor.datetime.DateTimeEditorDemo; +import jaxx.demo.component.jaxx.editor.gis.CoordinateDemo; +import jaxx.demo.component.jaxx.editor.gis.CoordinatesEditorDemo; import jaxx.demo.component.swing.HidorButtonDemo; import jaxx.demo.component.swing.JButtonDemo; import jaxx.demo.component.swing.JCheckBoxDemo; @@ -57,9 +60,9 @@ import jaxx.demo.component.swing.JToggleButtonDemo; import jaxx.demo.feature.databinding.BeanDataBindingDemo; import jaxx.demo.feature.databinding.BindingExtremeDemo; import jaxx.demo.feature.nav.NavDemo; +import jaxx.demo.feature.validation.list.ListBeanValidationDemo; import jaxx.demo.feature.validation.simple.SimpleBeanValidationByListDemo; import jaxx.demo.feature.validation.simple.SimpleBeanValidationByTableDemo; -import jaxx.demo.feature.validation.list.ListBeanValidationDemo; import jaxx.demo.fun.CalculatorDemo; import jaxx.demo.fun.CounterDemo; import jaxx.demo.fun.LabelStyleDemo; @@ -72,8 +75,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import jaxx.demo.component.jaxx.editor.BeanDoubleListDemo; -import jaxx.demo.component.jaxx.editor.BeanFilterableComboBoxDemo; import static org.nuiton.i18n.I18n.n; /** @@ -159,6 +160,7 @@ public class DemoDataProvider implements NavDataProvider { addMapping(n("jaxxdemo.component.jaxx.editor"), TimeEditorDemo.class, SimpleTimeEditorDemo.class, + NumberEditor2Demo.class, NumberEditorDemo.class, ComboEditorDemo.class, I18nEditorDemo.class, diff --git a/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties b/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties index 7690f20..24b70f7 100644 --- a/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties +++ b/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties @@ -305,7 +305,13 @@ jaxxdemo.navigation.movies.title=Movies jaxxdemo.numbereditor.applyNumberPattern=Apply pattern jaxxdemo.numbereditor.autoPopup=Show automatic popup jaxxdemo.numbereditor.configuration=Configuration +jaxxdemo.numbereditor.doubleNumberConfig=Double editor (pattern / enable) +jaxxdemo.numbereditor.floatNumberConfig=Float editor (pattern / enable) +jaxxdemo.numbereditor.integerNumberConfig=Integer editor (pattern / enable) jaxxdemo.numbereditor.model=Result +jaxxdemo.numbereditor.model.double=Valeur Double \: %s +jaxxdemo.numbereditor.model.float=Valeur Float \: %s +jaxxdemo.numbereditor.model.integer=Valeur Integer \: %s jaxxdemo.numbereditor.numberPattern.configuration=Number Pattern jaxxdemo.numbereditor.showPopupButton=Show Popup button jaxxdemo.numbereditor.showReset=Show reset button diff --git a/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties b/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties index e88831b..7d88871 100644 --- a/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties +++ b/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties @@ -311,6 +311,12 @@ jaxxdemo.navigation.movies.title=Films jaxxdemo.numbereditor.applyNumberPattern=Appliquer le pattern jaxxdemo.numbereditor.autoPopup=Affichage automatique popup jaxxdemo.numbereditor.configuration=Configuration +jaxxdemo.numbereditor.doubleNumberConfig= +jaxxdemo.numbereditor.doubleNumberPattern= +jaxxdemo.numbereditor.floatNumberConfig= +jaxxdemo.numbereditor.floatNumberPattern= +jaxxdemo.numbereditor.integerNumberConfig= +jaxxdemo.numbereditor.integerNumberPattern= jaxxdemo.numbereditor.model=Résultat jaxxdemo.numbereditor.numberPattern.configuration=Pattern du nombre jaxxdemo.numbereditor.showPopupButton=Afficher le boutton de popup diff --git a/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties b/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties index fd9ecc4..7911f68 100644 --- a/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties +++ b/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties @@ -305,7 +305,13 @@ jaxxdemo.navigation.movies.title=Films jaxxdemo.numbereditor.applyNumberPattern=Appliquer le pattern jaxxdemo.numbereditor.autoPopup=Affichage automatique popup jaxxdemo.numbereditor.configuration=Configuration +jaxxdemo.numbereditor.doubleNumberConfig=Éditeur Double (pattern / actif) +jaxxdemo.numbereditor.floatNumberConfig=Éditeur Float (pattern / actif) +jaxxdemo.numbereditor.integerNumberConfig=Éditeur Integer (pattern / actif) jaxxdemo.numbereditor.model=Résultat +jaxxdemo.numbereditor.model.double=Valeur Double \: %s +jaxxdemo.numbereditor.model.float=Valeur Float \: %s +jaxxdemo.numbereditor.model.integer=Valeur Integer \: %s jaxxdemo.numbereditor.numberPattern.configuration=Pattern du nombre jaxxdemo.numbereditor.showPopupButton=Afficher le boutton de popup jaxxdemo.numbereditor.showReset=Afficher le boutton de reset diff --git a/jaxx-demo/src/main/resources/log4j.properties b/jaxx-demo/src/main/resources/log4j.properties index d7e579b..a793374 100644 --- a/jaxx-demo/src/main/resources/log4j.properties +++ b/jaxx-demo/src/main/resources/log4j.properties @@ -35,4 +35,5 @@ log4j.logger.jaxx=INFO #log4j.logger.jaxx.runtime.swing.editor.config=INFO #log4j.logger.jaxx.runtime.swing.editor.config.model.ConfigUIModelBuilder=DEBUG log4j.logger.org.nuiton=WARN +log4j.logger.org.nuiton.jaxx=INFO #log4j.logger.jaxx.runtime.swing.help=DEBUG -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.