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 32ba97d4ba5e5dcd3134d0dc229a447497ef39f2 Author: Tony CHEMIT <dev@tchemit.fr> Date: Sat Dec 31 14:20:58 2016 +0100 Move widgets to their module (See #4103) --- .../org/nuiton/jaxx/config/ConfigTableEditor.java | 6 +- .../component/jaxx/editor/BeanComboBoxDemo.jaxx | 2 +- .../component/jaxx/editor/BeanDoubleListDemo.jaxx | 2 +- .../jaxx/editor/BeanFilterableComboBoxDemo.jaxx | 2 +- .../demo/component/jaxx/editor/DatePickerDemo.jaxx | 1 + .../demo/feature/nav/content/ActorsContentUI.jaxx | 2 +- .../demo/feature/nav/content/MoviesContentUI.jaxx | 2 +- .../nuiton/jaxx/runtime/swing/CompoundIcon.java | 0 .../jaxx/widgets/datetime}/DateCellEditor.java | 10 +- .../jaxx/widgets/datetime}/DateCellRenderer.java | 2 +- .../jaxx/widgets/datetime}/JAXXDatePicker.jaxx | 0 jaxx-widgets-file/pom.xml | 18 +-- .../nuiton/jaxx/widgets/file}/BaseActionPanel.java | 2 +- .../org/nuiton/jaxx/widgets/file/FileEditor.jaxx | 2 +- .../i18n/jaxx-widgets-file_en_GB.properties | 68 -------- .../i18n/jaxx-widgets-file_es_ES.properties | 68 -------- .../i18n/jaxx-widgets-file_fr_FR.properties | 68 -------- jaxx-widgets-font/pom.xml | 23 --- .../i18n/jaxx-widgets-font_en_GB.properties | 66 -------- .../i18n/jaxx-widgets-font_es_ES.properties | 66 -------- .../i18n/jaxx-widgets-font_fr_FR.properties | 66 -------- jaxx-widgets-select/pom.xml | 20 +++ .../nuiton/jaxx/widgets/select}/BeanComboBox.jaxx | 0 .../nuiton/jaxx/widgets/select}/BeanComboBox.jcss | 0 .../jaxx/widgets/select}/BeanComboBoxHandler.java | 2 +- .../jaxx/widgets/select}/BeanDoubleList.jaxx | 0 .../jaxx/widgets/select}/BeanDoubleList.jcss | 0 .../widgets/select}/BeanDoubleListHandler.java | 2 +- .../jaxx/widgets/select}/BeanDoubleListModel.java | 2 +- .../widgets/select}/BeanFilterableComboBox.jaxx | 0 .../widgets/select}/BeanFilterableComboBox.jcss | 0 .../select}/BeanFilterableComboBoxHandler.java | 2 +- .../jaxx/widgets/select}/BeanListHeader.jaxx | 0 .../jaxx/widgets/select}/BeanListHeader.jcss | 0 .../widgets/select}/BeanListHeaderHandler.java | 2 +- .../nuiton/jaxx/widgets/select}/BeanUIUtil.java | 29 ++-- .../select}/session/BeanDoubleListState.java | 5 +- .../session/BeanFilterableComboBoxState.java | 5 +- .../i18n/jaxx-widgets-select_en_GB.properties | 14 ++ .../i18n/jaxx-widgets-select_es_ES.properties | 14 ++ .../i18n/jaxx-widgets-select_fr_FR.properties | 14 ++ .../icons/action-bean-doublelist-down.png | Bin .../icons/action-bean-doublelist-select.png | Bin .../icons/action-bean-doublelist-unselect.png | Bin .../resources/icons/action-bean-doublelist-up.png | Bin .../main/resources/icons/action-bean-sort-down.png | Bin .../main/resources/icons/action-bean-sort-up.png | Bin .../src/main/resources/icons/action-bean-sort.png | Bin .../main/resources/icons/action-combobox-reset.png | Bin .../main/resources/icons/action-combobox-sort.png | Bin jaxx-widgets-status/pom.xml | 23 --- .../i18n/jaxx-widgets-status_en_GB.properties | 68 -------- .../i18n/jaxx-widgets-status_es_ES.properties | 68 -------- .../i18n/jaxx-widgets-status_fr_FR.properties | 68 -------- jaxx-widgets/pom.xml | 25 --- .../jaxx/runtime/swing/ComboToListSelector.jaxx | 87 ---------- .../jaxx/runtime/swing/JAXXRuntimeException.java | 48 ------ .../nuiton/jaxx/runtime/swing/JAXXWidgetUtil.java | 53 ------- .../jaxx/runtime/swing/JSearchTextField.java | 18 +-- .../nuiton/jaxx/runtime/swing/ListSelector.jaxx | 77 --------- .../jaxx/runtime/swing/ListSelectorModel.java | 175 --------------------- .../jaxx/runtime/swing/ListToListSelector.jaxx | 88 ----------- .../jaxx/runtime/swing/editor/bean/package.html | 30 ---- .../table/filter/FilterTableHeaderRenderer.java | 111 +++++++------ .../swing/table/filter/TableFilterColumnPopup.java | 45 ++++-- .../resources/i18n/jaxx-widgets_en_GB.properties | 56 ------- .../resources/i18n/jaxx-widgets_es_ES.properties | 56 ------- .../resources/i18n/jaxx-widgets_fr_FR.properties | 56 ------- .../resources/icons/action-doublelist-reset.png | Bin 396 -> 0 bytes .../resources/icons/action-doublelist-sort.png | Bin 574 -> 0 bytes 70 files changed, 208 insertions(+), 1531 deletions(-) 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 6cb21d1..fa9a4f2 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 @@ -23,15 +23,15 @@ package org.nuiton.jaxx.config; */ import com.google.common.io.Files; -import org.nuiton.jaxx.runtime.swing.JAXXWidgetUtil; +import org.apache.commons.lang3.StringUtils; import org.nuiton.jaxx.config.model.ConfigTableModel; import org.nuiton.jaxx.config.model.OptionModel; 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.KeyStrokeCellEditor; import org.nuiton.jaxx.widgets.file.FileCellEditor; -import org.apache.commons.lang3.StringUtils; import javax.swing.DefaultCellEditor; import javax.swing.JTable; @@ -132,7 +132,7 @@ public class ConfigTableEditor implements TableCellEditor { editor = new FileCellEditorWithExtDetector(); } else if (type.equals(KeyStroke.class)) { - editor = JAXXWidgetUtil.newKeyStrokeTableCellEditor(); + editor = new KeyStrokeCellEditor(); } else if (type.equals(Locale.class)) { editor = new DefaultCellEditor(LocaleEditor.newEditor()); diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.jaxx index 86a4fbb..847da10 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.jaxx @@ -23,7 +23,7 @@ <import> org.nuiton.jaxx.demo.entities.People - org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox + org.nuiton.jaxx.widgets.select.BeanComboBox </import> <Table insets='0' fill='both' weightx='1' constraints='BorderLayout.NORTH'> diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jaxx index 22ae48f..db2c62f 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jaxx @@ -23,7 +23,7 @@ <import> org.nuiton.jaxx.demo.entities.People - org.nuiton.jaxx.runtime.swing.editor.bean.BeanDoubleList + org.nuiton.jaxx.widgets.select.BeanDoubleList </import> <Table fill='both'> diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jaxx index 33e4931..56366cb 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jaxx @@ -23,7 +23,7 @@ <import> org.nuiton.jaxx.demo.entities.People - org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + org.nuiton.jaxx.widgets.select.BeanFilterableComboBox </import> <Table insets='0' fill='both' weightx='1' constraints='BorderLayout.NORTH'> diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/DatePickerDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/DatePickerDemo.jaxx index fa6e577..fb388b2 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/DatePickerDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/DatePickerDemo.jaxx @@ -26,6 +26,7 @@ java.beans.PropertyChangeListener java.text.SimpleDateFormat java.util.Date + org.nuiton.jaxx.widgets.datetime.JAXXDatePicker </import> <String id='patternLayout' javaBean='"dd/MM/yyyy HH:mm:ss"'/> diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/content/ActorsContentUI.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/content/ActorsContentUI.jaxx index 3d101b5..9af3e75 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/content/ActorsContentUI.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/content/ActorsContentUI.jaxx @@ -25,7 +25,7 @@ <import> java.util.List org.nuiton.jaxx.demo.entities.People - org.nuiton.jaxx.runtime.swing.editor.bean.BeanListHeader + org.nuiton.jaxx.widgets.select.BeanListHeader org.nuiton.jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer static org.nuiton.i18n.I18n.t diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/content/MoviesContentUI.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/content/MoviesContentUI.jaxx index 5bb0f04..112e75e 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/content/MoviesContentUI.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/content/MoviesContentUI.jaxx @@ -25,7 +25,7 @@ <import> java.util.List org.nuiton.jaxx.demo.entities.Movie - org.nuiton.jaxx.runtime.swing.editor.bean.BeanListHeader + org.nuiton.jaxx.widgets.select.BeanListHeader org.nuiton.jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer static org.nuiton.i18n.I18n.t diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/CompoundIcon.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/CompoundIcon.java similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/CompoundIcon.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/CompoundIcon.java diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/DateCellEditor.java b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateCellEditor.java similarity index 87% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/DateCellEditor.java rename to jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateCellEditor.java index 2b04445..85aff82 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/DateCellEditor.java +++ b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateCellEditor.java @@ -19,20 +19,18 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.jaxx.runtime.swing.editor.cell; +package org.nuiton.jaxx.widgets.datetime; -import java.awt.Component; -import java.util.Date; import javax.swing.AbstractCellEditor; import javax.swing.JTable; import javax.swing.table.TableCellEditor; -import org.nuiton.jaxx.runtime.swing.JAXXDatePicker; +import java.awt.Component; +import java.util.Date; /** * @author Sylvain Lletellier */ -public class DateCellEditor extends AbstractCellEditor - implements TableCellEditor { +public class DateCellEditor extends AbstractCellEditor implements TableCellEditor { protected final JAXXDatePicker datePicker; diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DateCellRenderer.java b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateCellRenderer.java similarity index 97% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DateCellRenderer.java rename to jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateCellRenderer.java index e6a3a4d..78ba39d 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DateCellRenderer.java +++ b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateCellRenderer.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.jaxx.runtime.swing.renderer; +package org.nuiton.jaxx.widgets.datetime; import java.awt.Component; import java.text.SimpleDateFormat; diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXDatePicker.jaxx b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/JAXXDatePicker.jaxx similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXDatePicker.jaxx rename to jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/JAXXDatePicker.jaxx diff --git a/jaxx-widgets-file/pom.xml b/jaxx-widgets-file/pom.xml index eeec01c..4952d07 100644 --- a/jaxx-widgets-file/pom.xml +++ b/jaxx-widgets-file/pom.xml @@ -64,12 +64,6 @@ <artifactId>jaxx-widgets-common</artifactId> <version>${project.version}</version> </dependency--> - <!--Remove this--> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jaxx-widgets</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.nuiton.i18n</groupId> @@ -87,6 +81,11 @@ </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + </dependency> + + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> @@ -123,13 +122,6 @@ </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/src/main/java/org/nuiton/jaxx/runtime/swing/BaseActionPanel.java b/jaxx-widgets-file/src/main/java/org/nuiton/jaxx/widgets/file/BaseActionPanel.java similarity index 98% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/BaseActionPanel.java rename to jaxx-widgets-file/src/main/java/org/nuiton/jaxx/widgets/file/BaseActionPanel.java index e6f9842..d229b01 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/BaseActionPanel.java +++ b/jaxx-widgets-file/src/main/java/org/nuiton/jaxx/widgets/file/BaseActionPanel.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.jaxx.runtime.swing; +package org.nuiton.jaxx.widgets.file; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; diff --git a/jaxx-widgets-file/src/main/java/org/nuiton/jaxx/widgets/file/FileEditor.jaxx b/jaxx-widgets-file/src/main/java/org/nuiton/jaxx/widgets/file/FileEditor.jaxx index 5f7ab2d..af2d1ab 100644 --- a/jaxx-widgets-file/src/main/java/org/nuiton/jaxx/widgets/file/FileEditor.jaxx +++ b/jaxx-widgets-file/src/main/java/org/nuiton/jaxx/widgets/file/FileEditor.jaxx @@ -21,7 +21,7 @@ --> <BaseActionPanel layout='{new BorderLayout()}'> <import> - org.nuiton.jaxx.runtime.swing.BaseActionPanel + org.nuiton.jaxx.widgets.file.BaseActionPanel org.apache.commons.lang3.StringUtils 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 index 954b4ea..26ff3a4 100644 --- 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 @@ -1,69 +1 @@ -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 index 4d58091..980fd05 100644 --- 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 @@ -1,69 +1 @@ -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 index abb0e71..846ecac 100644 --- 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 @@ -1,69 +1 @@ -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-font/pom.xml b/jaxx-widgets-font/pom.xml index 4685f07..02f92f0 100644 --- a/jaxx-widgets-font/pom.xml +++ b/jaxx-widgets-font/pom.xml @@ -64,12 +64,6 @@ <artifactId>jaxx-widgets-common</artifactId> <version>${project.version}</version> </dependency--> - <!--Remove this--> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jaxx-widgets</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.nuiton.i18n</groupId> @@ -77,16 +71,6 @@ </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-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> @@ -123,13 +107,6 @@ </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-font/src/main/resources/i18n/jaxx-widgets-font_en_GB.properties b/jaxx-widgets-font/src/main/resources/i18n/jaxx-widgets-font_en_GB.properties index 954b4ea..bf05844 100644 --- a/jaxx-widgets-font/src/main/resources/i18n/jaxx-widgets-font_en_GB.properties +++ b/jaxx-widgets-font/src/main/resources/i18n/jaxx-widgets-font_en_GB.properties @@ -1,69 +1,3 @@ -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-font/src/main/resources/i18n/jaxx-widgets-font_es_ES.properties b/jaxx-widgets-font/src/main/resources/i18n/jaxx-widgets-font_es_ES.properties index 4d58091..7bde4f0 100644 --- a/jaxx-widgets-font/src/main/resources/i18n/jaxx-widgets-font_es_ES.properties +++ b/jaxx-widgets-font/src/main/resources/i18n/jaxx-widgets-font_es_ES.properties @@ -1,69 +1,3 @@ -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-font/src/main/resources/i18n/jaxx-widgets-font_fr_FR.properties b/jaxx-widgets-font/src/main/resources/i18n/jaxx-widgets-font_fr_FR.properties index abb0e71..b5e2d1c 100644 --- a/jaxx-widgets-font/src/main/resources/i18n/jaxx-widgets-font_fr_FR.properties +++ b/jaxx-widgets-font/src/main/resources/i18n/jaxx-widgets-font_fr_FR.properties @@ -1,69 +1,3 @@ -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-select/pom.xml b/jaxx-widgets-select/pom.xml index a9e6ef9..eb5692d 100644 --- a/jaxx-widgets-select/pom.xml +++ b/jaxx-widgets-select/pom.xml @@ -93,6 +93,26 @@ </dependency> <dependency> + <groupId>commons-primitives</groupId> + <artifactId>commons-primitives</artifactId> + </dependency> + + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + </dependency> + + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-autocomplete</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/editor/bean/BeanComboBox.jaxx b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanComboBox.jaxx similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx rename to jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanComboBox.jaxx diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanComboBox.jcss b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanComboBox.jcss similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanComboBox.jcss rename to jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanComboBox.jcss diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanComboBoxHandler.java similarity index 99% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java rename to jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanComboBoxHandler.java index 48f0d41..ae090c0 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java +++ b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanComboBoxHandler.java @@ -20,7 +20,7 @@ * #L% */ -package org.nuiton.jaxx.runtime.swing.editor.bean; +package org.nuiton.jaxx.widgets.select; import org.nuiton.jaxx.runtime.SwingUtil; import org.nuiton.jaxx.runtime.swing.JAXXButtonGroup; diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanDoubleList.jaxx similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx rename to jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanDoubleList.jaxx diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanDoubleList.jcss b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanDoubleList.jcss similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanDoubleList.jcss rename to jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanDoubleList.jcss diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanDoubleListHandler.java similarity index 99% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java rename to jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanDoubleListHandler.java index 92cc01a..14c7a46 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java +++ b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanDoubleListHandler.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.runtime.swing.editor.bean; +package org.nuiton.jaxx.widgets.select; /* * #%L diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanDoubleListModel.java similarity index 99% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java rename to jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanDoubleListModel.java index 4b5e0d7..129e0ef 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java +++ b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanDoubleListModel.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.runtime.swing.editor.bean; +package org.nuiton.jaxx.widgets.select; /* * #%L diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanFilterableComboBox.jaxx similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx rename to jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanFilterableComboBox.jaxx diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jcss b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanFilterableComboBox.jcss similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jcss rename to jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanFilterableComboBox.jcss diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanFilterableComboBoxHandler.java similarity index 99% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java rename to jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanFilterableComboBoxHandler.java index 08e934e..565768f 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java +++ b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanFilterableComboBoxHandler.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.jaxx.runtime.swing.editor.bean; +package org.nuiton.jaxx.widgets.select; import org.nuiton.jaxx.runtime.JAXXUtil; import org.nuiton.jaxx.runtime.SwingUtil; diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanListHeader.jaxx similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx rename to jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanListHeader.jaxx diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanListHeader.jcss b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanListHeader.jcss similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanListHeader.jcss rename to jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanListHeader.jcss diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanListHeaderHandler.java similarity index 99% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java rename to jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanListHeaderHandler.java index 279a9bf..f2715ca 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java +++ b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanListHeaderHandler.java @@ -20,7 +20,7 @@ * #L% */ -package org.nuiton.jaxx.runtime.swing.editor.bean; +package org.nuiton.jaxx.widgets.select; import org.nuiton.jaxx.runtime.swing.JAXXButtonGroup; import org.nuiton.jaxx.runtime.swing.renderer.DecoratorListCellRenderer; diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanUIUtil.java b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanUIUtil.java similarity index 95% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanUIUtil.java rename to jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanUIUtil.java index 35b53be..8e0c985 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanUIUtil.java +++ b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanUIUtil.java @@ -19,10 +19,8 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.jaxx.runtime.swing.editor.bean; +package org.nuiton.jaxx.widgets.select; -import org.nuiton.jaxx.runtime.swing.JAXXButtonGroup; -import org.nuiton.jaxx.runtime.swing.JAXXRuntimeException; import org.apache.commons.beanutils.MethodUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -35,6 +33,7 @@ import org.nuiton.decorator.Decorator; import org.nuiton.decorator.DecoratorUtil; import org.nuiton.decorator.JXPathDecorator; import org.nuiton.decorator.MultiJXPathDecorator; +import org.nuiton.jaxx.runtime.swing.JAXXButtonGroup; import javax.swing.AbstractButton; import javax.swing.ActionMap; @@ -64,8 +63,8 @@ import java.util.List; import static java.util.Arrays.asList; import static java.util.Collections.unmodifiableList; -import static org.nuiton.i18n.I18n.t; import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; /** * Class with usefull methods used in bean uis. @@ -89,9 +88,9 @@ public class BeanUIUtil { try { mut.invoke(source, params); } catch (IllegalAccessException e) { - throw new JAXXRuntimeException(e); + throw new RuntimeException(e); } catch (InvocationTargetException e) { - throw new JAXXRuntimeException(e.getCause()); + throw new RuntimeException(e.getCause()); } } } @@ -346,15 +345,15 @@ public class BeanUIUtil { * @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) { + 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; diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/session/BeanDoubleListState.java b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/session/BeanDoubleListState.java similarity index 94% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/session/BeanDoubleListState.java rename to jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/session/BeanDoubleListState.java index d75e4e6..afef40c 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/session/BeanDoubleListState.java +++ b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/session/BeanDoubleListState.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.runtime.swing.session; +package org.nuiton.jaxx.widgets.select.session; /* * #%L @@ -22,7 +22,8 @@ package org.nuiton.jaxx.runtime.swing.session; * #L% */ -import org.nuiton.jaxx.runtime.swing.editor.bean.BeanDoubleList; +import org.nuiton.jaxx.runtime.swing.session.State; +import org.nuiton.jaxx.widgets.select.BeanDoubleList; /** * @author Kevin Morin - morin@codelutin.com diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/session/BeanFilterableComboBoxState.java b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/session/BeanFilterableComboBoxState.java similarity index 93% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/session/BeanFilterableComboBoxState.java rename to jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/session/BeanFilterableComboBoxState.java index ad8e245..5504466 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/session/BeanFilterableComboBoxState.java +++ b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/session/BeanFilterableComboBoxState.java @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.runtime.swing.session; +package org.nuiton.jaxx.widgets.select.session; /* * #%L @@ -22,7 +22,8 @@ package org.nuiton.jaxx.runtime.swing.session; * #L% */ -import org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.jaxx.runtime.swing.session.State; +import org.nuiton.jaxx.widgets.select.BeanFilterableComboBox; /** * @author Kevin Morin - morin@codelutin.com diff --git a/jaxx-widgets-select/src/main/resources/i18n/jaxx-widgets-select_en_GB.properties b/jaxx-widgets-select/src/main/resources/i18n/jaxx-widgets-select_en_GB.properties index 3caaa9d..fc1d025 100644 --- a/jaxx-widgets-select/src/main/resources/i18n/jaxx-widgets-select_en_GB.properties +++ b/jaxx-widgets-select/src/main/resources/i18n/jaxx-widgets-select_en_GB.properties @@ -4,11 +4,25 @@ 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 diff --git a/jaxx-widgets-select/src/main/resources/i18n/jaxx-widgets-select_es_ES.properties b/jaxx-widgets-select/src/main/resources/i18n/jaxx-widgets-select_es_ES.properties index 848cb36..09a36b8 100644 --- a/jaxx-widgets-select/src/main/resources/i18n/jaxx-widgets-select_es_ES.properties +++ b/jaxx-widgets-select/src/main/resources/i18n/jaxx-widgets-select_es_ES.properties @@ -4,11 +4,25 @@ 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 diff --git a/jaxx-widgets-select/src/main/resources/i18n/jaxx-widgets-select_fr_FR.properties b/jaxx-widgets-select/src/main/resources/i18n/jaxx-widgets-select_fr_FR.properties index 0c8b63f..904d1f3 100644 --- a/jaxx-widgets-select/src/main/resources/i18n/jaxx-widgets-select_fr_FR.properties +++ b/jaxx-widgets-select/src/main/resources/i18n/jaxx-widgets-select_fr_FR.properties @@ -4,11 +4,25 @@ 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 diff --git a/jaxx-widgets/src/main/resources/icons/action-bean-doublelist-down.png b/jaxx-widgets-select/src/main/resources/icons/action-bean-doublelist-down.png similarity index 100% rename from jaxx-widgets/src/main/resources/icons/action-bean-doublelist-down.png rename to jaxx-widgets-select/src/main/resources/icons/action-bean-doublelist-down.png diff --git a/jaxx-widgets/src/main/resources/icons/action-bean-doublelist-select.png b/jaxx-widgets-select/src/main/resources/icons/action-bean-doublelist-select.png similarity index 100% rename from jaxx-widgets/src/main/resources/icons/action-bean-doublelist-select.png rename to jaxx-widgets-select/src/main/resources/icons/action-bean-doublelist-select.png diff --git a/jaxx-widgets/src/main/resources/icons/action-bean-doublelist-unselect.png b/jaxx-widgets-select/src/main/resources/icons/action-bean-doublelist-unselect.png similarity index 100% rename from jaxx-widgets/src/main/resources/icons/action-bean-doublelist-unselect.png rename to jaxx-widgets-select/src/main/resources/icons/action-bean-doublelist-unselect.png diff --git a/jaxx-widgets/src/main/resources/icons/action-bean-doublelist-up.png b/jaxx-widgets-select/src/main/resources/icons/action-bean-doublelist-up.png similarity index 100% rename from jaxx-widgets/src/main/resources/icons/action-bean-doublelist-up.png rename to jaxx-widgets-select/src/main/resources/icons/action-bean-doublelist-up.png diff --git a/jaxx-widgets/src/main/resources/icons/action-bean-sort-down.png b/jaxx-widgets-select/src/main/resources/icons/action-bean-sort-down.png similarity index 100% rename from jaxx-widgets/src/main/resources/icons/action-bean-sort-down.png rename to jaxx-widgets-select/src/main/resources/icons/action-bean-sort-down.png diff --git a/jaxx-widgets/src/main/resources/icons/action-bean-sort-up.png b/jaxx-widgets-select/src/main/resources/icons/action-bean-sort-up.png similarity index 100% rename from jaxx-widgets/src/main/resources/icons/action-bean-sort-up.png rename to jaxx-widgets-select/src/main/resources/icons/action-bean-sort-up.png diff --git a/jaxx-widgets/src/main/resources/icons/action-bean-sort.png b/jaxx-widgets-select/src/main/resources/icons/action-bean-sort.png similarity index 100% rename from jaxx-widgets/src/main/resources/icons/action-bean-sort.png rename to jaxx-widgets-select/src/main/resources/icons/action-bean-sort.png diff --git a/jaxx-widgets/src/main/resources/icons/action-combobox-reset.png b/jaxx-widgets-select/src/main/resources/icons/action-combobox-reset.png similarity index 100% rename from jaxx-widgets/src/main/resources/icons/action-combobox-reset.png rename to jaxx-widgets-select/src/main/resources/icons/action-combobox-reset.png diff --git a/jaxx-widgets/src/main/resources/icons/action-combobox-sort.png b/jaxx-widgets-select/src/main/resources/icons/action-combobox-sort.png similarity index 100% rename from jaxx-widgets/src/main/resources/icons/action-combobox-sort.png rename to jaxx-widgets-select/src/main/resources/icons/action-combobox-sort.png diff --git a/jaxx-widgets-status/pom.xml b/jaxx-widgets-status/pom.xml index ceb3f06..7fead43 100644 --- a/jaxx-widgets-status/pom.xml +++ b/jaxx-widgets-status/pom.xml @@ -64,12 +64,6 @@ <artifactId>jaxx-widgets-common</artifactId> <version>${project.version}</version> </dependency--> - <!--Remove this--> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jaxx-widgets</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.nuiton.i18n</groupId> @@ -77,16 +71,6 @@ </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-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> @@ -123,13 +107,6 @@ </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-status/src/main/resources/i18n/jaxx-widgets-status_en_GB.properties b/jaxx-widgets-status/src/main/resources/i18n/jaxx-widgets-status_en_GB.properties index 954b4ea..8b0e803 100644 --- a/jaxx-widgets-status/src/main/resources/i18n/jaxx-widgets-status_en_GB.properties +++ b/jaxx-widgets-status/src/main/resources/i18n/jaxx-widgets-status_en_GB.properties @@ -1,69 +1 @@ -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-status/src/main/resources/i18n/jaxx-widgets-status_es_ES.properties b/jaxx-widgets-status/src/main/resources/i18n/jaxx-widgets-status_es_ES.properties index 4d58091..b233c02 100644 --- a/jaxx-widgets-status/src/main/resources/i18n/jaxx-widgets-status_es_ES.properties +++ b/jaxx-widgets-status/src/main/resources/i18n/jaxx-widgets-status_es_ES.properties @@ -1,69 +1 @@ -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-status/src/main/resources/i18n/jaxx-widgets-status_fr_FR.properties b/jaxx-widgets-status/src/main/resources/i18n/jaxx-widgets-status_fr_FR.properties index abb0e71..b233c02 100644 --- a/jaxx-widgets-status/src/main/resources/i18n/jaxx-widgets-status_fr_FR.properties +++ b/jaxx-widgets-status/src/main/resources/i18n/jaxx-widgets-status_fr_FR.properties @@ -1,69 +1 @@ -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/pom.xml b/jaxx-widgets/pom.xml index 3bad327..55605ec 100644 --- a/jaxx-widgets/pom.xml +++ b/jaxx-widgets/pom.xml @@ -61,31 +61,16 @@ <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> @@ -100,11 +85,6 @@ </dependency> <dependency> - <groupId>commons-primitives</groupId> - <artifactId>commons-primitives</artifactId> - </dependency> - - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> </dependency> @@ -115,11 +95,6 @@ </dependency> <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</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/ComboToListSelector.jaxx b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ComboToListSelector.jaxx deleted file mode 100644 index f589b3d..0000000 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ComboToListSelector.jaxx +++ /dev/null @@ -1,87 +0,0 @@ -<!-- - #%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% - --> -<ListSelector genericType='B' superGenericType='B'> - - <import> - java.util.Set - java.beans.PropertyChangeEvent - java.beans.PropertyChangeListener - </import> - - <ListSelectorModel id='model' - genericType='B' - javaBean='new ListSelectorModel()'/> - - <script><![CDATA[ - -protected void $afterCompleteSetup() { - - addPropertyChangeListener(PROPERTY_MODEL, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - - Set<String> bindings = $bindings.keySet(); - JAXXUtil.applyDataBinding(ComboToListSelector.this, bindings); - JAXXUtil.processDataBinding( - ComboToListSelector.this, bindings.toArray(new String[bindings.size()])); - } - }); -} -]]></script> - - <row> - <cell fill='horizontal' weightx='1' anchor="west"> - <JComboBox id='from' - model='{model.getFromModel()}' - renderer='{getRenderer()}'/> - </cell> - <cell anchor='east'> - <JToolBar id='actions' floatable='false'> - <JButton id="add" - toolTipText='{getAddToolTip()}' - actionIcon='add' - enabled='{model.isAddEnabled()}' - onActionPerformed='model.add()'/> - - <JButton id="remove" - toolTipText='{getRemoveToolTip()}' - actionIcon='remove' - enabled='{model.isRemoveEnabled()}' - onActionPerformed='model.remove()'/> - - </JToolBar> - </cell> - </row> - <row> - <cell columns='2' fill='both' weightx='1' weighty='1'> - <JScrollPane id='listPane'> - <JList id='to' - model='{model.getToModel()}' - selectionModel='{model.getToModel()}' - font-size='11' - onMouseClicked='if (event.getClickCount()==2) { model.remove(); }' - cellRenderer='{getRenderer()}'/> - </JScrollPane> - </cell> - </row> -</ListSelector> diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXRuntimeException.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXRuntimeException.java deleted file mode 100644 index bd0a996..0000000 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXRuntimeException.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.nuiton.jaxx.runtime.swing; - -/* - * #%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% - */ - -/** - * A special runtime exception to catch special errors fro - * - * @author Tony Chemit - dev@tchemit.fr - * @since 2.5.19 - */ -public class JAXXRuntimeException extends RuntimeException { - private static final long serialVersionUID = -2963740979386945340L; - - public JAXXRuntimeException() { - } - - public JAXXRuntimeException(String message) { - super(message); - } - - public JAXXRuntimeException(String message, Throwable cause) { - super(message, cause); - } - - public JAXXRuntimeException(Throwable cause) { - super(cause); - } -} 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 deleted file mode 100644 index 0de7547..0000000 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXWidgetUtil.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * #%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% - */ -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.KeyStrokeCellEditor; -import org.nuiton.jaxx.runtime.swing.renderer.DateCellRenderer; - -import javax.swing.table.TableCellEditor; -import javax.swing.table.TableCellRenderer; - -/** - * @author Sylvain Lletellier - */ -public class JAXXWidgetUtil extends SwingUtil { - - public static TableCellRenderer newDateTableCellRenderer(TableCellRenderer renderer) { - return newDateTableCellRenderer(renderer, null); - } - - public static TableCellRenderer newDateTableCellRenderer(TableCellRenderer renderer, String datePattern) { - return new DateCellRenderer(renderer, datePattern); - } - - public static TableCellEditor newDateTableCellEditor() { - return new DateCellEditor(); - } - - public static TableCellEditor newKeyStrokeTableCellEditor() { - return new KeyStrokeCellEditor(); - } - -} diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JSearchTextField.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JSearchTextField.java index 6f16dd7..35ff9f7 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JSearchTextField.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JSearchTextField.java @@ -31,11 +31,12 @@ */ package org.nuiton.jaxx.runtime.swing; -import java.awt.Graphics; -import java.awt.Image; +import org.nuiton.jaxx.runtime.SwingUtil; import javax.swing.ImageIcon; import javax.swing.JTextField; +import java.awt.Graphics; +import java.awt.Image; /** * A text field with search symbol painted to indicate @@ -43,7 +44,6 @@ import javax.swing.JTextField; * * @author Eugene Ryzhikov * @since 2.13 - * */ public class JSearchTextField extends JTextField { @@ -52,22 +52,22 @@ public class JSearchTextField extends JTextField { private static ImageIcon icon; - private static Image getScaledImage( int size ) { + private static Image getScaledImage(int size) { if (icon == null) { - icon = JAXXWidgetUtil.createImageIcon(ICON_NAME); + icon = SwingUtil.createImageIcon(ICON_NAME); } - return new ImageIcon(icon.getImage().getScaledInstance( size, size, Image.SCALE_SMOOTH )).getImage(); + return new ImageIcon(icon.getImage().getScaledInstance(size, size, Image.SCALE_SMOOTH)).getImage(); } private static final int PAD = 4; - private static final int PAD2 = PAD*2; + private static final int PAD2 = PAD * 2; @Override public void paint(Graphics g) { super.paint(g); - int size = getHeight()-PAD2; - g.drawImage( getScaledImage(size), getWidth()-size-PAD, PAD, null); + int size = getHeight() - PAD2; + g.drawImage(getScaledImage(size), getWidth() - size - PAD, PAD, null); } } diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ListSelector.jaxx b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ListSelector.jaxx deleted file mode 100644 index e2819a6..0000000 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ListSelector.jaxx +++ /dev/null @@ -1,77 +0,0 @@ -<!-- - #%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% - --> -<Table insets='0' genericType='B' abstract='true'> - - <import> - com.google.common.collect.Lists - java.util.List - javax.swing.DefaultComboBoxModel - javax.swing.DefaultListModel - javax.swing.DefaultListCellRenderer - java.beans.PropertyChangeEvent - java.beans.PropertyChangeListener - javax.swing.event.ListDataListener - org.nuiton.jaxx.runtime.swing.model.GenericListModel - org.nuiton.jaxx.runtime.swing.model.GenericListListener - java.util.Collection - java.util.Set - </import> - - <String id='addToolTip' javaBean='"+"'/> - - <String id='removeToolTip' javaBean='"-"'/> - - <ListSelectorModel id='model' - genericType='B' - javaBean='null'/> - - <ListCellRenderer id='renderer' javaBean='new DefaultListCellRenderer()'/> - - <script><![CDATA[ - -public void setValues(Collection<B> values) { - model.setValues(values); -} - -public Collection<B> getValues() { - return model.getValues(); -} - -public void setSelectedValues(Collection<B> selectedValues) { - model.setSelectedValues(selectedValues); -} - -public Collection<B> getSelectedValues() { - return model.getSelectedValues(); -} - -public void addGenericListListener(GenericListListener l) { - model.addGenericListListener(l); -} - -public void removeGenericListListener(GenericListListener l) { - model.removeGenericListListener(l); -} -]]> - </script> - -</Table> diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ListSelectorModel.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ListSelectorModel.java deleted file mode 100644 index 8aef2db..0000000 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ListSelectorModel.java +++ /dev/null @@ -1,175 +0,0 @@ -/* - * #%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% - */ -package org.nuiton.jaxx.runtime.swing; - -import com.google.common.collect.Lists; - -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; -import java.util.Collection; -import org.nuiton.jaxx.runtime.swing.model.GenericListListener; -import org.nuiton.jaxx.runtime.swing.model.GenericListModel; - -/** - * @author Sylvain Lletellier - */ -public class ListSelectorModel<B> { - - protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); - - public static final String PROPERTY_ADD_ENABLED = "addEnabled"; - public static final String PROPERTY_REMOVE_ENABLED = "removeEnabled"; - - public static final String PROPERTY_SELECTED_VALUES = "selectedValues"; - public static final String PROPERTY_VALUES = "values"; - - protected boolean addEnabled; - protected boolean removeEnabled; - - protected final GenericListModel<B> fromModel; - protected final GenericListModel<B> toModel; - - protected ListSelectorModel() { - - fromModel = new GenericListModel<>(); - fromModel.addPropertyChangeListener(GenericListModel.PROPERTY_SELECTED_VALUE, evt -> setAddEnabled(fromModel.hasSelectedIndex())); - - toModel = new GenericListModel<>(); - toModel.addPropertyChangeListener(GenericListModel.PROPERTY_SELECTED_VALUE, evt -> setRemoveEnabled(toModel.hasSelectedIndex())); - } - - public boolean isAddEnabled() { - return addEnabled; - } - - public void setAddEnabled(boolean addEnabled) { - boolean oldValue = isAddEnabled(); - this.addEnabled = addEnabled; - firePropertyChange(PROPERTY_ADD_ENABLED, oldValue, addEnabled); - } - - public boolean isRemoveEnabled() { - return removeEnabled; - } - - public void setRemoveEnabled(boolean removeEnabled) { - boolean oldValue = isRemoveEnabled(); - this.removeEnabled = removeEnabled; - firePropertyChange(PROPERTY_REMOVE_ENABLED, oldValue, removeEnabled); - } - - public GenericListModel<B> getFromModel() { - return fromModel; - } - - public GenericListModel<B> getToModel() { - return toModel; - } - - public Collection<B> getValues() { - return fromModel.getElements(); - } - - public void setValues(Collection<B> values) { - Collection<B> oldValues = getValues(); - toModel.clearElements(); - fromModel.setElements(values); - firePropertyChange(PROPERTY_VALUES, oldValues, values); - } - - public void addValues(Collection<B> values) { - Collection<B> oldValues = getValues(); - toModel.removeElements(values); - fromModel.removeElements(values); - fromModel.addElements(values); - firePropertyChange(PROPERTY_VALUES, oldValues, values); - } - - public void removeValues(Collection<B> values) { - Collection<B> oldValues = getValues(); - toModel.removeElements(values); - fromModel.removeElements(values); - firePropertyChange(PROPERTY_VALUES, oldValues, values); - } - - public Collection<B> getSelectedValues() { - return toModel.getElements(); - } - - public void setSelectedValues(Collection<B> selectedValues) { - Collection<B> oldValue = getSelectedValues(); - fromModel.removeElements(selectedValues); - toModel.removeElements(selectedValues); - toModel.setElements(selectedValues); - firePropertyChange(PROPERTY_SELECTED_VALUES, oldValue, selectedValues); - } - - public void add() { - Collection<B> oldValues = getValues(); - Collection<B> oldSelectedValue = getSelectedValues(); - moveSelect(fromModel, toModel); - firePropertyChange(PROPERTY_VALUES, oldValues, getValues()); - firePropertyChange(PROPERTY_SELECTED_VALUES, oldSelectedValue, getSelectedValues()); - } - - public void remove() { - moveSelect(toModel, fromModel); - } - - protected void moveSelect(GenericListModel<B> from, GenericListModel<B> to) { - Collection<B> selectedValues = Lists.newArrayList(from.getSelectedValues()); - from.removeElements(selectedValues); - to.addElements(selectedValues); - } - - public void addGenericListListener(GenericListListener l) { - toModel.addGenericListListener(l); - } - - public void removeGenericListListener(GenericListListener l) { - toModel.removeGenericListListener(l); - } - - public void addPropertyChangeListener(PropertyChangeListener listener) { - pcs.addPropertyChangeListener(listener); - } - - public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { - pcs.addPropertyChangeListener(propertyName, listener); - } - - public void removePropertyChangeListener(PropertyChangeListener listener) { - pcs.removePropertyChangeListener(listener); - } - - public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { - pcs.removePropertyChangeListener(propertyName, listener); - } - - protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) { - pcs.firePropertyChange(propertyName, oldValue, newValue); - } - - protected void fireIndexedPropertyChange(String propertyName, int index, Object oldValue, Object newValue) { - pcs.fireIndexedPropertyChange(propertyName, index, oldValue, newValue); - } -} diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ListToListSelector.jaxx b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ListToListSelector.jaxx deleted file mode 100644 index 3636c93..0000000 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ListToListSelector.jaxx +++ /dev/null @@ -1,88 +0,0 @@ -<!-- - #%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% - --> -<ListSelector genericType='B' superGenericType='B'> - <import> - javax.swing.SwingConstants - java.util.Set - java.beans.PropertyChangeEvent - java.beans.PropertyChangeListener - </import> - - <script><![CDATA[ - -protected void $afterCompleteSetup() { - - addPropertyChangeListener(PROPERTY_MODEL, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - - Set<String> bindings = $bindings.keySet(); - JAXXUtil.applyDataBinding(ListToListSelector.this, bindings); - JAXXUtil.processDataBinding( - ListToListSelector.this, bindings.toArray(new String[bindings.size()])); - } - }); -} -]]></script> - - <ListSelectorModel id='model' - genericType='B' - initializer='new ListSelectorModel()'/> - <row> - <cell fill='both' weightx='1' weighty='1' rows="2"> - <JScrollPane id='fromScrollpane'> - <JList id='from' - model='{model.getFromModel()}' - selectionModel='{model.getFromModel()}' - onMouseClicked='if (event.getClickCount()==2) { model.add(); }' - cellRenderer='{getRenderer()}'/> - </JScrollPane> - </cell> - <cell anchor='north'> - <JButton id="add" - toolTipText='{getAddToolTip()}' - actionIcon='select' - enabled='{model.isAddEnabled()}' - onActionPerformed='model.add()'/> - </cell> - - <cell fill='both' weightx='1' weighty='1' rows="2"> - <JScrollPane id='toScrollpane'> - <JList id='to' - model='{model.getToModel()}' - selectionModel='{model.getToModel()}' - onMouseClicked='if (event.getClickCount()==2) { model.remove(); }' - cellRenderer='{getRenderer()}'/> - </JScrollPane> - </cell> - </row> - <row> - <cell anchor='north'> - <JButton id="remove" - toolTipText='{getRemoveToolTip()}' - actionIcon='unselect' - enabled='{model.isRemoveEnabled()}' - onActionPerformed='model.remove()'/> - </cell> - </row> -</ListSelector> diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/package.html b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/package.html deleted file mode 100644 index e373ef7..0000000 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/package.html +++ /dev/null @@ -1,30 +0,0 @@ -<!-- - #%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% - --> -<html> -<body> -<h1>Package jaxx.runtime.swing.editor.bean</h1> - -Package containing several rich editors based on JavaBeans: -<ul> - <li>BeanComboBox : a rich combo box selector (reset, auto-complete + use of decorators to customize view)</li> - <li>BeanListHeader : a rich list header (reset, use of decorators to customize view)</li> -</ul> -</body> -</html> diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/FilterTableHeaderRenderer.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/FilterTableHeaderRenderer.java index 1e4cdc9..f44f6ae 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/FilterTableHeaderRenderer.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/FilterTableHeaderRenderer.java @@ -32,87 +32,94 @@ package org.nuiton.jaxx.runtime.swing.table.filter; +import org.nuiton.jaxx.runtime.SwingUtil; import org.nuiton.jaxx.runtime.swing.CompoundIcon; -import org.nuiton.jaxx.runtime.swing.JAXXWidgetUtil; +import javax.swing.Icon; +import javax.swing.ImageIcon; +import javax.swing.JComponent; +import javax.swing.JLabel; +import javax.swing.JTable; +import javax.swing.table.TableCellRenderer; import java.awt.Component; import java.awt.Image; -import javax.swing.*; -import javax.swing.table.TableCellRenderer; - /** - * Table header renderer to show the column filter state - * + * Table header renderer to show the column filter state + * * Created on Feb 10, 2011 + * * @author Eugene Ryzhikov * @author Kevin Morin - * */ class FilterTableHeaderRenderer extends JComponent implements TableCellRenderer { private static final long serialVersionUID = 1L; - private ImageIcon icon; - private final TableFilter<?> tableFilter; - private boolean rendererInit = true; - private int originalHorizontalTextPosition; - - public FilterTableHeaderRenderer( TableFilter<?> tableFilter ) { - this.tableFilter = tableFilter; - } - - private Icon getFilterIcon() { - - if (icon == null) { - icon = JAXXWidgetUtil.createImageIcon("funnel.png"); - icon = new ImageIcon( icon.getImage().getScaledInstance( 12, 12, Image.SCALE_SMOOTH )); - } - return icon; - - } - - @Override - public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, - boolean hasFocus, int row, int column) { - + private ImageIcon icon; + private final TableFilter<?> tableFilter; + private boolean rendererInit = true; + private int originalHorizontalTextPosition; + + public FilterTableHeaderRenderer(TableFilter<?> tableFilter) { + this.tableFilter = tableFilter; + } + + private Icon getFilterIcon() { + + if (icon == null) { + icon = SwingUtil.createImageIcon("funnel.png"); + icon = new ImageIcon(icon.getImage().getScaledInstance(12, 12, Image.SCALE_SMOOTH)); + } + return icon; + + } + + @Override + public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, + boolean hasFocus, int row, int column) { + final JLabel label = (JLabel) table.getTableHeader().getDefaultRenderer() - .getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); - if ( rendererInit ) { - originalHorizontalTextPosition = label.getHorizontalTextPosition(); - rendererInit = false; + .getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); + if (rendererInit) { + originalHorizontalTextPosition = label.getHorizontalTextPosition(); + rendererInit = false; } - - int modelColumn = table.convertColumnIndexToModel(column); - if ( tableFilter.isFiltered(modelColumn) ) { - - Icon originalIcon = label.getIcon(); - if ( originalIcon == null ) { - label.setIcon( getFilterIcon() ); - } else { - label.setIcon( new CompoundIcon( getFilterIcon(), originalIcon ) ); + + int modelColumn = table.convertColumnIndexToModel(column); + if (tableFilter.isFiltered(modelColumn)) { + + Icon originalIcon = label.getIcon(); + if (originalIcon == null) { + label.setIcon(getFilterIcon()); + } else { + label.setIcon(new CompoundIcon(getFilterIcon(), originalIcon)); } - label.setHorizontalTextPosition( JLabel.TRAILING ); - + label.setHorizontalTextPosition(JLabel.TRAILING); + } else { - label.setHorizontalTextPosition( originalHorizontalTextPosition ); + label.setHorizontalTextPosition(originalHorizontalTextPosition); } - + return label; - } + } // following methods are overriden for performance reasons @Override - public void validate() {} + public void validate() { + } @Override - public void revalidate() {} + public void revalidate() { + } @Override - public void firePropertyChange(String propertyName, boolean oldValue, boolean newValue) {} + public void firePropertyChange(String propertyName, boolean oldValue, boolean newValue) { + } @Override - public void firePropertyChange(String propertyName, Object oldValue, Object newValue) {} + public void firePropertyChange(String propertyName, Object oldValue, Object newValue) { + } } \ No newline at end of file diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterColumnPopup.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterColumnPopup.java index 1286965..35c208d 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterColumnPopup.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterColumnPopup.java @@ -33,31 +33,50 @@ package org.nuiton.jaxx.runtime.swing.table.filter; -import org.nuiton.jaxx.runtime.swing.JAXXWidgetUtil; +import org.apache.commons.collections4.CollectionUtils; +import org.nuiton.decorator.Decorator; +import org.nuiton.jaxx.runtime.SwingUtil; import org.nuiton.jaxx.runtime.swing.JSearchTextField; import org.nuiton.jaxx.runtime.swing.list.filter.CheckListFilterType; import org.nuiton.jaxx.runtime.swing.list.filter.DefaultFilterableCheckListModel; import org.nuiton.jaxx.runtime.swing.list.filter.FilterableActionCheckListModel; import org.nuiton.jaxx.runtime.swing.list.filter.FilterableCheckList; import org.nuiton.jaxx.runtime.swing.list.filter.FilterableCheckListModel; -import org.apache.commons.collections4.CollectionUtils; -import org.nuiton.decorator.Decorator; -import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; - -import javax.swing.*; +import javax.swing.AbstractAction; +import javax.swing.Action; +import javax.swing.BorderFactory; +import javax.swing.Box; +import javax.swing.BoxLayout; +import javax.swing.Icon; +import javax.swing.JButton; +import javax.swing.JComponent; +import javax.swing.JPanel; +import javax.swing.JPopupMenu; +import javax.swing.JScrollPane; +import javax.swing.JToolBar; +import javax.swing.SwingUtilities; +import javax.swing.UIManager; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import javax.swing.event.PopupMenuEvent; import javax.swing.event.PopupMenuListener; import javax.swing.table.JTableHeader; import javax.swing.table.TableColumnModel; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Component; +import java.awt.Cursor; +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.event.ActionEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; import static org.nuiton.i18n.I18n.t; @@ -236,7 +255,7 @@ class TableFilterColumnPopup extends MouseAdapter { toolbar.setOpaque(false); toolbar.add(new CommandAction( t("jaxx.table.filter.popup.button.clearAll"), - JAXXWidgetUtil.createImageIcon("funnel_delete.png")) { + SwingUtil.createImageIcon("funnel_delete.png")) { @Override protected boolean perform() { return clearAllFilters(); diff --git a/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_en_GB.properties b/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_en_GB.properties index 954b4ea..1aac99d 100644 --- a/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_en_GB.properties +++ b/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_en_GB.properties @@ -1,69 +1,13 @@ -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/src/main/resources/i18n/jaxx-widgets_es_ES.properties b/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties index 4d58091..778f6ae 100644 --- a/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties +++ b/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties @@ -1,69 +1,13 @@ -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/src/main/resources/i18n/jaxx-widgets_fr_FR.properties b/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties index abb0e71..009788c 100644 --- a/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties +++ b/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties @@ -1,69 +1,13 @@ -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/src/main/resources/icons/action-doublelist-reset.png b/jaxx-widgets/src/main/resources/icons/action-doublelist-reset.png deleted file mode 100644 index 0fb00f9..0000000 Binary files a/jaxx-widgets/src/main/resources/icons/action-doublelist-reset.png and /dev/null differ diff --git a/jaxx-widgets/src/main/resources/icons/action-doublelist-sort.png b/jaxx-widgets/src/main/resources/icons/action-doublelist-sort.png deleted file mode 100644 index 188e1c1..0000000 Binary files a/jaxx-widgets/src/main/resources/icons/action-doublelist-sort.png and /dev/null differ -- 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 https://gitlab.nuiton.org/nuiton/jaxx.git commit 44a336c833c1d318f7d565cd3323a7ff2ad78d19 Author: Tony CHEMIT <dev@tchemit.fr> Date: Sat Dec 31 15:08:33 2016 +0100 Introduce jaxx-widgets-hidor module (Fixes #4111) Introduce jaxx-widgets-error module (Fixes #4110) Remove jaxx-widgets module (Fixes #4103) --- jaxx-demo/pom.xml | 18 +++++--- .../src/main/java/org/nuiton/jaxx/demo/DemoUI.jaxx | 2 - .../java/org/nuiton/jaxx/demo/DemoUIHandler.java | 51 ++++----------------- .../main/java/org/nuiton/jaxx/demo/RunDemo.java | 8 +--- .../jaxx/demo/component/swing/HidorButtonDemo.jaxx | 4 +- .../jaxx/demo/feature/nav/NavDemoHandler.java | 2 +- jaxx-widgets-datetime/pom.xml | 7 ++- .../jaxx/widgets/datetime/DateTimeEditor.jaxx | 2 +- .../datetime}/ExtendedBasicDatePickerUI.java | 4 +- .../jaxx/widgets/datetime/JAXXDatePicker.jaxx | 1 - .../nuiton/jaxx/widgets/datetime/TimeEditor.jaxx | 2 +- {jaxx-widgets => jaxx-widgets-error}/LICENSE.txt | 0 {jaxx-widgets => jaxx-widgets-error}/README.md | 0 {jaxx-widgets => jaxx-widgets-error}/changelog.txt | 0 {jaxx-widgets => jaxx-widgets-error}/pom.xml | 24 ++++------ .../src/license/THIRD-PARTY.properties | 0 .../nuiton/jaxx/widgets/error}/ErrorDialogUI.jaxx | 0 .../jaxx/widgets/error}/ErrorDialogUIHandler.java | 2 +- .../i18n/jaxx-widgets-error_en_GB.properties | 2 - .../i18n/jaxx-widgets-error_es_ES.properties | 2 - .../i18n/jaxx-widgets-error_fr_FR.properties | 2 - .../main/resources/icons/action-font-size-down.png | Bin 0 -> 300 bytes .../main/resources/icons/action-font-size-up.png | Bin 0 -> 356 bytes .../src/main/resources/icons/action-font-size.png | Bin 0 -> 295 bytes .../src/site/site.xml | 0 {jaxx-widgets => jaxx-widgets-hidor}/LICENSE.txt | 0 {jaxx-widgets => jaxx-widgets-hidor}/README.md | 0 {jaxx-widgets => jaxx-widgets-hidor}/changelog.txt | 0 {jaxx-widgets => jaxx-widgets-hidor}/pom.xml | 24 ++++------ .../src/license/THIRD-PARTY.properties | 0 .../nuiton/jaxx/widgets/hidor}/HidorButton.jaxx | 0 .../jaxx/widgets/hidor}/HidorButtonHandler.java | 2 +- .../i18n/jaxx-widgets-hidor_en_GB.properties | 2 + .../i18n/jaxx-widgets-hidor_es_ES.properties | 2 + .../i18n/jaxx-widgets-hidor_fr_FR.properties | 2 + .../src/main/resources/icons/action-collapse.png | Bin .../src/main/resources/icons/action-expand.png | Bin .../src/site/site.xml | 0 .../org/nuiton/jaxx/runtime/swing/package.html | 46 ------------------- .../src/main/resources/icons/action-add.png | Bin 733 -> 0 bytes .../src/main/resources/icons/action-open.png | Bin 606 -> 0 bytes .../src/main/resources/icons/action-remove.png | Bin 715 -> 0 bytes .../src/main/resources/icons/action-select.png | Bin 733 -> 0 bytes .../src/main/resources/icons/action-unselect.png | Bin 715 -> 0 bytes pom.xml | 3 +- 45 files changed, 63 insertions(+), 151 deletions(-) diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index ab9a91c..703419a 100644 --- a/jaxx-demo/pom.xml +++ b/jaxx-demo/pom.xml @@ -86,12 +86,6 @@ <dependency> <groupId>${project.groupId}</groupId> - <artifactId>jaxx-widgets</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>jaxx-widgets-about</artifactId> <version>${project.version}</version> </dependency> @@ -122,6 +116,18 @@ <dependency> <groupId>${project.groupId}</groupId> + <artifactId>jaxx-widgets-hidor</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-widgets-error</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/DemoUI.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUI.jaxx index f9931b2..55ae721 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUI.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUI.jaxx @@ -74,8 +74,6 @@ public boolean acceptLocale(Locale l, String expected) { </JMenu> <JMenu id='menuHelp'> - <JMenuItem id='menuHelpLogs' - onActionPerformed="handler.showLogs(this)"/> <JMenuItem id='menuHelpHelp' onActionPerformed="handler.showHelp(this, null)"/> <JMenuItem id='menuHelpSite' diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUIHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUIHandler.java index d5acca8..62c6ea3 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUIHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUIHandler.java @@ -22,6 +22,13 @@ package org.nuiton.jaxx.demo; * #L% */ +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.decorator.DecoratorProvider; +import org.nuiton.i18n.I18n; +import org.nuiton.jaxx.config.ConfigUIHelper; +import org.nuiton.jaxx.demo.tree.DemoNode; +import org.nuiton.jaxx.demo.tree.DemoTreeHelper; import org.nuiton.jaxx.runtime.JAXXContext; import org.nuiton.jaxx.runtime.JAXXUtil; import org.nuiton.jaxx.runtime.SwingUtil; @@ -29,18 +36,10 @@ import org.nuiton.jaxx.runtime.context.DefaultApplicationContext; import org.nuiton.jaxx.runtime.context.JAXXContextEntryDef; import org.nuiton.jaxx.runtime.context.JAXXInitialContext; import org.nuiton.jaxx.runtime.spi.UIHandler; -import org.nuiton.jaxx.runtime.swing.ErrorDialogUI; -import org.nuiton.jaxx.runtime.swing.log.JAXXLog4jUI; import org.nuiton.jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.decorator.DecoratorProvider; -import org.nuiton.i18n.I18n; -import org.nuiton.jaxx.config.ConfigUIHelper; -import org.nuiton.jaxx.demo.tree.DemoNode; -import org.nuiton.jaxx.demo.tree.DemoTreeHelper; import org.nuiton.jaxx.widgets.about.AboutUI; import org.nuiton.jaxx.widgets.about.AboutUIBuilder; +import org.nuiton.jaxx.widgets.error.ErrorDialogUI; import javax.swing.AbstractAction; import javax.swing.InputMap; @@ -94,17 +93,6 @@ public class DemoUIHandler implements UIHandler<DemoUI> { } close(DemoApplicationContext.get()); }; - reloadLogAppenderCallback = () -> { - if (log.isInfoEnabled()) { - log.info("will reload log appender"); - } - DefaultApplicationContext context = DemoApplicationContext.get(); - DemoUI ui = getUI(context); - DemoConfig config = ui.getConfig(); - - // init jaxx logger - JAXXLog4jUI.init(config.getLogLevel(), config.getLogPatternLayout()); - }; } /** @@ -408,8 +396,6 @@ public class DemoUIHandler implements UIHandler<DemoUI> { final Runnable reloadApplicationCallback; - final Runnable reloadLogAppenderCallback; - public void showConfig(JAXXContext context) { DemoUI ui = getUI(context); DemoConfig config = ui.getConfig(); @@ -426,11 +412,6 @@ public class DemoUIHandler implements UIHandler<DemoUI> { SwingUtil.createActionIcon("reload-application"), reloadApplicationCallback); - helper.registerCallBack("log", - n("demo.action.reload.logAppender"), - SwingUtil.createActionIcon("reload-log"), - reloadLogAppenderCallback); - // categorie repertoires helper.addCategory(n("jaxxdemo.config.category.directories"), @@ -466,14 +447,6 @@ public class DemoUIHandler implements UIHandler<DemoUI> { setOptionPropertyName(DemoConfig.PROPERTY_KEY_OPEN_CONFIG). setOptionCallBack("ui"); - helper.addOption(DemoConfig.Option.LOG_LEVEL). - setOptionPropertyName(DemoConfig.PROPERTY_LOG_LEVEL). - setOptionCallBack("log"); - - helper.addOption(DemoConfig.Option.LOG_PATTERN_LAYOUT). - setOptionPropertyName(DemoConfig.PROPERTY_LOG_PATTERN_LAYOUT). - setOptionCallBack("log"); - helper.buildUI(context, "jaxxdemo.config.category.other"); helper.displayUI(ui, false); @@ -496,14 +469,6 @@ public class DemoUIHandler implements UIHandler<DemoUI> { // mainUI.getHelp().setCurrentID(helpId); } - public void showLogs(DemoUI ui) { - - JAXXLog4jUI log4jUI = new JAXXLog4jUI(); - String title = t("jaxxdemo.title.showLog"); - log4jUI.setTitle(title); - log4jUI.showInDialog(ui, false); - } - public void gotoSite(JAXXContext context) { DemoUI ui = getUI(context); diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/RunDemo.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/RunDemo.java index 83fa270..02acd26 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/RunDemo.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/RunDemo.java @@ -22,9 +22,6 @@ package org.nuiton.jaxx.demo; -import org.nuiton.jaxx.runtime.SwingUtil; -import org.nuiton.jaxx.runtime.swing.ErrorDialogUI; -import org.nuiton.jaxx.runtime.swing.log.JAXXLog4jUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.DecoratorProvider; @@ -33,6 +30,8 @@ import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.jaxx.demo.entities.DemoDecoratorProvider; import org.nuiton.jaxx.demo.tree.DemoDataProvider; import org.nuiton.jaxx.demo.tree.DemoTreeHelper; +import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.widgets.error.ErrorDialogUI; import org.nuiton.util.StringUtil; import java.util.Arrays; @@ -96,9 +95,6 @@ public class RunDemo { log.info(t("jaxxdemo.message.config.loaded", config.getVersion())); - // init jaxx logger - JAXXLog4jUI.init(config.getLogLevel(), config.getLogPatternLayout()); - // prepare ui look&feel and load ui properties try { SwingUtil.initNimbusLoookAndFeel(); diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/HidorButtonDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/HidorButtonDemo.jaxx index 125573f..b06b2a7 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/HidorButtonDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/HidorButtonDemo.jaxx @@ -24,7 +24,7 @@ <HBox horizontalAlignment='center' verticalAlignment='middle'> - <org.nuiton.jaxx.runtime.swing.HidorButton target='{hidor1}' showText="show label1" + <org.nuiton.jaxx.widgets.hidor.HidorButton target='{hidor1}' showText="show label1" hideText='hide label1' targetVisible='{true}'/> @@ -32,7 +32,7 @@ </HBox> <HBox horizontalAlignment='center' verticalAlignment='middle'> - <org.nuiton.jaxx.runtime.swing.HidorButton target='{hidor2}' showText="show label2" + <org.nuiton.jaxx.widgets.hidor.HidorButton target='{hidor2}' showText="show label2" hideText='hide label2' targetVisible='{false}'/> diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/NavDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/NavDemoHandler.java index 111144c..6b9bbd5 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/NavDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/NavDemoHandler.java @@ -25,7 +25,7 @@ import org.nuiton.jaxx.runtime.JAXXContext; import org.nuiton.jaxx.runtime.SwingUtil; import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.jaxx.runtime.swing.CardLayout2; -import org.nuiton.jaxx.runtime.swing.ErrorDialogUI; +import org.nuiton.jaxx.widgets.error.ErrorDialogUI; import org.nuiton.jaxx.runtime.swing.nav.NavNode; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-widgets-datetime/pom.xml b/jaxx-widgets-datetime/pom.xml index 9fc5365..7106e5b 100644 --- a/jaxx-widgets-datetime/pom.xml +++ b/jaxx-widgets-datetime/pom.xml @@ -68,13 +68,12 @@ <dependency> <groupId>${project.groupId}</groupId> - <artifactId>jaxx-widgets</artifactId> + <artifactId>jaxx-widgets-common</artifactId> <version>${project.version}</version> </dependency> - <dependency> <groupId>${project.groupId}</groupId> - <artifactId>jaxx-widgets-common</artifactId> + <artifactId>jaxx-widgets-hidor</artifactId> <version>${project.version}</version> </dependency> @@ -149,7 +148,7 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>jaxx-widgets</artifactId> + <artifactId>jaxx-widgets-hidor</artifactId> <version>${project.version}</version> </dependency> </dependencies> 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 44c1507..2277c46 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 @@ -28,7 +28,7 @@ java.io.Serializable java.awt.BorderLayout - org.nuiton.jaxx.runtime.swing.HidorButton + org.nuiton.jaxx.widgets.hidor.HidorButton javax.swing.DefaultBoundedRangeModel org.jdesktop.swingx.JXDatePicker diff --git a/jaxx-widgets/src/main/java/org/jdesktop/swingx/plaf/basic/ExtendedBasicDatePickerUI.java b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/ExtendedBasicDatePickerUI.java similarity index 96% rename from jaxx-widgets/src/main/java/org/jdesktop/swingx/plaf/basic/ExtendedBasicDatePickerUI.java rename to jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/ExtendedBasicDatePickerUI.java index 189a9fb..f89e5b7 100644 --- a/jaxx-widgets/src/main/java/org/jdesktop/swingx/plaf/basic/ExtendedBasicDatePickerUI.java +++ b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/ExtendedBasicDatePickerUI.java @@ -19,7 +19,9 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.jdesktop.swingx.plaf.basic; +package org.nuiton.jaxx.widgets.datetime; + +import org.jdesktop.swingx.plaf.basic.BasicDatePickerUI; import java.beans.PropertyChangeSupport; import java.beans.PropertyVetoException; diff --git a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/JAXXDatePicker.jaxx b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/JAXXDatePicker.jaxx index 5e30a40..fa584e5 100644 --- a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/JAXXDatePicker.jaxx +++ b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/JAXXDatePicker.jaxx @@ -24,7 +24,6 @@ <import> java.beans.PropertyChangeEvent java.beans.PropertyChangeListener - org.jdesktop.swingx.plaf.basic.ExtendedBasicDatePickerUI java.text.SimpleDateFormat </import> diff --git a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeEditor.jaxx b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeEditor.jaxx index ef3f99e..eaed512 100644 --- a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeEditor.jaxx +++ b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeEditor.jaxx @@ -28,7 +28,7 @@ java.io.Serializable java.awt.BorderLayout - org.nuiton.jaxx.runtime.swing.HidorButton + org.nuiton.jaxx.widgets.hidor.HidorButton javax.swing.DefaultBoundedRangeModel </import> diff --git a/jaxx-widgets/LICENSE.txt b/jaxx-widgets-error/LICENSE.txt similarity index 100% copy from jaxx-widgets/LICENSE.txt copy to jaxx-widgets-error/LICENSE.txt diff --git a/jaxx-widgets/README.md b/jaxx-widgets-error/README.md similarity index 100% copy from jaxx-widgets/README.md copy to jaxx-widgets-error/README.md diff --git a/jaxx-widgets/changelog.txt b/jaxx-widgets-error/changelog.txt similarity index 100% copy from jaxx-widgets/changelog.txt copy to jaxx-widgets-error/changelog.txt diff --git a/jaxx-widgets/pom.xml b/jaxx-widgets-error/pom.xml similarity index 89% copy from jaxx-widgets/pom.xml copy to jaxx-widgets-error/pom.xml index b4766c6..71213ac 100644 --- a/jaxx-widgets/pom.xml +++ b/jaxx-widgets-error/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - JAXX :: Widgets + JAXX :: Widgets File $Id$ $HeadURL$ @@ -35,10 +35,10 @@ </parent> <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-widgets</artifactId> + <artifactId>jaxx-widgets-error</artifactId> - <name>JAXX :: Widgets</name> - <description>Collection of swing widgets wrote with JAXX</description> + <name>JAXX :: Widgets Error</name> + <description>Collection of widgets around Error managmenet</description> <properties> @@ -58,11 +58,12 @@ <artifactId>jaxx-runtime</artifactId> <version>${project.version}</version> </dependency> - - <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-core</artifactId> - </dependency> + <!--Should use this--> + <!--dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-widgets-common</artifactId> + <version>${project.version}</version> + </dependency--> <dependency> <groupId>org.nuiton.i18n</groupId> @@ -80,11 +81,6 @@ <scope>provided</scope> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - </dependencies> <build> diff --git a/jaxx-widgets/src/license/THIRD-PARTY.properties b/jaxx-widgets-error/src/license/THIRD-PARTY.properties similarity index 100% copy from jaxx-widgets/src/license/THIRD-PARTY.properties copy to jaxx-widgets-error/src/license/THIRD-PARTY.properties diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ErrorDialogUI.jaxx b/jaxx-widgets-error/src/main/java/org/nuiton/jaxx/widgets/error/ErrorDialogUI.jaxx similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ErrorDialogUI.jaxx rename to jaxx-widgets-error/src/main/java/org/nuiton/jaxx/widgets/error/ErrorDialogUI.jaxx diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ErrorDialogUIHandler.java b/jaxx-widgets-error/src/main/java/org/nuiton/jaxx/widgets/error/ErrorDialogUIHandler.java similarity index 98% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ErrorDialogUIHandler.java rename to jaxx-widgets-error/src/main/java/org/nuiton/jaxx/widgets/error/ErrorDialogUIHandler.java index 1578a94..e3df4d6 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ErrorDialogUIHandler.java +++ b/jaxx-widgets-error/src/main/java/org/nuiton/jaxx/widgets/error/ErrorDialogUIHandler.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.jaxx.runtime.swing; +package org.nuiton.jaxx.widgets.error; import org.nuiton.jaxx.runtime.JAXXUtil; import org.nuiton.jaxx.runtime.SwingUtil; diff --git a/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_en_GB.properties b/jaxx-widgets-error/src/main/resources/i18n/jaxx-widgets-error_en_GB.properties similarity index 70% rename from jaxx-widgets/src/main/resources/i18n/jaxx-widgets_en_GB.properties rename to jaxx-widgets-error/src/main/resources/i18n/jaxx-widgets-error_en_GB.properties index d83d44e..6e4c10a 100644 --- a/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_en_GB.properties +++ b/jaxx-widgets-error/src/main/resources/i18n/jaxx-widgets-error_en_GB.properties @@ -1,5 +1,3 @@ errorUI.action.close=Close errorUI.message=An error wad detected... errorUI.title=Error... -hidor.hideTip=Hide -hidor.showTip=Show diff --git a/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties b/jaxx-widgets-error/src/main/resources/i18n/jaxx-widgets-error_es_ES.properties similarity index 68% rename from jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties rename to jaxx-widgets-error/src/main/resources/i18n/jaxx-widgets-error_es_ES.properties index ffbb5a0..055ceb1 100644 --- a/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties +++ b/jaxx-widgets-error/src/main/resources/i18n/jaxx-widgets-error_es_ES.properties @@ -1,5 +1,3 @@ errorUI.action.close=Cerrar errorUI.message=ha habido un error \! errorUI.title=Error... -hidor.hideTip=Ocultar -hidor.showTip=Ver diff --git a/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties b/jaxx-widgets-error/src/main/resources/i18n/jaxx-widgets-error_fr_FR.properties similarity index 70% rename from jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties rename to jaxx-widgets-error/src/main/resources/i18n/jaxx-widgets-error_fr_FR.properties index 57c76a8..2d9e9d9 100644 --- a/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties +++ b/jaxx-widgets-error/src/main/resources/i18n/jaxx-widgets-error_fr_FR.properties @@ -1,5 +1,3 @@ errorUI.action.close=Fermer errorUI.message=Une erreur est survenue \! errorUI.title=Erreur... -hidor.hideTip=Cacher -hidor.showTip=Voir diff --git a/jaxx-widgets-error/src/main/resources/icons/action-font-size-down.png b/jaxx-widgets-error/src/main/resources/icons/action-font-size-down.png new file mode 100644 index 0000000..66e5e5f Binary files /dev/null and b/jaxx-widgets-error/src/main/resources/icons/action-font-size-down.png differ diff --git a/jaxx-widgets-error/src/main/resources/icons/action-font-size-up.png b/jaxx-widgets-error/src/main/resources/icons/action-font-size-up.png new file mode 100644 index 0000000..ac7160e Binary files /dev/null and b/jaxx-widgets-error/src/main/resources/icons/action-font-size-up.png differ diff --git a/jaxx-widgets-error/src/main/resources/icons/action-font-size.png b/jaxx-widgets-error/src/main/resources/icons/action-font-size.png new file mode 100644 index 0000000..ef125e9 Binary files /dev/null and b/jaxx-widgets-error/src/main/resources/icons/action-font-size.png differ diff --git a/jaxx-widgets/src/site/site.xml b/jaxx-widgets-error/src/site/site.xml similarity index 100% copy from jaxx-widgets/src/site/site.xml copy to jaxx-widgets-error/src/site/site.xml diff --git a/jaxx-widgets/LICENSE.txt b/jaxx-widgets-hidor/LICENSE.txt similarity index 100% rename from jaxx-widgets/LICENSE.txt rename to jaxx-widgets-hidor/LICENSE.txt diff --git a/jaxx-widgets/README.md b/jaxx-widgets-hidor/README.md similarity index 100% rename from jaxx-widgets/README.md rename to jaxx-widgets-hidor/README.md diff --git a/jaxx-widgets/changelog.txt b/jaxx-widgets-hidor/changelog.txt similarity index 100% rename from jaxx-widgets/changelog.txt rename to jaxx-widgets-hidor/changelog.txt diff --git a/jaxx-widgets/pom.xml b/jaxx-widgets-hidor/pom.xml similarity index 89% rename from jaxx-widgets/pom.xml rename to jaxx-widgets-hidor/pom.xml index b4766c6..5e88648 100644 --- a/jaxx-widgets/pom.xml +++ b/jaxx-widgets-hidor/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - JAXX :: Widgets + JAXX :: Widgets File $Id$ $HeadURL$ @@ -35,10 +35,10 @@ </parent> <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-widgets</artifactId> + <artifactId>jaxx-widgets-hidor</artifactId> - <name>JAXX :: Widgets</name> - <description>Collection of swing widgets wrote with JAXX</description> + <name>JAXX :: Widgets Hidor</name> + <description>Hidor widget</description> <properties> @@ -58,11 +58,12 @@ <artifactId>jaxx-runtime</artifactId> <version>${project.version}</version> </dependency> - - <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-core</artifactId> - </dependency> + <!--Should use this--> + <!--dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-widgets-common</artifactId> + <version>${project.version}</version> + </dependency--> <dependency> <groupId>org.nuiton.i18n</groupId> @@ -80,11 +81,6 @@ <scope>provided</scope> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - </dependencies> <build> diff --git a/jaxx-widgets/src/license/THIRD-PARTY.properties b/jaxx-widgets-hidor/src/license/THIRD-PARTY.properties similarity index 100% rename from jaxx-widgets/src/license/THIRD-PARTY.properties rename to jaxx-widgets-hidor/src/license/THIRD-PARTY.properties diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/HidorButton.jaxx b/jaxx-widgets-hidor/src/main/java/org/nuiton/jaxx/widgets/hidor/HidorButton.jaxx similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/HidorButton.jaxx rename to jaxx-widgets-hidor/src/main/java/org/nuiton/jaxx/widgets/hidor/HidorButton.jaxx diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/HidorButtonHandler.java b/jaxx-widgets-hidor/src/main/java/org/nuiton/jaxx/widgets/hidor/HidorButtonHandler.java similarity index 98% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/HidorButtonHandler.java rename to jaxx-widgets-hidor/src/main/java/org/nuiton/jaxx/widgets/hidor/HidorButtonHandler.java index b379aae..b15020c 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/HidorButtonHandler.java +++ b/jaxx-widgets-hidor/src/main/java/org/nuiton/jaxx/widgets/hidor/HidorButtonHandler.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.jaxx.runtime.swing; +package org.nuiton.jaxx.widgets.hidor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-widgets-hidor/src/main/resources/i18n/jaxx-widgets-hidor_en_GB.properties b/jaxx-widgets-hidor/src/main/resources/i18n/jaxx-widgets-hidor_en_GB.properties new file mode 100644 index 0000000..f5ea6ab --- /dev/null +++ b/jaxx-widgets-hidor/src/main/resources/i18n/jaxx-widgets-hidor_en_GB.properties @@ -0,0 +1,2 @@ +hidor.hideTip=Hide +hidor.showTip=Show diff --git a/jaxx-widgets-hidor/src/main/resources/i18n/jaxx-widgets-hidor_es_ES.properties b/jaxx-widgets-hidor/src/main/resources/i18n/jaxx-widgets-hidor_es_ES.properties new file mode 100644 index 0000000..54e0ad5 --- /dev/null +++ b/jaxx-widgets-hidor/src/main/resources/i18n/jaxx-widgets-hidor_es_ES.properties @@ -0,0 +1,2 @@ +hidor.hideTip=Ocultar +hidor.showTip=Ver diff --git a/jaxx-widgets-hidor/src/main/resources/i18n/jaxx-widgets-hidor_fr_FR.properties b/jaxx-widgets-hidor/src/main/resources/i18n/jaxx-widgets-hidor_fr_FR.properties new file mode 100644 index 0000000..8740bbe --- /dev/null +++ b/jaxx-widgets-hidor/src/main/resources/i18n/jaxx-widgets-hidor_fr_FR.properties @@ -0,0 +1,2 @@ +hidor.hideTip=Cacher +hidor.showTip=Voir diff --git a/jaxx-widgets/src/main/resources/icons/action-collapse.png b/jaxx-widgets-hidor/src/main/resources/icons/action-collapse.png similarity index 100% rename from jaxx-widgets/src/main/resources/icons/action-collapse.png rename to jaxx-widgets-hidor/src/main/resources/icons/action-collapse.png diff --git a/jaxx-widgets/src/main/resources/icons/action-expand.png b/jaxx-widgets-hidor/src/main/resources/icons/action-expand.png similarity index 100% rename from jaxx-widgets/src/main/resources/icons/action-expand.png rename to jaxx-widgets-hidor/src/main/resources/icons/action-expand.png diff --git a/jaxx-widgets/src/site/site.xml b/jaxx-widgets-hidor/src/site/site.xml similarity index 100% rename from jaxx-widgets/src/site/site.xml rename to jaxx-widgets-hidor/src/site/site.xml diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/package.html b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/package.html deleted file mode 100644 index 0cd995d..0000000 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/package.html +++ /dev/null @@ -1,46 +0,0 @@ -<!-- - #%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% - --> -<html> -<body> -<h1>Package jaxx.runtime.swing</h1> - -<p> - Base package of the project <strong>jaxx-widgets</strong>. -</p> - -In this package, we can find several simple widgets : - -<ul> - <li>AboutPanel : an About dialog ui</li> - <li>ClockWidget : a widget which displays time</li> - <li>EntityComboBox : a rich drop list of beans based on Decorator api</li> - <li>ErrordialogUI : error dialog to use each time there is an error</li> - <li>FontSizor : a widget to change font size</li> - <li>HidorButton : a simple widget to show and hide components</li> - <li>ListSelectorUI :</li> - <li>MemoryStatusWidget : a widget to display memory usage</li> - <li>StatusMessagePanel : a panel to display messages and show status of - application (busy, waking, ...) - </li> -</ul> -</body> -</html> diff --git a/jaxx-widgets/src/main/resources/icons/action-add.png b/jaxx-widgets/src/main/resources/icons/action-add.png deleted file mode 100644 index 6332fef..0000000 Binary files a/jaxx-widgets/src/main/resources/icons/action-add.png and /dev/null differ diff --git a/jaxx-widgets/src/main/resources/icons/action-open.png b/jaxx-widgets/src/main/resources/icons/action-open.png deleted file mode 100755 index e9c4476..0000000 Binary files a/jaxx-widgets/src/main/resources/icons/action-open.png and /dev/null differ diff --git a/jaxx-widgets/src/main/resources/icons/action-remove.png b/jaxx-widgets/src/main/resources/icons/action-remove.png deleted file mode 100644 index 08f2493..0000000 Binary files a/jaxx-widgets/src/main/resources/icons/action-remove.png and /dev/null differ diff --git a/jaxx-widgets/src/main/resources/icons/action-select.png b/jaxx-widgets/src/main/resources/icons/action-select.png deleted file mode 100644 index 6332fef..0000000 Binary files a/jaxx-widgets/src/main/resources/icons/action-select.png and /dev/null differ diff --git a/jaxx-widgets/src/main/resources/icons/action-unselect.png b/jaxx-widgets/src/main/resources/icons/action-unselect.png deleted file mode 100644 index 08f2493..0000000 Binary files a/jaxx-widgets/src/main/resources/icons/action-unselect.png and /dev/null differ diff --git a/pom.xml b/pom.xml index 9a3ac8a..af97e83 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,8 @@ <module>jaxx-widgets-about</module> <module>jaxx-widgets-number</module> <module>jaxx-widgets-select</module> - <module>jaxx-widgets</module> + <module>jaxx-widgets-hidor</module> + <module>jaxx-widgets-error</module> <module>jaxx-widgets-datetime</module> <module>jaxx-widgets-gis</module> <module>jaxx-config</module> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.