branch develop updated (9a04079 -> 0c72cbd)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git from 9a04079 Introduce jaxx-runtime-swing-wizard moduel (Fixes #4117) new 0c72cbd Continue cleaning jaxx-runtime (See #4114) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 0c72cbd344e5b7c565edcf4d2a048883926db7e3 Author: Tony CHEMIT <dev@tchemit.fr> Date: Sun Jan 1 17:22:53 2017 +0100 Continue cleaning jaxx-runtime (See #4114) Summary of changes: jaxx-compiler/pom.xml | 5 +++++ .../java/org/nuiton/jaxx/compiler/I18nHelper.java | 2 +- .../java/org/nuiton/jaxx/compiler/JAXXEngine.java | 2 +- .../decorators/BoxedCompiledObjectDecorator.java | 2 +- .../jaxx/compiler/finalizers/DefaultFinalizer.java | 2 +- .../compiler/finalizers/ValidatorFinalizer.java | 2 +- .../compiler/tags/DefaultComponentHandler.java | 2 +- .../compiler/tags/swing/JTextComponentHandler.java | 2 +- .../compiler/tasks/GenerateMissingRulesTask.java | 4 ++-- jaxx-demo/pom.xml | 5 +++++ .../java/org/nuiton/jaxx/demo/DemoHelpBroker.java | 2 +- .../java/org/nuiton/jaxx/demo/DemoSources.jaxx | 2 +- .../org/nuiton/jaxx/demo/DemoSourcesHandler.java | 2 +- .../src/main/java/org/nuiton/jaxx/demo/DemoUI.jaxx | 2 +- .../java/org/nuiton/jaxx/demo/DemoUIHandler.java | 2 +- .../main/java/org/nuiton/jaxx/demo/RunDemo.java | 2 +- .../demo/component/jaxx/BoxedDecoratorDemo.jaxx | 2 +- .../jaxx/demo/feature/nav/NavDemoHandler.java | 2 +- .../list/ListBeanValidationDemoHandler.java | 2 +- .../feature/validation/list/PeopleTableModel.java | 2 +- .../java/org/nuiton/jaxx/plugin/Bug1404Test.java | 2 +- .../nuiton/jaxx/runtime/{ => swing}/SwingUtil.java | 23 +++++++-------------- .../swing/renderer/LocaleListCellRenderer.java | 2 +- .../resources/i18n/jaxx-runtime_en_GB.properties | 19 ----------------- .../resources/i18n/jaxx-runtime_es_ES.properties | 19 ----------------- .../resources/i18n/jaxx-runtime_fr_FR.properties | 19 ----------------- .../src/main/resources/icons/action-delete.png | Bin 783 -> 0 bytes .../src/main/resources/icons/action-filter.png | Bin 3615 -> 0 bytes .../SimpleBeanValidatorMessageTableModel.java | 2 +- .../swing/SwingListValidatorMessageTableModel.java | 2 +- ...wingListValidatorMessageTableMouseListener.java | 2 +- .../swing/SwingListValidatorMessageWidget.java | 2 +- .../swing/SwingValidatorMessageTableModel.java | 2 +- .../swing/SwingValidatorMessageWidget.java | 2 +- .../jaxx/validator/swing/SwingValidatorUtil.java | 3 +-- .../unified/UnifiedValidatorMessageTableModel.java | 2 +- .../UnifiedValidatorMessageTableMouseListener.java | 2 +- .../swing/unified/UnifiedValidatorMessageUtil.java | 3 +-- .../unified/UnifiedValidatorMessageWidget.java | 2 +- .../src/main/resources/icons/error.png | Bin .../src/main/resources/icons/fatal.png | Bin .../src/main/resources/icons/info.png | Bin .../src/main/resources/icons/warning.png | Bin .../nuiton/jaxx/widgets/about/AboutUIBuilder.java | 2 +- .../widgets/config/ConfigCallBackUIHandler.java | 2 +- .../widgets/config/ConfigCategoryUIHandler.java | 2 +- .../jaxx/widgets/config/ConfigUIHandler.java | 2 +- .../widgets/config/model/MyDelegateConfigTest.java | 2 +- .../config/model/MyInheritedConfigTest.java | 2 +- .../jaxx/widgets/error/ErrorDialogUIHandler.java | 2 +- .../jaxx/runtime/swing/JSearchTextField.java | 2 -- .../table/filter/FilterTableHeaderRenderer.java | 2 +- .../swing/table/filter/TableFilterColumnPopup.java | 2 +- .../i18n/jaxx-widgets-extra_en_GB.properties | 4 ++++ .../i18n/jaxx-widgets-extra_es_ES.properties | 4 ++++ .../i18n/jaxx-widgets-extra_fr_FR.properties | 4 ++++ .../src/main/resources/icons/funnel.png | Bin .../src/main/resources/icons/funnel_delete.png | Bin .../src/main/resources/icons/search.png | Bin .../absolute/AbsoluteDdCoordinateEditorTest.java | 2 +- .../absolute/AbsoluteDmsCoordinateEditorTest.java | 2 +- .../org/nuiton/jaxx/widgets/i18n/I18nEditor.jaxx | 2 +- .../jaxx/widgets/select/BeanComboBoxHandler.java | 2 +- .../jaxx/widgets/select/BeanDoubleListHandler.java | 2 +- .../select/BeanFilterableComboBoxHandler.java | 2 +- .../select/FilterableDoubleListHandler.java | 2 +- 66 files changed, 78 insertions(+), 124 deletions(-) rename jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/{ => swing}/SwingUtil.java (98%) delete mode 100644 jaxx-runtime/src/main/resources/i18n/jaxx-runtime_en_GB.properties delete mode 100644 jaxx-runtime/src/main/resources/i18n/jaxx-runtime_es_ES.properties delete mode 100644 jaxx-runtime/src/main/resources/i18n/jaxx-runtime_fr_FR.properties delete mode 100644 jaxx-runtime/src/main/resources/icons/action-delete.png delete mode 100644 jaxx-runtime/src/main/resources/icons/action-filter.png rename {jaxx-runtime => jaxx-validator}/src/main/resources/icons/error.png (100%) rename {jaxx-runtime => jaxx-validator}/src/main/resources/icons/fatal.png (100%) rename {jaxx-runtime => jaxx-validator}/src/main/resources/icons/info.png (100%) rename {jaxx-runtime => jaxx-validator}/src/main/resources/icons/warning.png (100%) rename {jaxx-runtime => jaxx-widgets-extra}/src/main/resources/icons/funnel.png (100%) rename {jaxx-runtime => jaxx-widgets-extra}/src/main/resources/icons/funnel_delete.png (100%) rename {jaxx-runtime => jaxx-widgets-extra}/src/main/resources/icons/search.png (100%) -- 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 0c72cbd344e5b7c565edcf4d2a048883926db7e3 Author: Tony CHEMIT <dev@tchemit.fr> Date: Sun Jan 1 17:22:53 2017 +0100 Continue cleaning jaxx-runtime (See #4114) --- jaxx-compiler/pom.xml | 5 +++++ .../java/org/nuiton/jaxx/compiler/I18nHelper.java | 2 +- .../java/org/nuiton/jaxx/compiler/JAXXEngine.java | 2 +- .../decorators/BoxedCompiledObjectDecorator.java | 2 +- .../jaxx/compiler/finalizers/DefaultFinalizer.java | 2 +- .../compiler/finalizers/ValidatorFinalizer.java | 2 +- .../compiler/tags/DefaultComponentHandler.java | 2 +- .../compiler/tags/swing/JTextComponentHandler.java | 2 +- .../compiler/tasks/GenerateMissingRulesTask.java | 4 ++-- jaxx-demo/pom.xml | 5 +++++ .../java/org/nuiton/jaxx/demo/DemoHelpBroker.java | 2 +- .../java/org/nuiton/jaxx/demo/DemoSources.jaxx | 2 +- .../org/nuiton/jaxx/demo/DemoSourcesHandler.java | 2 +- .../src/main/java/org/nuiton/jaxx/demo/DemoUI.jaxx | 2 +- .../java/org/nuiton/jaxx/demo/DemoUIHandler.java | 2 +- .../main/java/org/nuiton/jaxx/demo/RunDemo.java | 2 +- .../demo/component/jaxx/BoxedDecoratorDemo.jaxx | 2 +- .../jaxx/demo/feature/nav/NavDemoHandler.java | 2 +- .../list/ListBeanValidationDemoHandler.java | 2 +- .../feature/validation/list/PeopleTableModel.java | 2 +- .../java/org/nuiton/jaxx/plugin/Bug1404Test.java | 2 +- .../nuiton/jaxx/runtime/{ => swing}/SwingUtil.java | 23 +++++++-------------- .../swing/renderer/LocaleListCellRenderer.java | 2 +- .../resources/i18n/jaxx-runtime_en_GB.properties | 19 ----------------- .../resources/i18n/jaxx-runtime_es_ES.properties | 19 ----------------- .../resources/i18n/jaxx-runtime_fr_FR.properties | 19 ----------------- .../src/main/resources/icons/action-delete.png | Bin 783 -> 0 bytes .../src/main/resources/icons/action-filter.png | Bin 3615 -> 0 bytes .../SimpleBeanValidatorMessageTableModel.java | 2 +- .../swing/SwingListValidatorMessageTableModel.java | 2 +- ...wingListValidatorMessageTableMouseListener.java | 2 +- .../swing/SwingListValidatorMessageWidget.java | 2 +- .../swing/SwingValidatorMessageTableModel.java | 2 +- .../swing/SwingValidatorMessageWidget.java | 2 +- .../jaxx/validator/swing/SwingValidatorUtil.java | 3 +-- .../unified/UnifiedValidatorMessageTableModel.java | 2 +- .../UnifiedValidatorMessageTableMouseListener.java | 2 +- .../swing/unified/UnifiedValidatorMessageUtil.java | 3 +-- .../unified/UnifiedValidatorMessageWidget.java | 2 +- .../src/main/resources/icons/error.png | Bin .../src/main/resources/icons/fatal.png | Bin .../src/main/resources/icons/info.png | Bin .../src/main/resources/icons/warning.png | Bin .../nuiton/jaxx/widgets/about/AboutUIBuilder.java | 2 +- .../widgets/config/ConfigCallBackUIHandler.java | 2 +- .../widgets/config/ConfigCategoryUIHandler.java | 2 +- .../jaxx/widgets/config/ConfigUIHandler.java | 2 +- .../widgets/config/model/MyDelegateConfigTest.java | 2 +- .../config/model/MyInheritedConfigTest.java | 2 +- .../jaxx/widgets/error/ErrorDialogUIHandler.java | 2 +- .../jaxx/runtime/swing/JSearchTextField.java | 2 -- .../table/filter/FilterTableHeaderRenderer.java | 2 +- .../swing/table/filter/TableFilterColumnPopup.java | 2 +- .../i18n/jaxx-widgets-extra_en_GB.properties | 4 ++++ .../i18n/jaxx-widgets-extra_es_ES.properties | 4 ++++ .../i18n/jaxx-widgets-extra_fr_FR.properties | 4 ++++ .../src/main/resources/icons/funnel.png | Bin .../src/main/resources/icons/funnel_delete.png | Bin .../src/main/resources/icons/search.png | Bin .../absolute/AbsoluteDdCoordinateEditorTest.java | 2 +- .../absolute/AbsoluteDmsCoordinateEditorTest.java | 2 +- .../org/nuiton/jaxx/widgets/i18n/I18nEditor.jaxx | 2 +- .../jaxx/widgets/select/BeanComboBoxHandler.java | 2 +- .../jaxx/widgets/select/BeanDoubleListHandler.java | 2 +- .../select/BeanFilterableComboBoxHandler.java | 2 +- .../select/FilterableDoubleListHandler.java | 2 +- 66 files changed, 78 insertions(+), 124 deletions(-) diff --git a/jaxx-compiler/pom.xml b/jaxx-compiler/pom.xml index 880453b..9cb7049 100644 --- a/jaxx-compiler/pom.xml +++ b/jaxx-compiler/pom.xml @@ -49,6 +49,11 @@ <artifactId>jaxx-runtime</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-runtime-swing-help</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>${project.groupId}</groupId> diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/I18nHelper.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/I18nHelper.java index 824e501..9794262 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/I18nHelper.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/I18nHelper.java @@ -26,7 +26,7 @@ import org.apache.commons.lang3.CharUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import java.util.Arrays; import java.util.List; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXEngine.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXEngine.java index a1fe219..cdf0dd9 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXEngine.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXEngine.java @@ -412,7 +412,7 @@ public class JAXXEngine { "jaxx.runtime.*", "jaxx.runtime.swing.*", "static org.nuiton.i18n.I18n.t", - "static org.nuiton.jaxx.runtime.SwingUtil.createImageIcon" + "static org.nuiton.jaxx.runtime.swing.SwingUtil.createImageIcon" ) */ JAXXCompiler jaxxCompiler = (JAXXCompiler) cons.newInstance( diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/decorators/BoxedCompiledObjectDecorator.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/decorators/BoxedCompiledObjectDecorator.java index bbc962c..c7c1aaf 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/decorators/BoxedCompiledObjectDecorator.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/decorators/BoxedCompiledObjectDecorator.java @@ -26,7 +26,7 @@ import org.nuiton.jaxx.compiler.CompiledObject; import org.nuiton.jaxx.compiler.CompiledObject.ChildRef; import org.nuiton.jaxx.compiler.JAXXCompiler; import org.nuiton.jaxx.compiler.java.JavaFile; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; /** * A decorator to surround a compiled object (should be a component at least) diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/finalizers/DefaultFinalizer.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/finalizers/DefaultFinalizer.java index 42cfa1c..d108bc3 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/finalizers/DefaultFinalizer.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/finalizers/DefaultFinalizer.java @@ -49,7 +49,7 @@ import org.nuiton.jaxx.runtime.JAXXContext; import org.nuiton.jaxx.runtime.JAXXObject; import org.nuiton.jaxx.runtime.JAXXObjectDescriptor; import org.nuiton.jaxx.runtime.JAXXUtil; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import java.awt.Container; import java.beans.PropertyChangeListener; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/finalizers/ValidatorFinalizer.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/finalizers/ValidatorFinalizer.java index ee8c541..dcd1d47 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/finalizers/ValidatorFinalizer.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/finalizers/ValidatorFinalizer.java @@ -37,7 +37,7 @@ import org.nuiton.jaxx.compiler.java.JavaFile; import org.nuiton.jaxx.compiler.tags.validator.BeanValidatorHandler; import org.nuiton.jaxx.compiler.tags.validator.BeanValidatorHandler.CompiledBeanValidator; import org.nuiton.jaxx.compiler.types.TypeManager; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.jaxx.validator.JAXXValidator; import org.nuiton.jaxx.validator.swing.SwingValidator; import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/DefaultComponentHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/DefaultComponentHandler.java index ea80c8d..d10146d 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/DefaultComponentHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/DefaultComponentHandler.java @@ -32,7 +32,7 @@ import org.nuiton.jaxx.compiler.UnsupportedAttributeException; import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; import org.nuiton.jaxx.compiler.types.TypeManager; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JTextComponentHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JTextComponentHandler.java index 17e7353..bc96928 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JTextComponentHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JTextComponentHandler.java @@ -28,7 +28,7 @@ import org.nuiton.jaxx.compiler.JAXXCompiler; import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; import org.nuiton.jaxx.compiler.tags.DefaultComponentHandler; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.w3c.dom.Attr; import org.w3c.dom.Element; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/GenerateMissingRulesTask.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/GenerateMissingRulesTask.java index 77ba96f..e9c833b 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/GenerateMissingRulesTask.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/GenerateMissingRulesTask.java @@ -21,7 +21,6 @@ */ package org.nuiton.jaxx.compiler.tasks; -import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -33,6 +32,7 @@ import org.nuiton.jaxx.compiler.JAXXEngine; import java.io.File; import java.nio.charset.StandardCharsets; import java.nio.file.Files; +import java.nio.file.StandardOpenOption; import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; @@ -118,7 +118,7 @@ public class GenerateMissingRulesTask extends JAXXEngineTask { } - FileUtils.write(cssFile, StringUtils.join(cssRulesToAdd, ""), true); + Files.write(cssFile.toPath(), StringUtils.join(cssRulesToAdd, "").getBytes(), StandardOpenOption.APPEND); } addEndProfileTime(engine, compiler); diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index 47e9900..a2780af 100644 --- a/jaxx-demo/pom.xml +++ b/jaxx-demo/pom.xml @@ -77,6 +77,11 @@ <artifactId>jaxx-runtime-swing-nav</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-runtime-swing-help</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>${project.groupId}</groupId> diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoHelpBroker.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoHelpBroker.java index bd5d38f..844f4ea 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoHelpBroker.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoHelpBroker.java @@ -25,7 +25,7 @@ package org.nuiton.jaxx.demo; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.runtime.JAXXObject; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.jaxx.runtime.awt.visitor.BuildTreeVisitor; import org.nuiton.jaxx.runtime.awt.visitor.ComponentTreeNode; import org.nuiton.jaxx.runtime.awt.visitor.DebugComponentTreeNodeVisitor; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSources.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSources.jaxx index 0e660f2..40d6b77 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSources.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSources.jaxx @@ -24,7 +24,7 @@ <import> org.nuiton.jaxx.demo.DemoHelpBroker - org.nuiton.jaxx.runtime.SwingUtil + org.nuiton.jaxx.runtime.swing.SwingUtil org.nuiton.jaxx.widgets.font.FontSizor java.awt.RenderingHints diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSourcesHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSourcesHandler.java index d4be376..372ab70 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSourcesHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSourcesHandler.java @@ -27,7 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea; import org.nuiton.jaxx.runtime.JAXXObject; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.jaxx.widgets.font.FontSizor; 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 7c303e4..5fa45d3 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 @@ -27,7 +27,7 @@ org.nuiton.jaxx.demo.tree.DemoTreeHelper org.nuiton.jaxx.demo.tree.DemoCellRenderer - org.nuiton.jaxx.runtime.SwingUtil + org.nuiton.jaxx.runtime.swing.SwingUtil org.nuiton.jaxx.runtime.swing.CardLayout2 org.nuiton.jaxx.widgets.status.StatusMessagePanel 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 ece7113..cde715d 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 @@ -30,7 +30,7 @@ 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; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.jaxx.runtime.context.DefaultApplicationContext; import org.nuiton.jaxx.runtime.context.JAXXContextEntryDef; import org.nuiton.jaxx.runtime.context.JAXXInitialContext; 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 79720b9..1eea956 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 @@ -30,7 +30,7 @@ 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.runtime.swing.SwingUtil; import org.nuiton.jaxx.widgets.error.ErrorDialogUI; import org.nuiton.util.StringUtil; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx index d083c63..7eb05ff 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx @@ -24,7 +24,7 @@ <org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> - org.nuiton.jaxx.runtime.SwingUtil + org.nuiton.jaxx.runtime.swing.SwingUtil org.nuiton.jaxx.runtime.swing.BlockingLayerUI org.nuiton.jaxx.runtime.swing.BlockingLayerUI2 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 84394fc..19078ef 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 @@ -39,7 +39,7 @@ import org.nuiton.jaxx.demo.feature.nav.tree.NavDemoTreeCellRenderer; import org.nuiton.jaxx.demo.feature.nav.tree.NavDemoTreeNode; import org.nuiton.jaxx.demo.feature.nav.treetable.NavDemoTreeTableNode; import org.nuiton.jaxx.runtime.JAXXContext; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.jaxx.runtime.swing.CardLayout2; import org.nuiton.jaxx.runtime.swing.nav.NavNode; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/ListBeanValidationDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/ListBeanValidationDemoHandler.java index 8e4d49b..f171696 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/ListBeanValidationDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/ListBeanValidationDemoHandler.java @@ -26,7 +26,7 @@ import org.jdesktop.swingx.JXTable; import org.nuiton.decorator.Decorator; import org.nuiton.jaxx.demo.entities.DemoDecoratorProvider; import org.nuiton.jaxx.demo.entities.People; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.jaxx.validator.swing.SwingListValidatorDataLocator; import org.nuiton.jaxx.validator.swing.SwingListValidatorMessageTableRenderer; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/PeopleTableModel.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/PeopleTableModel.java index 390ab70..b2776b2 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/PeopleTableModel.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/PeopleTableModel.java @@ -25,7 +25,7 @@ import com.google.common.collect.Lists; import org.apache.commons.lang3.tuple.Pair; import org.nuiton.jaxx.demo.entities.Identity; import org.nuiton.jaxx.demo.entities.People; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import javax.swing.table.AbstractTableModel; import java.util.Arrays; diff --git a/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1404Test.java b/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1404Test.java index fc8562a..edc697a 100644 --- a/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1404Test.java +++ b/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1404Test.java @@ -38,7 +38,7 @@ public class Bug1404Test extends JaxxBaseTest { mojo.execute(); assertNumberJaxxFiles(3); - checkPattern(mojo, "import org.nuiton.jaxx.runtime.SwingUtil;", true); + checkPattern(mojo, "import org.nuiton.jaxx.runtime.swing.SwingUtil;", true); checkPattern(mojo, "import org.nuiton.jaxx.runtime.JAXXUtil;", true); } } diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/SwingUtil.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/SwingUtil.java similarity index 98% rename from jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/SwingUtil.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/SwingUtil.java index c454e69..4656f28 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/SwingUtil.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/SwingUtil.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.jaxx.runtime; +package org.nuiton.jaxx.runtime.swing; import com.google.common.collect.ImmutableSet; import org.apache.commons.logging.Log; @@ -27,8 +27,8 @@ import org.apache.commons.logging.LogFactory; import org.jdesktop.jxlayer.JXLayer; import org.jdesktop.jxlayer.plaf.LayerUI; import org.jdesktop.swingx.JXTreeTable; -import org.nuiton.jaxx.runtime.swing.Item; -import org.nuiton.jaxx.runtime.swing.JAXXComboBox; +import org.nuiton.jaxx.runtime.JAXXObject; +import org.nuiton.jaxx.runtime.JAXXUtil; import org.nuiton.jaxx.runtime.swing.editor.BooleanCellEditor; import org.nuiton.jaxx.runtime.swing.model.JaxxDefaultComboBoxModel; import org.nuiton.jaxx.runtime.swing.model.JaxxDefaultListModel; @@ -100,8 +100,6 @@ import java.util.NoSuchElementException; import java.util.Properties; import java.util.function.Predicate; -import static org.nuiton.i18n.I18n.t; - /** * The runtime swing util class with some nice stuff. * @@ -1076,8 +1074,7 @@ public class SwingUtil extends JAXXUtil { try { if (!Desktop.isDesktopSupported()) { - throw new IllegalStateException( - t("swing.error.desktop.not.supported")); + throw new IllegalStateException("Desktop not accessible"); } @@ -1085,8 +1082,7 @@ public class SwingUtil extends JAXXUtil { if (!desktop.isSupported(Desktop.Action.BROWSE)) { - throw new IllegalStateException( - t("swing.error.desktop.browse.not.supported")); + throw new IllegalStateException("Action 'Go' not supported by desktop"); } URI uri = new URI(url); @@ -1459,24 +1455,21 @@ public class SwingUtil extends JAXXUtil { desktop.browse(uri); } catch (Exception e) { - throw new RuntimeException( - t("application.error.cannot.open.link", uri), e); + throw new RuntimeException("Could not open link " + uri, e); } } public static Desktop getDesktopForBrowse() { if (!Desktop.isDesktopSupported()) { - throw new RuntimeException( - t("application.error.desktop.not.supported")); + throw new RuntimeException("Desktop not accessible"); } Desktop desktop = Desktop.getDesktop(); if (!desktop.isSupported(Desktop.Action.BROWSE)) { - throw new RuntimeException( - t("application.error.desktop.browse.not.supported")); + throw new RuntimeException("Action 'Go' not supported by desktop"); } return desktop; diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/LocaleListCellRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/LocaleListCellRenderer.java index 4b51b67..71b9bd5 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/LocaleListCellRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/LocaleListCellRenderer.java @@ -23,7 +23,7 @@ package org.nuiton.jaxx.runtime.swing.renderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import javax.swing.DefaultListCellRenderer; import javax.swing.Icon; 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 deleted file mode 100644 index 99858f5..0000000 --- a/jaxx-runtime/src/main/resources/i18n/jaxx-runtime_en_GB.properties +++ /dev/null @@ -1,19 +0,0 @@ -swing.error.desktop.browse.not.supported=Action 'Go to' not available -swing.error.desktop.not.supported=Desktop not accessible -validator.field.header=Field -validator.field.header.tip=The field involved -validator.field.tip=Property '%1$s' -validator.message.header=Message -validator.message.header.tip=Message -validator.message.tip=Message \: %1$s -validator.scope.error.label=Error -validator.scope.fatal.label=Fatal error -validator.scope.header=... -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_es_ES.properties b/jaxx-runtime/src/main/resources/i18n/jaxx-runtime_es_ES.properties deleted file mode 100644 index 4a1e219..0000000 --- a/jaxx-runtime/src/main/resources/i18n/jaxx-runtime_es_ES.properties +++ /dev/null @@ -1,19 +0,0 @@ -swing.error.desktop.browse.not.supported=Action 'Go to' not available -swing.error.desktop.not.supported=Desktop not accessible -validator.field.header=Field -validator.field.header.tip=The field involved -validator.field.tip=Property '%1$s' -validator.message.header=Message -validator.message.header.tip=Message -validator.message.tip=Message \: %1$s -validator.scope.error.label=Error -validator.scope.fatal.label=Fatal error -validator.scope.header=... -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 deleted file mode 100644 index e698ee3..0000000 --- a/jaxx-runtime/src/main/resources/i18n/jaxx-runtime_fr_FR.properties +++ /dev/null @@ -1,19 +0,0 @@ -swing.error.desktop.browse.not.supported=Action 'aller \u00E0' non disponible -swing.error.desktop.not.supported=Desktop non accessible -validator.field.header=Champ -validator.field.header.tip=Le champ surquel intervient le message -validator.field.tip=Propri\u00E9t\u00E9 '%1$s' -validator.message.header=Message -validator.message.header.tip=Le texte du message -validator.message.tip=Message \: %1$s -validator.scope.error.label=Erreur -validator.scope.fatal.label=Erreur fatale -validator.scope.header=... -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-runtime/src/main/resources/icons/action-delete.png b/jaxx-runtime/src/main/resources/icons/action-delete.png deleted file mode 100644 index 184f762..0000000 Binary files a/jaxx-runtime/src/main/resources/icons/action-delete.png and /dev/null differ diff --git a/jaxx-runtime/src/main/resources/icons/action-filter.png b/jaxx-runtime/src/main/resources/icons/action-filter.png deleted file mode 100644 index 397e078..0000000 Binary files a/jaxx-runtime/src/main/resources/icons/action-filter.png and /dev/null differ diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SimpleBeanValidatorMessageTableModel.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SimpleBeanValidatorMessageTableModel.java index 622fb5d..69e6e66 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SimpleBeanValidatorMessageTableModel.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SimpleBeanValidatorMessageTableModel.java @@ -24,7 +24,7 @@ package org.nuiton.jaxx.validator.swing; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.validator.NuitonValidatorScope; import org.nuiton.validator.bean.simple.SimpleBeanValidator; import org.nuiton.validator.bean.simple.SimpleBeanValidatorEvent; diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableModel.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableModel.java index 25ee7ef..4840333 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableModel.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableModel.java @@ -25,7 +25,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.validator.NuitonValidatorScope; import org.nuiton.validator.bean.list.BeanListValidator; import org.nuiton.validator.bean.list.BeanListValidatorEvent; diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableMouseListener.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableMouseListener.java index b404c94..54dad2b 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableMouseListener.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableMouseListener.java @@ -24,7 +24,7 @@ package org.nuiton.jaxx.validator.swing; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import javax.swing.JTable; import java.awt.event.MouseAdapter; diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageWidget.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageWidget.java index 9024e6d..a69ff01 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageWidget.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageWidget.java @@ -25,7 +25,7 @@ package org.nuiton.jaxx.validator.swing; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTitledPanel; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.jaxx.runtime.swing.ComponentMover; import org.nuiton.jaxx.runtime.swing.ComponentResizer; import org.nuiton.validator.NuitonValidatorScope; diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageTableModel.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageTableModel.java index bee3961..33bf23b 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageTableModel.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageTableModel.java @@ -23,7 +23,7 @@ package org.nuiton.jaxx.validator.swing; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.validator.NuitonValidatorScope; import org.nuiton.validator.bean.simple.SimpleBeanValidatorEvent; import org.nuiton.validator.bean.simple.SimpleBeanValidatorListener; diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageWidget.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageWidget.java index dc98fb6..d7b8372 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageWidget.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageWidget.java @@ -25,7 +25,7 @@ package org.nuiton.jaxx.validator.swing; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTitledPanel; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.jaxx.runtime.swing.ComponentMover; import org.nuiton.jaxx.runtime.swing.ComponentResizer; import org.nuiton.validator.NuitonValidatorScope; diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorUtil.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorUtil.java index 28c6b2a..522cf02 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorUtil.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorUtil.java @@ -28,7 +28,7 @@ import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.decorator.ColorHighlighter; import org.nuiton.jaxx.runtime.JAXXObject; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.jaxx.validator.JAXXValidator; import org.nuiton.jaxx.validator.swing.meta.Validator; import org.nuiton.jaxx.validator.swing.meta.ValidatorField; @@ -51,7 +51,6 @@ import java.beans.PropertyChangeListener; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.EnumMap; import java.util.List; diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableModel.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableModel.java index 29aa965..ba26184 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableModel.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableModel.java @@ -26,7 +26,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.jaxx.validator.swing.SwingListValidator; import org.nuiton.jaxx.validator.swing.SwingValidator; import org.nuiton.validator.NuitonValidatorScope; diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableMouseListener.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableMouseListener.java index 5d75624..0f4d8dd 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableMouseListener.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableMouseListener.java @@ -25,7 +25,7 @@ package org.nuiton.jaxx.validator.swing.unified; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.jaxx.validator.swing.SwingListValidatorDataLocator; import javax.swing.JComponent; diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageUtil.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageUtil.java index 707ae42..d7a292f 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageUtil.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageUtil.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.validator.swing.unified; * #L% */ -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.jaxx.validator.swing.SwingListValidatorDataLocator; import org.nuiton.jaxx.validator.swing.SwingListValidatorTableEditorModelListener; import org.nuiton.jaxx.validator.swing.SwingValidator; @@ -34,7 +34,6 @@ import javax.swing.RowSorter; import javax.swing.SortOrder; import javax.swing.table.TableModel; import java.awt.event.MouseListener; -import java.util.Arrays; import java.util.Collections; import static org.nuiton.i18n.I18n.n; diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageWidget.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageWidget.java index e005716..91b9810 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageWidget.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageWidget.java @@ -25,7 +25,7 @@ package org.nuiton.jaxx.validator.swing.unified; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTitledPanel; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.jaxx.runtime.swing.ComponentMover; import org.nuiton.jaxx.runtime.swing.ComponentResizer; import org.nuiton.jaxx.validator.swing.SwingListValidatorDataLocator; diff --git a/jaxx-runtime/src/main/resources/icons/error.png b/jaxx-validator/src/main/resources/icons/error.png similarity index 100% rename from jaxx-runtime/src/main/resources/icons/error.png rename to jaxx-validator/src/main/resources/icons/error.png diff --git a/jaxx-runtime/src/main/resources/icons/fatal.png b/jaxx-validator/src/main/resources/icons/fatal.png similarity index 100% rename from jaxx-runtime/src/main/resources/icons/fatal.png rename to jaxx-validator/src/main/resources/icons/fatal.png diff --git a/jaxx-runtime/src/main/resources/icons/info.png b/jaxx-validator/src/main/resources/icons/info.png similarity index 100% rename from jaxx-runtime/src/main/resources/icons/info.png rename to jaxx-validator/src/main/resources/icons/info.png diff --git a/jaxx-runtime/src/main/resources/icons/warning.png b/jaxx-validator/src/main/resources/icons/warning.png similarity index 100% rename from jaxx-runtime/src/main/resources/icons/warning.png rename to jaxx-validator/src/main/resources/icons/warning.png diff --git a/jaxx-widgets-about/src/main/java/org/nuiton/jaxx/widgets/about/AboutUIBuilder.java b/jaxx-widgets-about/src/main/java/org/nuiton/jaxx/widgets/about/AboutUIBuilder.java index 33a16bd..fa3cc30 100644 --- a/jaxx-widgets-about/src/main/java/org/nuiton/jaxx/widgets/about/AboutUIBuilder.java +++ b/jaxx-widgets-about/src/main/java/org/nuiton/jaxx/widgets/about/AboutUIBuilder.java @@ -24,7 +24,7 @@ package org.nuiton.jaxx.widgets.about; import com.google.common.base.Charsets; import com.google.common.io.Resources; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.util.Resource; import javax.swing.AbstractAction; diff --git a/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCallBackUIHandler.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCallBackUIHandler.java index 59fc55b..8b0d64a 100644 --- a/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCallBackUIHandler.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCallBackUIHandler.java @@ -25,7 +25,7 @@ package org.nuiton.jaxx.widgets.config; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.runtime.JAXXUtil; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.jaxx.widgets.config.model.CallBackEntry; import org.nuiton.jaxx.widgets.config.model.CallBackMap; import org.nuiton.jaxx.widgets.config.model.OptionModel; diff --git a/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCategoryUIHandler.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCategoryUIHandler.java index 41a9895..125920d 100644 --- a/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCategoryUIHandler.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCategoryUIHandler.java @@ -27,7 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; import org.nuiton.jaxx.runtime.JAXXUtil; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.jaxx.runtime.swing.renderer.ClassTableCellRenderer; import org.nuiton.jaxx.runtime.swing.renderer.ColorCellRenderer; import org.nuiton.jaxx.widgets.config.model.ConfigTableModel; diff --git a/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigUIHandler.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigUIHandler.java index ba48989..cb7287a 100644 --- a/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigUIHandler.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigUIHandler.java @@ -25,7 +25,7 @@ package org.nuiton.jaxx.widgets.config; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.runtime.JAXXUtil; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.jaxx.runtime.context.JAXXInitialContext; import org.nuiton.jaxx.widgets.config.model.CallBackMap; import org.nuiton.jaxx.widgets.config.model.CategoryModel; diff --git a/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyDelegateConfigTest.java b/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyDelegateConfigTest.java index fc0dc71..92d61f9 100644 --- a/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyDelegateConfigTest.java +++ b/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyDelegateConfigTest.java @@ -26,7 +26,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.nuiton.config.ApplicationConfig; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.jaxx.runtime.swing.editor.MyDefaultCellEditor; import javax.swing.ImageIcon; diff --git a/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyInheritedConfigTest.java b/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyInheritedConfigTest.java index 6df82f6..5144c5e 100644 --- a/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyInheritedConfigTest.java +++ b/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyInheritedConfigTest.java @@ -25,7 +25,7 @@ package org.nuiton.jaxx.widgets.config.model; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.jaxx.runtime.swing.editor.MyDefaultCellEditor; import javax.swing.ImageIcon; diff --git a/jaxx-widgets-error/src/main/java/org/nuiton/jaxx/widgets/error/ErrorDialogUIHandler.java b/jaxx-widgets-error/src/main/java/org/nuiton/jaxx/widgets/error/ErrorDialogUIHandler.java index 7e135fe..1e23424 100644 --- a/jaxx-widgets-error/src/main/java/org/nuiton/jaxx/widgets/error/ErrorDialogUIHandler.java +++ b/jaxx-widgets-error/src/main/java/org/nuiton/jaxx/widgets/error/ErrorDialogUIHandler.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.widgets.error; import org.nuiton.jaxx.runtime.JAXXUtil; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import javax.swing.InputMap; import javax.swing.JButton; diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/runtime/swing/JSearchTextField.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/runtime/swing/JSearchTextField.java index 35ff9f7..4f35a79 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/runtime/swing/JSearchTextField.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/runtime/swing/JSearchTextField.java @@ -31,8 +31,6 @@ */ package org.nuiton.jaxx.runtime.swing; -import org.nuiton.jaxx.runtime.SwingUtil; - import javax.swing.ImageIcon; import javax.swing.JTextField; import java.awt.Graphics; diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/FilterTableHeaderRenderer.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/FilterTableHeaderRenderer.java index f44f6ae..cb1611e 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/FilterTableHeaderRenderer.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/FilterTableHeaderRenderer.java @@ -32,7 +32,7 @@ package org.nuiton.jaxx.runtime.swing.table.filter; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.jaxx.runtime.swing.CompoundIcon; import javax.swing.Icon; diff --git a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterColumnPopup.java b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterColumnPopup.java index 4e338ca..25d64a4 100644 --- a/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterColumnPopup.java +++ b/jaxx-widgets-extra/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterColumnPopup.java @@ -35,7 +35,7 @@ package org.nuiton.jaxx.runtime.swing.table.filter; import org.apache.commons.collections4.CollectionUtils; import org.nuiton.decorator.Decorator; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.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; 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 94ca18d..1b22bda 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 @@ -1,3 +1,7 @@ +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 nuitonwidgets.aboutframe.about=About nuitonwidgets.aboutframe.license=License nuitonwidgets.aboutframe.ok=OK 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 b986634..a104a87 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 @@ -1,3 +1,7 @@ +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 nuitonwidgets.aboutframe.about= nuitonwidgets.aboutframe.license= nuitonwidgets.aboutframe.ok= 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 e674db5..c10596d 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 @@ -1,3 +1,7 @@ +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 nuitonwidgets.aboutframe.about=À propos nuitonwidgets.aboutframe.license=Licence nuitonwidgets.aboutframe.ok=OK diff --git a/jaxx-runtime/src/main/resources/icons/funnel.png b/jaxx-widgets-extra/src/main/resources/icons/funnel.png similarity index 100% rename from jaxx-runtime/src/main/resources/icons/funnel.png rename to jaxx-widgets-extra/src/main/resources/icons/funnel.png diff --git a/jaxx-runtime/src/main/resources/icons/funnel_delete.png b/jaxx-widgets-extra/src/main/resources/icons/funnel_delete.png similarity index 100% rename from jaxx-runtime/src/main/resources/icons/funnel_delete.png rename to jaxx-widgets-extra/src/main/resources/icons/funnel_delete.png diff --git a/jaxx-runtime/src/main/resources/icons/search.png b/jaxx-widgets-extra/src/main/resources/icons/search.png similarity index 100% rename from jaxx-runtime/src/main/resources/icons/search.png rename to jaxx-widgets-extra/src/main/resources/icons/search.png diff --git a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorTest.java b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorTest.java index a7e5e64..360984c 100644 --- a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorTest.java +++ b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorTest.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.widgets.gis.absolute; * #L% */ -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.jaxx.widgets.gis.DdCoordinate; import javax.swing.JButton; diff --git a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorTest.java b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorTest.java index 4c99821..d64fbca 100644 --- a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorTest.java +++ b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorTest.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.widgets.gis.absolute; * #L% */ -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.jaxx.widgets.gis.DmsCoordinate; import javax.swing.JButton; diff --git a/jaxx-widgets-i18n/src/main/java/org/nuiton/jaxx/widgets/i18n/I18nEditor.jaxx b/jaxx-widgets-i18n/src/main/java/org/nuiton/jaxx/widgets/i18n/I18nEditor.jaxx index 279b7dc..dd53525 100644 --- a/jaxx-widgets-i18n/src/main/java/org/nuiton/jaxx/widgets/i18n/I18nEditor.jaxx +++ b/jaxx-widgets-i18n/src/main/java/org/nuiton/jaxx/widgets/i18n/I18nEditor.jaxx @@ -29,7 +29,7 @@ <import> - org.nuiton.jaxx.runtime.SwingUtil + org.nuiton.jaxx.runtime.swing.SwingUtil java.awt.BorderLayout java.awt.event.ItemEvent diff --git a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanComboBoxHandler.java b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanComboBoxHandler.java index e528f43..2f400dc 100644 --- a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanComboBoxHandler.java +++ b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanComboBoxHandler.java @@ -29,7 +29,7 @@ import org.jdesktop.swingx.autocomplete.ObjectToStringConverter; import org.nuiton.decorator.DecoratorUtil; import org.nuiton.decorator.JXPathDecorator; import org.nuiton.decorator.MultiJXPathDecorator; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.jaxx.runtime.swing.JAXXButtonGroup; import org.nuiton.jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import org.nuiton.util.beans.BeanUtil; diff --git a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanDoubleListHandler.java b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanDoubleListHandler.java index 92f86c5..00559a9 100644 --- a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanDoubleListHandler.java +++ b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanDoubleListHandler.java @@ -27,7 +27,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.DecoratorUtil; import org.nuiton.decorator.JXPathDecorator; import org.nuiton.decorator.MultiJXPathDecorator; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.jaxx.runtime.swing.JAXXButtonGroup; import org.nuiton.jaxx.runtime.swing.model.JaxxFilterableListModel; import org.nuiton.jaxx.runtime.swing.renderer.DecoratorListCellRenderer; diff --git a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanFilterableComboBoxHandler.java b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanFilterableComboBoxHandler.java index b570f93..2b57c19 100644 --- a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanFilterableComboBoxHandler.java +++ b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/BeanFilterableComboBoxHandler.java @@ -28,7 +28,7 @@ import org.nuiton.decorator.DecoratorUtil; import org.nuiton.decorator.JXPathDecorator; import org.nuiton.decorator.MultiJXPathDecorator; import org.nuiton.jaxx.runtime.JAXXUtil; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.jaxx.runtime.swing.JAXXButtonGroup; import org.nuiton.jaxx.runtime.swing.model.JaxxFilterableComboBoxModel; import org.nuiton.jaxx.runtime.swing.renderer.DecoratorListCellRenderer; diff --git a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListHandler.java b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListHandler.java index ad6cf6f..022d3fb 100644 --- a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListHandler.java +++ b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListHandler.java @@ -27,7 +27,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.DecoratorUtil; import org.nuiton.decorator.JXPathDecorator; import org.nuiton.decorator.MultiJXPathDecorator; -import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.jaxx.runtime.swing.JAXXButtonGroup; import org.nuiton.jaxx.runtime.swing.model.JaxxFilterableListModel; -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm