November 2014 - Jaxx-commits - mailman.cloud.codelutin.com

branch develop updated (49ac4c7 -> 5d89a13)
by nuiton.org scm 30 Nov '14

30 Nov '14

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 49ac4c7 refs #3884 (add enable state + test it in demo) new 5d89a13 refs #3501 add dateEditable and timeEditable property The 1 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 5d89a130697d47421c1bad820d90e72b05f61c09 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 30 18:47:10 2014 +0100 refs #3501 add dateEditable and timeEditable property Summary of changes: .../jaxx/widgets/datetime/DateTimeEditorDemo.css | 12 ++++++++ .../jaxx/widgets/datetime/DateTimeEditorDemo.jaxx | 10 +++++++ .../main/resources/i18n/jaxx-demo_en_GB.properties | 2 ++ .../main/resources/i18n/jaxx-demo_es_ES.properties | 2 ++ .../main/resources/i18n/jaxx-demo_fr_FR.properties | 2 ++ .../jaxx/widgets/datetime/DateTimeEditor.css | 8 +++--- .../jaxx/widgets/datetime/DateTimeEditor.jaxx | 4 ++- .../jaxx/widgets/datetime/DateTimeEditorModel.java | 33 ++++++++++++++++++++++ 8 files changed, 68 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 1

branch develop updated (12c4989 -> 49ac4c7)
by nuiton.org scm 30 Nov '14

30 Nov '14

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 12c4989 refs #3501 add timeeditor (ng) + fix enable state + add it in demo new a4c11c0 refs #3074 rename NumberEditor new 49ac4c7 refs #3884 (add enable state + test it in demo) The 2 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 49ac4c7046bcd7a374aa2b2b586e5cb673a52bcf Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 30 17:22:57 2014 +0100 refs #3884 (add enable state + test it in demo) commit a4c11c0003a498cf4c07d63854fe6df5ef3b0a17 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 30 15:53:49 2014 +0100 refs #3074 rename NumberEditor Summary of changes: .../component/jaxx/editor/NumberEditorDemo.jaxx | 18 ++++++------ .../jaxx/widgets/gis/CoordinatesEditorDemo.css | 6 ++++ .../jaxx/widgets/gis/CoordinatesEditorDemo.jaxx | 3 +- ...{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 +++++------- .../main/resources/i18n/jaxx-demo_en_GB.properties | 1 + .../main/resources/i18n/jaxx-demo_es_ES.properties | 1 + .../main/resources/i18n/jaxx-demo_fr_FR.properties | 1 + .../gis/absolute/AbsoluteDdCoordinateEditor.jaxx | 4 +-- .../gis/absolute/AbsoluteDmdCoordinateEditor.jaxx | 4 +-- .../gis/absolute/AbsoluteDmsCoordinateEditor.jaxx | 4 +-- .../jaxx/widgets/gis/absolute/CoordinateEditor.css | 12 ++++---- .../widgets/gis/absolute/CoordinatesEditor.css | 4 +++ .../widgets/gis/absolute/CoordinatesEditor.jaxx | 20 ++++++------- .../jaxx/widgets/gis/signed/CoordinateEditor.css | 10 +++---- .../gis/signed/SignedDdCoordinateEditor.jaxx | 6 ++-- .../gis/signed/SignedDmdCoordinateEditor.jaxx | 4 +-- .../gis/signed/SignedDmsCoordinateEditor.jaxx | 4 +-- ...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 ++++----- 27 files changed, 110 insertions(+), 98 deletions(-) rename jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/{NumberEditor2Demo.css => NumberEditorDemo.css} (99%) rename jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/{NumberEditor2Demo.jaxx => NumberEditorDemo.jaxx} (86%) rename jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/{NumberEditor2DemoHandler.java => NumberEditorDemoHandler.java} (83%) rename jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/number/{NumberEditor2DemoModel.java => NumberEditorDemoModel.java} (96%) rename jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/{NumberCellEditor2.java => NumberCellEditor.java} (90%) rename jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/{NumberEditor2.css => NumberEditor.css} (100%) rename jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/{NumberEditor2.jaxx => NumberEditor.jaxx} (98%) rename jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/{NumberEditor2Config.java => NumberEditorConfig.java} (97%) rename jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/{NumberEditor2Handler.java => NumberEditorHandler.java} (93%) rename jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/{NumberEditor2Model.java => NumberEditorModel.java} (91%) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 2

branch develop updated (e0f37a3 -> 12c4989)
by nuiton.org scm 30 Nov '14

30 Nov '14

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 e0f37a3 fixes #3585 Merge branch 'feature/3585' into develop new f0d2776 refs #3501 - use widgets-common - fix i18n - fix property default value new 12c4989 refs #3501 add timeeditor (ng) + fix enable state + add it in demo The 2 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 12c49893ad8cc336543445311caa192628e99646 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 30 15:30:05 2014 +0100 refs #3501 add timeeditor (ng) + fix enable state + add it in demo commit f0d2776206680317d564e0f68c83cb5259f42893 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 30 14:16:50 2014 +0100 refs #3501 - use widgets-common - fix i18n - fix property default value Summary of changes: .../demo/component/jaxx/editor/TimeEditorDemo.jaxx | 24 +-- .../jaxx/widgets/datetime/DateTimeEditorDemo.css | 6 + .../jaxx/widgets/datetime/DateTimeEditorDemo.jaxx | 5 + .../TimeEditorDemo.css} | 54 ++--- ...DateTimeEditorDemo.jaxx => TimeEditorDemo.jaxx} | 21 +- .../widgets/datetime/TimeEditorDemoHandler.java | 44 ++++ .../jaxx/widgets/datetime/TimeEditorDemoModel.java | 28 +++ .../main/java/jaxx/demo/tree/DemoDataProvider.java | 3 +- .../main/resources/i18n/jaxx-demo_en_GB.properties | 8 +- .../main/resources/i18n/jaxx-demo_es_ES.properties | 8 + .../main/resources/i18n/jaxx-demo_fr_FR.properties | 8 +- jaxx-widgets-datetime/pom.xml | 7 + .../jaxx/widgets/datetime/DateTimeEditor.css | 2 +- .../jaxx/widgets/datetime/DateTimeEditor.jaxx | 2 +- .../widgets/datetime/DateTimeEditorHandler.java | 165 ++------------- .../jaxx/widgets/datetime/DateTimeEditorModel.java | 16 +- .../{DateTimeEditor.css => TimeEditor.css} | 18 +- .../{DateTimeEditor.jaxx => TimeEditor.jaxx} | 28 +-- .../jaxx/widgets/datetime/TimeEditorHandler.java | 211 +++++++++++++++++++ .../jaxx/widgets/datetime/TimeEditorModel.java | 223 +++++++++++++++++++++ .../widgets/datetime/TimeSliderInitializer.java | 152 ++++++++++++++ ...teTimeEditorState.java => TimeEditorState.java} | 20 +- .../i18n/jaxx-widgets-datetime_en_GB.properties | 5 +- .../i18n/jaxx-widgets-datetime_es_ES.properties | 9 +- .../i18n/jaxx-widgets-datetime_fr_FR.properties | 5 +- .../resources/icons/action-coordinate-reset.png | Bin 396 -> 0 bytes 26 files changed, 806 insertions(+), 266 deletions(-) copy jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/{gis/CoordinatesEditorDemo.css => datetime/TimeEditorDemo.css} (53%) copy jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/{DateTimeEditorDemo.jaxx => TimeEditorDemo.jaxx} (68%) create mode 100644 jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/TimeEditorDemoHandler.java create mode 100644 jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/TimeEditorDemoModel.java copy jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/{DateTimeEditor.css => TimeEditor.css} (82%) copy jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/{DateTimeEditor.jaxx => TimeEditor.jaxx} (69%) create mode 100644 jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeEditorHandler.java create mode 100644 jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeEditorModel.java create mode 100644 jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeSliderInitializer.java copy jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/session/{DateTimeEditorState.java => TimeEditorState.java} (65%) delete mode 100644 jaxx-widgets-datetime/src/main/resources/icons/action-coordinate-reset.png -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 2

branch feature/3074 deleted (was bfda7bc)
by nuiton.org scm 30 Nov '14

30 Nov '14

This is an automated email from the git hooks/post-receive script. New change to branch feature/3074 in repository jaxx. See http://git.nuiton.org/jaxx.git was bfda7bc Ne pas formatter les petits nombres decimaux en notation scientifique This change permanently discards the following revisions: discards bfda7bc Ne pas formatter les petits nombres decimaux en notation scientifique discards 3f5d85c add demo for NumberEditor2 discards 522e7a5 deprecates NumberCellEditor and replace it with new one at org.nuiton.jaxx.widgets.editor.cell package discards 029f7c6 introduce NumberEditor2 discards 2c44ad5 remove NumberEditor2 (will use ng jaxx package for it (org.nuiton.jaxx...) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 0

branch develop updated (13a6581 -> e0f37a3)
by nuiton.org scm 30 Nov '14

30 Nov '14

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(a)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(a)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(a)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(a)codelutin.com> Date: Sun Nov 30 13:11:35 2014 +0100 mise a jour des demos commit 6ee5e589ce2a479b90e96e8affe3b8b1d1e6ef3c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 30 12:31:30 2014 +0100 amove numbercell editor to widgets-number module commit 24e9c724369109e741883423c14a61a44fcff6d7 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 30 12:29:27 2014 +0100 refs #3501 (add SwingSession state) commit cbee4d856a41f30a87db3f1b3adcc7432ef87a74 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 30 12:25:37 2014 +0100 use next version of nuiton-decorator commit 407c4cad7d8ca69941f670eb2984ad8cb8fac5b2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 30 12:25:04 2014 +0100 move numbercell editor to widgets-number module commit df5e3d941d74b5ffa1b8bf3d5829c2f80e180fa0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 30 12:23:13 2014 +0100 move double list to widgets-select module commit fadcb64c38721109dd1d5c85a9f1c824225b2a26 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 30 12:21:49 2014 +0100 optimize dependencies commit 57b380d1a2eee636a9ec392c809811260be1310d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 30 12:20:37 2014 +0100 add icons commit 125e1375f6e971cf08269a2e0d8220ee44a9cf58 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 30 09:55:55 2014 +0100 move number editor + some common classes commit 9c5dc9c212a18ccfaf76555533c3424504a565d1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 30 09:10:24 2014 +0100 add jaxx-widgets-select module structure commit 6777b878e30923536c87cf406127266ea5af3d1b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 30 09:10:03 2014 +0100 add jaxx-widgets-number module structure commit f215c1a189b77e3befecdea68ad7d54e677d36ff Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 30 08:51:46 2014 +0100 add module structure commit 9932e3150531490350209f953b886dbdfa1b35a5 Author: Tony CHEMIT <chemit(a)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(a)nuiton.org>.

1 5

11/16: refs #3501 (add SwingSession state)
by nuiton.org scm 30 Nov '14

30 Nov '14

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 24e9c724369109e741883423c14a61a44fcff6d7 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 30 12:29:27 2014 +0100 refs #3501 (add SwingSession state) --- .../jaxx/widgets/datetime/DateTimeEditor.css | 1 + .../jaxx/widgets/datetime/DateTimeEditor.jaxx | 4 +- .../datetime/session/DateTimeEditorState.java | 54 ++++++++++++++++++++++ 3 files changed, 58 insertions(+), 1 deletion(-) diff --git a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditor.css b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditor.css index e8d57b2..e5f019a 100644 --- a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditor.css +++ b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditor.css @@ -65,6 +65,7 @@ target:{slider}; showTip:{t("datetimeeditor.show.slider")}; hideTip:{t("datetimeeditor.hide.slider")}; + targetVisible:{isShowTimeEditorSlider()}; } #slider { diff --git a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditor.jaxx b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditor.jaxx index 13395be..4fe2d25 100644 --- a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditor.jaxx +++ b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditor.jaxx @@ -43,6 +43,9 @@  <SpinnerDateModel id="minuteModel"/> +  + <Boolean id='showTimeEditorSlider' javaBean='false'/> + <script><![CDATA[ public void init() { handler.init(this); } @@ -54,7 +57,6 @@ public void setDate(Date date) { model.setDate(date); } public void setDateFormat(String dateFormat) { dayDateEditor.setFormats(dateFormat); } public void setLabel(String label) { dateTimeLabel.setText(label); } -public void setShowTimeEditorSlider(boolean showTimeEditorSlider) { sliderHidor.setTargetVisible(showTimeEditorSlider); } ]]> </script> diff --git a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/session/DateTimeEditorState.java b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/session/DateTimeEditorState.java new file mode 100644 index 0000000..eae97f4 --- /dev/null +++ b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/session/DateTimeEditorState.java @@ -0,0 +1,54 @@ +package org.nuiton.jaxx.widgets.datetime.session; + +import jaxx.runtime.swing.session.State; +import org.nuiton.jaxx.widgets.datetime.DateTimeEditor; + +/** + * Created on 11/30/14. + * + * @author Tony Chemit - chemit(a)codelutin.com + * @since 2.18 + */ +public class DateTimeEditorState implements State { + + protected Boolean showTimeEditorSlider = false; + + public boolean getShowTimeEditorSlider() { + return showTimeEditorSlider; + } + + public void setShowTimeEditorSlider(boolean showTimeEditorSlider) { + this.showTimeEditorSlider = showTimeEditorSlider; + } + + @Override + public State getState(Object o) { + DateTimeEditor list = checkComponent(o); + DateTimeEditorState state = new DateTimeEditorState(); + state.setShowTimeEditorSlider(list.getShowTimeEditorSlider()); + return state; + } + + @Override + public void setState(Object o, State state) { + if (!(state instanceof DateTimeEditorState)) { + throw new IllegalArgumentException("invalid state"); + } + + DateTimeEditor list = checkComponent(o); + DateTimeEditorState beanDoubleListState = (DateTimeEditorState) state; + list.setShowTimeEditorSlider(beanDoubleListState.getShowTimeEditorSlider()); + + } + + protected DateTimeEditor checkComponent(Object o) { + if (o == null) { + throw new IllegalArgumentException("null component"); + } + if (!(o instanceof DateTimeEditor)) { + throw new IllegalArgumentException("invalid component"); + } + return (DateTimeEditor) o; + } + +} -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 0

10/16: use next version of nuiton-decorator
by nuiton.org scm 30 Nov '14

30 Nov '14

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 cbee4d856a41f30a87db3f1b3adcc7432ef87a74 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 30 12:25:37 2014 +0100 use next version of nuiton-decorator --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4b77d99..a0ffd3d 100644 --- a/pom.xml +++ b/pom.xml @@ -254,7 +254,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-decorator</artifactId> - <version>3.0-alpha-3</version> + <version>3.0-SNAPSHOT</version> </dependency> <dependency> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 0

09/16: move numbercell editor to widgets-number module
by nuiton.org scm 30 Nov '14

30 Nov '14

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 407c4cad7d8ca69941f670eb2984ad8cb8fac5b2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 30 12:25:04 2014 +0100 move numbercell editor to widgets-number module --- .../jaxx/widgets/editor/cell/NumberCellEditor.java | 139 --------------------- 1 file changed, 139 deletions(-) diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/cell/NumberCellEditor.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/cell/NumberCellEditor.java deleted file mode 100644 index 97866c3..0000000 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/cell/NumberCellEditor.java +++ /dev/null @@ -1,139 +0,0 @@ -package org.nuiton.jaxx.widgets.editor.cell; - -/* - * #%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 jaxx.runtime.swing.editor.NumberEditor; -import org.nuiton.jaxx.widgets.editor.number.NumberEditor2; -import org.nuiton.jaxx.widgets.editor.number.NumberEditor2Model; - -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(a)codelutin.com - * @since 2.17 - */ -public class NumberCellEditor<E extends Number> extends AbstractCellEditor - implements TableCellEditor, FocusListener, AncestorListener { - - private static final long serialVersionUID = 1L; - - protected final NumberEditor2 numberEditor; - - /** constructor */ - public NumberCellEditor(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 http://www.nuiton.org/issues/3517 and http://www.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(NumberEditor.BINDING_TEXT_FIELD_TEXT); - } - return result; - } - -} -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 0

08/16: move double list to widgets-select module
by nuiton.org scm 30 Nov '14

30 Nov '14

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 df5e3d941d74b5ffa1b8bf3d5829c2f80e180fa0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 30 12:23:13 2014 +0100 move double list to widgets-select module --- jaxx-widgets-select/pom.xml | 70 +++++++++------------- .../jaxx/widgets/select}/FilterableDoubleList.css | 14 ++--- .../jaxx/widgets/select}/FilterableDoubleList.jaxx | 16 ++--- .../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 +++++ 10 files changed, 159 insertions(+), 63 deletions(-) diff --git a/jaxx-widgets-select/pom.xml b/jaxx-widgets-select/pom.xml index 3854dc3..07d0f4c 100644 --- a/jaxx-widgets-select/pom.xml +++ b/jaxx-widgets-select/pom.xml @@ -37,6 +37,14 @@ <name>JAXX :: Widgets Select</name> <description>Widgets to select data (using combobox, jlist, doublelist...)</description> + <properties> + <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> + <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> + <jaxx.autoImportCss>true</jaxx.autoImportCss> + <jaxx.addAutoHandlerUI>true</jaxx.addAutoHandlerUI> +  + </properties> + <dependencies>  @@ -49,7 +57,7 @@ <dependency> <groupId>${project.groupId}</groupId> - <artifactId>jaxx-widgets-doublelist</artifactId> + <artifactId>jaxx-widgets-common</artifactId> <version>${project.version}</version> </dependency> @@ -57,16 +65,6 @@ <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-common</artifactId> </dependency> - - <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-core</artifactId> - </dependency> - - <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-autocomplete</artifactId> - </dependency> <dependency> <groupId>org.nuiton.i18n</groupId> @@ -84,46 +82,16 @@ </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-converter</artifactId> - </dependency> - - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - - <dependency> - <groupId>commons-primitives</groupId> - <artifactId>commons-primitives</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-collections4</artifactId> - </dependency> - - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> - - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <scope>provided</scope> @@ -150,8 +118,28 @@ <plugins> <plugin> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-maven-plugin</artifactId> + <version>${project.version}</version> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> + <configuration> + <entries> + <entry> + <basedir>${project.build.directory}/generated-sources/java</basedir> + </entry> + </entries> + </configuration> <executions> <execution> <goals> diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/bean/FilterableDoubleList.css b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleList.css similarity index 91% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/bean/FilterableDoubleList.css rename to jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleList.css index 76cc729..578c770 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/bean/FilterableDoubleList.css +++ b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleList.css @@ -24,12 +24,12 @@ enabled:{isEnabled()}; } -#filterPanel { +.filterable { visible: {isFilterable()}; } #filterFieldLabel { - actionIcon: "filter"; + actionIcon: "doublelist-filter"; } #universeList { @@ -38,7 +38,7 @@ #addButton { toolTipText:"beandoublelist.button.add"; - actionIcon:"bean-doublelist-select"; + actionIcon:"doublelist-select"; } #selectedList { @@ -48,7 +48,7 @@ #removeButton { toolTipText:"beandoublelist.button.remove"; - actionIcon:"bean-doublelist-unselect"; + actionIcon:"doublelist-unselect"; } #popup { @@ -77,21 +77,21 @@ } #selectedListMoveUpAction { - actionIcon: "bean-doublelist-up"; + actionIcon: "doublelist-up"; text: "bean.action.selected.move.up"; toolTipText: "bean.action.selected.move.up.tip"; enabled:{model.isSelectedUpEnabled()}; } #selectedListMoveDownAction { - actionIcon: "bean-doublelist-down"; + actionIcon: "doublelist-down"; text: "bean.action.selected.move.down"; toolTipText: "bean.action.selected.move.down.tip"; enabled:{model.isSelectedDownEnabled()}; } #selectedListRemoveAction { - actionIcon: "bean-doublelist-unselect"; + actionIcon: "doublelist-unselect"; text: "bean.action.selected.remove"; toolTipText: "bean.action.selected.remove.tip"; enabled:{model.isRemoveEnabled()}; diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/bean/FilterableDoubleList.jaxx b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleList.jaxx similarity index 91% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/bean/FilterableDoubleList.jaxx rename to jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleList.jaxx index 048d46c..7f73602 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/bean/FilterableDoubleList.jaxx +++ b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleList.jaxx @@ -40,16 +40,16 @@  <Boolean id='showSelectPopupEnabled' javaBean='true'/> -  - <Boolean id='reverseSort' javaBean='false'/> -  <Boolean id='highlightFilterText' javaBean='false'/>  <FilterableDoubleListModel id='model' genericType='O' initializer='getContextValue(FilterableDoubleListModel.class)'/> -  +  + <Boolean id='reverseSort' javaBean='false'/> + +  <Integer id='index' javaBean='0'/>  @@ -83,14 +83,14 @@ </row> <row> <cell columns='3' fill='both'> - <JPanel layout='{new BorderLayout()}' id='filterPanel'> + <JPanel layout='{new BorderLayout()}' id='topPanel'> <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.WEST'> - <JLabel id='filterFieldLabel' constraints='BorderLayout.WEST'/> - <JToolBar id='toolbarLeft' constraints='BorderLayout.EAST'> + <JLabel id='filterFieldLabel' styleClass='filterable' constraints='BorderLayout.WEST'/> + <JToolBar id='toolbarLeft' styleClass='filterable' constraints='BorderLayout.EAST'> <JButton id='resetButton' onActionPerformed='filterField.setText("")'/> </JToolBar> </JPanel> - <JTextField id='filterField' constraints='BorderLayout.CENTER'/> + <JTextField id='filterField' styleClass='filterable' constraints='BorderLayout.CENTER'/> <JToolBar id='toolbarRight' constraints='BorderLayout.EAST'> <JToggleButton id='changeDecorator' onActionPerformed='handler.togglePopup()'/> </JToolBar> diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/bean/FilterableDoubleListConfig.java b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListConfig.java similarity index 96% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/bean/FilterableDoubleListConfig.java rename to jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListConfig.java index aceb5cc..caf5de3 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/bean/FilterableDoubleListConfig.java +++ b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListConfig.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.widgets.editor.bean; +package org.nuiton.jaxx.widgets.select; import java.io.Serializable; diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/bean/FilterableDoubleListHandler.java b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListHandler.java similarity index 98% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/bean/FilterableDoubleListHandler.java rename to jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListHandler.java index 56b4d78..cf1749f 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/bean/FilterableDoubleListHandler.java +++ b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListHandler.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.widgets.editor.bean; +package org.nuiton.jaxx.widgets.select; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; @@ -7,7 +7,6 @@ import com.google.common.collect.Lists; import jaxx.runtime.SwingUtil; import jaxx.runtime.spi.UIHandler; import jaxx.runtime.swing.JAXXButtonGroup; -import jaxx.runtime.swing.editor.bean.BeanUIUtil; import jaxx.runtime.swing.model.JaxxFilterableListModel; import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import jaxx.runtime.swing.renderer.FilteredDecoratorListCellRenderer; @@ -16,6 +15,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.DecoratorUtil; import org.nuiton.decorator.JXPathDecorator; import org.nuiton.decorator.MultiJXPathDecorator; +import org.nuiton.jaxx.widgets.DecoratorPopupHandler; import org.nuiton.jaxx.widgets.MutateOnConditionalPropertyChangeListener; import org.nuiton.util.beans.BeanUtil; @@ -54,7 +54,7 @@ public class FilterableDoubleListHandler<O extends Serializable> implements UIHa /** the decorator of data */ private MultiJXPathDecorator<O> decorator; - private final BeanUIUtil.PopupHandler popupHandler = new BeanUIUtil.PopupHandler() { + private final DecoratorPopupHandler popupHandler = new DecoratorPopupHandler() { @Override public JPopupMenu getPopup() { @@ -287,7 +287,7 @@ public class FilterableDoubleListHandler<O extends Serializable> implements UIHa throw new NullPointerException("decorator can not be null (for type " + ui.getBeanType() + ")"); } - this.decorator = BeanUIUtil.createDecorator(decorator); + this.decorator = DecoratorUtil.cloneDecorator(decorator); FilterableDoubleListModel<O> model = ui.getModel(); @@ -365,7 +365,7 @@ public class FilterableDoubleListHandler<O extends Serializable> implements UIHa // Init selected list JList selectedList = ui.getSelectedList(); if (decorator2 != null) { - decorator2 = BeanUIUtil.createDecorator(decorator2); + decorator2 = DecoratorUtil.cloneDecorator(decorator2); } else { decorator2 = this.decorator; } diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/bean/FilterableDoubleListModel.java b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListModel.java similarity index 99% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/bean/FilterableDoubleListModel.java rename to jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListModel.java index 7451d18..f336c51 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/bean/FilterableDoubleListModel.java +++ b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListModel.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.widgets.editor.bean; +package org.nuiton.jaxx.widgets.select; import jaxx.runtime.swing.model.JaxxDefaultListModel; import jaxx.runtime.swing.model.JaxxFilterableListModel; diff --git a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/session/FilterableDoubleListState.java b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/session/FilterableDoubleListState.java new file mode 100644 index 0000000..4ff6bc1 --- /dev/null +++ b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/session/FilterableDoubleListState.java @@ -0,0 +1,66 @@ +package org.nuiton.jaxx.widgets.select.session; + +import jaxx.runtime.swing.session.State; +import org.nuiton.jaxx.widgets.select.FilterableDoubleList; + +/** + * Created on 11/30/14. + * + * @author Tony Chemit - chemit(a)codelutin.com + * @since 2.18 + */ +public class FilterableDoubleListState implements State { + + protected int index = 0; + + protected Boolean reverseSort = false; + + public int getIndex() { + return index; + } + + public void setIndex(int index) { + this.index = index; + } + + public boolean isReverseSort() { + return reverseSort; + } + + public void setReverseSort(boolean reverseSort) { + this.reverseSort = reverseSort; + } + + @Override + public State getState(Object o) { + FilterableDoubleList list = checkComponent(o); + FilterableDoubleListState state = new FilterableDoubleListState(); + state.setIndex(list.getIndex()); + state.setReverseSort(list.isReverseSort()); + return state; + } + + @Override + public void setState(Object o, State state) { + if (!(state instanceof FilterableDoubleListState)) { + throw new IllegalArgumentException("invalid state"); + } + + FilterableDoubleList list = checkComponent(o); + FilterableDoubleListState beanDoubleListState = (FilterableDoubleListState) state; + list.setIndex(beanDoubleListState.getIndex()); + list.setReverseSort(beanDoubleListState.isReverseSort()); + + } + + protected FilterableDoubleList checkComponent(Object o) { + if (o == null) { + throw new IllegalArgumentException("null component"); + } + if (!(o instanceof FilterableDoubleList)) { + throw new IllegalArgumentException("invalid component"); + } + return (FilterableDoubleList) o; + } + +} diff --git a/jaxx-widgets-select/src/main/resources/i18n/jaxx-widgets-select_en_GB.properties b/jaxx-widgets-select/src/main/resources/i18n/jaxx-widgets-select_en_GB.properties new file mode 100644 index 0000000..3caaa9d --- /dev/null +++ b/jaxx-widgets-select/src/main/resources/i18n/jaxx-widgets-select_en_GB.properties @@ -0,0 +1,14 @@ +bean.action.selected.move.down=Move down +bean.action.selected.move.down.tip=Move down the selected item +bean.action.selected.move.up=Move up +bean.action.selected.move.up.tip=Move up the selected item +bean.action.selected.remove=Unselect +bean.action.selected.remove.tip=Unselect the selected item +bean.sort.down=Descending sort +bean.sort.label=Sort order +bean.sort.up=Ascending sort +beandoublelist.action.reset.tip=Reset the value of the filter +beandoublelist.action.sort.tip=Change the sorted property +beandoublelist.button.add=Add +beandoublelist.button.remove=Remove +beandoublelist.popup.title=Change the sorted property diff --git a/jaxx-widgets-select/src/main/resources/i18n/jaxx-widgets-select_es_ES.properties b/jaxx-widgets-select/src/main/resources/i18n/jaxx-widgets-select_es_ES.properties new file mode 100644 index 0000000..848cb36 --- /dev/null +++ b/jaxx-widgets-select/src/main/resources/i18n/jaxx-widgets-select_es_ES.properties @@ -0,0 +1,14 @@ +bean.action.selected.move.down=Descendre +bean.action.selected.move.down.tip=Descendre l'élément sélectionné +bean.action.selected.move.up=Monter +bean.action.selected.move.up.tip=Monter l'élément sélectionné +bean.action.selected.remove=Supprimer +bean.action.selected.remove.tip=Supprimer l'élément sélectionné +bean.sort.down=Calsificación decreciente +bean.sort.label=Orden de clasificación +bean.sort.up=Clasificación creciente +beandoublelist.action.reset.tip=Reiniciar el valor de la lista desplegable +beandoublelist.action.sort.tip=Modificar la clasificación de la lista +beandoublelist.button.add=Add +beandoublelist.button.remove=Remove +beandoublelist.popup.title=Modificar la clasificación diff --git a/jaxx-widgets-select/src/main/resources/i18n/jaxx-widgets-select_fr_FR.properties b/jaxx-widgets-select/src/main/resources/i18n/jaxx-widgets-select_fr_FR.properties new file mode 100644 index 0000000..0c8b63f --- /dev/null +++ b/jaxx-widgets-select/src/main/resources/i18n/jaxx-widgets-select_fr_FR.properties @@ -0,0 +1,14 @@ +bean.action.selected.move.down=Descendre +bean.action.selected.move.down.tip=Descendre l'élément sélectionné +bean.action.selected.move.up=Monter +bean.action.selected.move.up.tip=Monter l'élément sélectionné +bean.action.selected.remove=Supprimer +bean.action.selected.remove.tip=Supprimer l'élément sélectionné +bean.sort.down=Tri décroissant +bean.sort.label=Ordre de tri +bean.sort.up=Tri croissant +beandoublelist.action.reset.tip=Réinitialiser la valeur du filtre +beandoublelist.action.sort.tip=Modifier le tri de la liste +beandoublelist.button.add=Ajouter +beandoublelist.button.remove=Enlever +beandoublelist.popup.title=Modifier le tri -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 0

07/16: optimize dependencies
by nuiton.org scm 30 Nov '14

30 Nov '14

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 fadcb64c38721109dd1d5c85a9f1c824225b2a26 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 30 12:21:49 2014 +0100 optimize dependencies --- jaxx-widgets-common/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/jaxx-widgets-common/pom.xml b/jaxx-widgets-common/pom.xml index 20c9642..6087753 100644 --- a/jaxx-widgets-common/pom.xml +++ b/jaxx-widgets-common/pom.xml @@ -45,6 +45,7 @@ <groupId>${project.groupId}</groupId> <artifactId>jaxx-runtime</artifactId> <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 0