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 9932e3150531490350209f953b886dbdfa1b35a5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 30 08:40:23 2014 +0100 fixes #3584: Improve gis editor layout --- .../widgets/gis/absolute/CoordinatesEditor.jaxx | 97 +++++++++++----------- 1 file changed, 47 insertions(+), 50 deletions(-) diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.jaxx b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.jaxx index 1f7187f..eae9c6b 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.jaxx +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.jaxx @@ -19,7 +19,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<JPanel id='coordinateEditorTopPanel'> +<Table id="coordinateEditorTopPanel" insets="0"> <import> jaxx.runtime.swing.CardLayout2Ext @@ -55,52 +55,49 @@ public void setShowResetButton(boolean showResetButton) { model.setShowResetButt <CardLayout2Ext id='latitudeLayout' constructorParams='this, "latitudeEditor"'/> <CardLayout2Ext id='longitudeLayout' constructorParams='this, "longitudeEditor"'/> - <Table id="coordinateEditorContainer" insets="0"> - <row> - <cell anchor="west"> - <JPanel id='quadrantEditor' layout="{new GridLayout(2,2,0,0)}"> - <JToggleButton id='quadrant4'/> - <JToggleButton id='quadrant1'/> - <JToggleButton id='quadrant3'/> - <JToggleButton id='quadrant2'/> - </JPanel> - </cell> - <cell weightx='1'> - <Table id='coordinatesPanel'> - <row> - <cell anchor='east'> - <JLabel id='latitudeLabel'/> - </cell> - <cell> - <JPanel id='latitudeEditor'> - <AbsoluteDdCoordinateEditor id='latitudeDd' constraints='CoordinateFormat.dd.name()'/> - <AbsoluteDmsCoordinateEditor id='latitudeDms' constraints='CoordinateFormat.dms.name()'/> - <AbsoluteDmdCoordinateEditor id='latitudeDmd' constraints='CoordinateFormat.dmd.name()'/> - </JPanel> - </cell> - </row> - <row> - <cell anchor='east'> - <JLabel id='longitudeLabel'/> - </cell> - <cell> - <JPanel id='longitudeEditor'> - <AbsoluteDdCoordinateEditor id='longitudeDd' constraints='CoordinateFormat.dd.name()'/> - <AbsoluteDmsCoordinateEditor id='longitudeDms' constraints='CoordinateFormat.dms.name()'/> - <AbsoluteDmdCoordinateEditor id='longitudeDmd' constraints='CoordinateFormat.dmd.name()'/> - </JPanel> - </cell> - </row> - </Table> - </cell> - <cell> - <JPanel id='formatPanel' layout='{new GridLayout(0,1,0,0)}'> - <JRadioButton id='ddFormat'/> - <JRadioButton id='dmsFormat'/> - <JRadioButton id='dmdFormat'/> - </JPanel> - </cell> - </row> - </Table> - -</JPanel> \ No newline at end of file + <row> + <cell anchor="west"> + <JPanel id='quadrantEditor' layout="{new GridLayout(2,2,0,0)}"> + <JToggleButton id='quadrant4'/> + <JToggleButton id='quadrant1'/> + <JToggleButton id='quadrant3'/> + <JToggleButton id='quadrant2'/> + </JPanel> + </cell> + <cell fill="both" weightx='1'> + <Table id='coordinatesPanel' insets="0"> + <row> + <cell anchor='east'> + <JLabel id='latitudeLabel'/> + </cell> + <cell fill="both" weightx='1'> + <JPanel id='latitudeEditor'> + <AbsoluteDdCoordinateEditor id='latitudeDd' constraints='CoordinateFormat.dd.name()'/> + <AbsoluteDmsCoordinateEditor id='latitudeDms' constraints='CoordinateFormat.dms.name()'/> + <AbsoluteDmdCoordinateEditor id='latitudeDmd' constraints='CoordinateFormat.dmd.name()'/> + </JPanel> + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel id='longitudeLabel'/> + </cell> + <cell fill="both" weightx='1'> + <JPanel id='longitudeEditor'> + <AbsoluteDdCoordinateEditor id='longitudeDd' constraints='CoordinateFormat.dd.name()'/> + <AbsoluteDmsCoordinateEditor id='longitudeDms' constraints='CoordinateFormat.dms.name()'/> + <AbsoluteDmdCoordinateEditor id='longitudeDmd' constraints='CoordinateFormat.dmd.name()'/> + </JPanel> + </cell> + </row> + </Table> + </cell> + <cell> + <JPanel id='formatPanel' layout='{new GridLayout(0,1,0,0)}'> + <JRadioButton id='ddFormat'/> + <JRadioButton id='dmsFormat'/> + <JRadioButton id='dmdFormat'/> + </JPanel> + </cell> + </row> +</Table> -- 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 6777b878e30923536c87cf406127266ea5af3d1b Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 30 09:10:03 2014 +0100 add jaxx-widgets-number module structure --- jaxx-widgets-number/LICENSE.txt | 165 ++++++++++++++++++++ jaxx-widgets-number/README.txt | 2 + jaxx-widgets-number/pom.xml | 168 +++++++++++++++++++++ jaxx-widgets-number/src/site/site.xml | 46 ++++++ .../src/test/resources/log4j.properties | 31 ++++ pom.xml | 1 + 6 files changed, 413 insertions(+) diff --git a/jaxx-widgets-number/LICENSE.txt b/jaxx-widgets-number/LICENSE.txt new file mode 100644 index 0000000..cca7fc2 --- /dev/null +++ b/jaxx-widgets-number/LICENSE.txt @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/jaxx-widgets-number/README.txt b/jaxx-widgets-number/README.txt new file mode 100644 index 0000000..d2e50d3 --- /dev/null +++ b/jaxx-widgets-number/README.txt @@ -0,0 +1,2 @@ +To deploy new version of pom: mvn deploy +To install localy: mvn install diff --git a/jaxx-widgets-number/pom.xml b/jaxx-widgets-number/pom.xml new file mode 100644 index 0000000..40610c1 --- /dev/null +++ b/jaxx-widgets-number/pom.xml @@ -0,0 +1,168 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + JAXX :: Widgets Common + %% + Copyright (C) 2008 - 2014 CodeLutin, Tony Chemit + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.nuiton</groupId> + <artifactId>jaxx</artifactId> + <version>2.18-SNAPSHOT</version> + </parent> + + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets-number</artifactId> + + <name>JAXX :: Widgets Number</name> + <description>Widget to edit numbers</description> + + <dependencies> + + <!-- sibiling dependencies --> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-runtime</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-widgets-common</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <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> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-decorator</artifactId> + </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> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + </dependencies> + + <build> + + <resources> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> + + <plugins> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>i18n-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + +</project> diff --git a/jaxx-widgets-number/src/site/site.xml b/jaxx-widgets-number/src/site/site.xml new file mode 100644 index 0000000..8d5a39f --- /dev/null +++ b/jaxx-widgets-number/src/site/site.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + JAXX :: Widgets + %% + Copyright (C) 2008 - 2014 Code Lutin, Tony Chemit + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --> + +<project name="${project.name}" + xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + + <bannerLeft> + <name>${project.name}</name> + <src>${siteCommonResourcesUrl}/images/logos/jaxx-logo.png</src> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu ref="reports"/> + + </body> +</project> diff --git a/jaxx-widgets-number/src/test/resources/log4j.properties b/jaxx-widgets-number/src/test/resources/log4j.properties new file mode 100644 index 0000000..a9515ea --- /dev/null +++ b/jaxx-widgets-number/src/test/resources/log4j.properties @@ -0,0 +1,31 @@ +### +# #%L +# JAXX :: Widgets +# %% +# Copyright (C) 2008 - 2014 Code Lutin, Tony Chemit +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### +# Global logging configuration +log4j.rootLogger=ERROR, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n + +log4j.logger.jaxx.runtime.swing=DEBUG +#log4j.logger.jaxx.runtime.swing.editor.config.model.ConfigUIModelBuilder=DEBUG +log4j.logger.org.nuiton=WARN diff --git a/pom.xml b/pom.xml index dcd1b15..cac3fa6 100644 --- a/pom.xml +++ b/pom.xml @@ -40,6 +40,7 @@ <module>jaxx-compiler</module> <module>jaxx-maven-plugin</module> <module>jaxx-widgets-common</module> + <module>jaxx-widgets-number</module> <module>jaxx-widgets</module> <module>jaxx-widgets-datetime</module> <module>jaxx-widgets-gis</module> -- 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 125e1375f6e971cf08269a2e0d8220ee44a9cf58 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 30 09:55:55 2014 +0100 move number editor + some common classes --- jaxx-widgets-common/pom.xml | 50 ------- .../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 + jaxx-widgets-number/pom.xml | 68 ++++----- .../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 ++ 17 files changed, 313 insertions(+), 98 deletions(-) diff --git a/jaxx-widgets-common/pom.xml b/jaxx-widgets-common/pom.xml index 356e6f4..20c9642 100644 --- a/jaxx-widgets-common/pom.xml +++ b/jaxx-widgets-common/pom.xml @@ -48,76 +48,26 @@ </dependency> <dependency> - <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> <artifactId>nuiton-i18n</artifactId> </dependency> <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> <artifactId>nuiton-decorator</artifactId> </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> diff --git a/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/DecoratorPopupHandler.java b/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/DecoratorPopupHandler.java new file mode 100644 index 0000000..8ae145c --- /dev/null +++ b/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/DecoratorPopupHandler.java @@ -0,0 +1,164 @@ +package org.nuiton.jaxx.widgets; + +import jaxx.runtime.swing.JAXXButtonGroup; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.decorator.MultiJXPathDecorator; + +import javax.swing.AbstractButton; +import javax.swing.ButtonGroup; +import javax.swing.JComponent; +import javax.swing.JLabel; +import javax.swing.JPopupMenu; +import javax.swing.JRadioButtonMenuItem; +import javax.swing.JSeparator; +import javax.swing.SwingUtilities; +import java.awt.Dimension; +import java.beans.Introspector; + +import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; + +/** + * Created on 11/30/14. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 2.18 + */ +public abstract class DecoratorPopupHandler implements Runnable { + + /** Logger. */ + public static final Log log = LogFactory.getLog(DecoratorPopupHandler.class); + + public static final String DEFAULT_POPUP_LABEL = n("bean.popup.label"); + + public static final String DEFAULT_SELECTED_TOOLTIP = n("bean.sort.on"); + + public static final String DEFAULT_NOT_SELECTED_TOOLTIP = n("bean.sort.off"); + + public abstract JPopupMenu getPopup(); + + public abstract JComponent getInvoker(); + + @Override + public void run() { + + updatePopup(); + + Dimension dim = getPopup().getPreferredSize(); + + JComponent invoker = getInvoker(); + getPopup().show( + invoker, + (int) (invoker.getPreferredSize().getWidth() - dim.getWidth()), + invoker.getHeight() + ); + } + + /** Toggle the popup visible state. */ + public void togglePopup() { + boolean newValue = !getPopup().isVisible(); + + if (log.isTraceEnabled()) { + log.trace(newValue); + } + + if (!newValue) { + if (getPopup() != null) { + getPopup().setVisible(false); + } + return; + } + SwingUtilities.invokeLater(this); + } + + protected void updatePopup() { + getPopup().pack(); + } + + /** + * Creation de l'ui pour modifier le décorateur. + * + * @param selectedTip + * @param notSelectedTip + * @param i18nPrefix + * @param title + * @param indexes + * @param popupLabel + * @param sortUp + * @param sortDown + * @param decorator le decorateur a utiliser + */ + public void preparePopup(String selectedTip, + String notSelectedTip, + String i18nPrefix, + String title, + ButtonGroup indexes, + JSeparator popupSeparator, + JLabel popupLabel, + AbstractButton sortUp, + AbstractButton sortDown, + MultiJXPathDecorator<?> decorator) { + if (selectedTip == null) { + // use default selected tip text + selectedTip = DEFAULT_SELECTED_TOOLTIP; + } + if (notSelectedTip == null) { + // use default selected tip text + notSelectedTip = DEFAULT_NOT_SELECTED_TOOLTIP; + } + JPopupMenu popup = getPopup(); + + //Container container = ui.getIndexesContainer(); + + int nbContext = decorator.getNbContext(); + if (nbContext > 1) { + for (int i = 0; i < nbContext; i++) { + String property = i18nPrefix + decorator.getProperty(i); + String propertyI18n = t(property); + JRadioButtonMenuItem button = new JRadioButtonMenuItem(propertyI18n); + button.putClientProperty(JAXXButtonGroup.BUTTON8GROUP_CLIENT_PROPERTY, indexes); + button.putClientProperty(JAXXButtonGroup.VALUE_CLIENT_PROPERTY, i); + popup.add(button); + if (selectedTip != null) { + button.putClientProperty(JAXXButtonGroup.SELECTED_TIP_CLIENT_PROPERTY, t(selectedTip, propertyI18n)); + } + if (notSelectedTip != null) { + button.putClientProperty(JAXXButtonGroup.NOT_SELECTED_TIP_CLIENT_PROPERTY, t(notSelectedTip, propertyI18n)); + } + button.setSelected(false); + indexes.add(button); + } + } + if (title == null) { + // use default popup title + title = DEFAULT_POPUP_LABEL; + + Class<?> type = decorator.getType(); + String beanI18nKey; + if (type == null) { + beanI18nKey = n("bean.unknown.type"); + } else { + beanI18nKey = i18nPrefix + Introspector.decapitalize(type.getSimpleName()); + } + String beanI18n = t(beanI18nKey); + title = t(title, beanI18n); + } else { + title = t(title); + } + + sortDown.putClientProperty(JAXXButtonGroup.SELECTED_TIP_CLIENT_PROPERTY, t("bean.sort.down.tip")); + sortDown.putClientProperty(JAXXButtonGroup.NOT_SELECTED_TIP_CLIENT_PROPERTY, t("bean.sort.down.toSelect.tip")); + + sortUp.putClientProperty(JAXXButtonGroup.SELECTED_TIP_CLIENT_PROPERTY, t("bean.sort.up.tip")); + sortUp.putClientProperty(JAXXButtonGroup.NOT_SELECTED_TIP_CLIENT_PROPERTY, t("bean.sort.up.toSelect.tip")); + + if (nbContext < 2) { + getPopup().remove(popupSeparator); + getPopup().remove(popupLabel); + } + popupLabel.setText(title); + getPopup().setLabel(title); + getPopup().invalidate(); + } +} \ No newline at end of file diff --git a/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/JaxxWidgetRuntimeException.java b/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/JaxxWidgetRuntimeException.java new file mode 100644 index 0000000..0bcdd6d --- /dev/null +++ b/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/JaxxWidgetRuntimeException.java @@ -0,0 +1,28 @@ +package org.nuiton.jaxx.widgets; + +/** + * A none checked exception to use in widgets. + * + * Created on 11/30/14. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 2.18 + */ +public class JaxxWidgetRuntimeException extends RuntimeException { + private static final long serialVersionUID = -2963740979386945340L; + + public JaxxWidgetRuntimeException() { + } + + public JaxxWidgetRuntimeException(String message) { + super(message); + } + + public JaxxWidgetRuntimeException(String message, Throwable cause) { + super(message, cause); + } + + public JaxxWidgetRuntimeException(Throwable cause) { + super(cause); + } +} \ No newline at end of file diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/ModelToBean.java b/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/ModelToBean.java similarity index 98% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/ModelToBean.java rename to jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/ModelToBean.java index 13d4081..4e941df 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/ModelToBean.java +++ b/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/ModelToBean.java @@ -26,7 +26,7 @@ package org.nuiton.jaxx.widgets; * Created on 11/23/14. * * @author Tony Chemit - chemit@codelutin.com - * @since 2.17 + * @since 2.18 */ public interface ModelToBean { diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/MutateOnConditionalPropertyChangeListener.java b/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/MutateOnConditionalPropertyChangeListener.java similarity index 70% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/MutateOnConditionalPropertyChangeListener.java rename to jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/MutateOnConditionalPropertyChangeListener.java index 4fe5ca4..e81f3ba 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/MutateOnConditionalPropertyChangeListener.java +++ b/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/MutateOnConditionalPropertyChangeListener.java @@ -22,33 +22,47 @@ package org.nuiton.jaxx.widgets; * #L% */ +import com.google.common.base.Preconditions; import com.google.common.base.Predicate; -import jaxx.runtime.swing.JAXXRuntimeException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.lang.reflect.Method; /** - * A property change listener to mutate to a bean after a predicate is applied. + * A property change listener to mutate to a bean after a predicate was applied. * * Created on 11/23/14. * * @author Tony Chemit - chemit@codelutin.com - * @since 2.17 + * @since 2.18 */ public class MutateOnConditionalPropertyChangeListener<M extends ModelToBean> implements PropertyChangeListener { + /** Logger. */ + private static final Log log = LogFactory.getLog(MutateOnConditionalPropertyChangeListener.class); + private final M model; private final Method mutator; private final Predicate<M> canMutatePredicate; + private final String propertyName; + public MutateOnConditionalPropertyChangeListener(M model, Method mutator, Predicate<M> canMutatePredicate) { + + Preconditions.checkNotNull(model); + Preconditions.checkNotNull(mutator); + Preconditions.checkNotNull(canMutatePredicate); + this.model = model; this.mutator = mutator; this.canMutatePredicate = canMutatePredicate; + this.propertyName = mutator.getName(); + } @Override @@ -58,12 +72,17 @@ public class MutateOnConditionalPropertyChangeListener<M extends ModelToBean> im Object newValue = evt.getNewValue(); + + if (log.isDebugEnabled()) { + log.debug("Mutates property " + propertyName + " with value " + newValue + " on " + model); + } + try { mutator.invoke(model.getBean(), newValue); } catch (Exception e) { - throw new JAXXRuntimeException(e); + throw new JaxxWidgetRuntimeException("Can't mutate property " + propertyName + " on " + model, e); } } diff --git a/jaxx-widgets-common/src/main/resources/i18n/jaxx-widgets-common_en_GB.properties b/jaxx-widgets-common/src/main/resources/i18n/jaxx-widgets-common_en_GB.properties new file mode 100644 index 0000000..56c28ff --- /dev/null +++ b/jaxx-widgets-common/src/main/resources/i18n/jaxx-widgets-common_en_GB.properties @@ -0,0 +1,8 @@ +bean.popup.label=Object '%1$s' +bean.sort.down.tip=Actually, sort order is descending +bean.sort.down.toSelect.tip=To sort in Descending order +bean.sort.off=Click to activate the sort on this property +bean.sort.on=This is the property actually used +bean.sort.up.tip=Actually, sort order is acending +bean.sort.up.toSelect.tip=Click here to sort in ascending order +bean.unknown.type=Object of unkown type diff --git a/jaxx-widgets-common/src/main/resources/i18n/jaxx-widgets-common_es_ES.properties b/jaxx-widgets-common/src/main/resources/i18n/jaxx-widgets-common_es_ES.properties new file mode 100644 index 0000000..ed64e0a --- /dev/null +++ b/jaxx-widgets-common/src/main/resources/i18n/jaxx-widgets-common_es_ES.properties @@ -0,0 +1,8 @@ +bean.popup.label=Objeto '%1$s' +bean.sort.down.tip=Clasificación decreciente actualmente utilizada +bean.sort.down.toSelect.tip=Clic para clasificar según orden decreciente +bean.sort.off=Click para activar la clasificación de la propiedad '%1$s' +bean.sort.on=Clasificación realizada sobre la propiedad '%1$s' +bean.sort.up.tip=Clasificación creciente actualmente utilizada +bean.sort.up.toSelect.tip=Clic para clasificar según orden creciente +bean.unknown.type=Objeto de tipo desconocido diff --git a/jaxx-widgets-common/src/main/resources/i18n/jaxx-widgets-common_fr_FR.properties b/jaxx-widgets-common/src/main/resources/i18n/jaxx-widgets-common_fr_FR.properties new file mode 100644 index 0000000..2c9371d --- /dev/null +++ b/jaxx-widgets-common/src/main/resources/i18n/jaxx-widgets-common_fr_FR.properties @@ -0,0 +1,8 @@ +bean.popup.label=Objet '%1$s' +bean.sort.down.tip=Tri décroissant actuellement utilisé +bean.sort.down.toSelect.tip=Cliquer pour trier selon l'ordre décroissant +bean.sort.off=Cliquer pour activer le tri sur la propriété '%1$s' +bean.sort.on=Le tri est effectué sur la propriété '%1$s' +bean.sort.up.tip=Tri croissant actuellement utilisé +bean.sort.up.toSelect.tip=Cliquer pour trier selon l'ordre croissant +bean.unknown.type=Objet de type inconnu diff --git a/jaxx-widgets-number/pom.xml b/jaxx-widgets-number/pom.xml index 40610c1..7ca62f2 100644 --- a/jaxx-widgets-number/pom.xml +++ b/jaxx-widgets-number/pom.xml @@ -37,6 +37,14 @@ <name>JAXX :: Widgets Number</name> <description>Widget to edit numbers</description> + <properties> + <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> + <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> + <jaxx.autoImportCss>true</jaxx.autoImportCss> + <jaxx.addAutoHandlerUI>true</jaxx.addAutoHandlerUI> + <!--jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon--> + </properties> + <dependencies> <!-- sibiling dependencies --> @@ -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> @@ -79,16 +77,6 @@ </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-decorator</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-converter</artifactId> - </dependency> - - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> @@ -99,31 +87,11 @@ </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/number/NumberEditor2.css b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2.css similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2.css rename to jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2.css diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2.jaxx b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2.jaxx similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2.jaxx rename to jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2.jaxx diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Config.java b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2Config.java similarity index 98% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Config.java rename to jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2Config.java index b9bce69..b9470ec 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Config.java +++ b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2Config.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.widgets.editor.number; +package org.nuiton.jaxx.widgets.number; /* * #%L diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Handler.java b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2Handler.java similarity index 99% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Handler.java rename to jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2Handler.java index d0cbf6f..91d8bae 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Handler.java +++ b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2Handler.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.widgets.editor.number; +package org.nuiton.jaxx.widgets.number; /* * #%L diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Model.java b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2Model.java similarity index 99% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Model.java rename to jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2Model.java index 20de0dc..c168b7c 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Model.java +++ b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor2Model.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.widgets.editor.number; +package org.nuiton.jaxx.widgets.number; /* * #%L diff --git a/jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_en_GB.properties b/jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_en_GB.properties new file mode 100644 index 0000000..67f8ca8 --- /dev/null +++ b/jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_en_GB.properties @@ -0,0 +1,14 @@ +numbereditor..=. +numbereditor.1=1 +numbereditor.2=2 +numbereditor.3=3 +numbereditor.4=4 +numbereditor.5=5 +numbereditor.6=6 +numbereditor.7=7 +numbereditor.8=8 +numbereditor.9=9 +numbereditor.action.reset.tip=Reset +numbereditor.action.show.tip=Show numeric panel +numbereditor.clearAll=C +numbereditor.toggleSign=+/- diff --git a/jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_es_ES.properties b/jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_es_ES.properties new file mode 100644 index 0000000..f8fe076 --- /dev/null +++ b/jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_es_ES.properties @@ -0,0 +1,14 @@ +numbereditor..=. +numbereditor.1=1 +numbereditor.2=2 +numbereditor.3=3 +numbereditor.4=4 +numbereditor.5=5 +numbereditor.6=6 +numbereditor.7=7 +numbereditor.8=8 +numbereditor.9=9 +numbereditor.action.reset.tip=Reinicializar +numbereditor.action.show.tip=Mostar el teclado numérico +numbereditor.clearAll=C +numbereditor.toggleSign=+/- diff --git a/jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_fr_FR.properties b/jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_fr_FR.properties new file mode 100644 index 0000000..9a34ded --- /dev/null +++ b/jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_fr_FR.properties @@ -0,0 +1,14 @@ +numbereditor..=. +numbereditor.1=1 +numbereditor.2=2 +numbereditor.3=3 +numbereditor.4=4 +numbereditor.5=5 +numbereditor.6=6 +numbereditor.7=7 +numbereditor.8=8 +numbereditor.9=9 +numbereditor.action.reset.tip=Réinitialiser +numbereditor.action.show.tip=Afficher le pavé numérique +numbereditor.clearAll=C +numbereditor.toggleSign=+/- -- 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 fadcb64c38721109dd1d5c85a9f1c824225b2a26 Author: Tony CHEMIT <chemit@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@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 407c4cad7d8ca69941f670eb2984ad8cb8fac5b2 Author: Tony CHEMIT <chemit@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@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@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 24e9c724369109e741883423c14a61a44fcff6d7 Author: Tony CHEMIT <chemit@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 @@ <!-- spinner minute editor --> <SpinnerDateModel id="minuteModel"/> + <!-- flag to show or hide the time slider (this state can be saved by SwingSession) --> + <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@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@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 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>.