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 d894d3e35ee67c4c5a18ee45dd095a754460174a Author: Tony CHEMIT <dev@tchemit.fr> Date: Sat Dec 31 14:40:46 2016 +0100 Continue to clean jaxx-widgets module (See #4103) --- jaxx-config/pom.xml | 6 - .../org/nuiton/jaxx/config/ConfigTableEditor.java | 2 +- jaxx-demo/pom.xml | 6 + .../demo/component/jaxx/editor/I18nEditorDemo.jaxx | 2 +- .../component/jaxx/editor/ListSelectorDemo.jaxx | 102 ------------- .../nuiton/jaxx/demo/tree/DemoDataProvider.java | 32 ++-- .../main/resources/i18n/jaxx-demo_en_GB.properties | 3 + .../main/resources/i18n/jaxx-demo_es_ES.properties | 3 + .../main/resources/i18n/jaxx-demo_fr_FR.properties | 3 + .../jaxx/runtime/swing/JSearchTextField.java | 0 .../runtime/swing/editor}/KeyStrokeCellEditor.java | 2 +- .../jaxx/runtime/swing/editor/KeyStrokeEditor.java | 0 .../runtime/swing/list/ActionCheckListModel.java | 0 .../nuiton/jaxx/runtime/swing/list/CheckList.java | 0 .../jaxx/runtime/swing/list/CheckListAction.java | 0 .../jaxx/runtime/swing/list/CheckListEditor.java | 0 .../jaxx/runtime/swing/list/CheckListModel.java | 0 .../jaxx/runtime/swing/list/CheckListRenderer.java | 0 .../runtime/swing/list/DefaultCheckListModel.java | 0 .../swing/list/filter/CheckListFilterType.java | 0 .../filter/DefaultFilterableCheckListModel.java | 0 .../filter/FilterableActionCheckListModel.java | 0 .../swing/list/filter/FilterableCheckList.java | 0 .../list/filter/FilterableCheckListModel.java | 0 .../swing/table/filter/AbstractTableFilter.java | 0 .../swing/table/filter/FilterChangeListener.java | 0 .../table/filter/FilterTableHeaderRenderer.java | 0 .../runtime/swing/table/filter/JTableFilter.java | 0 .../table/filter/TableAwareCheckListRenderer.java | 0 .../runtime/swing/table/filter/TableFilter.java | 0 .../swing/table/filter/TableFilterColumnPopup.java | 0 .../swing/table/filter/TableFilterState.java | 0 .../swing/table/filter/TableRowFilterSupport.java | 0 .../resources/i18n/jaxx-runtime_en_GB.properties | 4 + ...GB.properties => jaxx-runtime_es_ES.properties} | 4 + .../resources/i18n/jaxx-runtime_fr_FR.properties | 4 + .../src/main/resources/icons/action-filter.png | Bin .../src/main/resources/icons/funnel.png | Bin .../src/main/resources/icons/funnel_delete.png | Bin .../src/main/resources/icons/search.png | Bin .../i18n/jaxx-widgets-extra_en_GB.properties | 17 --- .../i18n/jaxx-widgets-extra_es_ES.properties | 1 - .../i18n/jaxx-widgets-extra_fr_FR.properties | 17 --- jaxx-widgets-i18n/LICENSE.txt | 165 +++++++++++++++++++++ jaxx-widgets-i18n/README.md | 2 + jaxx-widgets-i18n/changelog.txt | 5 + {jaxx-widgets => jaxx-widgets-i18n}/pom.xml | 44 ++---- .../src/license/THIRD-PARTY.properties | 20 +++ .../org/nuiton/jaxx/widgets/i18n}/I18nEditor.jaxx | 0 .../jaxx/widgets/i18n}/I18nEditorHandler.java | 10 +- .../i18n/jaxx-widgets-i18n_en_GB.properties | 4 + .../i18n/jaxx-widgets-i18n_es_ES.properties | 4 + .../i18n/jaxx-widgets-i18n_fr_FR.properties | 4 + .../src/main/resources/icons/action-i18n-be.png | Bin .../src/main/resources/icons/action-i18n-ca.png | Bin .../src/main/resources/icons/action-i18n-ch.png | Bin .../src/main/resources/icons/action-i18n-de.png | Bin .../src/main/resources/icons/action-i18n-dk.png | Bin .../src/main/resources/icons/action-i18n-es.png | Bin .../src/main/resources/icons/action-i18n-fi.png | Bin .../src/main/resources/icons/action-i18n-fr.png | Bin .../src/main/resources/icons/action-i18n-gb.png | Bin .../src/main/resources/icons/action-i18n-it.png | Bin .../src/main/resources/icons/action-i18n-nl.png | Bin .../src/main/resources/icons/action-i18n-no.png | Bin .../src/main/resources/icons/action-i18n-se.png | Bin .../src/main/resources/icons/action-i18n-us.png | Bin .../src/site/site.xml | 43 ++++-- jaxx-widgets/pom.xml | 20 --- .../jaxx/runtime/swing/log/JAXXLog4jAppender.java | 139 ----------------- .../jaxx/runtime/swing/log/JAXXLog4jHandler.java | 124 ---------------- .../nuiton/jaxx/runtime/swing/log/JAXXLog4jUI.jaxx | 118 --------------- .../resources/i18n/jaxx-widgets_en_GB.properties | 8 - .../resources/i18n/jaxx-widgets_es_ES.properties | 8 - .../resources/i18n/jaxx-widgets_fr_FR.properties | 8 - pom.xml | 1 + 76 files changed, 300 insertions(+), 635 deletions(-) diff --git a/jaxx-config/pom.xml b/jaxx-config/pom.xml index 8e387c8..8e84522 100644 --- a/jaxx-config/pom.xml +++ b/jaxx-config/pom.xml @@ -61,12 +61,6 @@ <dependency> <groupId>${project.groupId}</groupId> - <artifactId>jaxx-widgets</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>jaxx-widgets-file</artifactId> <version>${project.version}</version> </dependency> diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigTableEditor.java b/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigTableEditor.java index fa9a4f2..4309f5e 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigTableEditor.java +++ b/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigTableEditor.java @@ -30,7 +30,7 @@ import org.nuiton.jaxx.runtime.swing.editor.ClassCellEditor; import org.nuiton.jaxx.runtime.swing.editor.ColorCellEditor; import org.nuiton.jaxx.runtime.swing.editor.EnumEditor; import org.nuiton.jaxx.runtime.swing.editor.LocaleEditor; -import org.nuiton.jaxx.runtime.swing.editor.cell.KeyStrokeCellEditor; +import org.nuiton.jaxx.runtime.swing.editor.KeyStrokeCellEditor; import org.nuiton.jaxx.widgets.file.FileCellEditor; import javax.swing.DefaultCellEditor; diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index 8fc305d..ab9a91c 100644 --- a/jaxx-demo/pom.xml +++ b/jaxx-demo/pom.xml @@ -116,6 +116,12 @@ <dependency> <groupId>${project.groupId}</groupId> + <artifactId>jaxx-widgets-i18n</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>jaxx-widgets-gis</artifactId> <version>${project.version}</version> </dependency> diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx index ab6e5cc..a591a9b 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx @@ -24,7 +24,7 @@ <org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> javax.swing.border.Border - org.nuiton.jaxx.runtime.swing.editor.I18nEditor + org.nuiton.jaxx.widgets.i18n.I18nEditor org.nuiton.i18n.I18n java.util.Arrays </import> diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx deleted file mode 100644 index 6527aeb..0000000 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx +++ /dev/null @@ -1,102 +0,0 @@ -<!-- - #%L - JAXX :: Demo - %% - 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% - --> -<org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> - <import> - org.nuiton.jaxx.runtime.swing.ListSelector - com.google.common.collect.Lists - java.util.List - org.nuiton.jaxx.demo.entities.People - org.nuiton.jaxx.demo.entities.Movie - org.nuiton.jaxx.demo.entities.DemoDataProvider - org.nuiton.jaxx.demo.entities.DemoDecoratorProvider - org.nuiton.jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer - java.util.Collection - org.nuiton.jaxx.runtime.swing.model.GenericListModel - </import> - - <ListCellRenderer id='listCellRenderer' - initializer='new DecoratorProviderListCellRenderer(new DemoDecoratorProvider())'/> - <DemoDataProvider id='dataProvider'/> - - <String id='addToolTip' javaBean='"Add"'/> - <String id='removeToolTip' javaBean='"Remove"'/> - - <script><![CDATA[ -public List<People> getActors(Collection<Movie> movies) { - List<People> actors = Lists.newArrayList(); - for (Movie m : movies) { - List<People> actorsToAdd = m.getActors(); - actors.removeAll(actorsToAdd); - actors.addAll(actorsToAdd); - } - return actors; -} -]]></script> - - <Table fill='both' constraints='BorderLayout.CENTER'> - <row> - <cell fill='horizontal' weightx='1'> - <JLabel text='jaxxdemo.listSelector.addToolTipLbl'/> - </cell> - <cell fill='horizontal' weightx='1'> - <JTextField id='addToolTipField' - text='{getAddToolTip()}' - onKeyReleased='setAddToolTip(addToolTipField.getText())'/> - </cell> - </row> - <row> - <cell fill='horizontal' weightx='1'> - <JLabel text='jaxxdemo.listSelector.removeToolTipLbl'/> - </cell> - <cell fill='horizontal' weightx='1'> - <JTextField id='removeToolTipField' - text='{getRemoveToolTip()}' - onKeyReleased='setRemoveToolTip(removeToolTipField.getText())'/> - </cell> - </row> - <row> - <cell fill='both' weightx='1' weighty='0.5' columns='2'> - <JScrollPane> - <ComboToListSelector id='comboToListSelector' - genericType='Movie' - addToolTip='{getAddToolTip()}' - removeToolTip='{getRemoveToolTip()}' - values='{dataProvider.getMovies()}' - renderer='{listCellRenderer}' - onValuesAdded='listToListSelector.setValues(getActors(comboToListSelector.getSelectedValues()))' - onValuesRemoved='listToListSelector.setValues(getActors(comboToListSelector.getSelectedValues()))'/> - </JScrollPane> - </cell> - </row> - <row> - <cell fill='both' weightx='1' weighty='0.5' columns='2'> - <JScrollPane> - <ListToListSelector id='listToListSelector' - genericType='People' - addToolTip='{getAddToolTip()}' - removeToolTip='{getRemoveToolTip()}' - renderer='{listCellRenderer}'/> - </JScrollPane> - </cell> - </row> - </Table> -</org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoDataProvider.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoDataProvider.java index 890460e..2c691a1 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoDataProvider.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoDataProvider.java @@ -33,7 +33,6 @@ import org.nuiton.jaxx.demo.component.jaxx.editor.ComboEditorDemo; import org.nuiton.jaxx.demo.component.jaxx.editor.DatePickerDemo; import org.nuiton.jaxx.demo.component.jaxx.editor.FileEditorDemo; import org.nuiton.jaxx.demo.component.jaxx.editor.I18nEditorDemo; -import org.nuiton.jaxx.demo.component.jaxx.editor.ListSelectorDemo; import org.nuiton.jaxx.demo.component.jaxx.widgets.datetime.DateTimeEditorDemo; import org.nuiton.jaxx.demo.component.jaxx.widgets.datetime.TimeEditorDemo; import org.nuiton.jaxx.demo.component.jaxx.widgets.gis.CoordinatesEditorDemo; @@ -152,7 +151,6 @@ public class DemoDataProvider implements NavDataProvider { HidorButtonDemo.class, n("jaxxdemo.component.jaxx.widgets"), n("jaxxdemo.component.jaxx.editor"), - StatusMessagePanelDemo.class, BoxedDecoratorDemo.class ); @@ -160,6 +158,9 @@ public class DemoDataProvider implements NavDataProvider { n("jaxxdemo.component.jaxx.widgets.number"), n("jaxxdemo.component.jaxx.widgets.select"), n("jaxxdemo.component.jaxx.widgets.gis"), + n("jaxxdemo.component.jaxx.widgets.file"), + n("jaxxdemo.component.jaxx.widgets.i18n"), + n("jaxxdemo.component.jaxx.widgets.status"), n("jaxxdemo.component.jaxx.widgets.datetime") ); @@ -168,6 +169,9 @@ public class DemoDataProvider implements NavDataProvider { ); addMapping(n("jaxxdemo.component.jaxx.widgets.select"), + BeanComboBoxDemo.class, + BeanFilterableComboBoxDemo.class, + BeanDoubleListDemo.class, FilterableDoubleListDemo.class ); @@ -175,20 +179,26 @@ public class DemoDataProvider implements NavDataProvider { CoordinatesEditorDemo.class ); + addMapping(n("jaxxdemo.component.jaxx.widgets.file"), + FileEditorDemo.class + ); + + addMapping(n("jaxxdemo.component.jaxx.widgets.i18n"), + I18nEditorDemo.class + ); + addMapping(n("jaxxdemo.component.jaxx.widgets.status"), + StatusMessagePanelDemo.class + ); + addMapping(n("jaxxdemo.component.jaxx.widgets.datetime"), DateTimeEditorDemo.class, - TimeEditorDemo.class + TimeEditorDemo.class, + DatePickerDemo.class ); addMapping(n("jaxxdemo.component.jaxx.editor"), - ComboEditorDemo.class, - I18nEditorDemo.class, - DatePickerDemo.class, - FileEditorDemo.class, - ListSelectorDemo.class, - BeanComboBoxDemo.class, - BeanFilterableComboBoxDemo.class, - BeanDoubleListDemo.class + ComboEditorDemo.class + ); addMapping(n("jaxxdemo.feature"), diff --git a/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties b/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties index c55e00d..f8ebef5 100644 --- a/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties +++ b/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties @@ -216,9 +216,12 @@ jaxxdemo.component.jaxx=JAXX Components jaxxdemo.component.jaxx.editor=Editors (Deprecated) jaxxdemo.component.jaxx.widgets=Widgets (New) jaxxdemo.component.jaxx.widgets.datetime=jaxx-widgets-datetime (Date time editors) +jaxxdemo.component.jaxx.widgets.file= jaxxdemo.component.jaxx.widgets.gis=jaxx-widgets-gis (Gis editors) +jaxxdemo.component.jaxx.widgets.i18n= jaxxdemo.component.jaxx.widgets.number=jaxx-widgets-number (Number editors) jaxxdemo.component.jaxx.widgets.select=jaxx-widgets-select (Selectors) +jaxxdemo.component.jaxx.widgets.status= jaxxdemo.component.swing=Swing Components jaxxdemo.component.swing.buttons=Buttons jaxxdemo.component.swing.form=Form elements diff --git a/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties b/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties index 7c28a84..f45e04d 100644 --- a/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties +++ b/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties @@ -218,9 +218,12 @@ jaxxdemo.component.jaxx.editor.datetime= jaxxdemo.component.jaxx.editor.gis= jaxxdemo.component.jaxx.widgets= jaxxdemo.component.jaxx.widgets.datetime= +jaxxdemo.component.jaxx.widgets.file= jaxxdemo.component.jaxx.widgets.gis= +jaxxdemo.component.jaxx.widgets.i18n= jaxxdemo.component.jaxx.widgets.number= jaxxdemo.component.jaxx.widgets.select= +jaxxdemo.component.jaxx.widgets.status= jaxxdemo.component.swing=Composants Swing jaxxdemo.component.swing.buttons=Boutons jaxxdemo.component.swing.form=Elements de formulaire diff --git a/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties b/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties index 88f62fe..6911743 100644 --- a/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties +++ b/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties @@ -216,9 +216,12 @@ jaxxdemo.component.jaxx=Composants JAXX jaxxdemo.component.jaxx.editor=Éditeurs (Depréciés) jaxxdemo.component.jaxx.widgets=Widgets (Nouveau) jaxxdemo.component.jaxx.widgets.datetime=jaxx-widgets-datetime (Éditeurs de temps) +jaxxdemo.component.jaxx.widgets.file= jaxxdemo.component.jaxx.widgets.gis=jaxx-widgets-gis (Éditeurs de coordonnées) +jaxxdemo.component.jaxx.widgets.i18n= jaxxdemo.component.jaxx.widgets.number=jaxx-widgets-number (Éditeurs de nombres) jaxxdemo.component.jaxx.widgets.select=jaxx-widgets-select (Sélecteurs) +jaxxdemo.component.jaxx.widgets.status= jaxxdemo.component.swing=Composants Swing jaxxdemo.component.swing.buttons=Boutons jaxxdemo.component.swing.form=Elements de formulaire diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JSearchTextField.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JSearchTextField.java similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JSearchTextField.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JSearchTextField.java diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/KeyStrokeCellEditor.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/KeyStrokeCellEditor.java similarity index 97% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/KeyStrokeCellEditor.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/KeyStrokeCellEditor.java index 33da350..7a04e9e 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/KeyStrokeCellEditor.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/KeyStrokeCellEditor.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.jaxx.runtime.swing.editor.cell; +package org.nuiton.jaxx.runtime.swing.editor; import java.awt.Component; import javax.swing.AbstractCellEditor; diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/KeyStrokeEditor.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/KeyStrokeEditor.java similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/KeyStrokeEditor.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/KeyStrokeEditor.java diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/ActionCheckListModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/list/ActionCheckListModel.java similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/ActionCheckListModel.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/list/ActionCheckListModel.java diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckList.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckList.java similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckList.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckList.java diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListAction.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListAction.java similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListAction.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListAction.java diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListEditor.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListEditor.java similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListEditor.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListEditor.java diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListModel.java similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListModel.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListModel.java diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListRenderer.java similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListRenderer.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListRenderer.java diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/DefaultCheckListModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/list/DefaultCheckListModel.java similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/DefaultCheckListModel.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/list/DefaultCheckListModel.java diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/CheckListFilterType.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/CheckListFilterType.java similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/CheckListFilterType.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/CheckListFilterType.java diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/DefaultFilterableCheckListModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/DefaultFilterableCheckListModel.java similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/DefaultFilterableCheckListModel.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/DefaultFilterableCheckListModel.java diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/FilterableActionCheckListModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/FilterableActionCheckListModel.java similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/FilterableActionCheckListModel.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/FilterableActionCheckListModel.java diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/FilterableCheckList.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/FilterableCheckList.java similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/FilterableCheckList.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/FilterableCheckList.java diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/FilterableCheckListModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/FilterableCheckListModel.java similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/FilterableCheckListModel.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/FilterableCheckListModel.java diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/AbstractTableFilter.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/AbstractTableFilter.java similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/AbstractTableFilter.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/AbstractTableFilter.java diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/FilterChangeListener.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/FilterChangeListener.java similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/FilterChangeListener.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/FilterChangeListener.java diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/FilterTableHeaderRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/FilterTableHeaderRenderer.java similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/FilterTableHeaderRenderer.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/FilterTableHeaderRenderer.java diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/JTableFilter.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/JTableFilter.java similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/JTableFilter.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/JTableFilter.java diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableAwareCheckListRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableAwareCheckListRenderer.java similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableAwareCheckListRenderer.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableAwareCheckListRenderer.java diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilter.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilter.java similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilter.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilter.java diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterColumnPopup.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterColumnPopup.java similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterColumnPopup.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterColumnPopup.java diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterState.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterState.java similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterState.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterState.java diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableRowFilterSupport.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableRowFilterSupport.java similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableRowFilterSupport.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableRowFilterSupport.java diff --git a/jaxx-runtime/src/main/resources/i18n/jaxx-runtime_en_GB.properties b/jaxx-runtime/src/main/resources/i18n/jaxx-runtime_en_GB.properties index 531dd82..99858f5 100644 --- a/jaxx-runtime/src/main/resources/i18n/jaxx-runtime_en_GB.properties +++ b/jaxx-runtime/src/main/resources/i18n/jaxx-runtime_en_GB.properties @@ -13,3 +13,7 @@ validator.scope.header.tip=Severity of the message validator.scope.info.label=Information validator.scope.tip=Message scope \: '%1$s' validator.scope.warning.label=Warning +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 diff --git a/jaxx-runtime/src/main/resources/i18n/jaxx-runtime_en_GB.properties b/jaxx-runtime/src/main/resources/i18n/jaxx-runtime_es_ES.properties similarity index 78% copy from jaxx-runtime/src/main/resources/i18n/jaxx-runtime_en_GB.properties copy to jaxx-runtime/src/main/resources/i18n/jaxx-runtime_es_ES.properties index 531dd82..4a1e219 100644 --- a/jaxx-runtime/src/main/resources/i18n/jaxx-runtime_en_GB.properties +++ b/jaxx-runtime/src/main/resources/i18n/jaxx-runtime_es_ES.properties @@ -13,3 +13,7 @@ validator.scope.header.tip=Severity of the message validator.scope.info.label=Information validator.scope.tip=Message scope \: '%1$s' validator.scope.warning.label=Warning +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 diff --git a/jaxx-runtime/src/main/resources/i18n/jaxx-runtime_fr_FR.properties b/jaxx-runtime/src/main/resources/i18n/jaxx-runtime_fr_FR.properties index 05ce468..e698ee3 100644 --- a/jaxx-runtime/src/main/resources/i18n/jaxx-runtime_fr_FR.properties +++ b/jaxx-runtime/src/main/resources/i18n/jaxx-runtime_fr_FR.properties @@ -13,3 +13,7 @@ validator.scope.header.tip=Le type de message validator.scope.info.label=Information validator.scope.tip=Type de message \: '%1$s' validator.scope.warning.label=Avertissement +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 diff --git a/jaxx-widgets/src/main/resources/icons/action-filter.png b/jaxx-runtime/src/main/resources/icons/action-filter.png similarity index 100% rename from jaxx-widgets/src/main/resources/icons/action-filter.png rename to jaxx-runtime/src/main/resources/icons/action-filter.png diff --git a/jaxx-widgets/src/main/resources/icons/funnel.png b/jaxx-runtime/src/main/resources/icons/funnel.png similarity index 100% rename from jaxx-widgets/src/main/resources/icons/funnel.png rename to jaxx-runtime/src/main/resources/icons/funnel.png diff --git a/jaxx-widgets/src/main/resources/icons/funnel_delete.png b/jaxx-runtime/src/main/resources/icons/funnel_delete.png similarity index 100% rename from jaxx-widgets/src/main/resources/icons/funnel_delete.png rename to jaxx-runtime/src/main/resources/icons/funnel_delete.png diff --git a/jaxx-widgets/src/main/resources/icons/search.png b/jaxx-runtime/src/main/resources/icons/search.png similarity index 100% rename from jaxx-widgets/src/main/resources/icons/search.png rename to jaxx-runtime/src/main/resources/icons/search.png diff --git a/jaxx-widgets-extra/src/main/resources/i18n/jaxx-widgets-extra_en_GB.properties b/jaxx-widgets-extra/src/main/resources/i18n/jaxx-widgets-extra_en_GB.properties index edc0fcf..94ca18d 100644 --- a/jaxx-widgets-extra/src/main/resources/i18n/jaxx-widgets-extra_en_GB.properties +++ b/jaxx-widgets-extra/src/main/resources/i18n/jaxx-widgets-extra_en_GB.properties @@ -10,21 +10,4 @@ nuitonwidgets.editor.syntax.xml=XML nuitonwidgets.message.file=File nuitonwidgets.message.folder=Folder nuitonwidgets.message.nofile=No file -nuitonwidgets.message.statusbar.memory=%d/%dMb -nuitonwidgets.monitor.button.mail=Send by email -nuitonwidgets.monitor.button.reset=Reset -nuitonwidgets.monitor.information.application=Application information -nuitonwidgets.monitor.information.system=System information -nuitonwidgets.monitor.mail.failed=Can't send report by mail. Is your mail server up ? (I'm trying to contact the < %s > smtp server) -nuitonwidgets.monitor.mail.report=A report has been sent to %s -nuitonwidgets.monitor.mail.stream.all=All streams \: -nuitonwidgets.monitor.mail.stream.error=Standard Error \: -nuitonwidgets.monitor.mail.stream.log=Logging system -nuitonwidgets.monitor.mail.stream.output=Standard Output \: -nuitonwidgets.monitor.mail.subject=Report from logging console -nuitonwidgets.monitor.stream.all=All streams -nuitonwidgets.monitor.stream.error=Error stream -nuitonwidgets.monitor.stream.log=Log stream -nuitonwidgets.monitor.stream.output=Output stream -nuitonwidgets.monitor.title=Application console nuitonwidgets.tootilp.focushotkey=Press 'F2' for focus diff --git a/jaxx-widgets-extra/src/main/resources/i18n/jaxx-widgets-extra_es_ES.properties b/jaxx-widgets-extra/src/main/resources/i18n/jaxx-widgets-extra_es_ES.properties index 9b9de46..b986634 100644 --- a/jaxx-widgets-extra/src/main/resources/i18n/jaxx-widgets-extra_es_ES.properties +++ b/jaxx-widgets-extra/src/main/resources/i18n/jaxx-widgets-extra_es_ES.properties @@ -10,5 +10,4 @@ nuitonwidgets.editor.syntax.xml= nuitonwidgets.message.file= nuitonwidgets.message.folder= nuitonwidgets.message.nofile= -nuitonwidgets.message.statusbar.memory= nuitonwidgets.tootilp.focushotkey= diff --git a/jaxx-widgets-extra/src/main/resources/i18n/jaxx-widgets-extra_fr_FR.properties b/jaxx-widgets-extra/src/main/resources/i18n/jaxx-widgets-extra_fr_FR.properties index 6504d9e..e674db5 100644 --- a/jaxx-widgets-extra/src/main/resources/i18n/jaxx-widgets-extra_fr_FR.properties +++ b/jaxx-widgets-extra/src/main/resources/i18n/jaxx-widgets-extra_fr_FR.properties @@ -10,21 +10,4 @@ nuitonwidgets.editor.syntax.xml=XML nuitonwidgets.message.file=Fichier nuitonwidgets.message.folder=Répertoire nuitonwidgets.message.nofile=Aucun fichier -nuitonwidgets.message.statusbar.memory=%d/%dMo -nuitonwidgets.monitor.button.mail=Envoyer par courriel -nuitonwidgets.monitor.button.reset=Reset -nuitonwidgets.monitor.information.application=Information sur l'application -nuitonwidgets.monitor.information.system=Information système -nuitonwidgets.monitor.mail.failed=Impossible d'envoyer le rapport par courriel. Le serveur smtp fonctionne ? (J'essai de contacter < %s > smtp server) -nuitonwidgets.monitor.mail.report=Le rapport a été envoyé à %s -nuitonwidgets.monitor.mail.stream.all=Tous les flux \: -nuitonwidgets.monitor.mail.stream.error=Sortie d'erreur \: -nuitonwidgets.monitor.mail.stream.log=Log système -nuitonwidgets.monitor.mail.stream.output=Sortie standard \: -nuitonwidgets.monitor.mail.subject=Rapport de la console -nuitonwidgets.monitor.stream.all=Toutes les sorties -nuitonwidgets.monitor.stream.error=Sortie d'erreur -nuitonwidgets.monitor.stream.log=Logs -nuitonwidgets.monitor.stream.output=Sortie standard -nuitonwidgets.monitor.title=Moniteur de l'application nuitonwidgets.tootilp.focushotkey=Appuyez sur 'F2' pour agrandir diff --git a/jaxx-widgets-i18n/LICENSE.txt b/jaxx-widgets-i18n/LICENSE.txt new file mode 100644 index 0000000..cca7fc2 --- /dev/null +++ b/jaxx-widgets-i18n/LICENSE.txt @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/jaxx-widgets-i18n/README.md b/jaxx-widgets-i18n/README.md new file mode 100644 index 0000000..d2e50d3 --- /dev/null +++ b/jaxx-widgets-i18n/README.md @@ -0,0 +1,2 @@ +To deploy new version of pom: mvn deploy +To install localy: mvn install diff --git a/jaxx-widgets-i18n/changelog.txt b/jaxx-widgets-i18n/changelog.txt new file mode 100644 index 0000000..1e285bd --- /dev/null +++ b/jaxx-widgets-i18n/changelog.txt @@ -0,0 +1,5 @@ +1.6.0 + * introduce StatusMessageBar and AboutPanel (fork from nuiton-widgets but in JAXX :)) + +1.5 + * 20090404 [chemit] - initial version diff --git a/jaxx-widgets/pom.xml b/jaxx-widgets-i18n/pom.xml similarity index 78% copy from jaxx-widgets/pom.xml copy to jaxx-widgets-i18n/pom.xml index 55605ec..d5cfa65 100644 --- a/jaxx-widgets/pom.xml +++ b/jaxx-widgets-i18n/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-i18n</artifactId> - <name>JAXX :: Widgets</name> - <description>Collection of swing widgets wrote with JAXX</description> + <name>JAXX :: Widgets I18n</name> + <description>Collection of widgets around I18n</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> @@ -70,26 +71,6 @@ </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-decorator</artifactId> - </dependency> - - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-collections4</artifactId> - </dependency> - - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> @@ -100,11 +81,6 @@ <scope>provided</scope> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - </dependencies> <build> diff --git a/jaxx-widgets-i18n/src/license/THIRD-PARTY.properties b/jaxx-widgets-i18n/src/license/THIRD-PARTY.properties new file mode 100644 index 0000000..81b2769 --- /dev/null +++ b/jaxx-widgets-i18n/src/license/THIRD-PARTY.properties @@ -0,0 +1,20 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Public License Version 1.0 +# - GNU General Public License - Version 2 with the class path exception +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Thu Aug 18 07:10:57 CEST 2011 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/I18nEditor.jaxx b/jaxx-widgets-i18n/src/main/java/org/nuiton/jaxx/widgets/i18n/I18nEditor.jaxx similarity index 100% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/I18nEditor.jaxx rename to jaxx-widgets-i18n/src/main/java/org/nuiton/jaxx/widgets/i18n/I18nEditor.jaxx diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/I18nEditorHandler.java b/jaxx-widgets-i18n/src/main/java/org/nuiton/jaxx/widgets/i18n/I18nEditorHandler.java similarity index 96% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/I18nEditorHandler.java rename to jaxx-widgets-i18n/src/main/java/org/nuiton/jaxx/widgets/i18n/I18nEditorHandler.java index f6d521c..7870e4d 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/I18nEditorHandler.java +++ b/jaxx-widgets-i18n/src/main/java/org/nuiton/jaxx/widgets/i18n/I18nEditorHandler.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.jaxx.runtime.swing.editor; +package org.nuiton.jaxx.widgets.i18n; import org.nuiton.jaxx.runtime.swing.JAXXButtonGroup; import org.apache.commons.logging.Log; @@ -61,9 +61,9 @@ public class I18nEditorHandler implements PropertyChangeListener, ActionListener this.ui = ui; } - public static final String DEFAULT_SELECTED_TOOLTIP = n("i18neditor.selected"); + public static final String DEFAULT_SELECTED_TOOLTIP = I18n.n("i18neditor.selected"); - public static final String DEFAULT_NOT_SELECTED_TOOLTIP = n("i18neditor.unselected"); + public static final String DEFAULT_NOT_SELECTED_TOOLTIP = I18n.n("i18neditor.unselected"); public static final String LOCALES_PROPERTY = "locales"; @@ -213,7 +213,7 @@ public class I18nEditorHandler implements PropertyChangeListener, ActionListener selectedTip = DEFAULT_SELECTED_TOOLTIP; } String tip = ui.renderer.getToolTipText(l); - tip = t(selectedTip, tip); + tip = I18n.t(selectedTip, tip); return tip; } @@ -224,7 +224,7 @@ public class I18nEditorHandler implements PropertyChangeListener, ActionListener selectedTip = DEFAULT_NOT_SELECTED_TOOLTIP; } String tip = ui.renderer.getToolTipText(l); - tip = t(selectedTip, tip); + tip = I18n.t(selectedTip, tip); return tip; } diff --git a/jaxx-widgets-i18n/src/main/resources/i18n/jaxx-widgets-i18n_en_GB.properties b/jaxx-widgets-i18n/src/main/resources/i18n/jaxx-widgets-i18n_en_GB.properties new file mode 100644 index 0000000..edc32ab --- /dev/null +++ b/jaxx-widgets-i18n/src/main/resources/i18n/jaxx-widgets-i18n_en_GB.properties @@ -0,0 +1,4 @@ +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 diff --git a/jaxx-widgets-i18n/src/main/resources/i18n/jaxx-widgets-i18n_es_ES.properties b/jaxx-widgets-i18n/src/main/resources/i18n/jaxx-widgets-i18n_es_ES.properties new file mode 100644 index 0000000..a41888e --- /dev/null +++ b/jaxx-widgets-i18n/src/main/resources/i18n/jaxx-widgets-i18n_es_ES.properties @@ -0,0 +1,4 @@ +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 diff --git a/jaxx-widgets-i18n/src/main/resources/i18n/jaxx-widgets-i18n_fr_FR.properties b/jaxx-widgets-i18n/src/main/resources/i18n/jaxx-widgets-i18n_fr_FR.properties new file mode 100644 index 0000000..95fd5b8 --- /dev/null +++ b/jaxx-widgets-i18n/src/main/resources/i18n/jaxx-widgets-i18n_fr_FR.properties @@ -0,0 +1,4 @@ +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 diff --git a/jaxx-widgets/src/main/resources/icons/action-i18n-be.png b/jaxx-widgets-i18n/src/main/resources/icons/action-i18n-be.png similarity index 100% rename from jaxx-widgets/src/main/resources/icons/action-i18n-be.png rename to jaxx-widgets-i18n/src/main/resources/icons/action-i18n-be.png diff --git a/jaxx-widgets/src/main/resources/icons/action-i18n-ca.png b/jaxx-widgets-i18n/src/main/resources/icons/action-i18n-ca.png similarity index 100% rename from jaxx-widgets/src/main/resources/icons/action-i18n-ca.png rename to jaxx-widgets-i18n/src/main/resources/icons/action-i18n-ca.png diff --git a/jaxx-widgets/src/main/resources/icons/action-i18n-ch.png b/jaxx-widgets-i18n/src/main/resources/icons/action-i18n-ch.png similarity index 100% rename from jaxx-widgets/src/main/resources/icons/action-i18n-ch.png rename to jaxx-widgets-i18n/src/main/resources/icons/action-i18n-ch.png diff --git a/jaxx-widgets/src/main/resources/icons/action-i18n-de.png b/jaxx-widgets-i18n/src/main/resources/icons/action-i18n-de.png similarity index 100% rename from jaxx-widgets/src/main/resources/icons/action-i18n-de.png rename to jaxx-widgets-i18n/src/main/resources/icons/action-i18n-de.png diff --git a/jaxx-widgets/src/main/resources/icons/action-i18n-dk.png b/jaxx-widgets-i18n/src/main/resources/icons/action-i18n-dk.png similarity index 100% rename from jaxx-widgets/src/main/resources/icons/action-i18n-dk.png rename to jaxx-widgets-i18n/src/main/resources/icons/action-i18n-dk.png diff --git a/jaxx-widgets/src/main/resources/icons/action-i18n-es.png b/jaxx-widgets-i18n/src/main/resources/icons/action-i18n-es.png similarity index 100% rename from jaxx-widgets/src/main/resources/icons/action-i18n-es.png rename to jaxx-widgets-i18n/src/main/resources/icons/action-i18n-es.png diff --git a/jaxx-widgets/src/main/resources/icons/action-i18n-fi.png b/jaxx-widgets-i18n/src/main/resources/icons/action-i18n-fi.png similarity index 100% rename from jaxx-widgets/src/main/resources/icons/action-i18n-fi.png rename to jaxx-widgets-i18n/src/main/resources/icons/action-i18n-fi.png diff --git a/jaxx-widgets/src/main/resources/icons/action-i18n-fr.png b/jaxx-widgets-i18n/src/main/resources/icons/action-i18n-fr.png similarity index 100% rename from jaxx-widgets/src/main/resources/icons/action-i18n-fr.png rename to jaxx-widgets-i18n/src/main/resources/icons/action-i18n-fr.png diff --git a/jaxx-widgets/src/main/resources/icons/action-i18n-gb.png b/jaxx-widgets-i18n/src/main/resources/icons/action-i18n-gb.png similarity index 100% rename from jaxx-widgets/src/main/resources/icons/action-i18n-gb.png rename to jaxx-widgets-i18n/src/main/resources/icons/action-i18n-gb.png diff --git a/jaxx-widgets/src/main/resources/icons/action-i18n-it.png b/jaxx-widgets-i18n/src/main/resources/icons/action-i18n-it.png similarity index 100% rename from jaxx-widgets/src/main/resources/icons/action-i18n-it.png rename to jaxx-widgets-i18n/src/main/resources/icons/action-i18n-it.png diff --git a/jaxx-widgets/src/main/resources/icons/action-i18n-nl.png b/jaxx-widgets-i18n/src/main/resources/icons/action-i18n-nl.png similarity index 100% rename from jaxx-widgets/src/main/resources/icons/action-i18n-nl.png rename to jaxx-widgets-i18n/src/main/resources/icons/action-i18n-nl.png diff --git a/jaxx-widgets/src/main/resources/icons/action-i18n-no.png b/jaxx-widgets-i18n/src/main/resources/icons/action-i18n-no.png similarity index 100% rename from jaxx-widgets/src/main/resources/icons/action-i18n-no.png rename to jaxx-widgets-i18n/src/main/resources/icons/action-i18n-no.png diff --git a/jaxx-widgets/src/main/resources/icons/action-i18n-se.png b/jaxx-widgets-i18n/src/main/resources/icons/action-i18n-se.png similarity index 100% rename from jaxx-widgets/src/main/resources/icons/action-i18n-se.png rename to jaxx-widgets-i18n/src/main/resources/icons/action-i18n-se.png diff --git a/jaxx-widgets/src/main/resources/icons/action-i18n-us.png b/jaxx-widgets-i18n/src/main/resources/icons/action-i18n-us.png similarity index 100% rename from jaxx-widgets/src/main/resources/icons/action-i18n-us.png rename to jaxx-widgets-i18n/src/main/resources/icons/action-i18n-us.png diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/package.html b/jaxx-widgets-i18n/src/site/site.xml similarity index 53% rename from jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/package.html rename to jaxx-widgets-i18n/src/site/site.xml index ccb8ee0..8d5a39f 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/package.html +++ b/jaxx-widgets-i18n/src/site/site.xml @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!-- #%L JAXX :: Widgets @@ -5,27 +6,41 @@ 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 + 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 + + 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</h1> -Package containing several richi editors : -<ul> - <li>NumberEditor : a rich number editor with a calculator on popup</li> - <li>TimeEditor : a rich time editor based on JSpinner components</li> - <li>I18nEditor : a rich locale editor</li> -</ul> -</body> -</html> +<project name="${project.name}" + xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + + <bannerLeft> + <name>${project.name}</name> + <src>${siteCommonResourcesUrl}/images/logos/jaxx-logo.png</src> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu ref="reports"/> + + </body> +</project> diff --git a/jaxx-widgets/pom.xml b/jaxx-widgets/pom.xml index 55605ec..b4766c6 100644 --- a/jaxx-widgets/pom.xml +++ b/jaxx-widgets/pom.xml @@ -70,26 +70,6 @@ </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-decorator</artifactId> - </dependency> - - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-collections4</artifactId> - </dependency> - - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/log/JAXXLog4jAppender.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/log/JAXXLog4jAppender.java deleted file mode 100644 index 60c698f..0000000 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/log/JAXXLog4jAppender.java +++ /dev/null @@ -1,139 +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.log; - -import org.apache.log4j.Level; -import org.apache.log4j.WriterAppender; -import org.apache.log4j.spi.LoggingEvent; - -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; -import java.util.LinkedList; -import java.util.List; - -/** - * @author Sylvain Lletellier - */ -public class JAXXLog4jAppender extends WriterAppender { - - public static final String PROPERTY_LOGS = "logs"; - public static final String PROPERTY_LEVEL = "level"; - - protected final List<LoggingEvent> events; - protected StringBuilder logs; - protected Level level; - - protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); - - public JAXXLog4jAppender() { - events = new LinkedList<>(); - logs = new StringBuilder(); - } - - public String getLogs() { - return logs.toString(); - } - - public void setLogs(String logs) { - String oldValue = getLogs(); - this.logs = new StringBuilder(logs); - firePropertyChange(PROPERTY_LOGS, oldValue, logs); - } - - public Level getLevel() { - if (level == null) { - level = Level.ALL; - } - return level; - } - - public void setLevel(Level level) { - Level oldValue = getLevel(); - this.level = level; - firePropertyChange(PROPERTY_LEVEL, oldValue, level); - updateLogs(); - } - - @Override - public void append(LoggingEvent event) { - super.append(event); - if (event != null) { - events.add(event); - updateLog(event); - } - } - - protected void updateLogs() { - String oldValue = getLogs(); - logs = new StringBuilder(); - for (LoggingEvent event : events) { - updateLog(event); - } - firePropertyChange(PROPERTY_LOGS, oldValue, getLogs()); - } - - protected void updateLog(LoggingEvent event) { - Level level = event.getLevel(); - if (getLevel() != null && level.isGreaterOrEqual(getLevel())) { - String log = this.layout.format(event); - appendLog(log); - if(layout.ignoresThrowable()) { - String[] errorLogs = event.getThrowableStrRep(); - if (errorLogs != null) { - for (String errorLog : errorLogs) { - appendLog(errorLog + "\n"); - } - } - } - } - } - - protected void appendLog(String log) { - String oldValue = getLogs(); - logs.append(log); - firePropertyChange(PROPERTY_LOGS, oldValue, getLogs()); - } - - 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 firePropertyChange(String propertyName, Object newValue) { - firePropertyChange(propertyName, null, newValue); - } -} diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/log/JAXXLog4jHandler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/log/JAXXLog4jHandler.java deleted file mode 100644 index 3929728..0000000 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/log/JAXXLog4jHandler.java +++ /dev/null @@ -1,124 +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.log; - -import org.nuiton.jaxx.runtime.JAXXUtil; -import org.nuiton.jaxx.runtime.SwingUtil; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; -import org.apache.log4j.PatternLayout; - -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.JComponent; -import javax.swing.JDialog; -import javax.swing.JRootPane; -import javax.swing.KeyStroke; -import java.awt.Component; -import java.awt.Frame; -import java.awt.event.ActionEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; - -/** - * @author Sylvain Lletellier - */ -public class JAXXLog4jHandler { - - private static final Log log = LogFactory.getLog(JAXXLog4jHandler.class); - - protected final JAXXLog4jUI ui; - - protected static JAXXLog4jAppender appender; - - public JAXXLog4jHandler(JAXXLog4jUI ui) { - this.ui = ui; - } - - /** - * Init {@link JAXXLog4jAppender} with level INFO and pattern : %5p [%t] (%F:%L) %M - %m%n - */ - public static void init() { - init("INFO", "%5p [%t] (%F:%L) %M - %m%n"); - } - - /** - * Init {@link JAXXLog4jAppender} with specific {@link Level} and {@link PatternLayout} - * - * @param level specify log4j {@link Level} - * @param patternLayout log4j {@link PatternLayout} to display - */ - public static void init(String level, String patternLayout) { - Logger logger = Logger.getRootLogger(); - - if (appender == null) { - appender = new JAXXLog4jAppender(); - logger.addAppender(appender); - } - appender.setLevel(Level.toLevel(level)); - appender.setLayout(new PatternLayout(patternLayout)); - } - - final protected Action closeAction = new AbstractAction("close") { - private static final long serialVersionUID = 1L; - - @Override - public void actionPerformed(ActionEvent e) { - JDialog container = ui.getParentContainer(JDialog.class); - if (container != null) { - container.dispose(); - } else { - ui.setVisible(false); - } - } - }; - - public JAXXLog4jAppender getAppender() { - return appender; - } - - public void showInDialog(Frame ui, boolean undecorated) { - JDialog f = new JDialog(ui, this.ui.getTitle(), false); - f.add(this.ui); - f.setResizable(true); - f.setSize(550, 450); - f.setUndecorated(undecorated); - JRootPane rootPane = f.getRootPane(); - rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "close"); - rootPane.getActionMap().put("close", closeAction); - f.addWindowListener(new WindowAdapter() { - @Override - public void windowClosed(WindowEvent e) { - Component ui = (Component) e.getSource(); - if (log.isInfoEnabled()) { - log.info("destroy ui " + ui); - } - JAXXUtil.destroy(ui); - JAXXUtil.destroy(JAXXLog4jHandler.this.ui); - } - }); - SwingUtil.center(ui, f); - f.setVisible(true); - } -} diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/log/JAXXLog4jUI.jaxx b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/log/JAXXLog4jUI.jaxx deleted file mode 100644 index 2c358ac..0000000 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/log/JAXXLog4jUI.jaxx +++ /dev/null @@ -1,118 +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% - --> -<JPanel id='log4jUI' layout='{new BorderLayout()}'> - - <import> - java.awt.Frame - org.apache.log4j.Level - </import> - - <script><![CDATA[ - - /** - * Init {@link JAXXLog4jAppender} with level INFO and pattern : {@code %5p [%t] (%F:%L) %M - %m%n}. - */ - public static void init() { - JAXXLog4jHandler.init(); - } - - /** - * Init appender with specific level and pattern layout. - * - * @param level specify - * @param patternLayout patternto display - */ - public static void init(String level, String patternLayout) { - JAXXLog4jHandler.init(level, patternLayout); - } - - public void showInDialog(Frame ui, boolean undecorated) { - handler.showInDialog(ui, undecorated); - } - ]]></script> - - <String id='title' javaBean='null'/> - - <JAXXLog4jHandler id='handler' constructorParams='this'/> - - <JAXXLog4jAppender id='model' initializer='getHandler().getAppender()'/> - - <JScrollPane constraints='BorderLayout.CENTER'> - <JEditorPane id='logArea' - text='{model.getLogs()}'/> - </JScrollPane> - - <Table constraints='BorderLayout.SOUTH'> - <row> - <cell> - <JRadioButton id='fatalRadio' - buttonGroup="levelRadioGroup" - text='{Level.FATAL.toString()}' - value='{Level.FATAL}' - onActionPerformed='model.setLevel(Level.FATAL)'/> - </cell> - <cell> - <JRadioButton id='errorRadio' - buttonGroup="levelRadioGroup" - text='{Level.ERROR.toString()}' - value='{Level.ERROR}' - onActionPerformed='model.setLevel(Level.ERROR)'/> - </cell> - <cell> - <JRadioButton id='warnRadio' - buttonGroup="levelRadioGroup" - text='{Level.WARN.toString()}' - value='{Level.WARN}' - onActionPerformed='model.setLevel(Level.WARN)'/> - </cell> - <cell> - <JRadioButton id='infoRadio' - buttonGroup="levelRadioGroup" - text='{Level.INFO.toString()}' - value='{Level.INFO}' - onActionPerformed='model.setLevel(Level.INFO)'/> - </cell> - <cell> - <JRadioButton id='debugRadio' - buttonGroup="levelRadioGroup" - text='{Level.DEBUG.toString()}' - value='{Level.DEBUG}' - onActionPerformed='model.setLevel(Level.DEBUG)'/> - </cell> - <cell> - <JRadioButton id='traceRadio' - buttonGroup="levelRadioGroup" - text='{Level.TRACE.toString()}' - value='{Level.TRACE}' - onActionPerformed='model.setLevel(Level.TRACE)'/> - </cell> - <cell> - <JRadioButton id='allRadio' - buttonGroup="levelRadioGroup" - text='{Level.ALL.toString()}' - value='{Level.ALL}' - selected='true' - onActionPerformed='model.setLevel(Level.ALL)'/> - </cell> - </row> - </Table> -</JPanel> 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 1aac99d..d83d44e 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 @@ -3,11 +3,3 @@ errorUI.message=An error wad detected... errorUI.title=Error... 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.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 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 778f6ae..ffbb5a0 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 @@ -3,11 +3,3 @@ errorUI.message=ha habido un error \! errorUI.title=Error... 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.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 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 009788c..57c76a8 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 @@ -3,11 +3,3 @@ errorUI.message=Une erreur est survenue \! errorUI.title=Erreur... 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.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 diff --git a/pom.xml b/pom.xml index fe0491a..9a3ac8a 100644 --- a/pom.xml +++ b/pom.xml @@ -40,6 +40,7 @@ <module>jaxx-compiler</module> <module>jaxx-maven-plugin</module> <module>jaxx-widgets-common</module> + <module>jaxx-widgets-i18n</module> <module>jaxx-widgets-file</module> <module>jaxx-widgets-font</module> <module>jaxx-widgets-status</module> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.