This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit 91a98aba3e5c5f8f42332a9907b56a43f5c9ccb3 Author: Tony CHEMIT <dev@tchemit.fr> Date: Sat Dec 31 13:31:38 2016 +0100 Introduce jaxx-widgets-file module (Fixes #4105) --- jaxx-config/pom.xml | 6 + .../org/nuiton/jaxx/config/ConfigTableEditor.java | 2 +- jaxx-demo/pom.xml | 6 + .../demo/component/jaxx/editor/FileEditorDemo.jaxx | 2 +- .../feature/databinding/BindingExtremeDemo.jaxx | 2 +- jaxx-widgets-file/LICENSE.txt | 165 +++++++++++++++++++++ jaxx-widgets-file/README.md | 2 + jaxx-widgets-file/changelog.txt | 5 + {jaxx-config => jaxx-widgets-file}/pom.xml | 58 +++----- .../src/license/THIRD-PARTY.properties | 20 +++ .../nuiton/jaxx/widgets/file}/FileCellEditor.java | 4 +- .../org/nuiton/jaxx/widgets/file}/FileEditor.jaxx | 0 .../jaxx/widgets/file}/FileEditorHandler.java | 3 +- .../nuiton/jaxx/widgets/file}/JaxxFileChooser.java | 2 +- .../i18n/jaxx-widgets-file_en_GB.properties | 69 +++++++++ .../i18n/jaxx-widgets-file_es_ES.properties | 69 +++++++++ .../i18n/jaxx-widgets-file_fr_FR.properties | 69 +++++++++ .../resources/icons/action-fileeditor-reset.png | Bin 0 -> 396 bytes .../src/main/resources/icons/action-filter.png | Bin 0 -> 3615 bytes .../src/main/resources/icons/action-open.png | Bin 0 -> 606 bytes jaxx-widgets-file/src/site/site.xml | 46 ++++++ jaxx-widgets/pom.xml | 10 -- .../nuiton/jaxx/runtime/swing/JAXXWidgetUtil.java | 5 - pom.xml | 1 + 24 files changed, 485 insertions(+), 61 deletions(-) diff --git a/jaxx-config/pom.xml b/jaxx-config/pom.xml index 8e48d5c..8e387c8 100644 --- a/jaxx-config/pom.xml +++ b/jaxx-config/pom.xml @@ -66,6 +66,12 @@ </dependency> <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-widgets-file</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-common</artifactId> </dependency> diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigTableEditor.java b/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigTableEditor.java index ae89df6..6cb21d1 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigTableEditor.java +++ b/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigTableEditor.java @@ -30,7 +30,7 @@ import org.nuiton.jaxx.runtime.swing.editor.ClassCellEditor; import org.nuiton.jaxx.runtime.swing.editor.ColorCellEditor; import org.nuiton.jaxx.runtime.swing.editor.EnumEditor; import org.nuiton.jaxx.runtime.swing.editor.LocaleEditor; -import org.nuiton.jaxx.runtime.swing.editor.cell.FileCellEditor; +import org.nuiton.jaxx.widgets.file.FileCellEditor; import org.apache.commons.lang3.StringUtils; import javax.swing.DefaultCellEditor; diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index f605d87..0f4baee 100644 --- a/jaxx-demo/pom.xml +++ b/jaxx-demo/pom.xml @@ -98,6 +98,12 @@ <dependency> <groupId>${project.groupId}</groupId> + <artifactId>jaxx-widgets-file</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>jaxx-widgets-gis</artifactId> <version>${project.version}</version> </dependency> diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/FileEditorDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/FileEditorDemo.jaxx index 6e10e52..258e9b5 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/FileEditorDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/FileEditorDemo.jaxx @@ -21,7 +21,7 @@ --> <org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> - org.nuiton.jaxx.runtime.swing.editor.FileEditor + org.nuiton.jaxx.widgets.file.FileEditor </import> <String id='title' javaBean='"Open file"'/> diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/databinding/BindingExtremeDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/databinding/BindingExtremeDemo.jaxx index 05f3e29..4396594 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/databinding/BindingExtremeDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/databinding/BindingExtremeDemo.jaxx @@ -26,7 +26,7 @@ <import> org.nuiton.jaxx.runtime.JAXXBinding - org.nuiton.jaxx.runtime.JaxxFileChooser + org.nuiton.jaxx.widgets.file.JaxxFileChooser java.awt.Color javax.swing.border.TitledBorder javax.swing.DefaultListModel diff --git a/jaxx-widgets-file/LICENSE.txt b/jaxx-widgets-file/LICENSE.txt new file mode 100644 index 0000000..cca7fc2 --- /dev/null +++ b/jaxx-widgets-file/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-file/README.md b/jaxx-widgets-file/README.md new file mode 100644 index 0000000..d2e50d3 --- /dev/null +++ b/jaxx-widgets-file/README.md @@ -0,0 +1,2 @@ +To deploy new version of pom: mvn deploy +To install localy: mvn install diff --git a/jaxx-widgets-file/changelog.txt b/jaxx-widgets-file/changelog.txt new file mode 100644 index 0000000..1e285bd --- /dev/null +++ b/jaxx-widgets-file/changelog.txt @@ -0,0 +1,5 @@ +1.6.0 + * introduce StatusMessageBar and AboutPanel (fork from nuiton-widgets but in JAXX :)) + +1.5 + * 20090404 [chemit] - initial version diff --git a/jaxx-config/pom.xml b/jaxx-widgets-file/pom.xml similarity index 80% copy from jaxx-config/pom.xml copy to jaxx-widgets-file/pom.xml index 8e48d5c..eeec01c 100644 --- a/jaxx-config/pom.xml +++ b/jaxx-widgets-file/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - JAXX :: Widgets + JAXX :: Widgets File $Id$ $HeadURL$ @@ -35,16 +35,16 @@ </parent> <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-config</artifactId> + <artifactId>jaxx-widgets-file</artifactId> + + <name>JAXX :: Widgets File</name> + <description>Collection of widgets around File</description> - <name>JAXX :: Config</name> - <description> - Config UI based on org.nuiton.config.ApplicationConfig - </description> <properties> <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> <jaxx.autoImportCss>true</jaxx.autoImportCss> + <jaxx.addAutoHandlerUI>true</jaxx.addAutoHandlerUI> <jaxx.cssExtension>jcss</jaxx.cssExtension> <!--jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon--> </properties> @@ -58,7 +58,13 @@ <artifactId>jaxx-runtime</artifactId> <version>${project.version}</version> </dependency> - + <!--Should use this--> + <!--dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-widgets-common</artifactId> + <version>${project.version}</version> + </dependency--> + <!--Remove this--> <dependency> <groupId>${project.groupId}</groupId> <artifactId>jaxx-widgets</artifactId> @@ -66,31 +72,11 @@ </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.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-config</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-converter</artifactId> - </dependency> - - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> @@ -104,12 +90,6 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> - - - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> <dependency> <groupId>log4j</groupId> @@ -117,11 +97,6 @@ <scope>provided</scope> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - </dependencies> <build> @@ -148,6 +123,13 @@ </goals> </execution> </executions> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-widgets</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </plugin> <plugin> diff --git a/jaxx-widgets-file/src/license/THIRD-PARTY.properties b/jaxx-widgets-file/src/license/THIRD-PARTY.properties new file mode 100644 index 0000000..81b2769 --- /dev/null +++ b/jaxx-widgets-file/src/license/THIRD-PARTY.properties @@ -0,0 +1,20 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Public License Version 1.0 +# - GNU General Public License - Version 2 with the class path exception +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Thu Aug 18 07:10:57 CEST 2011 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/FileCellEditor.java b/jaxx-widgets-file/src/main/java/org/nuiton/jaxx/widgets/file/FileCellEditor.java similarity index 94% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/FileCellEditor.java rename to jaxx-widgets-file/src/main/java/org/nuiton/jaxx/widgets/file/FileCellEditor.java index 2c71fbe..3f56930 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/FileCellEditor.java +++ b/jaxx-widgets-file/src/main/java/org/nuiton/jaxx/widgets/file/FileCellEditor.java @@ -19,14 +19,14 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.jaxx.runtime.swing.editor.cell; +package org.nuiton.jaxx.widgets.file; import java.awt.Component; import java.io.File; import javax.swing.AbstractCellEditor; import javax.swing.JTable; import javax.swing.table.TableCellEditor; -import org.nuiton.jaxx.runtime.swing.editor.FileEditor; +import org.nuiton.jaxx.widgets.file.FileEditor; /** * @author Sylvain Lletellier diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/FileEditor.jaxx b/jaxx-widgets-file/src/main/java/org/nuiton/jaxx/widgets/file/FileEditor.jaxx similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/FileEditor.jaxx rename to jaxx-widgets-file/src/main/java/org/nuiton/jaxx/widgets/file/FileEditor.jaxx diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/FileEditorHandler.java b/jaxx-widgets-file/src/main/java/org/nuiton/jaxx/widgets/file/FileEditorHandler.java similarity index 98% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/FileEditorHandler.java rename to jaxx-widgets-file/src/main/java/org/nuiton/jaxx/widgets/file/FileEditorHandler.java index 1b48850..c746dda 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/FileEditorHandler.java +++ b/jaxx-widgets-file/src/main/java/org/nuiton/jaxx/widgets/file/FileEditorHandler.java @@ -19,11 +19,10 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.jaxx.runtime.swing.editor; +package org.nuiton.jaxx.widgets.file; import com.google.common.io.Files; import org.apache.commons.lang3.StringUtils; -import org.nuiton.jaxx.runtime.swing.editor.FileEditor; import javax.swing.JDialog; import javax.swing.JFileChooser; diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JaxxFileChooser.java b/jaxx-widgets-file/src/main/java/org/nuiton/jaxx/widgets/file/JaxxFileChooser.java similarity index 99% rename from jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JaxxFileChooser.java rename to jaxx-widgets-file/src/main/java/org/nuiton/jaxx/widgets/file/JaxxFileChooser.java index 7e5aa05..8043f5f 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JaxxFileChooser.java +++ b/jaxx-widgets-file/src/main/java/org/nuiton/jaxx/widgets/file/JaxxFileChooser.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.runtime; +package org.nuiton.jaxx.widgets.file; /* * #%L diff --git a/jaxx-widgets-file/src/main/resources/i18n/jaxx-widgets-file_en_GB.properties b/jaxx-widgets-file/src/main/resources/i18n/jaxx-widgets-file_en_GB.properties new file mode 100644 index 0000000..954b4ea --- /dev/null +++ b/jaxx-widgets-file/src/main/resources/i18n/jaxx-widgets-file_en_GB.properties @@ -0,0 +1,69 @@ +aboutframe.about=About +aboutframe.license=License +aboutframe.ok=OK +aboutframe.thirdparty=Third party +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.popup.label=Object '%1$s' +bean.sort.down=Descending sort +bean.sort.down.tip=Actually, sort order is descending +bean.sort.down.toSelect.tip=To sort in Descending order +bean.sort.label=Sort order +bean.sort.off=Click to activate the sort on this property +bean.sort.on=This is the property actually used +bean.sort.up=Ascending sort +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 +beancombobox.action.reset.tip=Reset the selected value +beancombobox.action.sort.tip=Change the sorted property +beancombobox.popup.title=Change the sorted property +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 +beanlist.action.reset.tip=Reset the selected selection +beanlist.action.sort.tip=Change the sorted property +beanlist.popup.title=Change the sorted property +errorUI.action.close=Close +errorUI.message=An error wad detected... +errorUI.title=Error... +fileeditor.action.reset.tip=Reset +fontsize.action.default.tip=Restore default font size +fontsize.action.down.tip=Decrease font size +fontsize.action.up.tip=Increase font size +hidor.hideTip=Hide +hidor.showTip=Show +i18neditor.empty.locales=< No locale to select > +i18neditor.popup.title=Change language +i18neditor.selected=Selected language \: %1$s +i18neditor.unselected=Select this langage \: %1$s +jaxx.error.no.convertor.coordinateDmd=Impossible to convert form (or to) a DMD coordinate (incoming value\: %s) +jaxx.error.no.convertor.coordinateDms=Impossible to convert form (or to) a DMS coordinate (incoming value\: %s) +jaxx.list.check.all=All +jaxx.table.filter.popup.button.apply=Apply +jaxx.table.filter.popup.button.cancel=Cancel +jaxx.table.filter.popup.button.clearAll=Clear all the filters +memorywidget.memory=%d/%dMb +numbereditor..=. +numbereditor.0=0 +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.clearOne=CE +numbereditor.toggleSign=+/- +timeeditor.H=H diff --git a/jaxx-widgets-file/src/main/resources/i18n/jaxx-widgets-file_es_ES.properties b/jaxx-widgets-file/src/main/resources/i18n/jaxx-widgets-file_es_ES.properties new file mode 100644 index 0000000..4d58091 --- /dev/null +++ b/jaxx-widgets-file/src/main/resources/i18n/jaxx-widgets-file_es_ES.properties @@ -0,0 +1,69 @@ +aboutframe.about=A cerca de +aboutframe.license=Licecia +aboutframe.ok=OK +aboutframe.thirdparty=Tierce partie +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.popup.label=Objeto '%1$s' +bean.sort.down=Calsificación decreciente +bean.sort.down.tip=Clasificación decreciente actualmente utilizada +bean.sort.down.toSelect.tip=Clic para clasificar según orden decreciente +bean.sort.label=Orden de clasificación +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=Clasificación creciente +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 +beancombobox.action.reset.tip=Reiniciar el valor de la lista desplegable +beancombobox.action.sort.tip=Modificar la clasificación de la lista desplegable +beancombobox.popup.title=Modificar la clasificación +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 +beanlist.action.reset.tip=Eliminar la selección +beanlist.action.sort.tip=Modificar la clasificación de la lista despleglable +beanlist.popup.title=Modificar la clasificación +errorUI.action.close=Cerrar +errorUI.message=ha habido un error \! +errorUI.title=Error... +fileeditor.action.reset.tip=Reinicializar +fontsize.action.default.tip=Volver al tamaño por defecto +fontsize.action.down.tip=Disminuir el tamaño del origen +fontsize.action.up.tip=Aumentar el tamaño de la fuente +hidor.hideTip=Ocultar +hidor.showTip=Ver +i18neditor.empty.locales=< Aucune locale à sélectionner > +i18neditor.popup.title=Cambiar idioma +i18neditor.selected=Idioma usado actualmente \: %1$s +i18neditor.unselected=Para usar este idioma \: %1$s +jaxx.error.no.convertor.coordinateDmd=Impossible to convert form (or to) a DMD coordinate (incoming value\: %s) +jaxx.error.no.convertor.coordinateDms=Impossible to convert form (or to) a DMS coordinate (incoming value\: %s) +jaxx.list.check.all=Todos +jaxx.table.filter.popup.button.apply=Applicar +jaxx.table.filter.popup.button.cancel=Anular +jaxx.table.filter.popup.button.clearAll=Eliminar +memorywidget.memory=%d/%dMo +numbereditor..=. +numbereditor.0=0 +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.clearOne=CE +numbereditor.toggleSign=+/- +timeeditor.H=H diff --git a/jaxx-widgets-file/src/main/resources/i18n/jaxx-widgets-file_fr_FR.properties b/jaxx-widgets-file/src/main/resources/i18n/jaxx-widgets-file_fr_FR.properties new file mode 100644 index 0000000..abb0e71 --- /dev/null +++ b/jaxx-widgets-file/src/main/resources/i18n/jaxx-widgets-file_fr_FR.properties @@ -0,0 +1,69 @@ +aboutframe.about=À propos +aboutframe.license=Licence +aboutframe.ok=OK +aboutframe.thirdparty=Tierce partie +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.popup.label=Objet '%1$s' +bean.sort.down=Tri décroissant +bean.sort.down.tip=Tri décroissant actuellement utilisé +bean.sort.down.toSelect.tip=Cliquer pour trier selon l'ordre décroissant +bean.sort.label=Ordre de tri +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=Tri croissant +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 +beancombobox.action.reset.tip=Réinitialiser la valeur de la liste déroulante +beancombobox.action.sort.tip=Modifier le tri de la liste déroulante +beancombobox.popup.title=Modifier le tri +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 +beanlist.action.reset.tip=Supprimer la sélection +beanlist.action.sort.tip=Modifier le tri de la liste déroulante +beanlist.popup.title=Modifier le tri +errorUI.action.close=Fermer +errorUI.message=Une erreur est survenue \! +errorUI.title=Erreur... +fileeditor.action.reset.tip=Réinitialiser +fontsize.action.default.tip=Retour sur la taille par défaut +fontsize.action.down.tip=Diminuer la taille de la police +fontsize.action.up.tip=Augmenter la taille de la police +hidor.hideTip=Cacher +hidor.showTip=Voir +i18neditor.empty.locales=< Aucune locale à sélectionner > +i18neditor.popup.title=Changer de langue +i18neditor.selected=Langue actuellement utilisée \: %1$s +i18neditor.unselected=Pour utiliser cette langue \: %1$s +jaxx.error.no.convertor.coordinateDmd=Impossible de convertir en (ou depuis) une coordonée DMD depuis la valeur %s +jaxx.error.no.convertor.coordinateDms=Impossible de convertir en (ou depuis) une coordonée DMS depuis la valeur %s +jaxx.list.check.all=Tous +jaxx.table.filter.popup.button.apply=Appliquer +jaxx.table.filter.popup.button.cancel=Annuler +jaxx.table.filter.popup.button.clearAll=Supprimer tous les filtres +memorywidget.memory=%d/%dMo +numbereditor..=. +numbereditor.0=0 +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.clearOne=CE +numbereditor.toggleSign=+/- +timeeditor.H=H diff --git a/jaxx-widgets-file/src/main/resources/icons/action-fileeditor-reset.png b/jaxx-widgets-file/src/main/resources/icons/action-fileeditor-reset.png new file mode 100644 index 0000000..0fb00f9 Binary files /dev/null and b/jaxx-widgets-file/src/main/resources/icons/action-fileeditor-reset.png differ diff --git a/jaxx-widgets-file/src/main/resources/icons/action-filter.png b/jaxx-widgets-file/src/main/resources/icons/action-filter.png new file mode 100644 index 0000000..397e078 Binary files /dev/null and b/jaxx-widgets-file/src/main/resources/icons/action-filter.png differ diff --git a/jaxx-widgets-file/src/main/resources/icons/action-open.png b/jaxx-widgets-file/src/main/resources/icons/action-open.png new file mode 100755 index 0000000..e9c4476 Binary files /dev/null and b/jaxx-widgets-file/src/main/resources/icons/action-open.png differ diff --git a/jaxx-widgets-file/src/site/site.xml b/jaxx-widgets-file/src/site/site.xml new file mode 100644 index 0000000..8d5a39f --- /dev/null +++ b/jaxx-widgets-file/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/pom.xml b/jaxx-widgets/pom.xml index 1464273..3bad327 100644 --- a/jaxx-widgets/pom.xml +++ b/jaxx-widgets/pom.xml @@ -90,11 +90,6 @@ </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-converter</artifactId> - </dependency> - - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> @@ -125,11 +120,6 @@ </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/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXWidgetUtil.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXWidgetUtil.java index cff617d..0de7547 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXWidgetUtil.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXWidgetUtil.java @@ -23,7 +23,6 @@ package org.nuiton.jaxx.runtime.swing; import org.nuiton.jaxx.runtime.SwingUtil; import org.nuiton.jaxx.runtime.swing.editor.cell.DateCellEditor; -import org.nuiton.jaxx.runtime.swing.editor.cell.FileCellEditor; import org.nuiton.jaxx.runtime.swing.editor.cell.KeyStrokeCellEditor; import org.nuiton.jaxx.runtime.swing.renderer.DateCellRenderer; @@ -47,10 +46,6 @@ public class JAXXWidgetUtil extends SwingUtil { return new DateCellEditor(); } - public static TableCellEditor newFileTableCellEditor() { - return new FileCellEditor(); - } - public static TableCellEditor newKeyStrokeTableCellEditor() { return new KeyStrokeCellEditor(); } diff --git a/pom.xml b/pom.xml index bdd0ef9..4fac0b4 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-file</module> <module>jaxx-widgets-about</module> <module>jaxx-widgets-number</module> <module>jaxx-widgets-select</module> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.