branch develop updated (13a6581 -> e0f37a3)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git from 13a6581 fixes #3583: Pass a predicate to BooleanCellRenderer new 9932e31 fixes #3584: Improve gis editor layout new 24e9c72 refs #3501 (add SwingSession state) new f215c1a add module structure new 6777b87 add jaxx-widgets-number module structure new 9c5dc9c add jaxx-widgets-select module structure new 125e137 move number editor + some common classes new 57b380d add icons new fadcb64 optimize dependencies new df5e3d9 move double list to widgets-select module new 407c4ca move numbercell editor to widgets-number module new cbee4d8 use next version of nuiton-decorator new 6ee5e58 amove numbercell editor to widgets-number module new f099a28 mise a jour des demos new 4d95a11 amelioration de l'accessibilite de la double liste new d6109ac amelioration de l'accessibilite de la double liste (dans la demo) new e0f37a3 fixes #3585 Merge branch 'feature/3585' into develop The 16 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit e0f37a3cbb23be1d93cfb86d99f113fb1dc18ffd Merge: 24e9c72 d6109ac Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 30 13:22:08 2014 +0100 fixes #3585 Merge branch 'feature/3585' into develop commit d6109ac3faa2a2924bb8ec4a66339e2fca2c490d Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 30 13:21:38 2014 +0100 amelioration de l'accessibilite de la double liste (dans la demo) commit 4d95a11f8ede73e6971c4b27dc0ac4846554481a Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 30 13:21:24 2014 +0100 amelioration de l'accessibilite de la double liste commit f099a2826350da4d7576978769e3f1e579295ad4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 30 13:11:35 2014 +0100 mise a jour des demos commit 6ee5e589ce2a479b90e96e8affe3b8b1d1e6ef3c Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 30 12:31:30 2014 +0100 amove numbercell editor to widgets-number module commit 24e9c724369109e741883423c14a61a44fcff6d7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 30 12:29:27 2014 +0100 refs #3501 (add SwingSession state) commit cbee4d856a41f30a87db3f1b3adcc7432ef87a74 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 30 12:25:37 2014 +0100 use next version of nuiton-decorator commit 407c4cad7d8ca69941f670eb2984ad8cb8fac5b2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 30 12:25:04 2014 +0100 move numbercell editor to widgets-number module commit df5e3d941d74b5ffa1b8bf3d5829c2f80e180fa0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 30 12:23:13 2014 +0100 move double list to widgets-select module commit fadcb64c38721109dd1d5c85a9f1c824225b2a26 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 30 12:21:49 2014 +0100 optimize dependencies commit 57b380d1a2eee636a9ec392c809811260be1310d Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 30 12:20:37 2014 +0100 add icons commit 125e1375f6e971cf08269a2e0d8220ee44a9cf58 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 30 09:55:55 2014 +0100 move number editor + some common classes commit 9c5dc9c212a18ccfaf76555533c3424504a565d1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 30 09:10:24 2014 +0100 add jaxx-widgets-select module structure commit 6777b878e30923536c87cf406127266ea5af3d1b Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 30 09:10:03 2014 +0100 add jaxx-widgets-number module structure commit f215c1a189b77e3befecdea68ad7d54e677d36ff Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 30 08:51:46 2014 +0100 add module structure commit 9932e3150531490350209f953b886dbdfa1b35a5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 30 08:40:23 2014 +0100 fixes #3584: Improve gis editor layout Summary of changes: jaxx-demo/pom.xml | 12 ++ .../datetime/DateTimeEditorDemo.css | 0 .../datetime/DateTimeEditorDemo.jaxx | 0 .../datetime/DateTimeEditorDemoHandler.java | 2 +- .../datetime/DateTimeEditorDemoModel.java | 2 +- .../gis/CoordinatesEditorDemo.css | 0 .../gis/CoordinatesEditorDemo.jaxx | 0 .../gis/CoordinatesEditorDemoHandler.java | 2 +- .../gis/CoordinatesEditorDemoModel.java | 2 +- .../number}/NumberEditor2Demo.css | 0 .../number}/NumberEditor2Demo.jaxx | 3 +- .../number}/NumberEditor2DemoHandler.java | 2 +- .../number}/NumberEditor2DemoModel.java | 2 +- .../select}/FilterableDoubleListDemo.css | 6 + .../select}/FilterableDoubleListDemo.jaxx | 3 +- .../select}/FilterableDoubleListDemoHandler.java | 11 +- .../select}/FilterableDoubleListDemoModel.java | 2 +- .../main/java/jaxx/demo/tree/DemoDataProvider.java | 45 ++++-- .../main/resources/i18n/jaxx-demo_en_GB.properties | 14 +- .../main/resources/i18n/jaxx-demo_es_ES.properties | 6 + .../main/resources/i18n/jaxx-demo_fr_FR.properties | 14 +- LICENSE.txt => jaxx-widgets-common/LICENSE.txt | 0 README.txt => jaxx-widgets-common/README.txt | 0 {jaxx-config => jaxx-widgets-common}/pom.xml | 76 +--------- .../nuiton/jaxx/widgets/DecoratorPopupHandler.java | 164 +++++++++++++++++++++ .../jaxx/widgets/JaxxWidgetRuntimeException.java | 28 ++++ .../java/org/nuiton/jaxx/widgets/ModelToBean.java | 2 +- .../MutateOnConditionalPropertyChangeListener.java | 27 +++- .../i18n/jaxx-widgets-common_en_GB.properties | 8 + .../i18n/jaxx-widgets-common_es_ES.properties | 8 + .../i18n/jaxx-widgets-common_fr_FR.properties | 8 + .../main/resources/icons/action-bean-sort-down.png | Bin .../main/resources/icons/action-bean-sort-up.png | Bin .../src/main/resources/icons/action-bean-sort.png | Bin .../src/site/site.xml | 0 .../src/test/resources/log4j.properties | 0 .../jaxx/widgets/datetime/DateTimeEditor.css | 1 + .../jaxx/widgets/datetime/DateTimeEditor.jaxx | 4 +- .../datetime/session/DateTimeEditorState.java | 54 +++++++ .../widgets/gis/absolute/CoordinatesEditor.jaxx | 97 ++++++------ LICENSE.txt => jaxx-widgets-number/LICENSE.txt | 0 README.txt => jaxx-widgets-number/README.txt | 0 {jaxx-widgets-gis => jaxx-widgets-number}/pom.xml | 34 ++--- .../jaxx/widgets/number/NumberCellEditor2.java | 14 +- .../nuiton/jaxx/widgets}/number/NumberEditor2.css | 0 .../nuiton/jaxx/widgets}/number/NumberEditor2.jaxx | 0 .../jaxx/widgets}/number/NumberEditor2Config.java | 2 +- .../jaxx/widgets}/number/NumberEditor2Handler.java | 2 +- .../jaxx/widgets}/number/NumberEditor2Model.java | 2 +- .../i18n/jaxx-widgets-number_en_GB.properties | 14 ++ .../i18n/jaxx-widgets-number_es_ES.properties | 14 ++ .../i18n/jaxx-widgets-number_fr_FR.properties | 14 ++ .../icons/action-numbereditor-calculator.png | Bin .../resources/icons/action-numbereditor-reset.png | Bin .../icons/action-numbereditor-validate.png | Bin .../src/site/site.xml | 0 .../src/test/resources/log4j.properties | 0 LICENSE.txt => jaxx-widgets-select/LICENSE.txt | 0 README.txt => jaxx-widgets-select/README.txt | 0 {jaxx-widgets-gis => jaxx-widgets-select}/pom.xml | 36 ++--- .../jaxx/widgets/select}/FilterableDoubleList.css | 18 +-- .../jaxx/widgets/select}/FilterableDoubleList.jaxx | 14 +- .../select}/FilterableDoubleListConfig.java | 2 +- .../select}/FilterableDoubleListHandler.java | 10 +- .../widgets/select}/FilterableDoubleListModel.java | 2 +- .../select/session/FilterableDoubleListState.java | 66 +++++++++ .../i18n/jaxx-widgets-select_en_GB.properties | 14 ++ .../i18n/jaxx-widgets-select_es_ES.properties | 14 ++ .../i18n/jaxx-widgets-select_fr_FR.properties | 14 ++ .../resources/icons/action-doublelist-down.png | Bin .../resources/icons/action-doublelist-filter.png | Bin .../resources/icons/action-doublelist-reset.png | Bin .../resources/icons/action-doublelist-select.png | Bin .../resources/icons/action-doublelist-sort.png | Bin .../resources/icons/action-doublelist-unselect.png | Bin .../main/resources/icons/action-doublelist-up.png | Bin .../src/site/site.xml | 0 .../src/test/resources/log4j.properties | 0 pom.xml | 5 +- 79 files changed, 646 insertions(+), 250 deletions(-) rename jaxx-demo/src/main/java/jaxx/demo/component/jaxx/{editor => widgets}/datetime/DateTimeEditorDemo.css (100%) rename jaxx-demo/src/main/java/jaxx/demo/component/jaxx/{editor => widgets}/datetime/DateTimeEditorDemo.jaxx (100%) rename jaxx-demo/src/main/java/jaxx/demo/component/jaxx/{editor => widgets}/datetime/DateTimeEditorDemoHandler.java (97%) rename jaxx-demo/src/main/java/jaxx/demo/component/jaxx/{editor => widgets}/datetime/DateTimeEditorDemoModel.java (97%) rename jaxx-demo/src/main/java/jaxx/demo/component/jaxx/{editor => widgets}/gis/CoordinatesEditorDemo.css (100%) rename jaxx-demo/src/main/java/jaxx/demo/component/jaxx/{editor => widgets}/gis/CoordinatesEditorDemo.jaxx (100%) rename jaxx-demo/src/main/java/jaxx/demo/component/jaxx/{editor => widgets}/gis/CoordinatesEditorDemoHandler.java (97%) rename jaxx-demo/src/main/java/jaxx/demo/component/jaxx/{editor => widgets}/gis/CoordinatesEditorDemoModel.java (97%) rename jaxx-demo/src/main/java/jaxx/demo/component/jaxx/{editor => widgets/number}/NumberEditor2Demo.css (100%) rename jaxx-demo/src/main/java/jaxx/demo/component/jaxx/{editor => widgets/number}/NumberEditor2Demo.jaxx (98%) rename jaxx-demo/src/main/java/jaxx/demo/component/jaxx/{editor => widgets/number}/NumberEditor2DemoHandler.java (96%) rename jaxx-demo/src/main/java/jaxx/demo/component/jaxx/{editor => widgets/number}/NumberEditor2DemoModel.java (97%) rename jaxx-demo/src/main/java/jaxx/demo/component/jaxx/{editor => widgets/select}/FilterableDoubleListDemo.css (93%) rename jaxx-demo/src/main/java/jaxx/demo/component/jaxx/{editor => widgets/select}/FilterableDoubleListDemo.jaxx (94%) rename jaxx-demo/src/main/java/jaxx/demo/component/jaxx/{editor => widgets/select}/FilterableDoubleListDemoHandler.java (87%) rename jaxx-demo/src/main/java/jaxx/demo/component/jaxx/{editor => widgets/select}/FilterableDoubleListDemoModel.java (93%) copy LICENSE.txt => jaxx-widgets-common/LICENSE.txt (100%) copy README.txt => jaxx-widgets-common/README.txt (100%) copy {jaxx-config => jaxx-widgets-common}/pom.xml (58%) create mode 100644 jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/DecoratorPopupHandler.java create mode 100644 jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/JaxxWidgetRuntimeException.java rename {jaxx-widgets => jaxx-widgets-common}/src/main/java/org/nuiton/jaxx/widgets/ModelToBean.java (98%) rename {jaxx-widgets => jaxx-widgets-common}/src/main/java/org/nuiton/jaxx/widgets/MutateOnConditionalPropertyChangeListener.java (70%) create mode 100644 jaxx-widgets-common/src/main/resources/i18n/jaxx-widgets-common_en_GB.properties create mode 100644 jaxx-widgets-common/src/main/resources/i18n/jaxx-widgets-common_es_ES.properties create mode 100644 jaxx-widgets-common/src/main/resources/i18n/jaxx-widgets-common_fr_FR.properties copy {jaxx-widgets => jaxx-widgets-common}/src/main/resources/icons/action-bean-sort-down.png (100%) copy {jaxx-widgets => jaxx-widgets-common}/src/main/resources/icons/action-bean-sort-up.png (100%) copy {jaxx-widgets => jaxx-widgets-common}/src/main/resources/icons/action-bean-sort.png (100%) copy {jaxx-widgets-datetime => jaxx-widgets-common}/src/site/site.xml (100%) copy {jaxx-widgets-datetime => jaxx-widgets-common}/src/test/resources/log4j.properties (100%) create mode 100644 jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/session/DateTimeEditorState.java copy LICENSE.txt => jaxx-widgets-number/LICENSE.txt (100%) copy README.txt => jaxx-widgets-number/README.txt (100%) copy {jaxx-widgets-gis => jaxx-widgets-number}/pom.xml (85%) rename jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/cell/NumberCellEditor.java => jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberCellEditor2.java (87%) rename {jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor => jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets}/number/NumberEditor2.css (100%) rename {jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor => jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets}/number/NumberEditor2.jaxx (100%) rename {jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor => jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets}/number/NumberEditor2Config.java (98%) rename {jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor => jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets}/number/NumberEditor2Handler.java (99%) rename {jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor => jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets}/number/NumberEditor2Model.java (99%) create mode 100644 jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_en_GB.properties create mode 100644 jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_es_ES.properties create mode 100644 jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_fr_FR.properties copy {jaxx-widgets => jaxx-widgets-number}/src/main/resources/icons/action-numbereditor-calculator.png (100%) copy {jaxx-widgets => jaxx-widgets-number}/src/main/resources/icons/action-numbereditor-reset.png (100%) copy {jaxx-widgets => jaxx-widgets-number}/src/main/resources/icons/action-numbereditor-validate.png (100%) copy {jaxx-widgets-datetime => jaxx-widgets-number}/src/site/site.xml (100%) copy {jaxx-widgets-datetime => jaxx-widgets-number}/src/test/resources/log4j.properties (100%) copy LICENSE.txt => jaxx-widgets-select/LICENSE.txt (100%) copy README.txt => jaxx-widgets-select/README.txt (100%) copy {jaxx-widgets-gis => jaxx-widgets-select}/pom.xml (83%) rename {jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/bean => jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select}/FilterableDoubleList.css (87%) rename {jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/bean => jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select}/FilterableDoubleList.jaxx (93%) rename {jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/bean => jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select}/FilterableDoubleListConfig.java (96%) rename {jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/bean => jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select}/FilterableDoubleListHandler.java (98%) rename {jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/bean => jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select}/FilterableDoubleListModel.java (99%) create mode 100644 jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/session/FilterableDoubleListState.java create mode 100644 jaxx-widgets-select/src/main/resources/i18n/jaxx-widgets-select_en_GB.properties create mode 100644 jaxx-widgets-select/src/main/resources/i18n/jaxx-widgets-select_es_ES.properties create mode 100644 jaxx-widgets-select/src/main/resources/i18n/jaxx-widgets-select_fr_FR.properties copy jaxx-widgets/src/main/resources/icons/action-bean-doublelist-down.png => jaxx-widgets-select/src/main/resources/icons/action-doublelist-down.png (100%) copy jaxx-widgets/src/main/resources/icons/action-filter.png => jaxx-widgets-select/src/main/resources/icons/action-doublelist-filter.png (100%) copy {jaxx-widgets => jaxx-widgets-select}/src/main/resources/icons/action-doublelist-reset.png (100%) copy jaxx-widgets/src/main/resources/icons/action-bean-doublelist-select.png => jaxx-widgets-select/src/main/resources/icons/action-doublelist-select.png (100%) copy {jaxx-widgets => jaxx-widgets-select}/src/main/resources/icons/action-doublelist-sort.png (100%) copy jaxx-widgets/src/main/resources/icons/action-bean-doublelist-unselect.png => jaxx-widgets-select/src/main/resources/icons/action-doublelist-unselect.png (100%) copy jaxx-widgets/src/main/resources/icons/action-bean-doublelist-up.png => jaxx-widgets-select/src/main/resources/icons/action-doublelist-up.png (100%) copy {jaxx-widgets-datetime => jaxx-widgets-select}/src/site/site.xml (100%) copy {jaxx-widgets-datetime => jaxx-widgets-select}/src/test/resources/log4j.properties (100%) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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 6ee5e589ce2a479b90e96e8affe3b8b1d1e6ef3c Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 30 12:31:30 2014 +0100 amove numbercell editor to widgets-number module --- .../jaxx/widgets/number/NumberCellEditor2.java | 135 +++++++++++++++++++++ 1 file changed, 135 insertions(+) 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/NumberCellEditor2.java new file mode 100644 index 0000000..7a370cd --- /dev/null +++ b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberCellEditor2.java @@ -0,0 +1,135 @@ +package org.nuiton.jaxx.widgets.number; + +/* + * #%L + * JAXX :: Widgets + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * 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% + */ + +import javax.swing.AbstractCellEditor; +import javax.swing.JTable; +import javax.swing.SwingConstants; +import javax.swing.SwingUtilities; +import javax.swing.event.AncestorEvent; +import javax.swing.event.AncestorListener; +import javax.swing.table.TableCellEditor; +import java.awt.Component; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; + +/** + * Created on 11/23/14. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 2.17 + */ +public class NumberCellEditor2<E extends Number> extends AbstractCellEditor + implements TableCellEditor, FocusListener, AncestorListener { + + private static final long serialVersionUID = 1L; + + protected final NumberEditor2 numberEditor; + + /** constructor */ + public NumberCellEditor2(Class<E> type, boolean useSign) { + numberEditor = new NumberEditor2(); + numberEditor.getTextField().setHorizontalAlignment(SwingConstants.RIGHT); + numberEditor.getTextField().setBorder(null); + numberEditor.getTextField().addFocusListener(this); + numberEditor.getTextField().addAncestorListener(this); + + numberEditor.setNumberType(type); + numberEditor.setUseSign(useSign); + numberEditor.init(); + + } + + @Override + public Component getTableCellEditorComponent(JTable table, + Object value, + boolean isSelected, + int row, + int column) { + + E number = (E) value; + numberEditor.setNumberValue(number); +// numberEditor.setModelText(JAXXUtil.getStringValue(number)); + return numberEditor; + } + + public NumberEditor2 getNumberEditor() { + return numberEditor; + } + + @Override + public E getCellEditorValue() { + NumberEditor2Model model = numberEditor.getModel(); + return (E) model.getNumberValue(); + } + + @Override + public void focusGained(FocusEvent e) { + SwingUtilities.invokeLater(new Runnable() { + public void run() { + numberEditor.getTextField().requestFocus(); + numberEditor.getTextField().selectAll(); + } + }); + } + + @Override + public void focusLost(FocusEvent e) { + // commenting the next line fixes https://forge.nuiton.org/issues/3517 and https://forge.nuiton.org/issues/3518 +// cancelCellEditing(); + } + + @Override + public void ancestorAdded(AncestorEvent event) { + SwingUtilities.invokeLater(new Runnable() { + public void run() { + numberEditor.getTextField().requestFocus(); + numberEditor.getTextField().selectAll(); + } + }); + } + + @Override + public void ancestorRemoved(AncestorEvent event) { + } + + @Override + public void ancestorMoved(AncestorEvent event) { + } + + @Override + public boolean stopCellEditing() { + boolean result = super.stopCellEditing(); + // Reset previous data to avoid keeping it on other cell edition + if (result) { + numberEditor.setNumberValue(null); +// // Use empty string, otherwise there is a NPE in NumberEditorHandler +// 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); + } + return result; + } + +} -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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 f099a2826350da4d7576978769e3f1e579295ad4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 30 13:11:35 2014 +0100 mise a jour des demos --- jaxx-demo/pom.xml | 12 ++++++ .../datetime/DateTimeEditorDemo.css | 0 .../datetime/DateTimeEditorDemo.jaxx | 0 .../datetime/DateTimeEditorDemoHandler.java | 2 +- .../datetime/DateTimeEditorDemoModel.java | 2 +- .../gis/CoordinatesEditorDemo.css | 0 .../gis/CoordinatesEditorDemo.jaxx | 0 .../gis/CoordinatesEditorDemoHandler.java | 2 +- .../gis/CoordinatesEditorDemoModel.java | 2 +- .../number}/NumberEditor2Demo.css | 0 .../number}/NumberEditor2Demo.jaxx | 3 +- .../number}/NumberEditor2DemoHandler.java | 2 +- .../number}/NumberEditor2DemoModel.java | 2 +- .../select}/FilterableDoubleListDemo.css | 0 .../select}/FilterableDoubleListDemo.jaxx | 2 +- .../select}/FilterableDoubleListDemoHandler.java | 11 +++--- .../select}/FilterableDoubleListDemoModel.java | 2 +- .../main/java/jaxx/demo/tree/DemoDataProvider.java | 45 ++++++++++++++-------- .../main/resources/i18n/jaxx-demo_en_GB.properties | 13 ++++--- .../main/resources/i18n/jaxx-demo_es_ES.properties | 5 +++ .../main/resources/i18n/jaxx-demo_fr_FR.properties | 13 ++++--- 21 files changed, 77 insertions(+), 41 deletions(-) diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index 068b4db..b8fa3fa 100644 --- a/jaxx-demo/pom.xml +++ b/jaxx-demo/pom.xml @@ -102,6 +102,18 @@ <dependency> <groupId>${project.groupId}</groupId> + <artifactId>jaxx-widgets-number</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-widgets-select</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>jaxx-config</artifactId> <version>${project.version}</version> </dependency> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/datetime/DateTimeEditorDemo.css b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemo.css similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/datetime/DateTimeEditorDemo.css rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemo.css diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/datetime/DateTimeEditorDemo.jaxx b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemo.jaxx similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/datetime/DateTimeEditorDemo.jaxx rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemo.jaxx diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/datetime/DateTimeEditorDemoHandler.java b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemoHandler.java similarity index 97% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/datetime/DateTimeEditorDemoHandler.java rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemoHandler.java index fe4e3b7..8ff7746 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/datetime/DateTimeEditorDemoHandler.java +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemoHandler.java @@ -1,4 +1,4 @@ -package jaxx.demo.component.jaxx.editor.datetime; +package jaxx.demo.component.jaxx.widgets.datetime; /* * #%L diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/datetime/DateTimeEditorDemoModel.java b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemoModel.java similarity index 97% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/datetime/DateTimeEditorDemoModel.java rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemoModel.java index d4d96d9..da62607 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/datetime/DateTimeEditorDemoModel.java +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemoModel.java @@ -1,4 +1,4 @@ -package jaxx.demo.component.jaxx.editor.datetime; +package jaxx.demo.component.jaxx.widgets.datetime; /* * #%L diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinatesEditorDemo.css b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.css similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinatesEditorDemo.css rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.css diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinatesEditorDemo.jaxx b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.jaxx similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinatesEditorDemo.jaxx rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.jaxx diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinatesEditorDemoHandler.java b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemoHandler.java similarity index 97% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinatesEditorDemoHandler.java rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemoHandler.java index 8904d7d..a443b6b 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinatesEditorDemoHandler.java +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemoHandler.java @@ -1,4 +1,4 @@ -package jaxx.demo.component.jaxx.editor.gis; +package jaxx.demo.component.jaxx.widgets.gis; /* * #%L diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinatesEditorDemoModel.java b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemoModel.java similarity index 97% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinatesEditorDemoModel.java rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemoModel.java index 30227be..d420326 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinatesEditorDemoModel.java +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemoModel.java @@ -1,4 +1,4 @@ -package jaxx.demo.component.jaxx.editor.gis; +package jaxx.demo.component.jaxx.widgets.gis; /* * #%L 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/widgets/number/NumberEditor2Demo.css similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor2Demo.css rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditor2Demo.css 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/widgets/number/NumberEditor2Demo.jaxx similarity index 98% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor2Demo.jaxx rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditor2Demo.jaxx index 3207c79..66f9cd9 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor2Demo.jaxx +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditor2Demo.jaxx @@ -23,7 +23,8 @@ <jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> - org.nuiton.jaxx.widgets.editor.number.NumberEditor2 + org.nuiton.jaxx.widgets.number.NumberEditor2 + static org.nuiton.i18n.I18n.t </import> 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/widgets/number/NumberEditor2DemoHandler.java similarity index 96% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor2DemoHandler.java rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditor2DemoHandler.java index 768b4ce..f58441b 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor2DemoHandler.java +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditor2DemoHandler.java @@ -1,4 +1,4 @@ -package jaxx.demo.component.jaxx.editor; +package jaxx.demo.component.jaxx.widgets.number; /* * #%L 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/widgets/number/NumberEditor2DemoModel.java similarity index 97% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor2DemoModel.java rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditor2DemoModel.java index ec8de51..fe794cf 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor2DemoModel.java +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/NumberEditor2DemoModel.java @@ -1,4 +1,4 @@ -package jaxx.demo.component.jaxx.editor; +package jaxx.demo.component.jaxx.widgets.number; /* * #%L diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/FilterableDoubleListDemo.css b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemo.css similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/FilterableDoubleListDemo.css rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemo.css diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/FilterableDoubleListDemo.jaxx b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemo.jaxx similarity index 96% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/FilterableDoubleListDemo.jaxx rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemo.jaxx index 3fdb6ea..72891d4 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/FilterableDoubleListDemo.jaxx +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemo.jaxx @@ -23,7 +23,7 @@ <import> jaxx.demo.entities.People - org.nuiton.jaxx.widgets.editor.bean.FilterableDoubleList + org.nuiton.jaxx.widgets.select.FilterableDoubleList </import> <FilterableDoubleListDemoModel id="model" initializer='getContextValue(FilterableDoubleListDemoModel.class)'/> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/FilterableDoubleListDemoHandler.java b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemoHandler.java similarity index 87% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/FilterableDoubleListDemoHandler.java rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemoHandler.java index cbbf467..a1f6124 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/FilterableDoubleListDemoHandler.java +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemoHandler.java @@ -1,11 +1,11 @@ -package jaxx.demo.component.jaxx.editor; +package jaxx.demo.component.jaxx.widgets.select; import jaxx.demo.entities.DemoDataProvider; import jaxx.demo.entities.DemoDecoratorProvider; import jaxx.demo.entities.People; import jaxx.runtime.spi.UIHandler; import org.nuiton.decorator.JXPathDecorator; -import org.nuiton.jaxx.widgets.editor.bean.FilterableDoubleList; +import org.nuiton.jaxx.widgets.select.FilterableDoubleList; import java.util.List; @@ -35,14 +35,13 @@ public class FilterableDoubleListDemoHandler implements UIHandler<FilterableDoub public void afterInit(final FilterableDoubleListDemo ui) { FilterableDoubleList<People> doubleList = ui.getDoubleList(); - doubleList.setFilterable(true); DemoDataProvider demoDataProvider = new DemoDataProvider(); - List<People> data = demoDataProvider.getPeoples(); - doubleList.init(decorator, data, null); + List<People> data = demoDataProvider.getPeoples(); + List<People> selected = data.subList(0, 1); - ui.getModel().setSelected(data.subList(0, 1)); + doubleList.init(decorator, data, selected); } diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/FilterableDoubleListDemoModel.java b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemoModel.java similarity index 93% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/FilterableDoubleListDemoModel.java rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemoModel.java index 83ae669..0c51c37 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/FilterableDoubleListDemoModel.java +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemoModel.java @@ -1,4 +1,4 @@ -package jaxx.demo.component.jaxx.editor; +package jaxx.demo.component.jaxx.widgets.select; import jaxx.demo.entities.People; import org.jdesktop.beans.AbstractSerializableBean; 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 639e76e..c02fbc9 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,16 @@ 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.editor.FilterableDoubleListDemo; +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.editor.NumberEditor2Demo; +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.editor.datetime.DateTimeEditorDemo; +import jaxx.demo.component.jaxx.widgets.datetime.DateTimeEditorDemo; import jaxx.demo.component.jaxx.editor.gis.CoordinateDemo; -import jaxx.demo.component.jaxx.editor.gis.CoordinatesEditorDemo; +import jaxx.demo.component.jaxx.widgets.gis.CoordinatesEditorDemo; import jaxx.demo.component.swing.HidorButtonDemo; import jaxx.demo.component.swing.JButtonDemo; import jaxx.demo.component.swing.JCheckBoxDemo; @@ -153,11 +153,35 @@ public class DemoDataProvider implements NavDataProvider { addMapping(n("jaxxdemo.component.jaxx"), HidorButtonDemo.class, + n("jaxxdemo.component.jaxx.widgets"), n("jaxxdemo.component.jaxx.editor"), StatusMessagePanelDemo.class, BoxedDecoratorDemo.class ); + addMapping(n("jaxxdemo.component.jaxx.widgets"), + n("jaxxdemo.component.jaxx.widgets.number"), + n("jaxxdemo.component.jaxx.widgets.select"), + n("jaxxdemo.component.jaxx.widgets.gis"), + n("jaxxdemo.component.jaxx.widgets.datetime") + ); + + addMapping(n("jaxxdemo.component.jaxx.widgets.number"), + NumberEditor2Demo.class + ); + + addMapping(n("jaxxdemo.component.jaxx.widgets.select"), + FilterableDoubleListDemo.class + ); + + addMapping(n("jaxxdemo.component.jaxx.widgets.gis"), + CoordinatesEditorDemo.class + ); + + addMapping(n("jaxxdemo.component.jaxx.widgets.datetime"), + DateTimeEditorDemo.class + ); + addMapping(n("jaxxdemo.component.jaxx.editor"), TimeEditorDemo.class, SimpleTimeEditorDemo.class, @@ -171,18 +195,7 @@ public class DemoDataProvider implements NavDataProvider { BeanComboBoxDemo.class, BeanFilterableComboBoxDemo.class, BeanDoubleListDemo.class, - FilterableDoubleListDemo.class, - n("jaxxdemo.component.jaxx.editor.gis"), - n("jaxxdemo.component.jaxx.editor.datetime") - ); - - addMapping(n("jaxxdemo.component.jaxx.editor.gis"), - CoordinateDemo.class, - CoordinatesEditorDemo.class - ); - - addMapping(n("jaxxdemo.component.jaxx.editor.datetime"), - DateTimeEditorDemo.class + CoordinateDemo.class ); addMapping(n("jaxxdemo.feature"), 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 3eed192..b0c0f2b 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 @@ -188,8 +188,8 @@ jaxxdemo.beandoublelistdemo.configuration=Configuration jaxxdemo.beandoublelistdemo.filterOnNacho=Show only the actors playing in Nacho Libre jaxxdemo.beandoublelistdemo.filterable=Filterable jaxxdemo.beandoublelistdemo.highlightFilterText=Highlight the filter text -jaxxdemo.beandoublelistdemo.noselected= -jaxxdemo.beandoublelistdemo.selected= +jaxxdemo.beandoublelistdemo.noselected=< No selection > +jaxxdemo.beandoublelistdemo.selected=Selected\: jaxxdemo.beandoublelistdemo.showDecorator=Show decorator button jaxxdemo.beandoublelistdemo.showReset=Show Reset button jaxxdemo.beanfilterablecomboboxdemo.colorizeInvalidComboEditorText=Colorize the text if it not valid @@ -212,9 +212,12 @@ jaxxdemo.common.people=People jaxxdemo.common.title=Title jaxxdemo.common.year=Year jaxxdemo.component.jaxx=JAXX Components -jaxxdemo.component.jaxx.editor=Editors -jaxxdemo.component.jaxx.editor.datetime=Time editors -jaxxdemo.component.jaxx.editor.gis=Gis editors +jaxxdemo.component.jaxx.editor=Editors (Deprecated) +jaxxdemo.component.jaxx.widgets=Widgets (New) +jaxxdemo.component.jaxx.widgets.datetime=jaxx-widgets-datetime (Date time editors) +jaxxdemo.component.jaxx.widgets.gis=jaxx-widgets-gis (Gis editors) +jaxxdemo.component.jaxx.widgets.number=jaxx-widgets-number (Number editors) +jaxxdemo.component.jaxx.widgets.select=jaxx-widgets-select (Selectors) jaxxdemo.component.swing=Swing Components jaxxdemo.component.swing.buttons=Buttons jaxxdemo.component.swing.form=Form elements 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 3ff807e..8857f75 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 @@ -215,6 +215,11 @@ jaxxdemo.component.jaxx=Composants JAXX jaxxdemo.component.jaxx.editor=Editeurs jaxxdemo.component.jaxx.editor.datetime= jaxxdemo.component.jaxx.editor.gis= +jaxxdemo.component.jaxx.widgets= +jaxxdemo.component.jaxx.widgets.datetime= +jaxxdemo.component.jaxx.widgets.gis= +jaxxdemo.component.jaxx.widgets.number= +jaxxdemo.component.jaxx.widgets.select= jaxxdemo.component.swing=Composants Swing jaxxdemo.component.swing.buttons=Boutons jaxxdemo.component.swing.form=Elements de formulaire 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 6da2d4f..328e9f8 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 @@ -188,8 +188,8 @@ jaxxdemo.beandoublelistdemo.configuration=Configuration jaxxdemo.beandoublelistdemo.filterOnNacho=N'afficher que les acteurs de Nacho Libre jaxxdemo.beandoublelistdemo.filterable=Filtrable jaxxdemo.beandoublelistdemo.highlightFilterText=Surligner le texte de filtre -jaxxdemo.beandoublelistdemo.noselected=< Aucune sélection > -jaxxdemo.beandoublelistdemo.selected=Sélection\: +jaxxdemo.beandoublelistdemo.noselected=< Aucune sélection > +jaxxdemo.beandoublelistdemo.selected=Sélection \: jaxxdemo.beandoublelistdemo.showDecorator=Changer la décoration jaxxdemo.beandoublelistdemo.showReset=Pouvoir réinitialiser le filtre jaxxdemo.beanfilterablecomboboxdemo.colorizeInvalidComboEditorText=Colorer le texte s'il n'est pas valide @@ -212,9 +212,12 @@ jaxxdemo.common.people=Acteur jaxxdemo.common.title=Titre jaxxdemo.common.year=Année jaxxdemo.component.jaxx=Composants JAXX -jaxxdemo.component.jaxx.editor=Éditeurs -jaxxdemo.component.jaxx.editor.datetime=Éditeurs de temps -jaxxdemo.component.jaxx.editor.gis=Éditeurs de coordonnées +jaxxdemo.component.jaxx.editor=Éditeurs (Depréciés) +jaxxdemo.component.jaxx.widgets=Widgets (Nouveau) +jaxxdemo.component.jaxx.widgets.datetime=jaxx-widgets-datetime (Éditeurs de temps) +jaxxdemo.component.jaxx.widgets.gis=jaxx-widgets-gis (Éditeurs de coordonnées) +jaxxdemo.component.jaxx.widgets.number=jaxx-widgets-number (Éditeurs de nombres) +jaxxdemo.component.jaxx.widgets.select=jaxx-widgets-select (Sélecteurs) jaxxdemo.component.swing=Composants Swing jaxxdemo.component.swing.buttons=Boutons jaxxdemo.component.swing.form=Elements de formulaire -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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 4d95a11f8ede73e6971c4b27dc0ac4846554481a Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 30 13:21:24 2014 +0100 amelioration de l'accessibilite de la double liste --- .../main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleList.css | 4 +--- .../java/org/nuiton/jaxx/widgets/select/FilterableDoubleList.jaxx | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleList.css b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleList.css index 578c770..3386232 100644 --- a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleList.css +++ b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleList.css @@ -100,7 +100,7 @@ #toolbarLeft { floatable:false; borderPainted:false; - visible:{isShowReset()}; + visible:{isFilterable() && isShowReset()}; } #resetButton { @@ -108,7 +108,6 @@ toolTipText:"beandoublelist.action.reset.tip"; focusable:false; focusPainted:false; - enabled:{isShowReset() && isEnabled()}; } #toolbarRight { @@ -122,5 +121,4 @@ toolTipText:"beandoublelist.action.sort.tip"; focusable:false; focusPainted:false; - enabled:{isShowDecorator() && isEnabled()}; } diff --git a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleList.jaxx b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleList.jaxx index 7f73602..7d4156d 100644 --- a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleList.jaxx +++ b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleList.jaxx @@ -86,7 +86,7 @@ <JPanel layout='{new BorderLayout()}' id='topPanel'> <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.WEST'> <JLabel id='filterFieldLabel' styleClass='filterable' constraints='BorderLayout.WEST'/> - <JToolBar id='toolbarLeft' styleClass='filterable' constraints='BorderLayout.EAST'> + <JToolBar id='toolbarLeft' constraints='BorderLayout.EAST'> <JButton id='resetButton' onActionPerformed='filterField.setText("")'/> </JToolBar> </JPanel> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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 d6109ac3faa2a2924bb8ec4a66339e2fca2c490d Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 30 13:21:38 2014 +0100 amelioration de l'accessibilite de la double liste (dans la demo) --- .../demo/component/jaxx/widgets/select/FilterableDoubleListDemo.css | 6 ++++++ .../component/jaxx/widgets/select/FilterableDoubleListDemo.jaxx | 1 + jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties | 1 + jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties | 1 + jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties | 1 + 5 files changed, 10 insertions(+) diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemo.css b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemo.css index 558dd9e..bdedb6a 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemo.css +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemo.css @@ -43,6 +43,11 @@ selected: true; } +#enableButton { + text: "jaxxdemo.beandoublelistdemo.enable"; + selected: true; +} + #doubleList { property:"selected"; bean:{model}; @@ -51,6 +56,7 @@ showReset: {showResetButton.isSelected()}; showDecorator: {showDecoratorButton.isSelected()}; highlightFilterText: {highlightFilterTextButton.isSelected()}; + enabled:{enableButton.isSelected()}; selected:{model.getSelected()}; } diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemo.jaxx b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemo.jaxx index 72891d4..94be1e83 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemo.jaxx +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemo.jaxx @@ -36,6 +36,7 @@ <JCheckBox id='highlightFilterTextButton'/> <JCheckBox id='showResetButton'/> <JCheckBox id='showDecoratorButton'/> + <JCheckBox id='enableButton'/> </JPanel> </cell> </row> 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 b0c0f2b..6d427a8 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 @@ -185,6 +185,7 @@ jaxxdemo.beancomboboxdemo.selected.people=Selection\: %s jaxxdemo.beancomboboxdemo.showDecorator=Show decorator button jaxxdemo.beancomboboxdemo.showReset=Show Reset button jaxxdemo.beandoublelistdemo.configuration=Configuration +jaxxdemo.beandoublelistdemo.enable=Enable / Disable jaxxdemo.beandoublelistdemo.filterOnNacho=Show only the actors playing in Nacho Libre jaxxdemo.beandoublelistdemo.filterable=Filterable jaxxdemo.beandoublelistdemo.highlightFilterText=Highlight the filter text 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 8857f75..7691328 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 @@ -185,6 +185,7 @@ jaxxdemo.beancomboboxdemo.selected.people= jaxxdemo.beancomboboxdemo.showDecorator= jaxxdemo.beancomboboxdemo.showReset= jaxxdemo.beandoublelistdemo.configuration= +jaxxdemo.beandoublelistdemo.enable= jaxxdemo.beandoublelistdemo.filterOnNacho= jaxxdemo.beandoublelistdemo.filterable= jaxxdemo.beandoublelistdemo.highlightFilterText= 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 328e9f8..b554e86 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 @@ -185,6 +185,7 @@ jaxxdemo.beancomboboxdemo.selected.people=Sélection \: %s jaxxdemo.beancomboboxdemo.showDecorator=Changer la décoration jaxxdemo.beancomboboxdemo.showReset=Pouvoir réinitialiser jaxxdemo.beandoublelistdemo.configuration=Configuration +jaxxdemo.beandoublelistdemo.enable=Activer / Désactiver jaxxdemo.beandoublelistdemo.filterOnNacho=N'afficher que les acteurs de Nacho Libre jaxxdemo.beandoublelistdemo.filterable=Filtrable jaxxdemo.beandoublelistdemo.highlightFilterText=Surligner le texte de filtre -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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 e0f37a3cbb23be1d93cfb86d99f113fb1dc18ffd Merge: 24e9c72 d6109ac Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 30 13:22:08 2014 +0100 fixes #3585 Merge branch 'feature/3585' into develop jaxx-demo/pom.xml | 12 ++ .../datetime/DateTimeEditorDemo.css | 0 .../datetime/DateTimeEditorDemo.jaxx | 0 .../datetime/DateTimeEditorDemoHandler.java | 2 +- .../datetime/DateTimeEditorDemoModel.java | 2 +- .../gis/CoordinatesEditorDemo.css | 0 .../gis/CoordinatesEditorDemo.jaxx | 0 .../gis/CoordinatesEditorDemoHandler.java | 2 +- .../gis/CoordinatesEditorDemoModel.java | 2 +- .../number}/NumberEditor2Demo.css | 0 .../number}/NumberEditor2Demo.jaxx | 3 +- .../number}/NumberEditor2DemoHandler.java | 2 +- .../number}/NumberEditor2DemoModel.java | 2 +- .../select}/FilterableDoubleListDemo.css | 6 + .../select}/FilterableDoubleListDemo.jaxx | 3 +- .../select}/FilterableDoubleListDemoHandler.java | 11 +- .../select}/FilterableDoubleListDemoModel.java | 2 +- .../main/java/jaxx/demo/tree/DemoDataProvider.java | 45 ++++-- .../main/resources/i18n/jaxx-demo_en_GB.properties | 14 +- .../main/resources/i18n/jaxx-demo_es_ES.properties | 6 + .../main/resources/i18n/jaxx-demo_fr_FR.properties | 14 +- jaxx-widgets-common/LICENSE.txt | 165 +++++++++++++++++++++ jaxx-widgets-common/README.txt | 2 + jaxx-widgets-common/pom.xml | 113 ++++++++++++++ .../nuiton/jaxx/widgets/DecoratorPopupHandler.java | 164 ++++++++++++++++++++ .../jaxx/widgets/JaxxWidgetRuntimeException.java | 28 ++++ .../java/org/nuiton/jaxx/widgets/ModelToBean.java | 2 +- .../MutateOnConditionalPropertyChangeListener.java | 27 +++- .../i18n/jaxx-widgets-common_en_GB.properties | 8 + .../i18n/jaxx-widgets-common_es_ES.properties | 8 + .../i18n/jaxx-widgets-common_fr_FR.properties | 8 + .../main/resources/icons/action-bean-sort-down.png | Bin 0 -> 594 bytes .../main/resources/icons/action-bean-sort-up.png | Bin 0 -> 599 bytes .../src/main/resources/icons/action-bean-sort.png | Bin 0 -> 463 bytes jaxx-widgets-common/src/site/site.xml | 46 ++++++ .../src/test/resources/log4j.properties | 31 ++++ jaxx-widgets-number/LICENSE.txt | 165 +++++++++++++++++++++ jaxx-widgets-number/README.txt | 2 + jaxx-widgets-number/pom.xml | 156 +++++++++++++++++++ .../jaxx/widgets/number/NumberCellEditor2.java | 14 +- .../nuiton/jaxx/widgets}/number/NumberEditor2.css | 0 .../nuiton/jaxx/widgets}/number/NumberEditor2.jaxx | 0 .../jaxx/widgets}/number/NumberEditor2Config.java | 2 +- .../jaxx/widgets}/number/NumberEditor2Handler.java | 2 +- .../jaxx/widgets}/number/NumberEditor2Model.java | 2 +- .../i18n/jaxx-widgets-number_en_GB.properties | 14 ++ .../i18n/jaxx-widgets-number_es_ES.properties | 14 ++ .../i18n/jaxx-widgets-number_fr_FR.properties | 14 ++ .../icons/action-numbereditor-calculator.png | Bin 0 -> 543 bytes .../resources/icons/action-numbereditor-reset.png | Bin 0 -> 396 bytes .../icons/action-numbereditor-validate.png | Bin 0 -> 537 bytes jaxx-widgets-number/src/site/site.xml | 46 ++++++ .../src/test/resources/log4j.properties | 31 ++++ jaxx-widgets-select/LICENSE.txt | 165 +++++++++++++++++++++ jaxx-widgets-select/README.txt | 2 + jaxx-widgets-select/pom.xml | 156 +++++++++++++++++++ .../jaxx/widgets/select}/FilterableDoubleList.css | 18 +-- .../jaxx/widgets/select}/FilterableDoubleList.jaxx | 14 +- .../select}/FilterableDoubleListConfig.java | 2 +- .../select}/FilterableDoubleListHandler.java | 10 +- .../widgets/select}/FilterableDoubleListModel.java | 2 +- .../select/session/FilterableDoubleListState.java | 66 +++++++++ .../i18n/jaxx-widgets-select_en_GB.properties | 14 ++ .../i18n/jaxx-widgets-select_es_ES.properties | 14 ++ .../i18n/jaxx-widgets-select_fr_FR.properties | 14 ++ .../resources/icons/action-doublelist-down.png | Bin 0 -> 379 bytes .../resources/icons/action-doublelist-filter.png | Bin 0 -> 3615 bytes .../resources/icons/action-doublelist-reset.png | Bin 0 -> 396 bytes .../resources/icons/action-doublelist-select.png | Bin 0 -> 349 bytes .../resources/icons/action-doublelist-sort.png | Bin 0 -> 574 bytes .../resources/icons/action-doublelist-unselect.png | Bin 0 -> 345 bytes .../main/resources/icons/action-doublelist-up.png | Bin 0 -> 372 bytes jaxx-widgets-select/src/site/site.xml | 46 ++++++ .../src/test/resources/log4j.properties | 31 ++++ pom.xml | 5 +- 75 files changed, 1668 insertions(+), 83 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm