Author: tchemit Date: 2013-07-21 12:57:39 +0200 (Sun, 21 Jul 2013) New Revision: 2704 Url: http://nuiton.org/projects/jaxx/repository/revisions/2704 Log: refs #2782: Use nuiton-decorator 3.0 refs #2783: Use nuiton-config 3.0 refs #2784: Use nuiton-utils 3.0 Removed: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ trunk/jaxx-widgets/src/test/java/jaxx/runtime/swing/ Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyInterface2.java trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyInterface3.java trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFileTest.java trunk/jaxx-config/pom.xml trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHelper.java trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModel.java trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModelBuilder.java trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/OptionModel.java trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/package.html trunk/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyDelegateConfig.java trunk/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyDelegateConfigTest.java trunk/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyInheritedConfig.java trunk/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyInheritedConfigTest.java trunk/jaxx-demo/pom.xml trunk/jaxx-demo/src/license/THIRD-PARTY.properties trunk/jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemoHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/entities/DemoDecoratorProvider.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeCellRenderer.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemoHandler.java trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties trunk/jaxx-runtime/pom.xml trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableListModel.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorListCellRenderer.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderListCellRenderer.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderTableCellRenderer.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorTableCellRenderer.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/FilteredDecoratorListCellRenderer.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorListCellRenderer.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorTableCelleRenderer.java trunk/jaxx-widgets/pom.xml trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-compiler/pom.xml 2013-07-21 10:57:39 UTC (rev 2704) @@ -61,6 +61,11 @@ </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> Modified: trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyInterface2.java =================================================================== --- trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyInterface2.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyInterface2.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -24,7 +24,7 @@ */ package jaxx.compiler.reflect; -import org.nuiton.util.ApplicationConfig; +import org.nuiton.config.ConfigOptionDef; /** * Simple interface to test. @@ -32,7 +32,7 @@ * @author tchemit <chemit@codelutin.com> * @since 2.0.2 */ -public interface MyInterface2 extends ApplicationConfig.OptionDef { +public interface MyInterface2 extends ConfigOptionDef { String MY_CONSTANT = "constant"; Modified: trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyInterface3.java =================================================================== --- trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyInterface3.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyInterface3.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -24,7 +24,7 @@ */ package jaxx.compiler.reflect; -import org.nuiton.util.ApplicationConfig.OptionDef; +import org.nuiton.config.ConfigOptionDef; /** * Simple interface to test. @@ -32,7 +32,7 @@ * @author tchemit <chemit@codelutin.com> * @since 2.0.2 */ -public interface MyInterface3 extends OptionDef, Iterable<MyInterface3> { +public interface MyInterface3 extends ConfigOptionDef, Iterable<MyInterface3> { String MY_CONSTANT = "constant"; Modified: trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFileTest.java =================================================================== --- trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFileTest.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFileTest.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -40,7 +40,7 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import org.nuiton.util.ApplicationConfig; +import org.nuiton.config.ConfigOptionDef; import org.nuiton.util.FileUtil; import java.io.File; @@ -148,7 +148,7 @@ ClassDescriptor descriptor = getDescriptor(MyInterface2.class); assertInterfaces(descriptor, MyInterface2.class.getInterfaces()); - assertInterfaces(descriptor, ApplicationConfig.OptionDef.class); + assertInterfaces(descriptor, ConfigOptionDef.class); assertSuperClass(descriptor, null); } @@ -159,7 +159,7 @@ ClassDescriptor descriptor = getDescriptor(MyInterface3.class); assertInterfaces(descriptor, MyInterface3.class.getInterfaces()); - assertInterfaces(descriptor, ApplicationConfig.OptionDef.class, + assertInterfaces(descriptor, ConfigOptionDef.class, Iterable.class); assertSuperClass(descriptor, null); } @@ -270,7 +270,7 @@ } - @Test + @Test public void parseMyChildClass2() throws Exception { ClassDescriptor descriptor = getDescriptor(MyChildClass2.class); Modified: trunk/jaxx-config/pom.xml =================================================================== --- trunk/jaxx-config/pom.xml 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-config/pom.xml 2013-07-21 10:57:39 UTC (rev 2704) @@ -39,7 +39,7 @@ <name>JAXX :: Config</name> <description> - Config UI based on org.nuiton.util.config.ApplicationConfig + Config UI based on org.nuiton.config.ApplicationConfig </description> <properties> Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHelper.java =================================================================== --- trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHelper.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHelper.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -35,8 +35,8 @@ import jaxx.runtime.swing.config.model.OptionModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.config.ApplicationConfig; -import org.nuiton.util.config.ConfigOptionDef; +import org.nuiton.config.ApplicationConfig; +import org.nuiton.config.ConfigOptionDef; import javax.swing.Icon; import javax.swing.table.TableCellEditor; Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModel.java =================================================================== --- trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModel.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModel.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -31,7 +31,7 @@ import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.config.ApplicationConfig; +import org.nuiton.config.ApplicationConfig; import javax.swing.Icon; import java.beans.PropertyChangeListener; Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModelBuilder.java =================================================================== --- trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModelBuilder.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModelBuilder.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -28,8 +28,8 @@ import com.google.common.base.Supplier; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.config.ApplicationConfig; -import org.nuiton.util.config.ConfigOptionDef; +import org.nuiton.config.ApplicationConfig; +import org.nuiton.config.ConfigOptionDef; import javax.swing.Icon; import javax.swing.table.TableCellEditor; Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/OptionModel.java =================================================================== --- trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/OptionModel.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/OptionModel.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -26,7 +26,7 @@ import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ObjectUtils; -import org.nuiton.util.config.ConfigOptionDef; +import org.nuiton.config.ConfigOptionDef; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/package.html =================================================================== --- trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/package.html 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/package.html 2013-07-21 10:57:39 UTC (rev 2704) @@ -25,7 +25,7 @@ <body> <h1>Package jaxx.runtime.swing.config</h1> -This package contains the Config ui, based on org.nuiton.util.config.ApplicationConfig. +This package contains the Config ui, based on org.nuiton.config.ApplicationConfig. The config ui is categorized and offers possibility to add callbacks to run when configuration was saved. Modified: trunk/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyDelegateConfig.java =================================================================== --- trunk/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyDelegateConfig.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyDelegateConfig.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -28,8 +28,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.beans.AbstractBean; -import org.nuiton.util.config.ApplicationConfig; -import org.nuiton.util.config.ConfigOptionDef; +import org.nuiton.config.ApplicationConfig; +import org.nuiton.config.ConfigOptionDef; import java.awt.Color; import java.beans.PropertyChangeEvent; Modified: trunk/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyDelegateConfigTest.java =================================================================== --- trunk/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyDelegateConfigTest.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyDelegateConfigTest.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -29,7 +29,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.nuiton.util.config.ApplicationConfig; +import org.nuiton.config.ApplicationConfig; import javax.swing.ImageIcon; import javax.swing.table.TableCellEditor; Modified: trunk/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyInheritedConfig.java =================================================================== --- trunk/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyInheritedConfig.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyInheritedConfig.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -26,8 +26,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.config.ApplicationConfig; -import org.nuiton.util.config.ConfigOptionDef; +import org.nuiton.config.ApplicationConfig; +import org.nuiton.config.ConfigOptionDef; import java.awt.Color; import java.beans.PropertyChangeEvent; Modified: trunk/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyInheritedConfigTest.java =================================================================== --- trunk/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyInheritedConfigTest.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyInheritedConfigTest.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -29,7 +29,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.nuiton.util.config.ApplicationConfig; +import org.nuiton.config.ApplicationConfig; import javax.swing.ImageIcon; import javax.swing.table.TableCellEditor; Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-demo/pom.xml 2013-07-21 10:57:39 UTC (rev 2704) @@ -86,6 +86,11 @@ <dependency> <groupId>org.nuiton</groupId> + <artifactId>nuiton-decorator</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> </dependency> Modified: trunk/jaxx-demo/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-demo/src/license/THIRD-PARTY.properties 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-demo/src/license/THIRD-PARTY.properties 2013-07-21 10:57:39 UTC (rev 2704) @@ -2,18 +2,17 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD -# - BSD style # - Common Public License Version 1.0 # - GNU General Public License - Version 2 with the class path exception # - GNU Lesser General Public License -# - LGPL 2.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 -# - MPL 1.1 +# - New BSD License # - The Apache Software License, Version 2.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Jun 29 01:42:10 CEST 2012 +#Sun Jul 21 12:51:11 CEST 2013 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +javassist--javassist--3.11.0.GA=The Apache Software License, Version 2.0 Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -31,11 +31,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.beans.AbstractBean; -import org.nuiton.util.config.ApplicationConfig; -import org.nuiton.util.config.ArgumentsParserException; +import org.nuiton.config.ApplicationConfig; +import org.nuiton.config.ArgumentsParserException; import org.nuiton.util.Version; import org.nuiton.util.VersionUtil; -import org.nuiton.util.config.ConfigOptionDef; +import org.nuiton.config.ConfigOptionDef; import javax.swing.KeyStroke; import java.awt.Color; Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -41,7 +41,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; -import org.nuiton.util.decorator.DecoratorProvider; +import org.nuiton.decorator.DecoratorProvider; import javax.swing.AbstractAction; import javax.swing.InputMap; Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -37,7 +37,7 @@ import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.util.StringUtil; -import org.nuiton.util.decorator.DecoratorProvider; +import org.nuiton.decorator.DecoratorProvider; import java.util.Arrays; import java.util.Date; Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemoHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemoHandler.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemoHandler.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -27,7 +27,7 @@ import jaxx.demo.entities.DemoDataProvider; import jaxx.demo.entities.DemoDecoratorProvider; import jaxx.demo.entities.People; -import org.nuiton.util.decorator.JXPathDecorator; +import org.nuiton.decorator.JXPathDecorator; import java.util.List; Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -36,7 +36,7 @@ import jaxx.demo.entities.DemoDecoratorProvider; import jaxx.demo.entities.Movie; import jaxx.demo.entities.People; -import org.nuiton.util.decorator.JXPathDecorator; +import org.nuiton.decorator.JXPathDecorator; /** @author kmorin */ public class BeanDoubleListDemoHandler { Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -27,7 +27,7 @@ import jaxx.demo.entities.DemoDataProvider; import jaxx.demo.entities.DemoDecoratorProvider; import jaxx.demo.entities.People; -import org.nuiton.util.decorator.JXPathDecorator; +import org.nuiton.decorator.JXPathDecorator; import java.util.List; Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/entities/DemoDecoratorProvider.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/entities/DemoDecoratorProvider.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/entities/DemoDecoratorProvider.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -24,7 +24,7 @@ */ package jaxx.demo.entities; -import org.nuiton.util.decorator.DecoratorProvider; +import org.nuiton.decorator.DecoratorProvider; /** * Demo decorator provider. Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -44,8 +44,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTreeTable; -import org.nuiton.util.decorator.DecoratorProvider; -import org.nuiton.util.decorator.JXPathDecorator; +import org.nuiton.decorator.DecoratorProvider; +import org.nuiton.decorator.JXPathDecorator; import javax.swing.ImageIcon; import javax.swing.JPanel; Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeCellRenderer.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeCellRenderer.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeCellRenderer.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -31,8 +31,8 @@ import jaxx.runtime.swing.nav.tree.AbstractNavTreeCellRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.decorator.Decorator; -import org.nuiton.util.decorator.DecoratorProvider; +import org.nuiton.decorator.Decorator; +import org.nuiton.decorator.DecoratorProvider; import javax.swing.JTree; import javax.swing.tree.DefaultTreeModel; Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemoHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemoHandler.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemoHandler.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -31,7 +31,7 @@ import jaxx.runtime.validator.swing.SwingValidatorUtil; import org.apache.commons.lang3.tuple.Pair; import org.jdesktop.swingx.JXTable; -import org.nuiton.util.decorator.Decorator; +import org.nuiton.decorator.Decorator; import org.nuiton.validator.NuitonValidatorScope; import org.nuiton.validator.bean.list.BeanListValidator; Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties =================================================================== --- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties 2013-07-21 10:57:39 UTC (rev 2704) @@ -161,7 +161,7 @@ jaxxdemo.action.fullscreen=Full screen jaxxdemo.action.fullscreen.mnemonic=u jaxxdemo.action.fullscreen.tip=Change to full screen mode -jaxxdemo.action.help=Help +jaxxdemo.action.help= jaxxdemo.action.help.mnemonic=e jaxxdemo.action.help.tip=Display help jaxxdemo.action.locale.fr=French @@ -268,7 +268,7 @@ jaxxdemo.menu.file.locale=Languages jaxxdemo.menu.file.locale.mnemonic=L jaxxdemo.menu.file.mnemonic=F -jaxxdemo.menu.help=Help +jaxxdemo.menu.help= jaxxdemo.menu.help.mnemonic=h jaxxdemo.message.config.loaded=Configuration of JAXXDemo v. %1$s loaded. jaxxdemo.message.goto.site=Go to JAXXDemo Web site Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-runtime/pom.xml 2013-07-21 10:57:39 UTC (rev 2704) @@ -46,6 +46,11 @@ </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-decorator</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -31,7 +31,7 @@ import java.util.List; import java.util.regex.Pattern; import org.apache.commons.lang3.StringUtils; -import org.nuiton.util.decorator.JXPathDecorator; +import org.nuiton.decorator.JXPathDecorator; /** * ComboBoxModel which can filter the elements displayed in the popup. Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableListModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableListModel.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableListModel.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -31,7 +31,7 @@ import java.util.List; import java.util.regex.Pattern; import org.apache.commons.lang3.StringUtils; -import org.nuiton.util.decorator.JXPathDecorator; +import org.nuiton.decorator.JXPathDecorator; /** * List model for filterable lists. Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorListCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorListCellRenderer.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorListCellRenderer.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -24,7 +24,7 @@ */ package jaxx.runtime.swing.renderer; -import org.nuiton.util.decorator.Decorator; +import org.nuiton.decorator.Decorator; import javax.swing.DefaultListCellRenderer; import javax.swing.JList; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderListCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderListCellRenderer.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderListCellRenderer.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -24,8 +24,8 @@ */ package jaxx.runtime.swing.renderer; -import org.nuiton.util.decorator.Decorator; -import org.nuiton.util.decorator.DecoratorProvider; +import org.nuiton.decorator.Decorator; +import org.nuiton.decorator.DecoratorProvider; import javax.swing.DefaultListCellRenderer; import javax.swing.JList; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderTableCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderTableCellRenderer.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderTableCellRenderer.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -24,8 +24,8 @@ */ package jaxx.runtime.swing.renderer; -import org.nuiton.util.decorator.Decorator; -import org.nuiton.util.decorator.DecoratorProvider; +import org.nuiton.decorator.Decorator; +import org.nuiton.decorator.DecoratorProvider; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorTableCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorTableCellRenderer.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorTableCellRenderer.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -24,7 +24,7 @@ */ package jaxx.runtime.swing.renderer; -import org.nuiton.util.decorator.Decorator; +import org.nuiton.decorator.Decorator; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/FilteredDecoratorListCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/FilteredDecoratorListCellRenderer.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/FilteredDecoratorListCellRenderer.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -30,7 +30,7 @@ import javax.swing.JList; import javax.swing.ListCellRenderer; import org.apache.commons.lang3.StringUtils; -import org.nuiton.util.decorator.Decorator; +import org.nuiton.decorator.Decorator; /** * A {@link ListCellRenderer} which compute text with the given {@link #decorator}, Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorListCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorListCellRenderer.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorListCellRenderer.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -24,8 +24,8 @@ */ package jaxx.runtime.swing.renderer; -import org.nuiton.util.decorator.Decorator; -import org.nuiton.util.decorator.JXPathDecorator; +import org.nuiton.decorator.Decorator; +import org.nuiton.decorator.JXPathDecorator; import javax.swing.DefaultListCellRenderer; import javax.swing.JList; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorTableCelleRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorTableCelleRenderer.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorTableCelleRenderer.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -24,8 +24,8 @@ */ package jaxx.runtime.swing.renderer; -import org.nuiton.util.decorator.Decorator; -import org.nuiton.util.decorator.JXPathDecorator; +import org.nuiton.decorator.Decorator; +import org.nuiton.decorator.JXPathDecorator; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-widgets/pom.xml 2013-07-21 10:57:39 UTC (rev 2704) @@ -92,6 +92,11 @@ </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-decorator</artifactId> + </dependency> + + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx 2013-07-21 10:57:39 UTC (rev 2704) @@ -29,7 +29,7 @@ <import> jaxx.runtime.swing.model.JaxxDefaultComboBoxModel - org.nuiton.util.decorator.JXPathDecorator + org.nuiton.decorator.JXPathDecorator javax.swing.border.TitledBorder </import> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -32,9 +32,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.autocomplete.ObjectToStringConverter; -import org.nuiton.util.decorator.DecoratorUtil; -import org.nuiton.util.decorator.JXPathDecorator; -import org.nuiton.util.decorator.MultiJXPathDecorator; +import org.nuiton.decorator.DecoratorUtil; +import org.nuiton.decorator.JXPathDecorator; +import org.nuiton.decorator.MultiJXPathDecorator; import javax.swing.JComboBox; import javax.swing.JComponent; Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx 2013-07-21 10:57:39 UTC (rev 2704) @@ -25,7 +25,7 @@ <import> jaxx.runtime.swing.model.JaxxDefaultListModel - org.nuiton.util.decorator.JXPathDecorator + org.nuiton.decorator.JXPathDecorator javax.swing.DefaultListModel </import> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -33,9 +33,9 @@ import jaxx.runtime.swing.renderer.FilteredDecoratorListCellRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.decorator.DecoratorUtil; -import org.nuiton.util.decorator.JXPathDecorator; -import org.nuiton.util.decorator.MultiJXPathDecorator; +import org.nuiton.decorator.DecoratorUtil; +import org.nuiton.decorator.JXPathDecorator; +import org.nuiton.decorator.MultiJXPathDecorator; import javax.swing.*; import javax.swing.event.DocumentEvent; Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx 2013-07-21 10:57:39 UTC (rev 2704) @@ -29,7 +29,7 @@ <import> jaxx.runtime.swing.model.JaxxFilterableComboBoxModel - org.nuiton.util.decorator.JXPathDecorator + org.nuiton.decorator.JXPathDecorator javax.swing.border.TitledBorder </import> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -33,9 +33,9 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.decorator.DecoratorUtil; -import org.nuiton.util.decorator.JXPathDecorator; -import org.nuiton.util.decorator.MultiJXPathDecorator; +import org.nuiton.decorator.DecoratorUtil; +import org.nuiton.decorator.JXPathDecorator; +import org.nuiton.decorator.MultiJXPathDecorator; import javax.swing.*; import javax.swing.event.DocumentEvent; Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx 2013-07-21 10:57:39 UTC (rev 2704) @@ -27,7 +27,7 @@ implements='jaxx.runtime.bean.BeanTypeAware<O>'> <import> - org.nuiton.util.decorator.JXPathDecorator + org.nuiton.decorator.JXPathDecorator javax.swing.border.TitledBorder </import> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -31,9 +31,9 @@ import org.apache.commons.collections.primitives.IntList; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.decorator.DecoratorUtil; -import org.nuiton.util.decorator.JXPathDecorator; -import org.nuiton.util.decorator.MultiJXPathDecorator; +import org.nuiton.decorator.DecoratorUtil; +import org.nuiton.decorator.JXPathDecorator; +import org.nuiton.decorator.MultiJXPathDecorator; import javax.swing.DefaultListModel; import javax.swing.JComponent; Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java 2013-07-21 10:57:39 UTC (rev 2704) @@ -35,10 +35,10 @@ import org.jdesktop.swingx.autocomplete.AutoCompleteDocument; import org.jdesktop.swingx.autocomplete.ComboBoxAdaptor; import org.jdesktop.swingx.autocomplete.ObjectToStringConverter; -import org.nuiton.util.decorator.Decorator; -import org.nuiton.util.decorator.DecoratorUtil; -import org.nuiton.util.decorator.JXPathDecorator; -import org.nuiton.util.decorator.MultiJXPathDecorator; +import org.nuiton.decorator.Decorator; +import org.nuiton.decorator.DecoratorUtil; +import org.nuiton.decorator.JXPathDecorator; +import org.nuiton.decorator.MultiJXPathDecorator; import javax.swing.AbstractButton; import javax.swing.ActionMap; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-18 13:36:49 UTC (rev 2703) +++ trunk/pom.xml 2013-07-21 10:57:39 UTC (rev 2704) @@ -112,7 +112,7 @@ <!-- pour un muli module on doit fixer le projectId --> <projectId>jaxx</projectId> - <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> + <nuitonValidatorVersion>3.0-SNAPSHOT</nuitonValidatorVersion> <nuitonI18nVersion>2.5.1</nuitonI18nVersion> <eugeneVersion>2.6.3</eugeneVersion> <jxLayerVersion>3.0.4</jxLayerVersion> @@ -152,19 +152,25 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>${nuitonUtilsVersion}</version> + <version>2.7-SNAPSHOT</version> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>${nuitonUtilsVersion}</version> + <version>3.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.nuiton</groupId> + <artifactId>nuiton-decorator</artifactId> + <version>3.0-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> - <version>${nuitonUtilsVersion}</version> + <version>${nuitonValidatorVersion}</version> </dependency> <dependency> @@ -390,7 +396,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> - <version>${nuitonUtilsVersion}</version> + <version>${nuitonValidatorVersion}</version> <scope>test</scope> <classifier>tests</classifier> </dependency>