This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git commit 2f94bee0d6bb5fa4fee9fb3a63914be84895c693 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Apr 12 17:34:00 2015 +0200 refs #3669 Migrates jaxx-validator and jaxx-config --- jaxx-application-swing/pom.xml | 2 +- .../application/swing/AbstractApplicationUIHandler.java | 2 +- .../swing/action/ApplicationActionUIHandler.java | 2 +- .../table/ApplicationTableModelValidatorDataLocator.java | 2 +- .../jaxx/compiler/finalizers/ValidatorFinalizer.java | 10 +++++----- .../org/nuiton/jaxx/compiler/spi/DefaultInitializer.java | 2 +- .../compiler/tags/validator/BeanValidatorHandler.java | 6 +++--- .../tags/validator/ExcludeFieldValidatorHandler.java | 2 +- .../compiler/tags/validator/FieldValidatorHandler.java | 2 +- jaxx-demo/pom.xml | 2 +- .../src/main/java/org/nuiton/jaxx/demo/DemoUIHandler.java | 2 +- .../org/nuiton/jaxx/demo/component/swing/JButtonDemo.jaxx | 2 +- .../jaxx/demo/component/swing/JRadioButtonDemo.jaxx | 2 +- .../nuiton/jaxx/demo/component/swing/JSplitPaneDemo.jaxx | 4 ++-- .../feature/validation/list/ListBeanValidationDemo.jaxx | 2 +- .../validation/list/ListBeanValidationDemoHandler.java | 6 +++--- .../validation/simple/SimpleBeanValidationByListDemo.jaxx | 10 +++++----- .../simple/SimpleBeanValidationByTableDemo.jaxx | 12 ++++++------ .../main/java/org/nuiton/jaxx/plugin/GenerateMojo.java | 4 ++-- .../test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java | 2 +- .../compilerValidatorTest/validator/ok/Validation.jaxx | 4 ++-- jaxx-validator/pom.xml | 2 +- .../nuiton/jaxx/validator}/JAXXValidator.java | 4 ++-- .../swing/SimpleBeanValidatorMessageTableModel.java | 2 +- .../swing/SimpleBeanValidatorMessageTableRenderer.java | 2 +- .../nuiton/jaxx}/validator/swing/SwingListValidator.java | 2 +- .../validator/swing/SwingListValidatorDataLocator.java | 2 +- .../swing/SwingListValidatorHighlightPredicate.java | 2 +- .../jaxx}/validator/swing/SwingListValidatorMessage.java | 2 +- .../swing/SwingListValidatorMessageTableModel.java | 2 +- .../SwingListValidatorMessageTableMouseListener.java | 2 +- .../swing/SwingListValidatorMessageTableRenderer.java | 2 +- .../validator/swing/SwingListValidatorMessageWidget.java | 2 +- .../swing/SwingListValidatorTableEditorModelListener.java | 2 +- .../nuiton/jaxx}/validator/swing/SwingValidator.java | 6 +++--- .../jaxx}/validator/swing/SwingValidatorMessage.java | 2 +- .../validator/swing/SwingValidatorMessageListModel.java | 2 +- .../swing/SwingValidatorMessageListMouseListener.java | 2 +- .../swing/SwingValidatorMessageListRenderer.java | 2 +- .../validator/swing/SwingValidatorMessageTableModel.java | 2 +- .../swing/SwingValidatorMessageTableMouseListener.java | 2 +- .../swing/SwingValidatorMessageTableRenderer.java | 2 +- .../validator/swing/SwingValidatorMessageWidget.java | 2 +- .../nuiton/jaxx}/validator/swing/SwingValidatorUtil.java | 10 +++++----- .../nuiton/jaxx}/validator/swing/meta/Validator.java | 2 +- .../nuiton/jaxx}/validator/swing/meta/ValidatorField.java | 2 +- .../jaxx}/validator/swing/ui/AbstractBeanValidatorUI.java | 2 +- .../nuiton/jaxx}/validator/swing/ui/IconValidationUI.java | 4 ++-- .../jaxx}/validator/swing/ui/ImageValidationUI.java | 4 ++-- .../jaxx}/validator/swing/ui/TranslucentValidationUI.java | 4 ++-- .../validator/swing/unified/UnifiedValidatorMessage.java | 4 ++-- .../swing/unified/UnifiedValidatorMessageTableModel.java | 6 +++--- .../UnifiedValidatorMessageTableMouseListener.java | 4 ++-- .../unified/UnifiedValidatorMessageTableRenderer.java | 4 ++-- .../swing/unified/UnifiedValidatorMessageUtil.java | 10 +++++----- .../swing/unified/UnifiedValidatorMessageWidget.java | 10 +++++----- .../jaxx}/validator/swing/unified/package-info.java | 2 +- {jaxx-config => jaxx-widgets-config}/LICENSE.txt | 0 {jaxx-config => jaxx-widgets-config}/README.txt | 0 {jaxx-config => jaxx-widgets-config}/changelog.txt | 0 {jaxx-config => jaxx-widgets-config}/pom.xml | 4 ++-- .../src/license/THIRD-PARTY.properties | 0 .../org/nuiton/jaxx/widgets}/config/ConfigCallBackUI.jaxx | 0 .../jaxx/widgets}/config/ConfigCallBackUIHandler.java | 8 ++++---- .../org/nuiton/jaxx/widgets}/config/ConfigCategoryUI.css | 0 .../org/nuiton/jaxx/widgets}/config/ConfigCategoryUI.jaxx | 6 +++--- .../jaxx/widgets}/config/ConfigCategoryUIHandler.java | 6 +++--- .../nuiton/jaxx/widgets}/config/ConfigTableEditor.java | 6 +++--- .../nuiton/jaxx/widgets}/config/ConfigTableRenderer.java | 6 +++--- .../java/org/nuiton/jaxx/widgets}/config/ConfigUI.css | 0 .../java/org/nuiton/jaxx/widgets}/config/ConfigUI.jaxx | 2 +- .../org/nuiton/jaxx/widgets}/config/ConfigUIHandler.java | 12 ++++++------ .../org/nuiton/jaxx/widgets}/config/ConfigUIHelper.java | 12 ++++++------ .../nuiton/jaxx/widgets}/config/model/CallBackEntry.java | 2 +- .../jaxx/widgets}/config/model/CallBackFinalizer.java | 2 +- .../nuiton/jaxx/widgets}/config/model/CallBackMap.java | 2 +- .../jaxx/widgets}/config/model/CallBacksManager.java | 2 +- .../nuiton/jaxx/widgets}/config/model/CategoryModel.java | 2 +- .../jaxx/widgets}/config/model/ConfigTableModel.java | 2 +- .../nuiton/jaxx/widgets}/config/model/ConfigUIModel.java | 2 +- .../jaxx/widgets}/config/model/ConfigUIModelBuilder.java | 2 +- .../jaxx/widgets}/config/model/MainCallBackFinalizer.java | 2 +- .../nuiton/jaxx/widgets}/config/model/OptionModel.java | 2 +- .../org/nuiton/jaxx/widgets}/config/model/package.html | 4 ++-- .../java/org/nuiton/jaxx/widgets}/config/package.html | 2 +- .../resources/i18n/jaxx-widgets-config_en_GB.properties | 0 .../resources/i18n/jaxx-widgets-config_es_ES.properties | 0 .../resources/i18n/jaxx-widgets-config_fr_FR.properties | 0 .../src/main/resources/icons/action-add.png | Bin .../src/main/resources/icons/action-config-copy.png | Bin .../src/main/resources/icons/action-config-quit.png | Bin .../main/resources/icons/action-config-reset-option.png | Bin .../src/main/resources/icons/action-config-reset.png | Bin .../src/main/resources/icons/action-config-save.png | Bin {jaxx-config => jaxx-widgets-config}/src/site/site.xml | 0 .../jaxx/widgets}/config/model/MyDelegateConfig.java | 2 +- .../jaxx/widgets}/config/model/MyDelegateConfigTest.java | 2 +- .../jaxx/widgets}/config/model/MyInheritedConfig.java | 2 +- .../jaxx/widgets}/config/model/MyInheritedConfigTest.java | 2 +- .../src/test/resources/log4j.properties | 0 pom.xml | 2 +- src/site/rst/BeanValidator.rst | 8 ++++---- src/site/rst/migrate_v3.rst | 14 +++++++++----- src/site/rst/old-compiler-doc/BeanValidator.rst | 6 +++--- 104 files changed, 165 insertions(+), 161 deletions(-) diff --git a/jaxx-application-swing/pom.xml b/jaxx-application-swing/pom.xml index 885b59a..14981c2 100644 --- a/jaxx-application-swing/pom.xml +++ b/jaxx-application-swing/pom.xml @@ -40,7 +40,7 @@ <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> <jaxx.defaultErrorUIFQN> - jaxx.runtime.validator.swing.ui.ImageValidationUI + org.nuiton.jaxx.validator.swing.ui.ImageValidationUI </jaxx.defaultErrorUIFQN> <!--<jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon>--> <jaxx.generateHelp>true</jaxx.generateHelp> diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/AbstractApplicationUIHandler.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/AbstractApplicationUIHandler.java index 115044b..16322a0 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/AbstractApplicationUIHandler.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/AbstractApplicationUIHandler.java @@ -25,7 +25,7 @@ package org.nuiton.jaxx.application.swing; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionUIHandler.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionUIHandler.java index b957c40..636473a 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionUIHandler.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionUIHandler.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.application.swing.action; * #L% */ -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/ApplicationTableModelValidatorDataLocator.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/ApplicationTableModelValidatorDataLocator.java index cbf9a9e..b508300 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/ApplicationTableModelValidatorDataLocator.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/ApplicationTableModelValidatorDataLocator.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.application.swing.table; * #L% */ -import jaxx.runtime.validator.swing.SwingListValidatorDataLocator; +import org.nuiton.jaxx.validator.swing.SwingListValidatorDataLocator; import org.apache.commons.lang3.tuple.Pair; import javax.swing.table.TableModel; 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 871da17..22f48d1 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 @@ -24,11 +24,11 @@ package org.nuiton.jaxx.compiler.finalizers; import com.google.common.base.Joiner; import com.google.common.collect.Lists; -import jaxx.runtime.JAXXValidator; -import jaxx.runtime.validator.swing.SwingValidator; -import jaxx.runtime.validator.swing.SwingValidatorUtil; -import jaxx.runtime.validator.swing.meta.Validator; -import jaxx.runtime.validator.swing.meta.ValidatorField; +import org.nuiton.jaxx.validator.JAXXValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; +import org.nuiton.jaxx.validator.swing.meta.Validator; +import org.nuiton.jaxx.validator.swing.meta.ValidatorField; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.compiler.CompiledObject; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/spi/DefaultInitializer.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/spi/DefaultInitializer.java index ebd0d21..3ac2b0b 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/spi/DefaultInitializer.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/spi/DefaultInitializer.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.compiler.spi; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.jdesktop.jxlayer.JXLayer; import org.nuiton.jaxx.compiler.JAXXCompiler; import org.nuiton.jaxx.compiler.beans.BeanInfoUtil; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/BeanValidatorHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/BeanValidatorHandler.java index 2c73b6c..240aa90 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/BeanValidatorHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/BeanValidatorHandler.java @@ -24,9 +24,9 @@ package org.nuiton.jaxx.compiler.tags.validator; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; -import jaxx.runtime.validator.swing.SwingValidator; -import jaxx.runtime.validator.swing.SwingValidatorUtil; -import jaxx.runtime.validator.swing.ui.AbstractBeanValidatorUI; +import org.nuiton.jaxx.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; +import org.nuiton.jaxx.validator.swing.ui.AbstractBeanValidatorUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.compiler.CompiledObject; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/ExcludeFieldValidatorHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/ExcludeFieldValidatorHandler.java index 39dcea3..8b2c872 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/ExcludeFieldValidatorHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/ExcludeFieldValidatorHandler.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.compiler.tags.validator; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.compiler.CompilerException; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/FieldValidatorHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/FieldValidatorHandler.java index e4d8c7c..79c9d18 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/FieldValidatorHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/FieldValidatorHandler.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.compiler.tags.validator; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index a956eac..7b1f80c 100644 --- a/jaxx-demo/pom.xml +++ b/jaxx-demo/pom.xml @@ -126,7 +126,7 @@ <dependency> <groupId>${project.groupId}</groupId> - <artifactId>jaxx-config</artifactId> + <artifactId>jaxx-widgets-config</artifactId> <version>${project.version}</version> </dependency> 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 a07fff0..6e0b292 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUIHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUIHandler.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.demo; * #L% */ -import jaxx.runtime.swing.config.ConfigUIHelper; +import org.nuiton.jaxx.widgets.config.ConfigUIHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.DecoratorProvider; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JButtonDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JButtonDemo.jaxx index 4bdd25c..1337c0f 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JButtonDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JButtonDemo.jaxx @@ -50,7 +50,7 @@ <String id='helpDefaultId' initializer='"ui.component.swing.buttons.JButtonDemo"'/> <javax.swing.ImageIcon id='pencil' - constructorParams='getClass().getResource("/jaxx/demo/images/pencil_black.gif")'/> + constructorParams='getClass().getResource("/org/nuiton/jaxx/demo/images/pencil_black.gif")'/> <VBox horizontalAlignment='center' verticalAlignment='middle'> <JButton id='simpleButon' text='Simple Button' diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JRadioButtonDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JRadioButtonDemo.jaxx index 983529a..079a45f 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JRadioButtonDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JRadioButtonDemo.jaxx @@ -36,6 +36,6 @@ </VBox> <JLabel - icon='{new ImageIcon(getClass().getResource("/jaxx/demo/images/" + radioButtons.getSelectedValue()))}'/> + icon='{new ImageIcon(getClass().getResource("/org/nuiton/jaxx/demo/images/" + radioButtons.getSelectedValue()))}'/> </HBox> </org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JSplitPaneDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JSplitPaneDemo.jaxx index f1b7984..9ce3f4b 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JSplitPaneDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/JSplitPaneDemo.jaxx @@ -27,12 +27,12 @@ <JSplitPane> <JScrollPane> <JLabel - icon='{new ImageIcon(getClass().getResource("/jaxx/demo/images/Amethyst.jpg"))}'/> + icon='{new ImageIcon(getClass().getResource("/org/nuiton/jaxx/demo/images/Amethyst.jpg"))}'/> </JScrollPane> <JScrollPane> <JLabel - icon='{new ImageIcon(getClass().getResource("/jaxx/demo/images/Lynx.jpg"))}'/> + icon='{new ImageIcon(getClass().getResource("/org/nuiton/jaxx/demo/images/Lynx.jpg"))}'/> </JScrollPane> </JSplitPane> </org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/ListBeanValidationDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/ListBeanValidationDemo.jaxx index 4948d99..f15bb25 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/ListBeanValidationDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/ListBeanValidationDemo.jaxx @@ -28,7 +28,7 @@ static org.nuiton.i18n.I18n.n org.nuiton.jaxx.demo.entities.People org.nuiton.validator.bean.list.BeanListValidator - jaxx.runtime.validator.swing.SwingListValidatorMessageTableModel + org.nuiton.jaxx.validator.swing.SwingListValidatorMessageTableModel java.io.File </import> 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 876e447..aa6d189 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 @@ -21,9 +21,9 @@ package org.nuiton.jaxx.demo.feature.validation.list; * #L% */ -import jaxx.runtime.validator.swing.SwingListValidatorDataLocator; -import jaxx.runtime.validator.swing.SwingListValidatorMessageTableRenderer; -import jaxx.runtime.validator.swing.SwingValidatorUtil; +import org.nuiton.jaxx.validator.swing.SwingListValidatorDataLocator; +import org.nuiton.jaxx.validator.swing.SwingListValidatorMessageTableRenderer; +import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; import org.apache.commons.lang3.tuple.Pair; import org.jdesktop.swingx.JXTable; import org.nuiton.decorator.Decorator; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/simple/SimpleBeanValidationByListDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/simple/SimpleBeanValidationByListDemo.jaxx index 460a2cc..96f94d5 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/simple/SimpleBeanValidationByListDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/simple/SimpleBeanValidationByListDemo.jaxx @@ -28,8 +28,8 @@ static org.nuiton.i18n.I18n.n org.nuiton.jaxx.demo.entities.Identity org.nuiton.jaxx.demo.entities.Model - jaxx.runtime.validator.swing.SwingValidatorMessageListRenderer - jaxx.runtime.validator.swing.SwingValidatorMessageListModel + org.nuiton.jaxx.validator.swing.SwingValidatorMessageListRenderer + org.nuiton.jaxx.validator.swing.SwingValidatorMessageListModel java.io.File </import> @@ -62,19 +62,19 @@ protected String[] getSources() { <!-- validators --> <BeanValidator id='validator' bean='model1' - uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> + uiClass="org.nuiton.jaxx.validator.swing.ui.ImageValidationUI"> <field name="text"/> <field name="text2"/> <field name="ratio"/> </BeanValidator> <BeanValidator id='validator2' bean='model2' - uiClass="jaxx.runtime.validator.swing.ui.IconValidationUI"> + uiClass="org.nuiton.jaxx.validator.swing.ui.IconValidationUI"> <field name="text" component="_text"/> <field name="text2" component="_text2"/> <field name="ratio" component="_ratio"/> </BeanValidator> <BeanValidator id='validator3' autoField='true' bean='identity' - uiClass="jaxx.runtime.validator.swing.ui.TranslucentValidationUI"> + uiClass="org.nuiton.jaxx.validator.swing.ui.TranslucentValidationUI"> <field name="email" component="email2"/> </BeanValidator> diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/simple/SimpleBeanValidationByTableDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/simple/SimpleBeanValidationByTableDemo.jaxx index a4f8824..88458ef 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/simple/SimpleBeanValidationByTableDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/simple/SimpleBeanValidationByTableDemo.jaxx @@ -28,9 +28,9 @@ static org.nuiton.i18n.I18n.n org.nuiton.jaxx.demo.entities.Identity org.nuiton.jaxx.demo.entities.Model - jaxx.runtime.validator.swing.SwingValidatorUtil - jaxx.runtime.validator.swing.SwingValidatorMessageTableRenderer - jaxx.runtime.validator.swing.SwingValidatorMessageTableModel + org.nuiton.jaxx.validator.swing.SwingValidatorUtil + org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableRenderer + org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel java.io.File </import> @@ -67,19 +67,19 @@ protected String[] getSources() { <!-- validators --> <BeanValidator id='validator' bean='model1' - uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> + uiClass="org.nuiton.jaxx.validator.swing.ui.ImageValidationUI"> <field name="text"/> <field name="text2"/> <field name="ratio"/> </BeanValidator> <BeanValidator id='validator2' bean='model2' - uiClass="jaxx.runtime.validator.swing.ui.IconValidationUI"> + uiClass="org.nuiton.jaxx.validator.swing.ui.IconValidationUI"> <field name="text" component="_text"/> <field name="text2" component="_text2"/> <field name="ratio" component="_ratio"/> </BeanValidator> <BeanValidator id='validator3' autoField='true' bean='identity' - uiClass="jaxx.runtime.validator.swing.ui.TranslucentValidationUI"> + uiClass="org.nuiton.jaxx.validator.swing.ui.TranslucentValidationUI"> <field name="email" component="email2"/> </BeanValidator> diff --git a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java index 685f7ad..3b7cb0e 100644 --- a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java +++ b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java @@ -37,7 +37,7 @@ import org.nuiton.jaxx.runtime.api.context.JAXXContext; import org.nuiton.jaxx.runtime.api.JAXXObject; import org.nuiton.jaxx.runtime.api.spi.UIHandler; import org.nuiton.jaxx.runtime.api.swing.help.JAXXHelpBroker; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.maven.plugin.MojoExecutionException; @@ -278,7 +278,7 @@ public class GenerateMojo extends AbstractJaxxMojo implements CompilerConfigurat * * @since 2.6 */ - @Parameter(property = "jaxx.validatorFactoryFQN", defaultValue = "jaxx.runtime.validator.swing.SwingValidator") + @Parameter(property = "jaxx.validatorFactoryFQN", defaultValue = "org.nuiton.jaxx.validator.swing.SwingValidator") protected String validatorFactoryFQN; /** diff --git a/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java b/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java index c6df00d..2d09c95 100644 --- a/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java +++ b/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java @@ -27,7 +27,7 @@ import org.nuiton.jaxx.compiler.JAXXCompilerFile; import org.nuiton.jaxx.compiler.JAXXEngine; import org.nuiton.jaxx.compiler.decorators.DefaultCompiledObjectDecorator; import org.nuiton.jaxx.runtime.api.context.DefaultJAXXContext; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/ok/Validation.jaxx b/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/ok/Validation.jaxx index e0a1869..3b256e2 100644 --- a/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/ok/Validation.jaxx +++ b/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/ok/Validation.jaxx @@ -37,13 +37,13 @@ <field name="ratio"/> </BeanValidator> <BeanValidator id='validator2' bean='model2' errorListModel='errors' - uiClass="jaxx.runtime.validator.swing.ui.IconValidationUI"> + uiClass="org.nuiton.jaxx.validator.swing.ui.IconValidationUI"> <field name="text" component="_text"/> <field name="text2" component="_text2"/> <field name="ratio" component="_ratio"/> </BeanValidator> <BeanValidator id='validator3' autoField='true' bean='identity' errorListModel='errors' - uiClass="jaxx.runtime.validator.swing.ui.TranslucentValidationUI"> + uiClass="org.nuiton.jaxx.validator.swing.ui.TranslucentValidationUI"> <field name="email" component="email2"/> </BeanValidator> diff --git a/jaxx-validator/pom.xml b/jaxx-validator/pom.xml index 5c36ec4..b50e792 100644 --- a/jaxx-validator/pom.xml +++ b/jaxx-validator/pom.xml @@ -123,7 +123,7 @@ <treateDefaultEntry>false</treateDefaultEntry> <entries> <entry> - <basedir>src/main/java/jaxx/runtime/validator</basedir> + <basedir>src/main/java/org/nuiton/jaxx/validator</basedir> </entry> </entries> </configuration> diff --git a/jaxx-validator/src/main/java/jaxx/runtime/JAXXValidator.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/JAXXValidator.java similarity index 95% rename from jaxx-validator/src/main/java/jaxx/runtime/JAXXValidator.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/JAXXValidator.java index 1d97025..a501446 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/JAXXValidator.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/JAXXValidator.java @@ -19,10 +19,10 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime; +package org.nuiton.jaxx.validator; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import javax.swing.JComponent; import java.util.List; diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SimpleBeanValidatorMessageTableModel.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SimpleBeanValidatorMessageTableModel.java similarity index 99% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SimpleBeanValidatorMessageTableModel.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SimpleBeanValidatorMessageTableModel.java index 326e68d..6071c3b 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SimpleBeanValidatorMessageTableModel.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SimpleBeanValidatorMessageTableModel.java @@ -1,4 +1,4 @@ -package jaxx.runtime.validator.swing; +package org.nuiton.jaxx.validator.swing; /* * #%L diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SimpleBeanValidatorMessageTableRenderer.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SimpleBeanValidatorMessageTableRenderer.java similarity index 99% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SimpleBeanValidatorMessageTableRenderer.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SimpleBeanValidatorMessageTableRenderer.java index 2c65ce2..0e8e043 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SimpleBeanValidatorMessageTableRenderer.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SimpleBeanValidatorMessageTableRenderer.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.validator.swing; +package org.nuiton.jaxx.validator.swing; import org.nuiton.validator.NuitonValidatorScope; import org.nuiton.validator.bean.simple.SimpleBeanValidatorMessage; diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidator.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidator.java similarity index 99% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidator.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidator.java index 36c1d03..99f8aab 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidator.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidator.java @@ -1,4 +1,4 @@ -package jaxx.runtime.validator.swing; +package org.nuiton.jaxx.validator.swing; /* * #%L diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorDataLocator.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorDataLocator.java similarity index 98% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorDataLocator.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorDataLocator.java index afed7b7..b9aab22 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorDataLocator.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorDataLocator.java @@ -1,4 +1,4 @@ -package jaxx.runtime.validator.swing; +package org.nuiton.jaxx.validator.swing; /* * #%L * JAXX :: Validator diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorHighlightPredicate.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorHighlightPredicate.java similarity index 99% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorHighlightPredicate.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorHighlightPredicate.java index d975f5d..70394c2 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorHighlightPredicate.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorHighlightPredicate.java @@ -1,4 +1,4 @@ -package jaxx.runtime.validator.swing; +package org.nuiton.jaxx.validator.swing; /* * #%L * JAXX :: Validator diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessage.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessage.java similarity index 98% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessage.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessage.java index bfa7548..23280b0 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessage.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessage.java @@ -1,4 +1,4 @@ -package jaxx.runtime.validator.swing; +package org.nuiton.jaxx.validator.swing; /* * #%L * JAXX :: Validator diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableModel.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableModel.java similarity index 99% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableModel.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableModel.java index ca6ee56..f5b0dc6 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableModel.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableModel.java @@ -1,4 +1,4 @@ -package jaxx.runtime.validator.swing; +package org.nuiton.jaxx.validator.swing; /* * #%L * JAXX :: Validator diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableMouseListener.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableMouseListener.java similarity index 99% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableMouseListener.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableMouseListener.java index ab7a339..b528b3d 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableMouseListener.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableMouseListener.java @@ -1,4 +1,4 @@ -package jaxx.runtime.validator.swing; +package org.nuiton.jaxx.validator.swing; /* * #%L * JAXX :: Validator diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableRenderer.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableRenderer.java similarity index 99% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableRenderer.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableRenderer.java index 742ea15..d42b204 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableRenderer.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableRenderer.java @@ -1,4 +1,4 @@ -package jaxx.runtime.validator.swing; +package org.nuiton.jaxx.validator.swing; /* * #%L * JAXX :: Validator diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageWidget.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageWidget.java similarity index 99% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageWidget.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageWidget.java index 8f31235..9cd0cd4 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageWidget.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageWidget.java @@ -1,4 +1,4 @@ -package jaxx.runtime.validator.swing; +package org.nuiton.jaxx.validator.swing; /* * #%L diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorTableEditorModelListener.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorTableEditorModelListener.java similarity index 99% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorTableEditorModelListener.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorTableEditorModelListener.java index f9f643e..3bcd236 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorTableEditorModelListener.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorTableEditorModelListener.java @@ -1,4 +1,4 @@ -package jaxx.runtime.validator.swing; +package org.nuiton.jaxx.validator.swing; /* * #%L * JAXX :: Validator diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidator.java similarity index 99% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidator.java index c62b402..bffdd27 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidator.java @@ -19,13 +19,13 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.validator.swing; +package org.nuiton.jaxx.validator.swing; import com.google.common.base.Preconditions; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; -import jaxx.runtime.validator.swing.ui.AbstractBeanValidatorUI; -import jaxx.runtime.validator.swing.ui.IconValidationUI; +import org.nuiton.jaxx.validator.swing.ui.AbstractBeanValidatorUI; +import org.nuiton.jaxx.validator.swing.ui.IconValidationUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.jxlayer.JXLayer; diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessage.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessage.java similarity index 98% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessage.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessage.java index 26a09d0..a1bf0bb 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessage.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessage.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.validator.swing; +package org.nuiton.jaxx.validator.swing; import org.nuiton.validator.NuitonValidatorScope; import org.nuiton.validator.bean.simple.SimpleBeanValidatorMessage; diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListModel.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageListModel.java similarity index 99% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListModel.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageListModel.java index 8d6e567..aad5b55 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListModel.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageListModel.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.validator.swing; +package org.nuiton.jaxx.validator.swing; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListMouseListener.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageListMouseListener.java similarity index 98% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListMouseListener.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageListMouseListener.java index af5c982..e3c97a5 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListMouseListener.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageListMouseListener.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.validator.swing; +package org.nuiton.jaxx.validator.swing; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListRenderer.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageListRenderer.java similarity index 98% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListRenderer.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageListRenderer.java index 56b17cb..7562ab8 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListRenderer.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageListRenderer.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.validator.swing; +package org.nuiton.jaxx.validator.swing; import org.nuiton.validator.NuitonValidatorScope; diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableModel.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageTableModel.java similarity index 99% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableModel.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageTableModel.java index b493951..04836d0 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableModel.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageTableModel.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.validator.swing; +package org.nuiton.jaxx.validator.swing; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableMouseListener.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageTableMouseListener.java similarity index 99% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableMouseListener.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageTableMouseListener.java index d9e2e12..1190879 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableMouseListener.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageTableMouseListener.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.validator.swing; +package org.nuiton.jaxx.validator.swing; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableRenderer.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageTableRenderer.java similarity index 99% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableRenderer.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageTableRenderer.java index bd86741..2f48c55 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableRenderer.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageTableRenderer.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.validator.swing; +package org.nuiton.jaxx.validator.swing; import org.nuiton.validator.NuitonValidatorScope; diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageWidget.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageWidget.java similarity index 99% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageWidget.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageWidget.java index e44f580..1620f9c 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageWidget.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageWidget.java @@ -1,5 +1,5 @@ -package jaxx.runtime.validator.swing; +package org.nuiton.jaxx.validator.swing; /* * #%L diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorUtil.java similarity index 99% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorUtil.java index 0698e34..4c870d2 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorUtil.java @@ -19,14 +19,14 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.validator.swing; +package org.nuiton.jaxx.validator.swing; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; -import jaxx.runtime.JAXXValidator; -import jaxx.runtime.validator.swing.meta.Validator; -import jaxx.runtime.validator.swing.meta.ValidatorField; -import jaxx.runtime.validator.swing.unified.UnifiedValidatorMessage; +import org.nuiton.jaxx.validator.JAXXValidator; +import org.nuiton.jaxx.validator.swing.meta.Validator; +import org.nuiton.jaxx.validator.swing.meta.ValidatorField; +import org.nuiton.jaxx.validator.swing.unified.UnifiedValidatorMessage; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/meta/Validator.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/meta/Validator.java similarity index 96% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/meta/Validator.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/meta/Validator.java index 68f9cbd..47d75c5 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/meta/Validator.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/meta/Validator.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.validator.swing.meta; +package org.nuiton.jaxx.validator.swing.meta; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/meta/ValidatorField.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/meta/ValidatorField.java similarity index 97% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/meta/ValidatorField.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/meta/ValidatorField.java index 23a327e..ea7a40d 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/meta/ValidatorField.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/meta/ValidatorField.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.validator.swing.meta; +package org.nuiton.jaxx.validator.swing.meta; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/AbstractBeanValidatorUI.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/ui/AbstractBeanValidatorUI.java similarity index 98% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/AbstractBeanValidatorUI.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/ui/AbstractBeanValidatorUI.java index 906ba85..ab363d4 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/AbstractBeanValidatorUI.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/ui/AbstractBeanValidatorUI.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.validator.swing.ui; +package org.nuiton.jaxx.validator.swing.ui; import com.google.common.collect.Ordering; import com.google.common.collect.Sets; diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/IconValidationUI.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/ui/IconValidationUI.java similarity index 97% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/IconValidationUI.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/ui/IconValidationUI.java index e999968..db468c5 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/IconValidationUI.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/ui/IconValidationUI.java @@ -19,10 +19,10 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.validator.swing.ui; +package org.nuiton.jaxx.validator.swing.ui; import com.google.common.collect.Sets; -import jaxx.runtime.validator.swing.SwingValidatorUtil; +import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; import org.jdesktop.jxlayer.JXLayer; import org.nuiton.validator.NuitonValidatorScope; diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/ImageValidationUI.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/ui/ImageValidationUI.java similarity index 96% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/ImageValidationUI.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/ui/ImageValidationUI.java index 20fcd09..9c97491 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/ImageValidationUI.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/ui/ImageValidationUI.java @@ -19,10 +19,10 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.validator.swing.ui; +package org.nuiton.jaxx.validator.swing.ui; import com.google.common.collect.Sets; -import jaxx.runtime.validator.swing.SwingValidatorUtil; +import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; import org.jdesktop.jxlayer.JXLayer; import org.nuiton.validator.NuitonValidatorScope; diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/TranslucentValidationUI.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/ui/TranslucentValidationUI.java similarity index 96% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/TranslucentValidationUI.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/ui/TranslucentValidationUI.java index 98a93aa..565ecfd 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/TranslucentValidationUI.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/ui/TranslucentValidationUI.java @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.validator.swing.ui; +package org.nuiton.jaxx.validator.swing.ui; -import jaxx.runtime.validator.swing.SwingValidatorUtil; +import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; import org.jdesktop.jxlayer.JXLayer; import org.nuiton.validator.NuitonValidatorScope; diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/unified/UnifiedValidatorMessage.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessage.java similarity index 98% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/unified/UnifiedValidatorMessage.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessage.java index 99bd1c9..097619d 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/unified/UnifiedValidatorMessage.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessage.java @@ -1,4 +1,4 @@ -package jaxx.runtime.validator.swing.unified; +package org.nuiton.jaxx.validator.swing.unified; /* * #%L @@ -22,7 +22,7 @@ package jaxx.runtime.validator.swing.unified; * #L% */ -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.lang3.ObjectUtils; import org.nuiton.validator.NuitonValidatorScope; import org.nuiton.validator.bean.AbstractValidator; diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/unified/UnifiedValidatorMessageTableModel.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableModel.java similarity index 98% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/unified/UnifiedValidatorMessageTableModel.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableModel.java index 763eb6c..81ecbc6 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/unified/UnifiedValidatorMessageTableModel.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableModel.java @@ -1,4 +1,4 @@ -package jaxx.runtime.validator.swing.unified; +package org.nuiton.jaxx.validator.swing.unified; /* * #%L @@ -24,8 +24,8 @@ package jaxx.runtime.validator.swing.unified; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import jaxx.runtime.validator.swing.SwingListValidator; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingListValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.swing.extra.JTables; diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/unified/UnifiedValidatorMessageTableMouseListener.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableMouseListener.java similarity index 97% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/unified/UnifiedValidatorMessageTableMouseListener.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableMouseListener.java index 7cb7829..5a46ca1 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/unified/UnifiedValidatorMessageTableMouseListener.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableMouseListener.java @@ -1,4 +1,4 @@ -package jaxx.runtime.validator.swing.unified; +package org.nuiton.jaxx.validator.swing.unified; /* * #%L @@ -22,7 +22,7 @@ package jaxx.runtime.validator.swing.unified; * #L% */ -import jaxx.runtime.validator.swing.SwingListValidatorDataLocator; +import org.nuiton.jaxx.validator.swing.SwingListValidatorDataLocator; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/unified/UnifiedValidatorMessageTableRenderer.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableRenderer.java similarity index 98% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/unified/UnifiedValidatorMessageTableRenderer.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableRenderer.java index 1f05c3d..5d9b2be 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/unified/UnifiedValidatorMessageTableRenderer.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableRenderer.java @@ -1,4 +1,4 @@ -package jaxx.runtime.validator.swing.unified; +package org.nuiton.jaxx.validator.swing.unified; /* * #%L @@ -23,7 +23,7 @@ package jaxx.runtime.validator.swing.unified; */ import com.google.common.collect.Maps; -import jaxx.runtime.validator.swing.SwingValidatorUtil; +import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; import org.apache.commons.lang3.StringUtils; import org.nuiton.validator.NuitonValidatorScope; import org.nuiton.validator.bean.simple.SimpleBeanValidator; diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/unified/UnifiedValidatorMessageUtil.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageUtil.java similarity index 95% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/unified/UnifiedValidatorMessageUtil.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageUtil.java index a1e6135..cb6594f 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/unified/UnifiedValidatorMessageUtil.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageUtil.java @@ -1,4 +1,4 @@ -package jaxx.runtime.validator.swing.unified; +package org.nuiton.jaxx.validator.swing.unified; /* * #%L @@ -22,10 +22,10 @@ package jaxx.runtime.validator.swing.unified; * #L% */ -import jaxx.runtime.validator.swing.SwingListValidatorDataLocator; -import jaxx.runtime.validator.swing.SwingListValidatorTableEditorModelListener; -import jaxx.runtime.validator.swing.SwingValidator; -import jaxx.runtime.validator.swing.SwingValidatorMessageTableMouseListener; +import org.nuiton.jaxx.validator.swing.SwingListValidatorDataLocator; +import org.nuiton.jaxx.validator.swing.SwingListValidatorTableEditorModelListener; +import org.nuiton.jaxx.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableMouseListener; import org.nuiton.jaxx.swing.extra.JTables; import org.nuiton.validator.bean.list.BeanListValidator; diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/unified/UnifiedValidatorMessageWidget.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageWidget.java similarity index 97% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/unified/UnifiedValidatorMessageWidget.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageWidget.java index a5d626f..b6ecf71 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/unified/UnifiedValidatorMessageWidget.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageWidget.java @@ -1,4 +1,4 @@ -package jaxx.runtime.validator.swing.unified; +package org.nuiton.jaxx.validator.swing.unified; /* * #%L @@ -22,10 +22,10 @@ package jaxx.runtime.validator.swing.unified; * #L% */ -import jaxx.runtime.validator.swing.SwingListValidatorDataLocator; -import jaxx.runtime.validator.swing.SwingListValidatorMessageTableRenderer; -import jaxx.runtime.validator.swing.SwingValidator; -import jaxx.runtime.validator.swing.SwingValidatorUtil; +import org.nuiton.jaxx.validator.swing.SwingListValidatorDataLocator; +import org.nuiton.jaxx.validator.swing.SwingListValidatorMessageTableRenderer; +import org.nuiton.jaxx.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTitledPanel; diff --git a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/unified/package-info.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/package-info.java similarity index 94% rename from jaxx-validator/src/main/java/jaxx/runtime/validator/swing/unified/package-info.java rename to jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/package-info.java index 5705780..bcf72f5 100644 --- a/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/unified/package-info.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/package-info.java @@ -5,7 +5,7 @@ * @author Tony Chemit - chemit@codelutin.com * @since 2.10 */ -package jaxx.runtime.validator.swing.unified; +package org.nuiton.jaxx.validator.swing.unified; /* * #%L diff --git a/jaxx-config/LICENSE.txt b/jaxx-widgets-config/LICENSE.txt similarity index 100% rename from jaxx-config/LICENSE.txt rename to jaxx-widgets-config/LICENSE.txt diff --git a/jaxx-config/README.txt b/jaxx-widgets-config/README.txt similarity index 100% rename from jaxx-config/README.txt rename to jaxx-widgets-config/README.txt diff --git a/jaxx-config/changelog.txt b/jaxx-widgets-config/changelog.txt similarity index 100% rename from jaxx-config/changelog.txt rename to jaxx-widgets-config/changelog.txt diff --git a/jaxx-config/pom.xml b/jaxx-widgets-config/pom.xml similarity index 98% rename from jaxx-config/pom.xml rename to jaxx-widgets-config/pom.xml index 7cf6f5a..ed53900 100644 --- a/jaxx-config/pom.xml +++ b/jaxx-widgets-config/pom.xml @@ -35,9 +35,9 @@ </parent> <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-config</artifactId> + <artifactId>jaxx-widgets-config</artifactId> - <name>JAXX :: Config</name> + <name>JAXX :: Widgets Config</name> <description> Config UI based on org.nuiton.config.ApplicationConfig </description> diff --git a/jaxx-config/src/license/THIRD-PARTY.properties b/jaxx-widgets-config/src/license/THIRD-PARTY.properties similarity index 100% rename from jaxx-config/src/license/THIRD-PARTY.properties rename to jaxx-widgets-config/src/license/THIRD-PARTY.properties diff --git a/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCallBackUI.jaxx b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCallBackUI.jaxx similarity index 100% rename from jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCallBackUI.jaxx rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCallBackUI.jaxx diff --git a/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCallBackUIHandler.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCallBackUIHandler.java similarity index 96% rename from jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCallBackUIHandler.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCallBackUIHandler.java index 275a8b9..1c61864 100644 --- a/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCallBackUIHandler.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCallBackUIHandler.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.config; +package org.nuiton.jaxx.widgets.config; /* * #%L @@ -22,12 +22,12 @@ package jaxx.runtime.swing.config; * #L% */ -import jaxx.runtime.swing.config.model.CallBackEntry; -import jaxx.runtime.swing.config.model.CallBackMap; -import jaxx.runtime.swing.config.model.OptionModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.swing.extra.JTrees; +import org.nuiton.jaxx.widgets.config.model.CallBackEntry; +import org.nuiton.jaxx.widgets.config.model.CallBackMap; +import org.nuiton.jaxx.widgets.config.model.OptionModel; import javax.swing.JLabel; import javax.swing.JTree; diff --git a/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCategoryUI.css b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCategoryUI.css similarity index 100% rename from jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCategoryUI.css rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCategoryUI.css diff --git a/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCategoryUI.jaxx b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCategoryUI.jaxx similarity index 94% rename from jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCategoryUI.jaxx rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCategoryUI.jaxx index 7562b08..f887d14 100644 --- a/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCategoryUI.jaxx +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCategoryUI.jaxx @@ -25,9 +25,9 @@ java.awt.Color javax.swing.DefaultListSelectionModel javax.swing.ScrollPaneConstants - jaxx.runtime.swing.config.model.CategoryModel - jaxx.runtime.swing.config.model.ConfigTableModel - jaxx.runtime.swing.config.model.ConfigUIModel + org.nuiton.jaxx.widgets.config.model.CategoryModel + org.nuiton.jaxx.widgets.config.model.ConfigTableModel + org.nuiton.jaxx.widgets.config.model.ConfigUIModel org.jdesktop.swingx.JXTable org.nuiton.jaxx.swing.extra.Icons diff --git a/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCategoryUIHandler.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCategoryUIHandler.java similarity index 98% rename from jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCategoryUIHandler.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCategoryUIHandler.java index d5e507c..418e0c3 100644 --- a/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCategoryUIHandler.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigCategoryUIHandler.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.config; +package org.nuiton.jaxx.widgets.config; /* * #%L @@ -22,8 +22,6 @@ package jaxx.runtime.swing.config; * #L% */ -import jaxx.runtime.swing.config.model.ConfigTableModel; -import jaxx.runtime.swing.config.model.OptionModel; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -32,6 +30,8 @@ import org.nuiton.jaxx.swing.extra.Desktops; import org.nuiton.jaxx.swing.extra.JTables; import org.nuiton.jaxx.swing.extra.table.renderer.ClassTableCellRenderer; import org.nuiton.jaxx.swing.extra.table.renderer.ColorCellRenderer; +import org.nuiton.jaxx.widgets.config.model.ConfigTableModel; +import org.nuiton.jaxx.widgets.config.model.OptionModel; import javax.swing.JLabel; import javax.swing.JPopupMenu; diff --git a/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigTableEditor.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigTableEditor.java similarity index 97% rename from jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigTableEditor.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigTableEditor.java index 2a0ad26..c94e5e1 100644 --- a/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigTableEditor.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigTableEditor.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.config; +package org.nuiton.jaxx.widgets.config; /* * #%L @@ -23,8 +23,8 @@ package jaxx.runtime.swing.config; */ import com.google.common.io.Files; -import jaxx.runtime.swing.config.model.ConfigTableModel; -import jaxx.runtime.swing.config.model.OptionModel; +import org.nuiton.jaxx.widgets.config.model.ConfigTableModel; +import org.nuiton.jaxx.widgets.config.model.OptionModel; import org.nuiton.jaxx.runtime.swing.editor.cell.FileCellEditor; import org.apache.commons.lang3.StringUtils; import org.nuiton.jaxx.swing.extra.editor.ColorCellEditor; diff --git a/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigTableRenderer.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigTableRenderer.java similarity index 96% rename from jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigTableRenderer.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigTableRenderer.java index 57e87b8..673cbed 100644 --- a/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigTableRenderer.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigTableRenderer.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.config; +package org.nuiton.jaxx.widgets.config; /* * #%L @@ -22,8 +22,8 @@ package jaxx.runtime.swing.config; * #L% */ -import jaxx.runtime.swing.config.model.ConfigTableModel; -import jaxx.runtime.swing.config.model.OptionModel; +import org.nuiton.jaxx.widgets.config.model.ConfigTableModel; +import org.nuiton.jaxx.widgets.config.model.OptionModel; import javax.swing.JComponent; import javax.swing.JTable; diff --git a/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUI.css b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigUI.css similarity index 100% rename from jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUI.css rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigUI.css diff --git a/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUI.jaxx b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigUI.jaxx similarity index 96% rename from jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUI.jaxx rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigUI.jaxx index 4597fdd..3b94091 100644 --- a/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUI.jaxx +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigUI.jaxx @@ -22,7 +22,7 @@ <JPanel layout='{new BorderLayout()}'> <import> - jaxx.runtime.swing.config.model.ConfigUIModel + org.nuiton.jaxx.widgets.config.model.ConfigUIModel </import> <script><![CDATA[ diff --git a/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHandler.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigUIHandler.java similarity index 97% rename from jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHandler.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigUIHandler.java index 472409e..a2fb210 100644 --- a/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHandler.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigUIHandler.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.config; +package org.nuiton.jaxx.widgets.config; /* * #%L @@ -22,16 +22,16 @@ package jaxx.runtime.swing.config; * #L% */ -import jaxx.runtime.swing.config.model.CallBackEntry; -import jaxx.runtime.swing.config.model.CallBackMap; -import jaxx.runtime.swing.config.model.CategoryModel; -import jaxx.runtime.swing.config.model.ConfigUIModel; -import jaxx.runtime.swing.config.model.OptionModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.runtime.api.context.JAXXInitialContext; import org.nuiton.jaxx.swing.extra.PropertyChangeListeners; import org.nuiton.jaxx.swing.extra.Swings; +import org.nuiton.jaxx.widgets.config.model.CallBackEntry; +import org.nuiton.jaxx.widgets.config.model.CallBackMap; +import org.nuiton.jaxx.widgets.config.model.CategoryModel; +import org.nuiton.jaxx.widgets.config.model.ConfigUIModel; +import org.nuiton.jaxx.widgets.config.model.OptionModel; import javax.swing.AbstractAction; import javax.swing.Action; diff --git a/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHelper.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigUIHelper.java similarity index 95% rename from jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHelper.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigUIHelper.java index 9ca44f5..2a45918 100644 --- a/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHelper.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/ConfigUIHelper.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.config; +package org.nuiton.jaxx.widgets.config; /* * #%L @@ -24,17 +24,17 @@ package jaxx.runtime.swing.config; import com.google.common.base.Preconditions; import com.google.common.base.Supplier; -import jaxx.runtime.swing.config.model.CallBackFinalizer; -import jaxx.runtime.swing.config.model.CategoryModel; -import jaxx.runtime.swing.config.model.ConfigUIModel; -import jaxx.runtime.swing.config.model.ConfigUIModelBuilder; -import jaxx.runtime.swing.config.model.OptionModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ConfigOptionDef; import org.nuiton.jaxx.runtime.api.context.JAXXContext; import org.nuiton.jaxx.runtime.api.context.JAXXInitialContext; +import org.nuiton.jaxx.widgets.config.model.CallBackFinalizer; +import org.nuiton.jaxx.widgets.config.model.CategoryModel; +import org.nuiton.jaxx.widgets.config.model.ConfigUIModel; +import org.nuiton.jaxx.widgets.config.model.ConfigUIModelBuilder; +import org.nuiton.jaxx.widgets.config.model.OptionModel; import javax.swing.Icon; import javax.swing.table.TableCellEditor; diff --git a/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/CallBackEntry.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/CallBackEntry.java similarity index 97% rename from jaxx-config/src/main/java/jaxx/runtime/swing/config/model/CallBackEntry.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/CallBackEntry.java index e5ccc77..5af9444 100644 --- a/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/CallBackEntry.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/CallBackEntry.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.config.model; +package org.nuiton.jaxx.widgets.config.model; /* * #%L diff --git a/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/CallBackFinalizer.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/CallBackFinalizer.java similarity index 96% rename from jaxx-config/src/main/java/jaxx/runtime/swing/config/model/CallBackFinalizer.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/CallBackFinalizer.java index 38b89e2..7d97782 100644 --- a/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/CallBackFinalizer.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/CallBackFinalizer.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.config.model; +package org.nuiton.jaxx.widgets.config.model; /* * #%L diff --git a/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/CallBackMap.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/CallBackMap.java similarity index 97% rename from jaxx-config/src/main/java/jaxx/runtime/swing/config/model/CallBackMap.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/CallBackMap.java index d299e6a..2a9cec5 100644 --- a/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/CallBackMap.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/CallBackMap.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.config.model; +package org.nuiton.jaxx.widgets.config.model; /* * #%L diff --git a/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/CallBacksManager.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/CallBacksManager.java similarity index 99% rename from jaxx-config/src/main/java/jaxx/runtime/swing/config/model/CallBacksManager.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/CallBacksManager.java index b562d05..23ce0f5 100644 --- a/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/CallBacksManager.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/CallBacksManager.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.config.model; +package org.nuiton.jaxx.widgets.config.model; /* * #%L diff --git a/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/CategoryModel.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/CategoryModel.java similarity index 99% rename from jaxx-config/src/main/java/jaxx/runtime/swing/config/model/CategoryModel.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/CategoryModel.java index c649ad4..7706963 100644 --- a/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/CategoryModel.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/CategoryModel.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.config.model; +package org.nuiton.jaxx.widgets.config.model; /* * #%L diff --git a/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigTableModel.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/ConfigTableModel.java similarity index 99% rename from jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigTableModel.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/ConfigTableModel.java index 0a76508..22ea536 100644 --- a/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigTableModel.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/ConfigTableModel.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.config.model; +package org.nuiton.jaxx.widgets.config.model; /* * #%L diff --git a/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModel.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/ConfigUIModel.java similarity index 99% rename from jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModel.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/ConfigUIModel.java index 0bf2250..7445074 100644 --- a/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModel.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/ConfigUIModel.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.config.model; +package org.nuiton.jaxx.widgets.config.model; /* * #%L diff --git a/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModelBuilder.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/ConfigUIModelBuilder.java similarity index 99% rename from jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModelBuilder.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/ConfigUIModelBuilder.java index 3012ac1..8be1184 100644 --- a/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModelBuilder.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/ConfigUIModelBuilder.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.config.model; +package org.nuiton.jaxx.widgets.config.model; /* * #%L diff --git a/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/MainCallBackFinalizer.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/MainCallBackFinalizer.java similarity index 97% rename from jaxx-config/src/main/java/jaxx/runtime/swing/config/model/MainCallBackFinalizer.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/MainCallBackFinalizer.java index bfba1e1..c8e3bb5 100644 --- a/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/MainCallBackFinalizer.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/MainCallBackFinalizer.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.config.model; +package org.nuiton.jaxx.widgets.config.model; /* * #%L diff --git a/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/OptionModel.java b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/OptionModel.java similarity index 99% rename from jaxx-config/src/main/java/jaxx/runtime/swing/config/model/OptionModel.java rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/OptionModel.java index 415c308..aea375e 100644 --- a/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/OptionModel.java +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/OptionModel.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.config.model; +package org.nuiton.jaxx.widgets.config.model; /* * #%L diff --git a/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/package.html b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/package.html similarity index 88% rename from jaxx-config/src/main/java/jaxx/runtime/swing/config/model/package.html rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/package.html index 6f6f055..bf6c686 100644 --- a/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/package.html +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/model/package.html @@ -21,8 +21,8 @@ --> <html> <body> -<h1>Package jaxx.runtime.swing.config.model</h1> +<h1>Package org.nuiton.jaxx.widgets.config.model</h1> -the package contains the models of the Config UI. +The package contains the models of the Config UI. </body> </html> diff --git a/jaxx-config/src/main/java/jaxx/runtime/swing/config/package.html b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/package.html similarity index 95% rename from jaxx-config/src/main/java/jaxx/runtime/swing/config/package.html rename to jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/package.html index 24c5f93..a057394 100644 --- a/jaxx-config/src/main/java/jaxx/runtime/swing/config/package.html +++ b/jaxx-widgets-config/src/main/java/org/nuiton/jaxx/widgets/config/package.html @@ -21,7 +21,7 @@ --> <html> <body> -<h1>Package jaxx.runtime.swing.config</h1> +<h1>Package org.nuiton.jaxx.widhets.config</h1> This package contains the Config ui, based on org.nuiton.config.ApplicationConfig. diff --git a/jaxx-config/src/main/resources/i18n/jaxx-config_en_GB.properties b/jaxx-widgets-config/src/main/resources/i18n/jaxx-widgets-config_en_GB.properties similarity index 100% rename from jaxx-config/src/main/resources/i18n/jaxx-config_en_GB.properties rename to jaxx-widgets-config/src/main/resources/i18n/jaxx-widgets-config_en_GB.properties diff --git a/jaxx-config/src/main/resources/i18n/jaxx-config_es_ES.properties b/jaxx-widgets-config/src/main/resources/i18n/jaxx-widgets-config_es_ES.properties similarity index 100% rename from jaxx-config/src/main/resources/i18n/jaxx-config_es_ES.properties rename to jaxx-widgets-config/src/main/resources/i18n/jaxx-widgets-config_es_ES.properties diff --git a/jaxx-config/src/main/resources/i18n/jaxx-config_fr_FR.properties b/jaxx-widgets-config/src/main/resources/i18n/jaxx-widgets-config_fr_FR.properties similarity index 100% rename from jaxx-config/src/main/resources/i18n/jaxx-config_fr_FR.properties rename to jaxx-widgets-config/src/main/resources/i18n/jaxx-widgets-config_fr_FR.properties diff --git a/jaxx-config/src/main/resources/icons/action-add.png b/jaxx-widgets-config/src/main/resources/icons/action-add.png similarity index 100% rename from jaxx-config/src/main/resources/icons/action-add.png rename to jaxx-widgets-config/src/main/resources/icons/action-add.png diff --git a/jaxx-config/src/main/resources/icons/action-config-copy.png b/jaxx-widgets-config/src/main/resources/icons/action-config-copy.png similarity index 100% rename from jaxx-config/src/main/resources/icons/action-config-copy.png rename to jaxx-widgets-config/src/main/resources/icons/action-config-copy.png diff --git a/jaxx-config/src/main/resources/icons/action-config-quit.png b/jaxx-widgets-config/src/main/resources/icons/action-config-quit.png similarity index 100% rename from jaxx-config/src/main/resources/icons/action-config-quit.png rename to jaxx-widgets-config/src/main/resources/icons/action-config-quit.png diff --git a/jaxx-config/src/main/resources/icons/action-config-reset-option.png b/jaxx-widgets-config/src/main/resources/icons/action-config-reset-option.png similarity index 100% rename from jaxx-config/src/main/resources/icons/action-config-reset-option.png rename to jaxx-widgets-config/src/main/resources/icons/action-config-reset-option.png diff --git a/jaxx-config/src/main/resources/icons/action-config-reset.png b/jaxx-widgets-config/src/main/resources/icons/action-config-reset.png similarity index 100% rename from jaxx-config/src/main/resources/icons/action-config-reset.png rename to jaxx-widgets-config/src/main/resources/icons/action-config-reset.png diff --git a/jaxx-config/src/main/resources/icons/action-config-save.png b/jaxx-widgets-config/src/main/resources/icons/action-config-save.png similarity index 100% rename from jaxx-config/src/main/resources/icons/action-config-save.png rename to jaxx-widgets-config/src/main/resources/icons/action-config-save.png diff --git a/jaxx-config/src/site/site.xml b/jaxx-widgets-config/src/site/site.xml similarity index 100% rename from jaxx-config/src/site/site.xml rename to jaxx-widgets-config/src/site/site.xml diff --git a/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyDelegateConfig.java b/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyDelegateConfig.java similarity index 99% rename from jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyDelegateConfig.java rename to jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyDelegateConfig.java index 5afc02b..3c8eb51 100644 --- a/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyDelegateConfig.java +++ b/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyDelegateConfig.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.config.model; +package org.nuiton.jaxx.widgets.config.model; /* * #%L diff --git a/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyDelegateConfigTest.java b/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyDelegateConfigTest.java similarity index 99% rename from jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyDelegateConfigTest.java rename to jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyDelegateConfigTest.java index 4b54765..7d54407 100644 --- a/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyDelegateConfigTest.java +++ b/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyDelegateConfigTest.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.config.model; +package org.nuiton.jaxx.widgets.config.model; /* * #%L diff --git a/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyInheritedConfig.java b/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyInheritedConfig.java similarity index 99% rename from jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyInheritedConfig.java rename to jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyInheritedConfig.java index 047f118..86a3752 100644 --- a/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyInheritedConfig.java +++ b/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyInheritedConfig.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.config.model; +package org.nuiton.jaxx.widgets.config.model; /* * #%L diff --git a/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyInheritedConfigTest.java b/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyInheritedConfigTest.java similarity index 99% rename from jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyInheritedConfigTest.java rename to jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyInheritedConfigTest.java index f4d86bc..a7c753c 100644 --- a/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyInheritedConfigTest.java +++ b/jaxx-widgets-config/src/test/java/org/nuiton/jaxx/widgets/config/model/MyInheritedConfigTest.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.config.model; +package org.nuiton.jaxx.widgets.config.model; /* * #%L diff --git a/jaxx-config/src/test/resources/log4j.properties b/jaxx-widgets-config/src/test/resources/log4j.properties similarity index 100% rename from jaxx-config/src/test/resources/log4j.properties rename to jaxx-widgets-config/src/test/resources/log4j.properties diff --git a/pom.xml b/pom.xml index fa34559..3f9f5d0 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ <module>jaxx-widgets-gis</module> <module>jaxx-widgets</module> <module>jaxx-widgets-datetime</module> - <module>jaxx-config</module> + <module>jaxx-widgets-config</module> <module>jaxx-application-api</module> <module>jaxx-application-swing</module> </modules> diff --git a/src/site/rst/BeanValidator.rst b/src/site/rst/BeanValidator.rst index f8ce081..78a72d5 100644 --- a/src/site/rst/BeanValidator.rst +++ b/src/site/rst/BeanValidator.rst @@ -68,7 +68,7 @@ Les attributs autorisés sont les suivants : * *errorListModel* : le modèle qui contient la liste des erreurs (et est liée au composant *errorList*), doit étendre *jaxx.runtime.validator.swing.SwingValidatorErrorListModel*. Si non présent on essayera le composent d'id *errorListModel*. - * *uiClass* : le FQN de la classe utilisé pour le rendu des erreurs sur les wigets d'édition. La classe doit étendre *jaxx.runtime.validator.swing.ui.AbstractBeanValidatorUI*. Si non présent, on utilise par défaut le render *jaxx.runtime.validator.swing.ui.IconValidationUI*. + * *uiClass* : le FQN de la classe utilisé pour le rendu des erreurs sur les wigets d'édition. La classe doit étendre *org.nuiton.jaxx.validator.swing.ui.AbstractBeanValidatorUI*. Si non présent, on utilise par défaut le render *org.nuiton.jaxx.validator.swing.ui.IconValidationUI*. Le tag supporte aussi l'ajout de tag *field* comme fils pour définir explicitement des champs à validater. @@ -90,12 +90,12 @@ Le tag supporte les attributs suivants : Les classes du runtime ====================== -Ce développement est dans le paquetage *jaxx.runtime.validator* (sauf pour l'interface *jaxx.runtime.JAXXValidator*). +Ce développement est dans le paquetage *jaxx.runtime.validator* (sauf pour l'interface *org.nuiton.jaxx.validator.JAXXValidator*). Il s'agit de l'ensemble des classes ajoutées dans le module *jaxx-core* pour encapsuler la validation dans les fichiers java générés à partir des fichiers JAXX. -interface jaxx.runtime.JAXXValidator +interface org.nuiton.jaxx.validator.JAXXValidator ************************************ Ce contrat a été ajouté à tous les objets JAXX générés (donc l'interface JAXXObject étend JAXXValidator). @@ -105,7 +105,7 @@ On définit ici uniquement des méthodes d'accès aux validateurs enregistrés d TODO on pourrait ajouter des méthodes pour savoir l'état de validation d'un validateur ? -classe jaxx.runtime.validator.swing.SwingValidator +classe org.nuiton.jaxx.validator.swing.SwingValidator ************************************************** Il s'agit de la classe principale d'encapsulation d'un validateur XWorks 2. diff --git a/src/site/rst/migrate_v3.rst b/src/site/rst/migrate_v3.rst index 0ec1396..9cb3ea7 100644 --- a/src/site/rst/migrate_v3.rst +++ b/src/site/rst/migrate_v3.rst @@ -19,6 +19,8 @@ Disparition du module jaxx-runtime remplacé par * jaxx-runtime-api (pour tout ce qui est strictement nécessaire pour compiler du code généré par jaxx) * jaxx-swing-extra (du + pour swing) +Renommage de **jaxx-config** en **jaxx-widgets-config** + Renommage des paquetages ~~~~~~~~~~~~~~~~~~~~~~~~ @@ -26,6 +28,8 @@ On est passé à **org.nuiton.jaxx** au lieu de **jaxx** Un script (ou goal du plugin serait mieux) est disponible pour effectuer les remplacements de paquetage sur un projet. +jaxx.runtime.validator -> org.nuiton.jaxx.validator + jaxx.runtime.spi.UIHandler -> org.nuiton.jaxx.runtime.api.spi.UIHandler jaxx.runtime.swing.ComponentMover -> org.nuiton.jaxx.swing.extra.ComponentMover @@ -48,12 +52,12 @@ jaxx.runtime.swing.help.JAXXHelpUI -> org.nuiton.jaxx.runtime.api.swing.help.JAX jaxx.runtime.swing.JTables -> org.nuiton.jaxx.swing.extra.JTables jaxx.runtime.swing.Table -> org.nuiton.jaxx.runtime.api.swing.Table -org.nuiton.jaxx.runtime.swing.renderer.DecoratorListCellRenderer -> org.nuiton.jaxx.swing.extra.list.renderer.DecoratorListCellRenderer -org.nuiton.jaxx.runtime.swing.session.SwingSession --> org.nuiton.jaxx.swing.extra.session.SwingSession -org.nuiton.jaxx.runtime.swing.session.State --> org.nuiton.jaxx.swing.extra.session.State +jaxx.runtime.swing.renderer.DecoratorListCellRenderer -> org.nuiton.jaxx.swing.extra.list.renderer.DecoratorListCellRenderer +jaxx.runtime.swing.session.SwingSession --> org.nuiton.jaxx.swing.extra.session.SwingSession +jaxx.runtime.swing.session.State --> org.nuiton.jaxx.swing.extra.session.State jaxx.runtime.swing.editor.EnumEditor -> org.nuiton.jaxx.swing.extra.editor.EnumEditor -org.nuiton.jaxx.runtime.swing.renderer.DecoratorTableCellRenderer -> org.nuiton.jaxx.swing.extra.table.renderer.DecoratorTableCellRenderer +jaxx.runtime.swing.renderer.DecoratorTableCellRenderer -> org.nuiton.jaxx.swing.extra.table.renderer.DecoratorTableCellRenderer Remplacement de JXLayer par l'api JLayer ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -61,7 +65,7 @@ Remplacement de JXLayer par l'api JLayer L'api JLayer est désormais intégrée dans la jdk 7 donc plus besoin d'avoir la dépendance vers JXLayer. À noter au passage, que l'artefact de JXLayer était signé (donc des possibles modifications seront nécessaires -pour les configuration webstart). +pour les configurations webstart (suppression d'extension)). Classes non incluses dans la compilation ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/src/site/rst/old-compiler-doc/BeanValidator.rst b/src/site/rst/old-compiler-doc/BeanValidator.rst index 8a81caf..1598b07 100644 --- a/src/site/rst/old-compiler-doc/BeanValidator.rst +++ b/src/site/rst/old-compiler-doc/BeanValidator.rst @@ -97,7 +97,7 @@ Les attributs autorisés sont les suivants : * *errorListModel* : le modèle qui contient la liste des erreurs (et est liée au composant *errorList*), doit étendre *jaxx.runtime.validator.swing.SwingValidatorErrorListModel*. Si non présent on essayera le composent d'id *errorListModel*. - * *uiClass* : le FQN de la classe utilisé pour le rendu des erreurs sur les wigets d'édition. La classe doit étendre *jaxx.runtime.validator.swing.ui.AbstractBeanValidatorUI*. Si non présent, on utilise par défaut le render *jaxx.runtime.validator.swing.ui.IconValidationUI*. + * *uiClass* : le FQN de la classe utilisé pour le rendu des erreurs sur les wigets d'édition. La classe doit étendre *org.nuiton.jaxx.validator.swing.ui.AbstractBeanValidatorUI*. Si non présent, on utilise par défaut le render *org.nuiton.jaxx.validator.swing.ui.IconValidationUI*. Le tag supporte aussi l'ajout de tag *field* comme fils pour définir explicitement des champs à validater. @@ -119,12 +119,12 @@ Le tag supporte les attributs suivants : Les classes du runtime ====================== -Ce développement est dans le paquetage *jaxx.runtime.validator* (sauf pour l'interface *jaxx.runtime.JAXXValidator*). +Ce développement est dans le paquetage *jaxx.runtime.validator* (sauf pour l'interface *org.nuiton.jaxx.validator.JAXXValidator*). Il s'agit de l'ensemble des classes ajoutées dans le module *jaxx-core* pour encapsuler la validation dans les fichiers java générés à partir des fichiers JAXX. -interface jaxx.runtime.JAXXValidator +interface org.nuiton.jaxx.validator.JAXXValidator ************************************ Ce contrat a été ajouté à tous les objets JAXX générés (donc l'interface JAXXObject étend JAXXValidator). -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.