- Jaxx-commits - mailman.cloud.codelutin.com

r1623 - branches/jaxx-2.X
by tchemit＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: tchemit Date: 2009-11-02 04:47:28 +0100 (Mon, 02 Nov 2009) New Revision: 1623 Modified: branches/jaxx-2.X/pom.xml Log: use mavenpom 1.1.0 Modified: branches/jaxx-2.X/pom.xml =================================================================== --- branches/jaxx-2.X/pom.xml 2009-11-02 03:38:30 UTC (rev 1622) +++ branches/jaxx-2.X/pom.xml 2009-11-02 03:47:28 UTC (rev 1623) @@ -1,6 +1,6 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion>  @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> </parent> <artifactId>jaxx</artifactId> @@ -18,7 +18,7 @@ <modules> <module>jaxx-runtime</module> - + <module>jaxx-compiler</module> <module>jaxx-swing-action</module> @@ -282,7 +282,7 @@ </exclusion> </exclusions> </dependency> - + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -296,7 +296,7 @@ <version>1.0</version> <scope>test</scope> </dependency> - + <dependency> <groupId>org.apache.maven.plugin-testing</groupId> <artifactId>maven-plugin-testing-harness</artifactId> @@ -331,7 +331,7 @@ </exclusions> </dependency> - + </dependencies> </dependencyManagement> @@ -343,7 +343,7 @@ <description>JAXX Project</description> <inceptionYear>2008</inceptionYear> <url>http://maven-site.nuiton.org/jaxx-2.0</url> - +    @@ -359,7 +359,7 @@ <i18n.version>1.0.2-SNAPSHOT</i18n.version> <jxlayer.version>3.0.3</jxlayer.version> - + <javahelp.version>2.0.02</javahelp.version> </properties> @@ -386,7 +386,7 @@ </dependency> </dependencies> </plugin> - + </plugins> </pluginManagement>

1 0

r1622 - in branches/jaxx-2.X: jaxx-runtime jaxx-widgets
by tchemit＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: tchemit Date: 2009-11-02 04:38:30 +0100 (Mon, 02 Nov 2009) New Revision: 1622 Modified: branches/jaxx-2.X/jaxx-runtime/ branches/jaxx-2.X/jaxx-widgets/ Log: svn ignore idea files Property changes on: branches/jaxx-2.X/jaxx-runtime ___________________________________________________________________ Modified: svn:ignore - target *.log + target *.log *.iml Property changes on: branches/jaxx-2.X/jaxx-widgets ___________________________________________________________________ Modified: svn:ignore - velocity.log target nbactions.xml nbproject + velocity.log target nbactions.xml nbproject *.iml

1 0

01 Nov '09

Author: tchemit Date: 2009-11-01 17:21:04 +0100 (Sun, 01 Nov 2009) New Revision: 1621 Added: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1722Test/ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1750Test/ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1751Test/ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/dataBindingTest/ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/decoratorTest/ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/evolution74Test/ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/ Removed: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1722Test/ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1750Test/ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1751Test/ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/DataBindingTest/ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/DecoratorTest/ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/I18nTest/ Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1750Test.java branches/jaxx-2.X/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/Evolution74Test.java branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1722Test/Bug_1722.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1750Test/Bug_1750.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1751Test/Bug_1751.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/CSSTests.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ClassReferences.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ClientProperty.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ErrorJaxxContextImplementorClass.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Errors.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Force.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Icon.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Initializers.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/InnerClasses.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/NoLog.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/OverridingDataBindings.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Script.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/SpecialSubclassing.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/WithLog.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/ValidatorErrors.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/ValidatorOk.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/AutoFieldComponentNotFound.jaxx branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/DuplicatedErrorListModel.jaxx branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/DuplicatedErrorTableModel.jaxx branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/DuplicatedFieldInSameValidator.jaxx branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/FieldBeanPropertyNotFound.jaxx branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/FieldComponentDuplicated.jaxx branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/FieldComponentNotFound.jaxx branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/FieldComponentNotFound2.jaxx branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/FieldNoName.jaxx branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/FieldNoName2.jaxx branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/Model.java branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/UnfoundErrorList.jaxx branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/UnfoundErrorListModel.jaxx branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/UnfoundErrorTable.jaxx branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/UnfoundErrorTableModel.jaxx branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/UnfoundParentValidator.jaxx branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/ok/Identity.java branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/ok/Model.java branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/ok/ValidationBeanClass.jaxx branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/dataBindingTest/simpleBinding.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/decoratorTest/Decorator.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/evolution74Test/error.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/evolution74Test/ok.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nText.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nTitle.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nToolTipText.xml Log: use maven-helper-plugin 1.1.0 new test dir layout Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1750Test.java =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1750Test.java 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1750Test.java 2009-11-01 16:21:04 UTC (rev 1621) @@ -36,7 +36,7 @@ getMojo().execute(); assertNumberJaxxFiles(1); - JAXXCompiler compiler = getMojo().getEngine().getJAXXCompiler("org.nuiton.jaxx.plugin.Bug1750Test.ComboBox"); + JAXXCompiler compiler = getMojo().getEngine().getJAXXCompiler("org.nuiton.jaxx.plugin.bug1750Test.ComboBox"); assertNotNull(compiler); JAXXObjectDescriptor descriptor = compiler.getJAXXObjectDescriptor(); Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/Evolution74Test.java =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/Evolution74Test.java 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/Evolution74Test.java 2009-11-01 16:21:04 UTC (rev 1621) @@ -35,20 +35,20 @@ mojo.execute(); assertNumberJaxxFiles(6); - checkPattern(mojo, "JComboBox", true, "org/nuiton/jaxx/plugin/Evolution74Test/ok/swingcombo.java"); - checkPattern(mojo, "JComboBox", false, "org/nuiton/jaxx/plugin/Evolution74Test/ok/jaxxcombo.java"); - checkPattern(mojo, "JAXXComboBox", false, "org/nuiton/jaxx/plugin/Evolution74Test/ok/swingcombo.java"); - checkPattern(mojo, "JAXXComboBox", true, "org/nuiton/jaxx/plugin/Evolution74Test/ok/jaxxcombo.java"); + checkPattern(mojo, "JComboBox", true, "org/nuiton/jaxx/plugin/evolution74Test/ok/swingcombo.java"); + checkPattern(mojo, "JComboBox", false, "org/nuiton/jaxx/plugin/evolution74Test/ok/jaxxcombo.java"); + checkPattern(mojo, "JAXXComboBox", false, "org/nuiton/jaxx/plugin/evolution74Test/ok/swingcombo.java"); + checkPattern(mojo, "JAXXComboBox", true, "org/nuiton/jaxx/plugin/evolution74Test/ok/jaxxcombo.java"); - checkPattern(mojo, "JList", true, "org/nuiton/jaxx/plugin/Evolution74Test/ok/swinglist.java"); - checkPattern(mojo, "JList", false, "org/nuiton/jaxx/plugin/Evolution74Test/ok/jaxxlist.java"); - checkPattern(mojo, "JAXXList", false, "org/nuiton/jaxx/plugin/Evolution74Test/ok/swinglist.java"); - checkPattern(mojo, "JAXXList", true, "org/nuiton/jaxx/plugin/Evolution74Test/ok/jaxxlist.java"); + checkPattern(mojo, "JList", true, "org/nuiton/jaxx/plugin/evolution74Test/ok/swinglist.java"); + checkPattern(mojo, "JList", false, "org/nuiton/jaxx/plugin/evolution74Test/ok/jaxxlist.java"); + checkPattern(mojo, "JAXXList", false, "org/nuiton/jaxx/plugin/evolution74Test/ok/swinglist.java"); + checkPattern(mojo, "JAXXList", true, "org/nuiton/jaxx/plugin/evolution74Test/ok/jaxxlist.java"); - checkPattern(mojo, "JTree", true, "org/nuiton/jaxx/plugin/Evolution74Test/ok/swingtree.java"); - checkPattern(mojo, "JTree", false, "org/nuiton/jaxx/plugin/Evolution74Test/ok/jaxxtree.java"); - checkPattern(mojo, "JAXXTree", false, "org/nuiton/jaxx/plugin/Evolution74Test/ok/swingtree.java"); - checkPattern(mojo, "JAXXTree", true, "org/nuiton/jaxx/plugin/Evolution74Test/ok/jaxxtree.java"); + checkPattern(mojo, "JTree", true, "org/nuiton/jaxx/plugin/evolution74Test/ok/swingtree.java"); + checkPattern(mojo, "JTree", false, "org/nuiton/jaxx/plugin/evolution74Test/ok/jaxxtree.java"); + checkPattern(mojo, "JAXXTree", false, "org/nuiton/jaxx/plugin/evolution74Test/ok/swingtree.java"); + checkPattern(mojo, "JAXXTree", true, "org/nuiton/jaxx/plugin/evolution74Test/ok/jaxxtree.java"); } @SuppressWarnings({"unchecked"}) Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1722Test/Bug_1722.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1722Test/Bug_1722.xml 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1722Test/Bug_1722.xml 2009-11-01 16:21:04 UTC (rev 1621) @@ -18,7 +18,7 @@ <force>true</force>  <includes> - <value>**/Bug1722Test/*.jaxx</value> + <value>**/bug1722Test/*.jaxx</value> </includes> </configuration> </plugin> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1750Test/Bug_1750.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1750Test/Bug_1750.xml 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1750Test/Bug_1750.xml 2009-11-01 16:21:04 UTC (rev 1621) @@ -19,7 +19,7 @@  <resetAfterCompile>false</resetAfterCompile> <includes> - <value>**/Bug1750Test/*.jaxx</value> + <value>**/bug1750Test/*.jaxx</value> </includes> </configuration> </plugin> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1751Test/Bug_1751.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1751Test/Bug_1751.xml 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1751Test/Bug_1751.xml 2009-11-01 16:21:04 UTC (rev 1621) @@ -20,7 +20,7 @@  <resetAfterCompile>false</resetAfterCompile> <includes> - <value>**/Bug1751Test/*.jaxx</value> + <value>**/bug1751Test/*.jaxx</value> </includes> </configuration> </plugin> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/CSSTests.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/CSSTests.xml 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/CSSTests.xml 2009-11-01 16:21:04 UTC (rev 1621) @@ -18,7 +18,7 @@ <force>true</force> <i18nable>false</i18nable> <includes> - <value>**/CompilerTest/CSSTests/*.jaxx</value> + <value>**/compilerTest/CSSTests/*.jaxx</value> </includes> </configuration> </plugin> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ClassReferences.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/ClassReferences.xml 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ClassReferences.xml 2009-11-01 16:21:04 UTC (rev 1621) @@ -17,7 +17,7 @@  <force>true</force> <includes> - <value>**/CompilerTest/ClassReferences/*.jaxx</value> + <value>**/compilerTest/ClassReferences/*.jaxx</value> </includes> </configuration> </plugin> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ClientProperty.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/ClientProperty.xml 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ClientProperty.xml 2009-11-01 16:21:04 UTC (rev 1621) @@ -18,7 +18,7 @@ <force>true</force> <addLogger>false</addLogger> <includes> - <value>**/CompilerTest/clientProperty/*.jaxx</value> + <value>**/compilerTest/clientProperty/*.jaxx</value> </includes> </configuration> </plugin> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ErrorJaxxContextImplementorClass.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/ErrorJaxxContextImplementorClass.xml 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ErrorJaxxContextImplementorClass.xml 2009-11-01 16:21:04 UTC (rev 1621) @@ -18,7 +18,7 @@ <jaxxContextFQN>java.lang.String</jaxxContextFQN> <force>true</force> <includes> - <value>**/Evolution74Test/ok/*.jaxx</value> + <value>**/evolution74Test/ok/*.jaxx</value> </includes> </configuration> </plugin> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Errors.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Errors.xml 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Errors.xml 2009-11-01 16:21:04 UTC (rev 1621) @@ -17,10 +17,10 @@  <force>true</force> <includes> - <value>**/CompilerTest/errors/*.jaxx</value> + <value>**/compilerTest/errors/*.jaxx</value> </includes> <excludes> - <value>**/CompilerTest/validator/errors/*.jaxx</value> + <value>**/compilerTest/validator/errors/*.jaxx</value> </excludes> </configuration> </plugin> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Force.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Force.xml 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Force.xml 2009-11-01 16:21:04 UTC (rev 1621) @@ -17,7 +17,7 @@  <force>true</force> <includes> - <value>**/CompilerTest/force/*.jaxx</value> + <value>**/compilerTest/force/*.jaxx</value> </includes> </configuration> </plugin> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Icon.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Icon.xml 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Icon.xml 2009-11-01 16:21:04 UTC (rev 1621) @@ -20,7 +20,7 @@  <resetAfterCompile>true</resetAfterCompile> <includes> - <value>**/CompilerTest/icon/*.jaxx</value> + <value>**/compilerTest/icon/*.jaxx</value> </includes> </configuration> </plugin> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Initializers.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Initializers.xml 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Initializers.xml 2009-11-01 16:21:04 UTC (rev 1621) @@ -17,7 +17,7 @@  <force>true</force> <includes> - <value>**/CompilerTest/Initializers/*.jaxx</value> + <value>**/compilerTest/Initializers/*.jaxx</value> </includes> </configuration> </plugin> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/InnerClasses.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/InnerClasses.xml 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/InnerClasses.xml 2009-11-01 16:21:04 UTC (rev 1621) @@ -17,7 +17,7 @@  <force>true</force> <includes> - <value>**/CompilerTest/InnerClasses/*.jaxx</value> + <value>**/compilerTest/InnerClasses/*.jaxx</value> </includes> </configuration> </plugin> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/NoLog.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/NoLog.xml 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/NoLog.xml 2009-11-01 16:21:04 UTC (rev 1621) @@ -18,7 +18,7 @@ <force>true</force> <addLogger>false</addLogger> <includes> - <value>**/CompilerTest/log/nolog/*.jaxx</value> + <value>**/compilerTest/log/nolog/*.jaxx</value> </includes> </configuration> </plugin> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/OverridingDataBindings.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/OverridingDataBindings.xml 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/OverridingDataBindings.xml 2009-11-01 16:21:04 UTC (rev 1621) @@ -17,7 +17,7 @@  <force>true</force> <includes> - <value>**/CompilerTest/OverridingDataBindings/*.jaxx</value> + <value>**/compilerTest/OverridingDataBindings/*.jaxx</value> </includes> </configuration> </plugin> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Script.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Script.xml 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Script.xml 2009-11-01 16:21:04 UTC (rev 1621) @@ -17,7 +17,7 @@  <force>true</force> <includes> - <value>**/CompilerTest/Script/*.jaxx</value> + <value>**/compilerTest/Script/*.jaxx</value> </includes> </configuration> </plugin> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/SpecialSubclassing.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/SpecialSubclassing.xml 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/SpecialSubclassing.xml 2009-11-01 16:21:04 UTC (rev 1621) @@ -17,7 +17,7 @@  <force>true</force> <includes> - <value>**/CompilerTest/SpecialSubclassing/*.jaxx</value> + <value>**/compilerTest/SpecialSubclassing/*.jaxx</value> </includes> </configuration> </plugin> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/WithLog.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/WithLog.xml 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/WithLog.xml 2009-11-01 16:21:04 UTC (rev 1621) @@ -18,7 +18,7 @@ <force>true</force> <addLogger>true</addLogger> <includes> - <value>**/CompilerTest/log/withlog/*.jaxx</value> + <value>**/compilerTest/log/withlog/*.jaxx</value> </includes> </configuration> </plugin> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/ValidatorErrors.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/ValidatorErrors.xml 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/ValidatorErrors.xml 2009-11-01 16:21:04 UTC (rev 1621) @@ -19,7 +19,7 @@ <force>true</force>  <includes> - <value>**/CompilerValidatorTest/validator/errors/*.jaxx</value> + <value>**/compilerValidatorTest/validator/errors/*.jaxx</value> </includes> </configuration> </plugin> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/ValidatorOk.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/ValidatorOk.xml 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/ValidatorOk.xml 2009-11-01 16:21:04 UTC (rev 1621) @@ -18,7 +18,7 @@ <force>true</force>  <includes> - <value>**/CompilerValidatorTest/validator/ok/*.jaxx</value> + <value>**/compilerValidatorTest/validator/ok/*.jaxx</value> </includes> </configuration> </plugin> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/AutoFieldComponentNotFound.jaxx =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/validator/errors/AutoFieldComponentNotFound.jaxx 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/AutoFieldComponentNotFound.jaxx 2009-11-01 16:21:04 UTC (rev 1621) @@ -1,5 +1,5 @@ <Application> - <BeanValidator beanClass="org.nuiton.jaxx.plugin.CompilerValidatorTest.validator.errors.Model" autoField='true' strictMode='true'/> + <BeanValidator beanClass="org.nuiton.jaxx.plugin.compilerValidatorTest.validator.errors.Model" autoField='true' strictMode='true'/> <JTextField id='text'/> <JTextField id='text2'/> </Application> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/DuplicatedErrorListModel.jaxx =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/validator/errors/DuplicatedErrorListModel.jaxx 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/DuplicatedErrorListModel.jaxx 2009-11-01 16:21:04 UTC (rev 1621) @@ -1,4 +1,4 @@ <Application> <jaxx.runtime.validator.swing.SwingValidatorMessageListModel id='errors'/> - <BeanValidator beanClass='org.nuiton.jaxx.plugin.CompilerValidatorTest.validator.errors.Model' errorListModel='errors' errorListModel='fake'/> + <BeanValidator beanClass='org.nuiton.jaxx.plugin.compilerValidatorTest.validator.errors.Model' errorListModel='errors' errorListModel='fake'/> </Application> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/DuplicatedErrorTableModel.jaxx =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/validator/errors/DuplicatedErrorTableModel.jaxx 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/DuplicatedErrorTableModel.jaxx 2009-11-01 16:21:04 UTC (rev 1621) @@ -1,4 +1,4 @@ <Application> <jaxx.runtime.validator.swing.SwingValidatorMessageListModel id='errors'/> - <BeanValidator beanClass='org.nuiton.jaxx.plugin.CompilerValidatorTest.validator.errors.Model' errorTableModel='errors' errorTableModel='fake'/> + <BeanValidator beanClass='org.nuiton.jaxx.plugin.compilerValidatorTest.validator.errors.Model' errorTableModel='errors' errorTableModel='fake'/> </Application> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/DuplicatedFieldInSameValidator.jaxx =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/validator/errors/DuplicatedFieldInSameValidator.jaxx 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/DuplicatedFieldInSameValidator.jaxx 2009-11-01 16:21:04 UTC (rev 1621) @@ -1,5 +1,5 @@ <Application> - <BeanValidator beanClass="org.nuiton.jaxx.plugin.CompilerValidatorTest.validator.errors.Model"> + <BeanValidator beanClass="org.nuiton.jaxx.plugin.compilerValidatorTest.validator.errors.Model"> <field name="text"/> <field name="text"/> </BeanValidator> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/FieldBeanPropertyNotFound.jaxx =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/validator/errors/FieldBeanPropertyNotFound.jaxx 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/FieldBeanPropertyNotFound.jaxx 2009-11-01 16:21:04 UTC (rev 1621) @@ -1,5 +1,5 @@ <Application> - <BeanValidator beanClass="org.nuiton.jaxx.plugin.CompilerValidatorTest.validator.errors.Model"> + <BeanValidator beanClass="org.nuiton.jaxx.plugin.compilerValidatorTest.validator.errors.Model"> <field name="fake"/> </BeanValidator> </Application> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/FieldComponentDuplicated.jaxx =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/validator/errors/FieldComponentDuplicated.jaxx 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/FieldComponentDuplicated.jaxx 2009-11-01 16:21:04 UTC (rev 1621) @@ -1,5 +1,5 @@ <Application> - <BeanValidator beanClass="org.nuiton.jaxx.plugin.CompilerValidatorTest.validator.errors.Model"> + <BeanValidator beanClass="org.nuiton.jaxx.plugin.compilerValidatorTest.validator.errors.Model"> <field name="text2" component="text"/> <field name="text" component="text"/> </BeanValidator> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/FieldComponentNotFound.jaxx =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/validator/errors/FieldComponentNotFound.jaxx 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/FieldComponentNotFound.jaxx 2009-11-01 16:21:04 UTC (rev 1621) @@ -1,5 +1,5 @@ <Application> - <BeanValidator beanClass="org.nuiton.jaxx.plugin.CompilerValidatorTest.validator.errors.Model"> + <BeanValidator beanClass="org.nuiton.jaxx.plugin.compilerValidatorTest.validator.errors.Model"> <field name="text" component="fake"/> </BeanValidator> </Application> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/FieldComponentNotFound2.jaxx =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/validator/errors/FieldComponentNotFound2.jaxx 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/FieldComponentNotFound2.jaxx 2009-11-01 16:21:04 UTC (rev 1621) @@ -1,5 +1,5 @@ <Application> - <BeanValidator beanClass="org.nuiton.jaxx.plugin.CompilerValidatorTest.validator.errors.Model"> + <BeanValidator beanClass="org.nuiton.jaxx.plugin.compilerValidatorTest.validator.errors.Model"> <field name="fake"/> </BeanValidator> </Application> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/FieldNoName.jaxx =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/validator/errors/FieldNoName.jaxx 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/FieldNoName.jaxx 2009-11-01 16:21:04 UTC (rev 1621) @@ -1,5 +1,5 @@ <Application> - <BeanValidator beanClass="org.nuiton.jaxx.plugin.CompilerValidatorTest.validator.errors.Model"> + <BeanValidator beanClass="org.nuiton.jaxx.plugin.compilerValidatorTest.validator.errors.Model"> <field/> </BeanValidator> </Application> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/FieldNoName2.jaxx =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/validator/errors/FieldNoName2.jaxx 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/FieldNoName2.jaxx 2009-11-01 16:21:04 UTC (rev 1621) @@ -1,5 +1,5 @@ <Application> - <BeanValidator beanClass="org.nuiton.jaxx.plugin.CompilerValidatorTest.validator.errors.Model"> + <BeanValidator beanClass="org.nuiton.jaxx.plugin.compilerValidatorTest.validator.errors.Model"> <field component="text"/> </BeanValidator> </Application> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/Model.java =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/validator/errors/Model.java 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/Model.java 2009-11-01 16:21:04 UTC (rev 1621) @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.plugin.CompilerValidatorTest.validator.errors; +package org.nuiton.jaxx.plugin.compilerValidatorTest.validator.errors; import java.beans.*; Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/UnfoundErrorList.jaxx =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/validator/errors/UnfoundErrorList.jaxx 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/UnfoundErrorList.jaxx 2009-11-01 16:21:04 UTC (rev 1621) @@ -1,3 +1,3 @@ <Application> - <BeanValidator beanClass='org.nuiton.jaxx.plugin.CompilerValidatorTest.validator.errors.Model' errorList='fake'/> + <BeanValidator beanClass='org.nuiton.jaxx.plugin.compilerValidatorTest.validator.errors.Model' errorList='fake'/> </Application> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/UnfoundErrorListModel.jaxx =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/validator/errors/UnfoundErrorListModel.jaxx 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/UnfoundErrorListModel.jaxx 2009-11-01 16:21:04 UTC (rev 1621) @@ -1,3 +1,3 @@ <Application> - <BeanValidator beanClass='org.nuiton.jaxx.plugin.CompilerValidatorTest.validator.errors.Model' errorListModel='fake'/> + <BeanValidator beanClass='org.nuiton.jaxx.plugin.compilerValidatorTest.validator.errors.Model' errorListModel='fake'/> </Application> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/UnfoundErrorTable.jaxx =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/validator/errors/UnfoundErrorTable.jaxx 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/UnfoundErrorTable.jaxx 2009-11-01 16:21:04 UTC (rev 1621) @@ -1,3 +1,3 @@ <Application> - <BeanValidator beanClass='org.nuiton.jaxx.plugin.CompilerValidatorTest.validator.errors.Model' errorTable='fake'/> + <BeanValidator beanClass='org.nuiton.jaxx.plugin.compilerValidatorTest.validator.errors.Model' errorTable='fake'/> </Application> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/UnfoundErrorTableModel.jaxx =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/validator/errors/UnfoundErrorTableModel.jaxx 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/UnfoundErrorTableModel.jaxx 2009-11-01 16:21:04 UTC (rev 1621) @@ -1,3 +1,3 @@ <Application> - <BeanValidator bean='org.nuiton.jaxx.plugin.CompilerValidatorTest.validator.errors.Model' errorTableModel='fake'/> + <BeanValidator bean='org.nuiton.jaxx.plugin.compilerValidatorTest.validator.errors.Model' errorTableModel='fake'/> </Application> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/UnfoundParentValidator.jaxx =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/validator/errors/UnfoundParentValidator.jaxx 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/UnfoundParentValidator.jaxx 2009-11-01 16:21:04 UTC (rev 1621) @@ -1,3 +1,3 @@ <Application> - <BeanValidator beanClass='org.nuiton.jaxx.plugin.CompilerValidatorTest.validator.errors.Model' parentValidator='fake'/> + <BeanValidator beanClass='org.nuiton.jaxx.plugin.compilerValidatorTest.validator.errors.Model' parentValidator='fake'/> </Application> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/ok/Identity.java =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/validator/ok/Identity.java 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/ok/Identity.java 2009-11-01 16:21:04 UTC (rev 1621) @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.plugin.CompilerValidatorTest.validator.ok; +package org.nuiton.jaxx.plugin.compilerValidatorTest.validator.ok; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/ok/Model.java =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/validator/ok/Model.java 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/ok/Model.java 2009-11-01 16:21:04 UTC (rev 1621) @@ -1,4 +1,4 @@ -package org.nuiton.jaxx.plugin.CompilerValidatorTest.validator.ok; +package org.nuiton.jaxx.plugin.compilerValidatorTest.validator.ok; import java.beans.*; Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/ok/ValidationBeanClass.jaxx =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/validator/ok/ValidationBeanClass.jaxx 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/ok/ValidationBeanClass.jaxx 2009-11-01 16:21:04 UTC (rev 1621) @@ -7,7 +7,7 @@ <jaxx.runtime.validator.swing.SwingValidatorMessageListModel id='errors'/>  - <BeanValidator id='validator3' autoField='true' beanClass='org.nuiton.jaxx.plugin.CompilerValidatorTest.validator.ok.Identity' errorListModel='errors'> + <BeanValidator id='validator3' autoField='true' beanClass='org.nuiton.jaxx.plugin.compilerValidatorTest.validator.ok.Identity' errorListModel='errors'> <field name="email" component="email2"/> </BeanValidator> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/dataBindingTest/simpleBinding.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/DataBindingTest/simpleBinding.xml 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/dataBindingTest/simpleBinding.xml 2009-11-01 16:21:04 UTC (rev 1621) @@ -17,7 +17,7 @@ <force>true</force>  <includes> - <value>**/DataBindingTest/*.jaxx</value> + <value>**/dataBindingTest/*.jaxx</value> </includes> </configuration> </plugin> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/decoratorTest/Decorator.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/DecoratorTest/Decorator.xml 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/decoratorTest/Decorator.xml 2009-11-01 16:21:04 UTC (rev 1621) @@ -18,7 +18,7 @@ <force>true</force> <addLogger>false</addLogger> <includes> - <value>**/DecoratorTest/*.jaxx</value> + <value>**/decoratorTest/*.jaxx</value> </includes> </configuration> </plugin> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/evolution74Test/error.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/error.xml 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/evolution74Test/error.xml 2009-11-01 16:21:04 UTC (rev 1621) @@ -18,7 +18,7 @@ <force>true</force>  <includes> - <value>**/Evolution74Test/error/*.jaxx</value> + <value>**/evolution74Test/error/*.jaxx</value> </includes> </configuration> </plugin> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/evolution74Test/ok.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/ok.xml 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/evolution74Test/ok.xml 2009-11-01 16:21:04 UTC (rev 1621) @@ -17,7 +17,7 @@  <force>true</force> <includes> - <value>**/Evolution74Test/ok/*.jaxx</value> + <value>**/evolution74Test/ok/*.jaxx</value> </includes> </configuration> </plugin> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nText.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/I18nTest/I18nText.xml 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nText.xml 2009-11-01 16:21:04 UTC (rev 1621) @@ -18,7 +18,7 @@ <force>true</force> <i18nable>true</i18nable> <includes> - <value>**/I18nTest/text/*.jaxx</value> + <value>**/i18nTest/text/*.jaxx</value> </includes> </configuration> </plugin> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nTitle.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/I18nTest/I18nTitle.xml 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nTitle.xml 2009-11-01 16:21:04 UTC (rev 1621) @@ -18,7 +18,7 @@ <force>true</force> <i18nable>true</i18nable> <includes> - <value>**/I18nTest/title/*.jaxx</value> + <value>**/i18nTest/title/*.jaxx</value> </includes> </configuration> </plugin> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nToolTipText.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/I18nTest/I18nToolTipText.xml 2009-10-30 11:09:43 UTC (rev 1620) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nToolTipText.xml 2009-11-01 16:21:04 UTC (rev 1621) @@ -18,7 +18,7 @@ <force>true</force> <i18nable>true</i18nable> <includes> - <value>**/I18nTest/tooltiptext/*.jaxx</value> + <value>**/i18nTest/tooltiptext/*.jaxx</value> </includes> </configuration> </plugin>

1 0

r1620 - branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/decorator
by tchemit＠users.nuiton.org 30 Oct '09

30 Oct '09

Author: tchemit Date: 2009-10-30 12:09:43 +0100 (Fri, 30 Oct 2009) New Revision: 1620 Modified: branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorUtils.java Log: Evolution #106: Am?\195?\169lioration de l'api des Decorator Modified: branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorUtils.java =================================================================== --- branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorUtils.java 2009-10-29 18:21:10 UTC (rev 1619) +++ branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorUtils.java 2009-10-30 11:09:43 UTC (rev 1620) @@ -26,7 +26,7 @@ import java.util.*; /** - * Some usefull methods on {@link Decorator} to create, decorators and obtain decorators. + * Some usefull methods on {@link Decorator} to create, and sort data with decorators. * * To create a new decorator, use one of the methods : * <ul> @@ -36,13 +36,6 @@ * <li>{@link #newMultiJXPathDecorator(Class, String, String, String)})</li> * </ul> * - * - * To register a new decorator, use the method {@link #register(String, Decorator)}. - * - * To obtain a registred decorator, use the method {@link #get(String)} - * (get the decorator based on his registred name). or the method {@link #get(Class, String)} - * (get the decorator based on the type of decorator and the registred name). - * * To sort a list of data, using a {@link JXPathDecorator}, use the method * {@link #sort(JXPathDecorator, List, int)}. * @@ -53,13 +46,6 @@ public class DecoratorUtils { /** - * Registred decorators. - * @deprecated prefer use a {@link DecoratorProvider} - */ - @Deprecated - protected static List<DecoratorContext<?>> decorators; - - /** * Factory method to instanciate a new {@link PropertyDecorator} for the * given class {@code internlaClass} and a readable property name. * @@ -120,49 +106,7 @@ return new MultiJXPathDecorator<O>(internalClass, expression, separator, separatorReplacement, contexts); } - @Deprecated - public static <T> Decorator<T> get(String context) { - Decorator<T> result = get(null, context); - return result; - } - - @Deprecated - public static <T> Decorator<T> get(Class<T> type, String context) { - DecoratorContext<T> decoratorContext = getDecoratorContext(type, context); - Decorator<T> result = decoratorContext == null ? null : decoratorContext.getDecorator(); - return result; - } - /** - * Register a new decorator in the cache. - * - * @param <T> type of data decorated - * @param context the name decorator - * @param decorator the decorator to register - */ - @Deprecated - public static <T> void register(String context, Decorator<T> decorator) { - - DecoratorContext<T> result = getDecoratorContext(decorator.getInternalClass(), context); - - if (result != null) { - throw new IllegalArgumentException("there is an already register decorator " + result); - } - - if (decorators == null) { - decorators = new java.util.ArrayList<DecoratorContext<?>>(); - } - decorators.add(new DecoratorContext<T>(context, decorator)); - } - - @Deprecated - public static void clear() { - if (decorators != null) { - decorators.clear(); - } - } - - /** * Sort a list of data based on the first token property of a given context * in a given decorator. * @@ -189,71 +133,6 @@ } } - @SuppressWarnings({"unchecked"}) - @Deprecated - protected static <T> DecoratorContext<T> getDecoratorContext(Class<T> type, String context) { - DecoratorContext<T> result = null; - if (decorators != null) { - for (DecoratorContext<?> d : decorators) { - if (type == null) { - if (d.accept(context)) { - result = (DecoratorContext<T>) d; - break; - } - continue; - } - if (d.accept(type, context)) { - result = (DecoratorContext<T>) d; - break; - } - } - } - return result; - } - - @Deprecated - public static class DecoratorContext<T> { - - /** - * the context name of the decorator - */ - final String context; - /** - * the decorator - */ - final Decorator<T> decorator; - - public DecoratorContext(String context, Decorator<T> decorator) { - this.context = context; - this.decorator = decorator; - } - - public String getContext() { - return context; - } - - public Decorator<T> getDecorator() { - return decorator; - } - - public Class<T> getType() { - return decorator.getInternalClass(); - } - - public boolean accept(Class<?> type, String context) { - return getType().isAssignableFrom(type) && accept(context); - } - - public boolean accept(String context) { - return ((this.context == null && context == null) || (this.context != null && this.context.equals(context))); - } - - @Override - public String toString() { - return super.toString() + "<type: " + getType().getName() + ", context :" + context + ">"; - } - } - public static <O> Context<O> createJXPathContext(String expression) { List<String> lTokens = new ArrayList<String>(); StringBuilder buffer = new StringBuilder();

1 0

r1619 - in branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo: . component/jaxx/navigation
by tchemit＠users.nuiton.org 29 Oct '09

29 Oct '09

Author: tchemit Date: 2009-10-29 19:21:10 +0100 (Thu, 29 Oct 2009) New Revision: 1619 Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/FullNavigationTreeDemo.jaxx Log: fix context error Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java =================================================================== --- branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java 2009-10-29 17:06:25 UTC (rev 1618) +++ branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java 2009-10-29 18:21:10 UTC (rev 1619) @@ -84,6 +84,9 @@ // share a unique DecoratorProviderListCellRenderer DecoratorProvider decoratorProvider = rootContext.getContextValue(DecoratorProvider.class); + + context.add(decoratorProvider); + context.add(new DecoratorProviderListCellRenderer(decoratorProvider)); // instanciate ui Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/FullNavigationTreeDemo.jaxx =================================================================== --- branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/FullNavigationTreeDemo.jaxx 2009-10-29 17:06:25 UTC (rev 1618) +++ branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/FullNavigationTreeDemo.jaxx 2009-10-29 18:21:10 UTC (rev 1619) @@ -28,11 +28,14 @@ import jaxx.runtime.SwingUtil; import jaxx.demo.component.jaxx.navigation.content.*; +import jaxx.runtime.decorator.DecoratorProvider; + private final FullNavigationTreeHelper helper = new FullNavigationTreeHelper(); private final ContentUIHandler contentUIHandler = new ContentUIHandler(); setContextValue(helper); setContextValue(contentUIHandler); helper.setTree(this, navigation); +log.info("decorator provider = "+getContextValue(DecoratorProvider.class)); helper.createModel(this); @Override @@ -73,8 +76,6 @@ showsRootHandles='false' model='{helper.createTreeModel(this)}' selectionModel="{helper.createTreeHandler(this)}"/> -  - </JScrollPane> <JPanel id="content" layout="{contentLayout}" />

1 0

r1618 - in branches/jaxx-2.X: jaxx-demo jaxx-swing-action maven-jaxx-plugin
by tchemit＠users.nuiton.org 29 Oct '09

29 Oct '09

Author: tchemit Date: 2009-10-29 18:06:25 +0100 (Thu, 29 Oct 2009) New Revision: 1618 Modified: branches/jaxx-2.X/jaxx-demo/ branches/jaxx-2.X/jaxx-swing-action/ branches/jaxx-2.X/maven-jaxx-plugin/ Log: svn:ingore idea files Property changes on: branches/jaxx-2.X/jaxx-demo ___________________________________________________________________ Modified: svn:ignore - target + target *.iml Property changes on: branches/jaxx-2.X/jaxx-swing-action ___________________________________________________________________ Modified: svn:ignore - target + target *.iml Property changes on: branches/jaxx-2.X/maven-jaxx-plugin ___________________________________________________________________ Modified: svn:ignore - target + target *.iml

1 0

r1617 - in branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo: . component/jaxx/navigation component/jaxx/navigation/content
by tchemit＠users.nuiton.org 29 Oct '09

29 Oct '09

Author: tchemit Date: 2009-10-29 17:48:10 +0100 (Thu, 29 Oct 2009) New Revision: 1617 Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/FullNavigationTreeHelper.java branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/FullNavigationTreeModelBuilder.java branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ActorsContentUI.jaxx branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ContentUI.jaxx branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/MoviesContentUI.jaxx Log: - use DecoratorProviderListCellRenderer Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java =================================================================== --- branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java 2009-10-29 14:55:21 UTC (rev 1616) +++ branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java 2009-10-29 16:48:10 UTC (rev 1617) @@ -20,26 +20,28 @@ */ package jaxx.demo; -import jaxx.runtime.swing.ErrorDialogUI; import jaxx.runtime.JAXXContext; +import jaxx.runtime.context.DefaultApplicationContext; +import jaxx.runtime.context.JAXXContextEntryDef; import jaxx.runtime.context.JAXXInitialContext; +import jaxx.runtime.decorator.DecoratorProvider; +import jaxx.runtime.swing.AboutPanel; +import jaxx.runtime.swing.ErrorDialogUI; +import jaxx.runtime.swing.editor.config.ConfigUI; +import jaxx.runtime.swing.editor.config.ConfigUIBuilder; +import jaxx.runtime.swing.editor.config.model.ConfigUIModel; import jaxx.runtime.swing.navigation.NavigationTreeNode; +import jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.i18n.I18n; import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; -import java.awt.Desktop; +import javax.swing.*; +import java.awt.*; import java.net.URL; import java.util.Locale; -import javax.swing.SwingUtilities; -import jaxx.runtime.context.DefaultApplicationContext; -import jaxx.runtime.context.JAXXContextEntryDef; -import jaxx.runtime.swing.AboutPanel; -import jaxx.runtime.swing.editor.config.ConfigUI; -import jaxx.runtime.swing.editor.config.ConfigUIBuilder; -import jaxx.runtime.swing.editor.config.model.ConfigUIModel; -import org.nuiton.i18n.I18n; /** * Le handler de l'ui principale. @@ -49,7 +51,9 @@ */ public class DemoUIHandler { //implements JAXXHelp { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** + * to use log facility, just put in your code: log.info(\"...\"); + */ static private Log log = LogFactory.getLog(DemoUIHandler.class); static final JAXXContextEntryDef<DemoUI> MAIN_UI_ENTRY_DEF = jaxx.runtime.Util.newContextEntryDef("mainui", DemoUI.class); @@ -78,6 +82,10 @@ // share config context.add(rootContext.getContextValue(DemoConfig.class)); + // share a unique DecoratorProviderListCellRenderer + DecoratorProvider decoratorProvider = rootContext.getContextValue(DecoratorProvider.class); + context.add(new DecoratorProviderListCellRenderer(decoratorProvider)); + // instanciate ui DemoUI ui = new DemoUI(context); @@ -145,7 +153,7 @@ // scan main ui DemoUI ui = getUI(rootContext); - NavigationTreeNode node = null; + NavigationTreeNode node; String nodePath = null; if (ui != null) { @@ -181,7 +189,7 @@ * mode console (c'est à dire en mode plein écran exclusif), sinon on * passe en mode fenetré normal. * - * @param context l'ui principale de l'application + * @param context l'ui principale de l'application * @param fullscreen le nouvel état requis. */ public void changeScreen(JAXXContext context, final boolean fullscreen) { @@ -250,7 +258,7 @@ ConfigUIBuilder.showConfigUI(configUI, ui, false); } -// @Override + // @Override public void showHelp(JAXXContext context, String helpId) { // DemoUI mainUI = getUI(context); // ObserveHelpBroker helpBroker = context.getContextValue(ObserveHelpBroker.class); Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java =================================================================== --- branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java 2009-10-29 14:55:21 UTC (rev 1616) +++ branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java 2009-10-29 16:48:10 UTC (rev 1617) @@ -20,7 +20,11 @@ */ package jaxx.demo; +import jaxx.demo.component.jaxx.navigation.Movie; +import jaxx.demo.component.jaxx.navigation.People; +import jaxx.runtime.SwingUtil; import jaxx.runtime.context.DefaultApplicationContext; +import jaxx.runtime.decorator.DecoratorProvider; import jaxx.runtime.swing.ErrorDialogUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -28,10 +32,7 @@ import static org.nuiton.i18n.I18n._; import org.nuiton.util.StringUtil; -import jaxx.runtime.SwingUtil; - /** - * * @author chemit */ public class RunDemo { @@ -41,17 +42,13 @@ */ private static Log log = LogFactory.getLog(RunDemo.class); /** - * When application was started - */ - private static long startingTime = System.nanoTime(); - /** * The singleton instance of the main context */ protected static DefaultApplicationContext context; public static void main(String[] args) { - startingTime = System.nanoTime(); + long startingTime = System.nanoTime(); log.info("JAXX Demo start at " + new java.util.Date() + " args: " + java.util.Arrays.toString(args)); try { @@ -81,6 +78,20 @@ // share the config rootContext.setContextValue(config); + // init decorator provider + DecoratorProvider p = new DecoratorProvider() { + + @Override + protected void loadDecorators() { + + registerMultiJXPathDecorator(Movie.class, "${title}$s##${year}$s", "##", " - "); + registerMultiJXPathDecorator(People.class, "${firstName}$s##${lastName}$s", "##", " "); + } + }; + + // share the decorator provider + rootContext.setContextValue(p); + long t00 = System.nanoTime(); // init i18n @@ -141,6 +152,7 @@ * l'context partagée. * * Note : Cette méthode ne peut être appelée qu'une seule fois. + * * @return l'context partagée * @throws IllegalStateException si un contexte applicatif a déja été positionné. */ Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/FullNavigationTreeHelper.java =================================================================== --- branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/FullNavigationTreeHelper.java 2009-10-29 14:55:21 UTC (rev 1616) +++ branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/FullNavigationTreeHelper.java 2009-10-29 16:48:10 UTC (rev 1617) @@ -20,10 +20,10 @@ */ package jaxx.demo.component.jaxx.navigation; -import jaxx.runtime.JAXXObject; import jaxx.runtime.JAXXContext; +import jaxx.runtime.JAXXObject; +import jaxx.runtime.Util; import jaxx.runtime.context.JAXXContextEntryDef; -import jaxx.runtime.decorator.DecoratorUtils; import jaxx.runtime.swing.CardLayout2; import jaxx.runtime.swing.ErrorDialogUI; import jaxx.runtime.swing.navigation.NavigationTreeHandler; @@ -34,11 +34,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - +import javax.swing.*; import java.util.Arrays; import java.util.List; -import javax.swing.JPanel; -import jaxx.runtime.Util; /** * @@ -47,17 +45,17 @@ */ public class FullNavigationTreeHelper extends NavigationTreeHelper { - static { - // register decorator one for all - - DecoratorUtils.register( - Movie.class.getSimpleName(), - DecoratorUtils.newMultiJXPathDecorator(Movie.class, "${title}$s##${year}$s", "##", " - ")); - - DecoratorUtils.register( - People.class.getSimpleName(), - DecoratorUtils.newMultiJXPathDecorator(People.class, "${firstName}$s##${lastName}$s", "##", " ")); - } +// static { +// // register decorator one for all +// +// DecoratorUtils.register( +// Movie.class.getSimpleName(), +// DecoratorUtils.newMultiJXPathDecorator(Movie.class, "${title}$s##${year}$s", "##", " - ")); +// +// DecoratorUtils.register( +// People.class.getSimpleName(), +// DecoratorUtils.newMultiJXPathDecorator(People.class, "${firstName}$s##${lastName}$s", "##", " ")); +// } /** * Logger */ Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/FullNavigationTreeModelBuilder.java =================================================================== --- branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/FullNavigationTreeModelBuilder.java 2009-10-29 14:55:21 UTC (rev 1616) +++ branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/FullNavigationTreeModelBuilder.java 2009-10-29 16:48:10 UTC (rev 1617) @@ -20,14 +20,17 @@ */ package jaxx.demo.component.jaxx.navigation; +import jaxx.demo.component.jaxx.navigation.content.ActorContentUI; +import jaxx.demo.component.jaxx.navigation.content.ActorsContentUI; +import jaxx.demo.component.jaxx.navigation.content.MovieContentUI; +import jaxx.demo.component.jaxx.navigation.content.MoviesContentUI; import jaxx.runtime.JAXXContext; import jaxx.runtime.decorator.Decorator; -import jaxx.runtime.decorator.DecoratorUtils; +import jaxx.runtime.decorator.DecoratorProvider; import jaxx.runtime.swing.navigation.NavigationTreeModelBuilder; import jaxx.runtime.swing.navigation.NavigationTreeNode; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import jaxx.demo.component.jaxx.navigation.content.*; import static org.nuiton.i18n.I18n._; import java.util.List; @@ -39,7 +42,6 @@ */ public class FullNavigationTreeModelBuilder extends NavigationTreeModelBuilder { - private static final long serialVersionUID = 1l; /** * Logger */ @@ -67,8 +69,9 @@ } - Decorator<Movie> mDecorator = DecoratorUtils.get(Movie.class.getSimpleName()); - Decorator<People> pDecorator = DecoratorUtils.get(People.class.getSimpleName()); + DecoratorProvider decoratorProvider = getModel().getContext().getContextValue(DecoratorProvider.class); + Decorator<Movie> mDecorator = decoratorProvider.getDecorator(Movie.class); + Decorator<People> pDecorator = decoratorProvider.getDecorator(People.class); // construction du noeud root // il ne contient pas de context et ne sera pas visible Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ActorsContentUI.jaxx =================================================================== --- branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ActorsContentUI.jaxx 2009-10-29 14:55:21 UTC (rev 1616) +++ branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ActorsContentUI.jaxx 2009-10-29 16:48:10 UTC (rev 1617) @@ -23,8 +23,7 @@ <script><![CDATA[ import jaxx.runtime.SwingUtil; import jaxx.demo.component.jaxx.navigation.*; -import jaxx.runtime.decorator.DecoratorUtils; -import jaxx.runtime.swing.renderer.MultiDecoratorListCellRenderer; +import jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer; import jaxx.runtime.swing.navigation.NavigationTreeNode; @Override @@ -56,7 +55,7 @@ columnHeaderView='{toolbar}' horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}' verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}'> - <JList id='list' model='{new DefaultListModel()}' cellRenderer='{getContextValue(MultiDecoratorListCellRenderer.class)}'/> + <JList id='list' model='{new DefaultListModel()}' cellRenderer='{getContextValue(DecoratorProviderListCellRenderer.class)}'/> </JScrollPane> <JToolBar id='toolbar' constraints='BorderLayout.SOUTH' floatable='false'> Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ContentUI.jaxx =================================================================== --- branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ContentUI.jaxx 2009-10-29 14:55:21 UTC (rev 1616) +++ branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ContentUI.jaxx 2009-10-29 16:48:10 UTC (rev 1617) @@ -26,18 +26,9 @@ <script><![CDATA[ import jaxx.runtime.SwingUtil; import jaxx.demo.component.jaxx.navigation.*; -import jaxx.runtime.decorator.DecoratorUtils; -import jaxx.runtime.decorator.MultiJXPathDecorator; -import jaxx.runtime.swing.renderer.MultiDecoratorListCellRenderer; import jaxx.runtime.swing.navigation.NavigationTreeNode; import jaxx.runtime.swing.navigation.NavigationContentUI; -// init shared list decorator -MultiJXPathDecorator<?> d0 = (MultiJXPathDecorator<?>)DecoratorUtils.get(People.class.getSimpleName()); -MultiJXPathDecorator<?> d1 = (MultiJXPathDecorator<?>)DecoratorUtils.get(Movie.class.getSimpleName()); -MultiDecoratorListCellRenderer r = new MultiDecoratorListCellRenderer(d0,d1); -setContextValue(r); - ContentUIHandler getHandler() { return getContextValue(ContentUIHandler.class); } Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/MoviesContentUI.jaxx =================================================================== --- branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/MoviesContentUI.jaxx 2009-10-29 14:55:21 UTC (rev 1616) +++ branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/MoviesContentUI.jaxx 2009-10-29 16:48:10 UTC (rev 1617) @@ -23,8 +23,7 @@ <script><![CDATA[ import jaxx.runtime.SwingUtil; import jaxx.demo.component.jaxx.navigation.*; -import jaxx.runtime.decorator.DecoratorUtils; -import jaxx.runtime.swing.renderer.MultiDecoratorListCellRenderer; +import jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer; import jaxx.runtime.swing.navigation.NavigationTreeNode; @Override @@ -56,7 +55,7 @@ columnHeaderView='{toolbar}' horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}' verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}'> - <JList id='list' model='{new DefaultListModel()}' cellRenderer='{getContextValue(MultiDecoratorListCellRenderer.class)}'/> + <JList id='list' model='{new DefaultListModel()}' cellRenderer='{getContextValue(DecoratorProviderListCellRenderer.class)}'/> </JScrollPane> <JToolBar id='toolbar' opaque='false' constraints='BorderLayout.SOUTH' floatable='false'>

1 0

r1616 - branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer
by tchemit＠users.nuiton.org 29 Oct '09

29 Oct '09

Author: tchemit Date: 2009-10-29 15:55:21 +0100 (Thu, 29 Oct 2009) New Revision: 1616 Added: branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderTableCellRenderer.java Log: add a DecoratorProviderTableCellRenderer Added: branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderTableCellRenderer.java =================================================================== --- branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderTableCellRenderer.java (rev 0) +++ branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderTableCellRenderer.java 2009-10-29 14:55:21 UTC (rev 1616) @@ -0,0 +1,56 @@ +package jaxx.runtime.swing.renderer; + +import jaxx.runtime.decorator.Decorator; +import jaxx.runtime.decorator.DecoratorProvider; + +import javax.swing.*; +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.TableCellRenderer; +import java.awt.*; + +/** + * A {@link TableCellRenderer} which use decorators from the {@link #provider} to obtain the text to display. + * + * The interest of this renderer is to define a unique renderer for your application (put it in JAXXContext) + * and then use it simply :) + * + * User: chemit + * Date: 29 oct. 2009 + * Time: 03:00:53 + * + * @see DecoratorProvider + * @since 2.0.0 + */ +public class DecoratorProviderTableCellRenderer implements TableCellRenderer { + + /** + * Delegate cell renderer + */ + protected TableCellRenderer delegate; + + /** + * provider of decorators + */ + protected DecoratorProvider provider; + + public DecoratorProviderTableCellRenderer(DecoratorProvider provider) { + this(new DefaultTableCellRenderer(), provider); + } + + public DecoratorProviderTableCellRenderer(TableCellRenderer delegate, DecoratorProvider provider) { + this.delegate = delegate; + this.provider = provider; + } + + @Override + public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasfocus, int row, int column) { + if (value != null) { + Decorator<?> decorator = provider.getDecorator(value); + + if (decorator != null) { + value = decorator.toString(value); + } + } + return delegate.getTableCellRendererComponent(table, value, isSelected, hasfocus, row, column); + } +} \ No newline at end of file Property changes on: branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderTableCellRenderer.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL

1 0

r1615 - branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer
by tchemit＠users.nuiton.org 29 Oct '09

29 Oct '09

Author: tchemit Date: 2009-10-29 03:08:58 +0100 (Thu, 29 Oct 2009) New Revision: 1615 Added: branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderListCellRenderer.java Log: add a DecoratorProviderListCellRenderer Added: branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderListCellRenderer.java =================================================================== --- branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderListCellRenderer.java (rev 0) +++ branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderListCellRenderer.java 2009-10-29 02:08:58 UTC (rev 1615) @@ -0,0 +1,53 @@ +package jaxx.runtime.swing.renderer; + +import jaxx.runtime.decorator.Decorator; +import jaxx.runtime.decorator.DecoratorProvider; + +import javax.swing.*; +import java.awt.*; + +/** + * A {@link ListCellRenderer} which use decorators from the {@link #provider} to obtain the text to display. + * + * The interest of this renderer is to define a unique renderer for your application (put it in JAXXContext) + * and then use it simply :) + * + * User: chemit + * Date: 29 oct. 2009 + * Time: 03:00:53 + * @since 2.0.0 + * @see DecoratorProvider + */ +public class DecoratorProviderListCellRenderer implements ListCellRenderer { + + /** + * Delegate cell renderer + */ + protected ListCellRenderer delegate; + + /** + * provider of decorators + */ + protected DecoratorProvider provider; + + public DecoratorProviderListCellRenderer(DecoratorProvider provider) { + this(new DefaultListCellRenderer(), provider); + } + + public DecoratorProviderListCellRenderer(ListCellRenderer delegate, DecoratorProvider provider) { + this.delegate = delegate; + this.provider = provider; + } + + @Override + public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { + if (value != null) { + Decorator<?> decorator = provider.getDecorator(value); + + if (decorator != null) { + value = decorator.toString(value); + } + } + return delegate.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); + } +} Property changes on: branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderListCellRenderer.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL

1 0

r1614 - in branches/jaxx-2.X/jaxx-runtime: . src/main/java/jaxx/runtime/decorator src/test/java/jaxx/runtime/decorator
by tchemit＠users.nuiton.org 29 Oct '09

29 Oct '09

Author: tchemit Date: 2009-10-29 02:42:54 +0100 (Thu, 29 Oct 2009) New Revision: 1614 Added: branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorProvider.java branches/jaxx-2.X/jaxx-runtime/src/test/java/jaxx/runtime/decorator/DecoratorProviderTest.java Modified: branches/jaxx-2.X/jaxx-runtime/ branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorUtils.java branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/decorator/JXPathDecorator.java Log: - add a DecoratorProvider to store your decorators - deprecate all states in DecoratorUtils (use a DecoratorProvider to store decorators) Property changes on: branches/jaxx-2.X/jaxx-runtime ___________________________________________________________________ Modified: svn:ignore - target *.log *.iml + target *.log Added: branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorProvider.java =================================================================== --- branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorProvider.java (rev 0) +++ branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorProvider.java 2009-10-29 01:42:54 UTC (rev 1614) @@ -0,0 +1,226 @@ +package jaxx.runtime.decorator; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.util.ArrayList; +import java.util.List; + +/** + * A decorator provider. + * + * Implements the method {@link #loadDecorators()} to fill the decorators availables. + * + * Then can obtain decorator via the methods {@code getDecorator(...)} + * + * User: chemit + * Date: 28 oct. 2009 + * Time: 19:40:48 + */ +public abstract class DecoratorProvider { + + /** + * Logger + */ + private static final Log log = LogFactory.getLog(JXPathDecorator.class); + /** + * Registred decorators. + */ + protected List<DecoratorContext<?>> decorators; + + public DecoratorProvider() { + loadDecorators(); + } + + /** + * Load all decorators of the provider + */ + protected abstract void loadDecorators(); + + /** + * Obtain a decorator for the given object. + * + * @param object object of decorated object + * @param <O> object of decorated object + * @return the decorator or {@code null} if not found + */ + @SuppressWarnings({"unchecked"}) + public <O> Decorator<O> getDecorator(O object) { + return getDecorator(object, null); + } + + /** + * Obtain a decorator given a object and an extra name to qualify the context. + * + * @param object object of decorated object + * @param name extra name to qualify the decorator to use + * @param <O> object of decorated object + * @return the decorator or {@code null} if not found + */ + @SuppressWarnings({"unchecked"}) + public <O> Decorator<O> getDecorator(O object, String name) { + Class<O> k = (Class<O>) object.getClass(); + return getDecorator(k, name); + } + + /** + * Obtain a decorator given a type. + * + * @param type type of decorated object + * @param <O> type of decorated object + * @return the decorator or {@code null} if not found + */ + public <O> Decorator<O> getDecorator(Class<O> type) { + return getDecorator(type, null); + } + + /** + * Obtain a decorator given a type and a extra name. + * + * @param type type of decorated object + * @param name extra name to qualify the decorator to use + * @param <O> type of decorated object + * @return the decorator or {@code null} if not found + */ + public <O> Decorator<O> getDecorator(Class<O> type, String name) { + DecoratorContext<O> d = getDecoratorContext(type, name); + return d == null ? null : d.getDecorator(); + } + + public void reload() { + clear(); + loadDecorators(); + } + + public void clear() { + if (decorators != null) { + decorators.clear(); + } + } + + protected void registerPropertyDecorator(Class<?> klass, String expression) { + registerPropertyDecorator(klass, null, expression); + } + + protected void registerJXPathDecorator(Class<?> klass, String expression) { + registerJXPathDecorator(klass, null, expression); + } + + protected void registerMultiJXPathDecorator(Class<?> klass, String expression, String separator, String separatorReplacement) { + registerMultiJXPathDecorator(klass, null, expression, separator, separatorReplacement); + } + + protected void registerPropertyDecorator(Class<?> klass, String name, String expression) { + Decorator<?> decorator = DecoratorUtils.newPropertyDecorator(klass, expression); + registerDecorator(name, decorator); + } + + protected void registerJXPathDecorator(Class<?> klass, String name, String expression) { + Decorator<?> decorator = DecoratorUtils.newJXPathDecorator(klass, expression); + registerDecorator(name, decorator); + } + + protected void registerMultiJXPathDecorator(Class<?> klass, String name, String expression, String separator, String separatorReplacement) { + Decorator<?> decorator = DecoratorUtils.newMultiJXPathDecorator(klass, expression, separator, separatorReplacement); + registerDecorator(name, decorator); + } + + protected void registerDecorator(Decorator<?> decorator) { + registerDecorator(null, decorator); + } + + /** + * Register a new decorator in the cache of the provider. + * + * @param <T> type of data decorated + * @param context the name decorator + * @param decorator the decorator to register + */ + protected <T> void registerDecorator(String context, Decorator<T> decorator) { + + // obtain the decorator context + DecoratorContext<?> result = getDecoratorContext(decorator.getInternalClass(), context); + + if (result != null) { + throw new IllegalArgumentException("there is an already register decorator with context " + result); + } + + DecoratorContext<T> decoratorContext = new DecoratorContext<T>(context, decorator); + if (log.isDebugEnabled()) { + log.debug(decoratorContext); + } + getDecorators().add(decoratorContext); + } + + protected List<DecoratorContext<?>> getDecorators() { + if (decorators == null) { + decorators = new ArrayList<DecoratorContext<?>>(); + } + return decorators; + } + + @SuppressWarnings({"unchecked"}) + protected <T> DecoratorContext<T> getDecoratorContext(Class<T> type, String context) { + DecoratorContext<T> result = null; + if (decorators != null) { + for (DecoratorContext<?> d : decorators) { + if (type == null) { + if (d.accept(context)) { + result = (DecoratorContext<T>) d; + break; + } + continue; + } + if (d.accept(type, context)) { + result = (DecoratorContext<T>) d; + break; + } + } + } + return result; + } + + public static class DecoratorContext<T> { + + /** + * the context name of the decorator + */ + final String context; + /** + * the decorator + */ + final Decorator<T> decorator; + + public DecoratorContext(String context, Decorator<T> decorator) { + this.context = context; + this.decorator = decorator; + } + + public String getContext() { + return context; + } + + public Decorator<T> getDecorator() { + return decorator; + } + + public Class<T> getType() { + return decorator.getInternalClass(); + } + + public boolean accept(Class<?> type, String context) { + boolean accept = getType().isAssignableFrom(type) && accept(context); + return accept; + } + + public boolean accept(String context) { + return ((this.context == null && context == null) || (this.context != null && this.context.equals(context))); + } + + @Override + public String toString() { + return super.toString() + "<type: " + getType().getName() + ", context :" + context + ">"; + } + } + +} Property changes on: branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorProvider.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Modified: branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorUtils.java =================================================================== --- branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorUtils.java 2009-10-28 07:54:21 UTC (rev 1613) +++ branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorUtils.java 2009-10-29 01:42:54 UTC (rev 1614) @@ -20,18 +20,14 @@ */ package jaxx.runtime.decorator; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; -import java.util.StringTokenizer; +import jaxx.runtime.decorator.JXPathDecorator.Context; import jaxx.runtime.decorator.JXPathDecorator.JXPathComparator; -import jaxx.runtime.decorator.JXPathDecorator.Context; +import java.util.*; + /** - * * Some usefull methods on {@link Decorator} to create, decorators and obtain decorators. - * + * * To create a new decorator, use one of the methods : * <ul> * <li>{@link #newPropertyDecorator(Class, String)}</li> @@ -40,7 +36,7 @@ * <li>{@link #newMultiJXPathDecorator(Class, String, String, String)})</li> * </ul> * - * + * * To register a new decorator, use the method {@link #register(String, Decorator)}. * * To obtain a registred decorator, use the method {@link #get(String)} @@ -50,7 +46,7 @@ * To sort a list of data, using a {@link JXPathDecorator}, use the method * {@link #sort(JXPathDecorator, List, int)}. * - * + * * @author tony * @since 1.7.2 (was previously {@code jaxx.runtime.DecoratorUtils}) */ @@ -58,11 +54,13 @@ /** * Registred decorators. + * @deprecated prefer use a {@link DecoratorProvider} */ + @Deprecated protected static List<DecoratorContext<?>> decorators; /** - * Factory method to instanciate a new {@link PropertyDecorator} for the + * Factory method to instanciate a new {@link PropertyDecorator} for the * given class {@code internlaClass} and a readable property name. * * @param internalClass the class of the objects decorated by the new decorator @@ -104,17 +102,17 @@ } public static <O> MultiJXPathDecorator<O> newMultiJXPathDecorator(Class<O> internalClass, - String expression, - String separator) + String expression, + String separator) throws IllegalArgumentException, NullPointerException { return newMultiJXPathDecorator(internalClass, expression, separator, separator); } public static <O> MultiJXPathDecorator<O> newMultiJXPathDecorator(Class<O> internalClass, - String expression, - String separator, - String separatorReplacement) + String expression, + String separator, + String separatorReplacement) throws IllegalArgumentException, NullPointerException { Context<O>[] contexts = createMultiJXPathContext(expression, separator, separatorReplacement); @@ -122,11 +120,13 @@ return new MultiJXPathDecorator<O>(internalClass, expression, separator, separatorReplacement, contexts); } + @Deprecated public static <T> Decorator<T> get(String context) { Decorator<T> result = get(null, context); return result; } + @Deprecated public static <T> Decorator<T> get(Class<T> type, String context) { DecoratorContext<T> decoratorContext = getDecoratorContext(type, context); Decorator<T> result = decoratorContext == null ? null : decoratorContext.getDecorator(); @@ -136,10 +136,11 @@ /** * Register a new decorator in the cache. * - * @param <T> type of data decorated - * @param context the name decorator + * @param <T> type of data decorated + * @param context the name decorator * @param decorator the decorator to register */ + @Deprecated public static <T> void register(String context, Decorator<T> decorator) { DecoratorContext<T> result = getDecoratorContext(decorator.getInternalClass(), context); @@ -154,6 +155,7 @@ decorators.add(new DecoratorContext<T>(context, decorator)); } + @Deprecated public static void clear() { if (decorators != null) { decorators.clear(); @@ -164,7 +166,7 @@ * Sort a list of data based on the first token property of a given context * in a given decorator. * - * @param <O> type of data to sort + * @param <O> type of data to sort * @param decorator the decorator to use to sort * @param datas the list of data to sort * @param pos the index of context to used in decorator to obtain sorted property. @@ -188,6 +190,7 @@ } @SuppressWarnings({"unchecked"}) + @Deprecated protected static <T> DecoratorContext<T> getDecoratorContext(Class<T> type, String context) { DecoratorContext<T> result = null; if (decorators != null) { @@ -208,9 +211,16 @@ return result; } + @Deprecated public static class DecoratorContext<T> { + /** + * the context name of the decorator + */ final String context; + /** + * the decorator + */ final Decorator<T> decorator; public DecoratorContext(String context, Decorator<T> decorator) { Modified: branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/decorator/JXPathDecorator.java =================================================================== --- branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/decorator/JXPathDecorator.java 2009-10-28 07:54:21 UTC (rev 1613) +++ branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/decorator/JXPathDecorator.java 2009-10-29 01:42:54 UTC (rev 1614) @@ -24,14 +24,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.util.Arrays; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** - * JXPath decorator based on {@link String#format(String, Object[])} method. + * JXPath decorator based on {@link String#format(String, Object...)} method. * * To use it, give to him a expression where all jxpath to apply on bean are boxed in <code>${}</code>. * @@ -46,10 +42,10 @@ * assert "expr = %1$s" == d.toString(d); * </pre> * + * @author chemit * @param <O> type of data to decorate - * @author chemit * @see Decorator - * @since 1.7.2 (was previously {@code jaxx.runtime.JXPathDecorat}) + * @since 1.7.2 (was previously {@code jaxx.runtime.JXPathDecorator}) */ public class JXPathDecorator<O> extends Decorator<O> { @@ -58,11 +54,17 @@ * Logger */ private static final Log log = LogFactory.getLog(JXPathDecorator.class); - /** the computed context of the decorator */ + /** + * the computed context of the decorator + */ protected Context<O> context; - /** nb jxpath tokens to compute */ + /** + * nb jxpath tokens to compute + */ protected int nbToken; - /** the initial expression used to compute the decorator context. */ + /** + * the initial expression used to compute the decorator context. + */ protected String initialExpression; protected JXPathDecorator(Class<O> internalClass, String expression, Context<O> context) throws IllegalArgumentException, NullPointerException { @@ -174,11 +176,13 @@ public static class Context<O> implements java.io.Serializable { /** - * expression to format using {@link String#format(String, Object[])}, all variables are compute + * expression to format using {@link String#format(String, Object...)}, all variables are compute * using using the jxpath tokens. */ protected String expression; - /** list of jxpath tokens to apply on expression */ + /** + * list of jxpath tokens to apply on expression + */ protected String[] tokens; protected transient Comparator<O> comparator; private static final long serialVersionUID = 1L; Added: branches/jaxx-2.X/jaxx-runtime/src/test/java/jaxx/runtime/decorator/DecoratorProviderTest.java =================================================================== --- branches/jaxx-2.X/jaxx-runtime/src/test/java/jaxx/runtime/decorator/DecoratorProviderTest.java (rev 0) +++ branches/jaxx-2.X/jaxx-runtime/src/test/java/jaxx/runtime/decorator/DecoratorProviderTest.java 2009-10-29 01:42:54 UTC (rev 1614) @@ -0,0 +1,153 @@ +package jaxx.runtime.decorator; + +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.io.File; + +/** + * User: chemit + * Date: 28 oct. 2009 + * Time: 21:28:46 + */ +public class DecoratorProviderTest { + private static final String BY_NAME = "name"; + + static class MyDecoratorProvider extends DecoratorProvider { + + @Override + protected void loadDecorators() { + + registerPropertyDecorator(File.class, "name"); + registerPropertyDecorator(File.class, BY_NAME, "parent"); + + + registerJXPathDecorator(Class.class, "${simpleName}$s"); + registerJXPathDecorator(Class.class, BY_NAME, "${name}$s"); + + registerMultiJXPathDecorator(Data.class, "${name}$s", "-", " "); + registerMultiJXPathDecorator(Data.class, BY_NAME, "${pos}$d", "-", " "); + } + } + + static DecoratorProvider provider; + + @BeforeClass + public static void beforeTest() throws Exception { + provider = new MyDecoratorProvider(); + } + + @Test + public void testGetDecoratorByObject() throws Exception { + + File f = new File("myFile"); + Data d = new Data(0, "name"); + Class<?> k = File.class; + + Decorator<File> fileDecorator = provider.getDecorator(f); + Assert.assertNotNull(fileDecorator); + Assert.assertEquals(File.class, fileDecorator.getInternalClass()); + Assert.assertEquals("myFile", fileDecorator.toString(f)); + + Decorator<?> classDecorator = provider.getDecorator(Class.class); + Assert.assertNotNull(classDecorator); + Assert.assertEquals(Class.class, classDecorator.getInternalClass()); + Assert.assertEquals("File", classDecorator.toString(k)); + + Decorator<Data> dataDecorator = provider.getDecorator(d); + Assert.assertNotNull(dataDecorator); + Assert.assertEquals(Data.class, dataDecorator.getInternalClass()); + Assert.assertEquals("name", dataDecorator.toString(d)); + } + + @Test + public void testGetDecoratorByObjectAndName() throws Exception { + + File f = new File("myFile"); + Data d = new Data(0, "name"); + Class<?> k = File.class; + + Decorator<File> fileDecorator = provider.getDecorator(f, BY_NAME); + Assert.assertNotNull(fileDecorator); + Assert.assertEquals(File.class, fileDecorator.getInternalClass()); + Assert.assertEquals("null", fileDecorator.toString(f)); + + Decorator<Class> classDecorator = provider.getDecorator(Class.class, BY_NAME); + Assert.assertNotNull(classDecorator); + Assert.assertEquals(Class.class, classDecorator.getInternalClass()); + Assert.assertEquals("java.io.File", classDecorator.toString(k)); + + + Decorator<Data> dataDecorator = provider.getDecorator(d, BY_NAME); + Assert.assertNotNull(dataDecorator); + Assert.assertEquals(Data.class, dataDecorator.getInternalClass()); + Assert.assertEquals("0", dataDecorator.toString(d)); + } + + @Test + public void testGetDecoratorByType() throws Exception { + + File f = new File("myFile"); + Data d = new Data(0, "name"); + Class<?> k = File.class; + + Decorator<File> fileDecorator = provider.getDecorator(File.class); + Assert.assertNotNull(fileDecorator); + Assert.assertEquals(File.class, fileDecorator.getInternalClass()); + Assert.assertEquals("myFile", fileDecorator.toString(f)); + + Decorator<Class> classDecorator = provider.getDecorator(Class.class); + Assert.assertNotNull(classDecorator); + Assert.assertEquals(Class.class, classDecorator.getInternalClass()); + Assert.assertEquals("File", classDecorator.toString(k)); + + Decorator<Data> dataDecorator = provider.getDecorator(Data.class); + Assert.assertNotNull(dataDecorator); + Assert.assertEquals(Data.class, dataDecorator.getInternalClass()); + Assert.assertEquals("name", dataDecorator.toString(d)); + } + + @Test + public void testGetDecoratorByTypeAndName() throws Exception { + File f = new File("myFile"); + Data d = new Data(0, "name"); + Class<?> k = File.class; + + Decorator<File> fileDecorator = provider.getDecorator(File.class, BY_NAME); + Assert.assertNotNull(fileDecorator); + Assert.assertEquals(File.class, fileDecorator.getInternalClass()); + Assert.assertEquals("null", fileDecorator.toString(f)); + + Decorator<Class> classDecorator = provider.getDecorator(Class.class, BY_NAME); + Assert.assertNotNull(classDecorator); + Assert.assertEquals(Class.class, classDecorator.getInternalClass()); + Assert.assertEquals("java.io.File", classDecorator.toString(k)); + + + Decorator<Data> dataDecorator = provider.getDecorator(Data.class, BY_NAME); + Assert.assertNotNull(dataDecorator); + Assert.assertEquals(Data.class, dataDecorator.getInternalClass()); + Assert.assertEquals("0", dataDecorator.toString(d)); + } + + + @Test + public void testReload() throws Exception { + + int nb = provider.getDecorators().size(); + Assert.assertTrue(nb > 0); + + provider.reload(); + + Assert.assertEquals(nb, provider.getDecorators().size()); + } + + @Test + public void testClear() throws Exception { + provider.clear(); + + Assert.assertTrue(provider.getDecorators().isEmpty()); + } + +} Property changes on: branches/jaxx-2.X/jaxx-runtime/src/test/java/jaxx/runtime/decorator/DecoratorProviderTest.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL

1 0