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

r2351 - in trunk: jaxx-demo/src/license jaxx-maven-plugin jaxx-tutorial-config jaxx-tutorial-validation/src/license
by tchemit＠users.nuiton.org 28 Jun '12

28 Jun '12

Author: tchemit Date: 2012-06-29 01:43:02 +0200 (Fri, 29 Jun 2012) New Revision: 2351 Url: http://nuiton.org/repositories/revision/jaxx/2351 Log: optimize dependencies+ updates third parties Modified: trunk/jaxx-demo/src/license/THIRD-PARTY.properties trunk/jaxx-maven-plugin/pom.xml trunk/jaxx-tutorial-config/pom.xml trunk/jaxx-tutorial-validation/src/license/THIRD-PARTY.properties Modified: trunk/jaxx-demo/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-demo/src/license/THIRD-PARTY.properties 2012-06-28 23:39:49 UTC (rev 2350) +++ trunk/jaxx-demo/src/license/THIRD-PARTY.properties 2012-06-28 23:43:02 UTC (rev 2351) @@ -6,18 +6,14 @@ # - Common Public License Version 1.0 # - GNU General Public License - Version 2 with the class path exception # - GNU Lesser General Public License +# - LGPL 2.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 -# - Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) +# - MPL 1.1 # - The Apache Software License, Version 2.0 -# - http://asm.ow2.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Sep 23 13:25:29 CEST 2011 -asm--asm--3.1=http\://asm.ow2.org/license.html -asm--asm-commons--3.1=http\://asm.ow2.org/license.html -asm--asm-tree--3.1=http\://asm.ow2.org/license.html +#Fri Jun 29 01:42:10 CEST 2012 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -javassist--javassist--3.8.0.GA=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2012-06-28 23:39:49 UTC (rev 2350) +++ trunk/jaxx-maven-plugin/pom.xml 2012-06-28 23:43:02 UTC (rev 2351) @@ -99,6 +99,11 @@ </dependency> <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> <groupId>javax.help</groupId> <artifactId>javahelp</artifactId> </dependency> Modified: trunk/jaxx-tutorial-config/pom.xml =================================================================== --- trunk/jaxx-tutorial-config/pom.xml 2012-06-28 23:39:49 UTC (rev 2350) +++ trunk/jaxx-tutorial-config/pom.xml 2012-06-28 23:43:02 UTC (rev 2351) @@ -162,4 +162,81 @@ </plugins> </build> + <profiles> + +  + <profile> + <id>jnlp</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> +  + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <executions> + <execution> + <id>get-keystore</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore</serverId> + <privateKeyOut>keystorepath</privateKeyOut> + <passwordOut>keystorepass</passwordOut> + <usernameOut>keyalias</usernameOut> + <passphraseOut>keypass</passphraseOut> + </configuration> + </execution> + </executions> + </plugin> + +  + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-jnlp</id> + <phase>package</phase> + <goals> + <goal>jnlp-inline</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + +  + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>${webstartPluginVersion}</version> + </plugin> + </plugins> + </reporting> + + </profile> + + </profiles> + </project> Modified: trunk/jaxx-tutorial-validation/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-tutorial-validation/src/license/THIRD-PARTY.properties 2012-06-28 23:39:49 UTC (rev 2350) +++ trunk/jaxx-tutorial-validation/src/license/THIRD-PARTY.properties 2012-06-28 23:43:02 UTC (rev 2351) @@ -3,18 +3,14 @@ # Already used licenses in project : # - BSD # - GNU General Public License - Version 2 with the class path exception +# - LGPL 2.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 -# - Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) +# - MPL 1.1 # - The Apache Software License, Version 2.0 -# - http://asm.ow2.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Feb 09 23:56:26 CET 2012 -asm--asm--3.1=http\://asm.ow2.org/license.html -asm--asm-commons--3.1=http\://asm.ow2.org/license.html -asm--asm-tree--3.1=http\://asm.ow2.org/license.html +#Fri Jun 29 01:42:25 CEST 2012 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -javassist--javassist--3.8.0.GA=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL)

1 0

r2350 - in trunk/jaxx-maven-plugin/src: main/java/org/nuiton/jaxx/plugin test/java/org/nuiton/jaxx/plugin
by tchemit＠users.nuiton.org 28 Jun '12

28 Jun '12

Author: tchemit Date: 2012-06-29 01:39:49 +0200 (Fri, 29 Jun 2012) New Revision: 2350 Url: http://nuiton.org/repositories/revision/jaxx/2350 Log: refs #1645: Updates to nuiton-utils 2.5 Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java 2012-06-28 23:39:21 UTC (rev 2349) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java 2012-06-28 23:39:49 UTC (rev 2350) @@ -25,8 +25,8 @@ package org.nuiton.jaxx.plugin; +import org.apache.commons.io.FileUtils; import org.nuiton.plugin.VelocityTemplateGenerator; -import org.nuiton.util.FileUtil; import org.nuiton.util.SortedProperties; import java.io.File; @@ -303,7 +303,7 @@ boolean exist = f.exists(); if (exist) { // check if there is a autoremoveLine in content - String content = FileUtil.readAsString(f); + String content = FileUtils.readFileToString( f ); if (!content.contains(AUTOREMOVE_LINE)) { // no regenerate marker detected, so skip this file if (isVerbose()) { @@ -333,7 +333,7 @@ if (file.exists()) { // check the autoremove line presence - String content = FileUtil.readAsString(file); + String content = FileUtils.readFileToString(file); if (!content.contains(AUTOREMOVE_LINE)) { // no regenerate marker detected, so skip this file if (isVerbose()) { Modified: trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java =================================================================== --- trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java 2012-06-28 23:39:21 UTC (rev 2349) +++ trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java 2012-06-28 23:39:49 UTC (rev 2350) @@ -30,9 +30,8 @@ import jaxx.compiler.JAXXEngine; import jaxx.compiler.decorators.DefaultCompiledObjectDecorator; import jaxx.runtime.context.DefaultJAXXContext; -import jaxx.runtime.validator.swing.SwingValidator; +import org.apache.commons.io.FileUtils; import org.nuiton.plugin.AbstractMojoTest; -import org.nuiton.util.FileUtil; import java.io.File; import java.io.IOException; @@ -86,7 +85,7 @@ } assertTrue("generated file " + f + " was not found...", f.exists()); - String content = FileUtil.readAsString(f); + String content = FileUtils.readFileToString( f ); String errorMessage = required ? "could not find the pattern : " : "should not have found pattern :"; assertEquals(errorMessage + pattern + " in file " + f, required, content.contains(pattern));

1 0

r2349 - in trunk: jaxx-tutorial-config/src/license jaxx-tutorial-css/src/license jaxx-tutorial-databinding/src/license jaxx-tutorial-helloworld/src/license jaxx-tutorial-helloworld2/src/license
by tchemit＠users.nuiton.org 28 Jun '12

28 Jun '12

Author: tchemit Date: 2012-06-29 01:39:21 +0200 (Fri, 29 Jun 2012) New Revision: 2349 Url: http://nuiton.org/repositories/revision/jaxx/2349 Log: updates third parties Modified: trunk/jaxx-tutorial-config/src/license/THIRD-PARTY.properties trunk/jaxx-tutorial-css/src/license/THIRD-PARTY.properties trunk/jaxx-tutorial-databinding/src/license/THIRD-PARTY.properties trunk/jaxx-tutorial-helloworld/src/license/THIRD-PARTY.properties trunk/jaxx-tutorial-helloworld2/src/license/THIRD-PARTY.properties Modified: trunk/jaxx-tutorial-config/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-tutorial-config/src/license/THIRD-PARTY.properties 2012-06-28 23:17:41 UTC (rev 2348) +++ trunk/jaxx-tutorial-config/src/license/THIRD-PARTY.properties 2012-06-28 23:39:21 UTC (rev 2349) @@ -1,14 +1,19 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - GNU General Public License - Version 2 with the class path exception +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License # - The Apache Software License, Version 2.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sat Feb 19 22:39:53 CET 2011 -commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +#Fri Jun 29 00:14:41 CEST 2012 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 Modified: trunk/jaxx-tutorial-css/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-tutorial-css/src/license/THIRD-PARTY.properties 2012-06-28 23:17:41 UTC (rev 2348) +++ trunk/jaxx-tutorial-css/src/license/THIRD-PARTY.properties 2012-06-28 23:39:21 UTC (rev 2349) @@ -1,14 +1,19 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - GNU General Public License - Version 2 with the class path exception +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License # - The Apache Software License, Version 2.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sat Feb 19 22:38:35 CET 2011 -commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +#Fri Jun 29 00:13:20 CEST 2012 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 Modified: trunk/jaxx-tutorial-databinding/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-tutorial-databinding/src/license/THIRD-PARTY.properties 2012-06-28 23:17:41 UTC (rev 2348) +++ trunk/jaxx-tutorial-databinding/src/license/THIRD-PARTY.properties 2012-06-28 23:39:21 UTC (rev 2349) @@ -1,14 +1,19 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - GNU General Public License - Version 2 with the class path exception +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License # - The Apache Software License, Version 2.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sat Feb 19 22:39:17 CET 2011 -commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +#Fri Jun 29 00:13:58 CEST 2012 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 Modified: trunk/jaxx-tutorial-helloworld/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-tutorial-helloworld/src/license/THIRD-PARTY.properties 2012-06-28 23:17:41 UTC (rev 2348) +++ trunk/jaxx-tutorial-helloworld/src/license/THIRD-PARTY.properties 2012-06-28 23:39:21 UTC (rev 2349) @@ -1,14 +1,19 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - GNU General Public License - Version 2 with the class path exception +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License # - The Apache Software License, Version 2.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sat Feb 19 22:37:26 CET 2011 -commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +#Fri Jun 29 00:09:02 CEST 2012 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 Modified: trunk/jaxx-tutorial-helloworld2/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-tutorial-helloworld2/src/license/THIRD-PARTY.properties 2012-06-28 23:17:41 UTC (rev 2348) +++ trunk/jaxx-tutorial-helloworld2/src/license/THIRD-PARTY.properties 2012-06-28 23:39:21 UTC (rev 2349) @@ -1,14 +1,19 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - GNU General Public License - Version 2 with the class path exception +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License # - The Apache Software License, Version 2.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sat Feb 19 22:38:02 CET 2011 -commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +#Fri Jun 29 00:12:39 CEST 2012 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0

1 0

r2348 - in trunk: jaxx-compiler/src/site jaxx-compiler/src/site/rst jaxx-demo/src/site jaxx-demo/src/site/rst jaxx-maven-plugin/src/site jaxx-maven-plugin/src/site/rst jaxx-runtime/src/site jaxx-runtime/src/site/rst jaxx-tutorial/src/site jaxx-tutorial/src/site/rst jaxx-tutorial-config/src/site jaxx-tutorial-config/src/site/rst jaxx-tutorial-css/src/site jaxx-tutorial-css/src/site/rst jaxx-tutorial-databinding/src/site jaxx-tutorial-databinding/src/site/rst jaxx-tutorial-helloworld/src/site j
by tchemit＠users.nuiton.org 28 Jun '12

28 Jun '12

Author: tchemit Date: 2012-06-29 01:17:41 +0200 (Fri, 29 Jun 2012) New Revision: 2348 Url: http://nuiton.org/repositories/revision/jaxx/2348 Log: refs #2148: Use now fluido for generated site (first pass) Modified: trunk/jaxx-compiler/src/site/rst/index.rst trunk/jaxx-compiler/src/site/site_fr.xml trunk/jaxx-demo/src/site/rst/index.rst trunk/jaxx-demo/src/site/site_fr.xml trunk/jaxx-maven-plugin/src/site/rst/index.rst trunk/jaxx-maven-plugin/src/site/site_fr.xml trunk/jaxx-runtime/src/site/rst/index.rst trunk/jaxx-runtime/src/site/site_fr.xml trunk/jaxx-tutorial-config/src/site/rst/index.rst trunk/jaxx-tutorial-config/src/site/site_fr.xml trunk/jaxx-tutorial-css/src/site/rst/index.rst trunk/jaxx-tutorial-css/src/site/site_fr.xml trunk/jaxx-tutorial-databinding/src/site/rst/index.rst trunk/jaxx-tutorial-databinding/src/site/site_fr.xml trunk/jaxx-tutorial-helloworld/src/site/rst/index.rst trunk/jaxx-tutorial-helloworld/src/site/site_fr.xml trunk/jaxx-tutorial-helloworld2/src/site/rst/index.rst trunk/jaxx-tutorial-helloworld2/src/site/site_fr.xml trunk/jaxx-tutorial-validation/src/site/rst/index.rst trunk/jaxx-tutorial-validation/src/site/site_fr.xml trunk/jaxx-tutorial/src/site/rst/index.rst trunk/jaxx-tutorial/src/site/site_fr.xml trunk/jaxx-validator/src/site/apt/index.rst trunk/jaxx-validator/src/site/site_fr.xml trunk/jaxx-widgets/src/site/rst/index.rst trunk/jaxx-widgets/src/site/site_fr.xml trunk/src/site/rst/BeanValidator.rst trunk/src/site/rst/Core.rst trunk/src/site/rst/I18n.rst trunk/src/site/rst/JAXXContext.rst trunk/src/site/rst/JAXXFile.rst trunk/src/site/rst/NavigationModel.rst trunk/src/site/rst/Todo.rst trunk/src/site/rst/contractProgramming.rst trunk/src/site/rst/dataBinding.rst trunk/src/site/rst/demo.rst trunk/src/site/rst/index.rst trunk/src/site/rst/javaBeans.rst trunk/src/site/rst/migration.rst trunk/src/site/rst/old-compiler-doc/BeanValidator.rst trunk/src/site/rst/old-compiler-doc/I18n.rst trunk/src/site/rst/old-compiler-doc/Interface.rst trunk/src/site/rst/old-compiler-doc/JAXXContext.rst trunk/src/site/rst/old-compiler-doc/JavaBean.rst trunk/src/site/rst/old-compiler-doc/NavigationTreeModel.rst trunk/src/site/rst/presentation.rst trunk/src/site/rst/scripting.rst trunk/src/site/rst/spec-validator2.rst trunk/src/site/rst/tutos/config.rst trunk/src/site/rst/tutos/css.rst trunk/src/site/rst/tutos/data-binding.rst trunk/src/site/rst/tutos/helloworld.rst trunk/src/site/rst/tutos/helloworld2.rst trunk/src/site/rst/useStylesheets.rst trunk/src/site/rst/useSwingObjects.rst trunk/src/site/site_fr.xml Modified: trunk/jaxx-compiler/src/site/rst/index.rst =================================================================== --- trunk/jaxx-compiler/src/site/rst/index.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/jaxx-compiler/src/site/rst/index.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +============= jaxx-compiler ============= Modified: trunk/jaxx-compiler/src/site/site_fr.xml =================================================================== --- trunk/jaxx-compiler/src/site/site_fr.xml 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/jaxx-compiler/src/site/site_fr.xml 2012-06-28 23:17:41 UTC (rev 2348) @@ -26,63 +26,24 @@ <project name="${project.name}"> - <bannerLeft> - <name>${project.name}</name> - <src>../jaxx.png</src> - <href>index.html</href> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + <src>${project.url}/jaxx.png</src> + <href>index.html</href> + </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> + <body> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> - </skin> + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> - <custom> - <fluidoSkin> - <topBarEnabled>true</topBarEnabled> - <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> + <menu ref="parent"/> - <publishDate position="right" format="dd/MM/yyyy"/> - <version position="right"/> + <menu name="Utilisateur"/> - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" - img="${project.url}/images/logos/maven-feather.png"/> - <logo href="http://maven-site.nuiton.org/jrst" name="JRst" - img="http://maven-site.nuiton.org/public/images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" - name="ReStructuredText" - img="http://maven-site.nuiton.org/public/images/restructuredtext-logo.png"/> - </poweredBy> + <menu ref="reports"/> - <body> - <links> - <item name="nuiton.org" href="http://www.nuiton.org"/> - <item name="CodeLutin" href="http://codelutin.com"/> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> - </links> - - <breadcrumbs> - <item name="${project.name}" href="index.html" /> - </breadcrumbs> - - <menu ref="parent"/> - - <menu name="Utilisateur"/> - - <menu ref="reports"/> - <footer> <script type="text/javascript" @@ -102,5 +63,5 @@ </div> </footer> - </body> + </body> </project> Modified: trunk/jaxx-demo/src/site/rst/index.rst =================================================================== --- trunk/jaxx-demo/src/site/rst/index.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/jaxx-demo/src/site/rst/index.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + =================== Examples/Components =================== Modified: trunk/jaxx-demo/src/site/site_fr.xml =================================================================== --- trunk/jaxx-demo/src/site/site_fr.xml 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/jaxx-demo/src/site/site_fr.xml 2012-06-28 23:17:41 UTC (rev 2348) @@ -23,83 +23,53 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> - <project name="${project.name}"> - <bannerLeft> - <name>${project.name}</name> - <src>../jaxx.png</src> - <href>index.html</href> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + <src>${project.url}/jaxx.png</src> + <href>index.html</href> + </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> + <poweredBy> + <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" img="${project.url}/images/jaxx-logo.png"/> + </poweredBy> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> - </skin> + <body> - <custom> - <fluidoSkin> - <topBarEnabled>true</topBarEnabled> - <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> - <publishDate position="right" format="dd/MM/yyyy"/> - <version position="right"/> + <menu ref="parent"/> - <poweredBy> - <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" img="${project.url}/images/jaxx-logo.png"/> - </poweredBy> + <menu name="Utilisateur"> + <item name="Accueil" href="index.html"/> + <item name="Lancer la démo" href="jnlp/launch.jnlp"/> + </menu> - <body> - <links> - <item name="nuiton.org" href="http://www.nuiton.org"/> - <item name="CodeLutin" href="http://codelutin.com"/> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> - </links> - - <breadcrumbs> - <item name="${project.name}" href="index.html" /> - </breadcrumbs> + <menu ref="reports"/> - <menu ref="parent"/> + <menu ref="modules"/> - <menu name="Utilisateur"> - <item name="Accueil" href="index.html"/> - <item name="Lancer la démo" href="jnlp/launch.jnlp"/> - </menu> + <footer> - <menu ref="reports"/> + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> - <menu ref="modules"/> + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> - <footer> - - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> - - <div id='projectMetas' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.connection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> - </div> - </footer> - - </body> + </body> </project> Modified: trunk/jaxx-maven-plugin/src/site/rst/index.rst =================================================================== --- trunk/jaxx-maven-plugin/src/site/rst/index.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/jaxx-maven-plugin/src/site/rst/index.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,8 +22,10 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - -maven-jaxx-plugin + ================= +jaxx-maven-plugin +================= .. contents:: @@ -50,4 +52,4 @@ * the generated help search index should be under *target/generated-sources/help* -.. _documentation of each mojo: plugin-info.html +.. _documentation of each mojo: ./plugin-info.html Modified: trunk/jaxx-maven-plugin/src/site/site_fr.xml =================================================================== --- trunk/jaxx-maven-plugin/src/site/site_fr.xml 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/jaxx-maven-plugin/src/site/site_fr.xml 2012-06-28 23:17:41 UTC (rev 2348) @@ -26,94 +26,56 @@ <project name="${project.name}"> - <bannerLeft> - <name>${project.name}</name> - <src>../jaxx.png</src> - <href>index.html</href> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + <src>${project.url}/jaxx.png</src> + <href>index.html</href> + </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> + <body> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> - </skin> + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> - <custom> - <fluidoSkin> - <topBarEnabled>true</topBarEnabled> - <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> + <menu ref="parent"/> - <publishDate position="right" format="dd/MM/yyyy"/> - <version position="right"/> + <menu name="Utilisateur"> + <item name="Accueil" href="index.html"/> + <item name="Détail goals" href="plugin-info.html"> + <item name="generate" href="generate-mojo.html"/> + <item name="generate-help" href="generate-help-mojo.html"/> + <item name="generate-help-search" href="generate-help-search-mojo.html"/> + <item name="help" href="help-mojo.html"/> + </item> + </menu> - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" - img="${project.url}/images/logos/maven-feather.png"/> - <logo href="http://maven-site.nuiton.org/jrst" name="JRst" - img="http://maven-site.nuiton.org/public/images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" - name="ReStructuredText" - img="http://maven-site.nuiton.org/public/images/restructuredtext-logo.png"/> - </poweredBy> + <menu name="Développeur" inherit="top"> + <item name="A faire" href="Todo.html"/> + </menu> - <body> - <links> - <item name="nuiton.org" href="http://www.nuiton.org"/> - <item name="CodeLutin" href="http://codelutin.com"/> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> - </links> + <menu ref="reports"/> - <breadcrumbs> - <item name="${project.name}" href="index.html" /> - </breadcrumbs> + <menu ref="modules"/> - <menu ref="parent"/> + <footer> - <menu name="Utilisateur"> - <item name="Accueil" href="index.html"/> - <item name="Détail goals" href="plugin-info.html"> - <item name="generate" href="generate-mojo.html"/> - <item name="generate-help" href="generate-help-mojo.html"/> - <item name="generate-help-search" href="generate-help-search-mojo.html"/> - <item name="help" href="help-mojo.html"/> - </item> - </menu> + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> - <menu name="Développeur" inherit="top"> - <item name="A faire" href="Todo.html"/> - </menu> - - <menu ref="reports"/> + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> - <menu ref="modules"/> - - <footer> - - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> - - <div id='projectMetas' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.connection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> - </div> - </footer> - </body> + </body> </project> Modified: trunk/jaxx-runtime/src/site/rst/index.rst =================================================================== --- trunk/jaxx-runtime/src/site/rst/index.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/jaxx-runtime/src/site/rst/index.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +============ jaxx-runtime ============ Modified: trunk/jaxx-runtime/src/site/site_fr.xml =================================================================== --- trunk/jaxx-runtime/src/site/site_fr.xml 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/jaxx-runtime/src/site/site_fr.xml 2012-06-28 23:17:41 UTC (rev 2348) @@ -26,85 +26,45 @@ <project name="${project.name}"> - <bannerLeft> - <name>${project.name}</name> - <src>../jaxx.png</src> - <href>index.html</href> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + <src>${project.url}/jaxx.png</src> + <href>index.html</href> + </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> + <body> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> - </skin> + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> - <custom> - <fluidoSkin> - <topBarEnabled>true</topBarEnabled> - <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> + <menu ref="parent"/> - <publishDate position="right" format="dd/MM/yyyy"/> - <version position="right"/> + <menu name="Utilisateur"> + <item name="Accueil" href="index.html"/> + </menu> - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" - img="${project.url}/images/logos/maven-feather.png"/> - <logo href="http://maven-site.nuiton.org/jrst" name="JRst" - img="http://maven-site.nuiton.org/public/images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" - name="ReStructuredText" - img="http://maven-site.nuiton.org/public/images/restructuredtext-logo.png"/> - </poweredBy> + <menu ref="reports"/> - <body> - <links> - <item name="nuiton.org" href="http://www.nuiton.org"/> - <item name="CodeLutin" href="http://codelutin.com"/> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> - </links> - - <breadcrumbs> - <item name="${project.name}" href="index.html" /> - </breadcrumbs> + <menu ref="modules"/> - <menu ref="parent"/> + <footer> - <menu name="Utilisateur"> - <item name="Accueil" href="index.html"/> - </menu> + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> - <menu ref="reports"/> - - <menu ref="modules"/> - - <footer> - - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> - - <div id='projectMetas' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.connection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> - </div> - </footer> - - </body> + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project> Modified: trunk/jaxx-tutorial/src/site/rst/index.rst =================================================================== --- trunk/jaxx-tutorial/src/site/rst/index.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/jaxx-tutorial/src/site/rst/index.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ------------ Tutorial Pom ------------ Modified: trunk/jaxx-tutorial/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial/src/site/site_fr.xml 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/jaxx-tutorial/src/site/site_fr.xml 2012-06-28 23:17:41 UTC (rev 2348) @@ -24,77 +24,46 @@ #L% --> - - <project name="${project.name}"> - <bannerLeft> - <name>${project.name}</name> - <src>../jaxx.png</src> - <href>index.html</href> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + <src>${project.url}/jaxx.png</src> + <href>index.html</href> + </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> + <body> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> - </skin> + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> - <custom> - <fluidoSkin> - <topBarEnabled>true</topBarEnabled> - <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> + <menu ref="parent"/> - <publishDate position="right" format="dd/MM/yyyy"/> - <version position="right"/> + <menu name="Utilisateur"> + <item name="Accueil" href="index.html"/> + </menu> - <body> - <links> - <item name="nuiton.org" href="http://www.nuiton.org"/> - <item name="CodeLutin" href="http://codelutin.com"/> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> - </links> + <menu ref="modules"/> - <breadcrumbs> - <item name="${project.name}" href="index.html" /> - </breadcrumbs> + <footer> - <menu ref="parent"/> + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> - <menu name="Utilisateur"> - <item name="Accueil" href="index.html"/> - </menu> + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> - <menu ref="modules"/> - - <footer> - - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> - - <div id='projectMetas' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.connection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> - </div> - </footer> - - </body> + </body> </project> Modified: trunk/jaxx-tutorial-config/src/site/rst/index.rst =================================================================== --- trunk/jaxx-tutorial-config/src/site/rst/index.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/jaxx-tutorial-config/src/site/rst/index.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + =============== Tutorial Config =============== Modified: trunk/jaxx-tutorial-config/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-config/src/site/site_fr.xml 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/jaxx-tutorial-config/src/site/site_fr.xml 2012-06-28 23:17:41 UTC (rev 2348) @@ -28,40 +28,15 @@ <bannerLeft> <name>${project.name}</name> - <src>../jaxx.png</src> + <src>${project.url}/jaxx.png</src> <href>index.html</href> </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> + <poweredBy> + <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" img="${project.url}/images/jaxx-logo.png"/> + </poweredBy> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> - </skin> - - <custom> - <fluidoSkin> - <topBarEnabled>true</topBarEnabled> - <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> - - <publishDate position="right" format="dd/MM/yyyy"/> - <version position="right"/> - <body> - <links> - <item name="nuiton.org" href="http://www.nuiton.org"/> - <item name="CodeLutin" href="http://codelutin.com"/> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> - </links> <breadcrumbs> <item name="${project.name}" href="index.html"/> Modified: trunk/jaxx-tutorial-css/src/site/rst/index.rst =================================================================== --- trunk/jaxx-tutorial-css/src/site/rst/index.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/jaxx-tutorial-css/src/site/rst/index.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ============ Tutorial CSS ============ Modified: trunk/jaxx-tutorial-css/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-css/src/site/site_fr.xml 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/jaxx-tutorial-css/src/site/site_fr.xml 2012-06-28 23:17:41 UTC (rev 2348) @@ -28,40 +28,15 @@ <bannerLeft> <name>${project.name}</name> - <src>../jaxx.png</src> + <src>${project.url}/jaxx.png</src> <href>index.html</href> </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> + <poweredBy> + <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" img="${project.url}/images/jaxx-logo.png"/> + </poweredBy> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> - </skin> - - <custom> - <fluidoSkin> - <topBarEnabled>true</topBarEnabled> - <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> - - <publishDate position="right" format="dd/MM/yyyy"/> - <version position="right"/> - <body> - <links> - <item name="nuiton.org" href="http://www.nuiton.org"/> - <item name="CodeLutin" href="http://codelutin.com"/> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> - </links> <breadcrumbs> <item name="${project.name}" href="index.html"/> Modified: trunk/jaxx-tutorial-databinding/src/site/rst/index.rst =================================================================== --- trunk/jaxx-tutorial-databinding/src/site/rst/index.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/jaxx-tutorial-databinding/src/site/rst/index.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ============ Tutorial CSS ============ Modified: trunk/jaxx-tutorial-databinding/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-databinding/src/site/site_fr.xml 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/jaxx-tutorial-databinding/src/site/site_fr.xml 2012-06-28 23:17:41 UTC (rev 2348) @@ -28,40 +28,15 @@ <bannerLeft> <name>${project.name}</name> - <src>../jaxx.png</src> + <src>${project.url}/jaxx.png</src> <href>index.html</href> </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> + <poweredBy> + <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" img="${project.url}/images/jaxx-logo.png"/> + </poweredBy> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> - </skin> - - <custom> - <fluidoSkin> - <topBarEnabled>true</topBarEnabled> - <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> - - <publishDate position="right" format="dd/MM/yyyy"/> - <version position="right"/> - <body> - <links> - <item name="nuiton.org" href="http://www.nuiton.org"/> - <item name="CodeLutin" href="http://codelutin.com"/> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> - </links> <breadcrumbs> <item name="${project.name}" href="index.html"/> Modified: trunk/jaxx-tutorial-helloworld/src/site/rst/index.rst =================================================================== --- trunk/jaxx-tutorial-helloworld/src/site/rst/index.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/jaxx-tutorial-helloworld/src/site/rst/index.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ==================== Tutorial Hello World ==================== Modified: trunk/jaxx-tutorial-helloworld/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-helloworld/src/site/site_fr.xml 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/jaxx-tutorial-helloworld/src/site/site_fr.xml 2012-06-28 23:17:41 UTC (rev 2348) @@ -28,40 +28,15 @@ <bannerLeft> <name>${project.name}</name> - <src>../jaxx.png</src> + <src>${project.url}/jaxx.png</src> <href>index.html</href> </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> + <poweredBy> + <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" img="${project.url}/images/jaxx-logo.png"/> + </poweredBy> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> - </skin> - - <custom> - <fluidoSkin> - <topBarEnabled>true</topBarEnabled> - <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> - - <publishDate position="right" format="dd/MM/yyyy"/> - <version position="right"/> - <body> - <links> - <item name="nuiton.org" href="http://www.nuiton.org"/> - <item name="CodeLutin" href="http://codelutin.com"/> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> - </links> <breadcrumbs> <item name="${project.name}" href="index.html"/> Modified: trunk/jaxx-tutorial-helloworld2/src/site/rst/index.rst =================================================================== --- trunk/jaxx-tutorial-helloworld2/src/site/rst/index.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/jaxx-tutorial-helloworld2/src/site/rst/index.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ===================== Tutorial Hell world 2 ===================== Modified: trunk/jaxx-tutorial-helloworld2/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-helloworld2/src/site/site_fr.xml 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/jaxx-tutorial-helloworld2/src/site/site_fr.xml 2012-06-28 23:17:41 UTC (rev 2348) @@ -28,40 +28,15 @@ <bannerLeft> <name>${project.name}</name> - <src>../jaxx.png</src> + <src>${project.url}/jaxx.png</src> <href>index.html</href> </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> + <poweredBy> + <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" img="${project.url}/images/jaxx-logo.png"/> + </poweredBy> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> - </skin> - - <custom> - <fluidoSkin> - <topBarEnabled>true</topBarEnabled> - <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> - - <publishDate position="right" format="dd/MM/yyyy"/> - <version position="right"/> - <body> - <links> - <item name="nuiton.org" href="http://www.nuiton.org"/> - <item name="CodeLutin" href="http://codelutin.com"/> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> - </links> <breadcrumbs> <item name="${project.name}" href="index.html"/> Modified: trunk/jaxx-tutorial-validation/src/site/rst/index.rst =================================================================== --- trunk/jaxx-tutorial-validation/src/site/rst/index.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/jaxx-tutorial-validation/src/site/rst/index.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + =============== Tutorial Config =============== Modified: trunk/jaxx-tutorial-validation/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-validation/src/site/site_fr.xml 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/jaxx-tutorial-validation/src/site/site_fr.xml 2012-06-28 23:17:41 UTC (rev 2348) @@ -28,40 +28,16 @@ <bannerLeft> <name>${project.name}</name> - <src>../jaxx.png</src> + <src>${project.url}/jaxx.png</src> <href>index.html</href> </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> - </skin> + <poweredBy> + <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" img="${project.url}/images/jaxx-logo.png"/> + </poweredBy> - <custom> - <fluidoSkin> - <topBarEnabled>true</topBarEnabled> - <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> - - <publishDate position="right" format="dd/MM/yyyy"/> - <version position="right"/> - <body> - <links> - <item name="nuiton.org" href="http://www.nuiton.org"/> - <item name="CodeLutin" href="http://codelutin.com"/> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> - </links> <breadcrumbs> <item name="${project.name}" href="index.html"/> Modified: trunk/jaxx-validator/src/site/apt/index.rst =================================================================== --- trunk/jaxx-validator/src/site/apt/index.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/jaxx-validator/src/site/apt/index.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +============== jaxx-validator ============== Modified: trunk/jaxx-validator/src/site/site_fr.xml =================================================================== --- trunk/jaxx-validator/src/site/site_fr.xml 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/jaxx-validator/src/site/site_fr.xml 2012-06-28 23:17:41 UTC (rev 2348) @@ -26,83 +26,44 @@ <project name="${project.name}"> - <bannerLeft> - <name>${project.name}</name> - <src>../jaxx.png</src> - <href>index.html</href> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + <src>${project.url}/jaxx.png</src> + <href>index.html</href> + </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> + <body> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> - </skin> + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> - <custom> - <fluidoSkin> - <topBarEnabled>true</topBarEnabled> - <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> + <menu ref="parent"/> - <publishDate position="right" format="dd/MM/yyyy"/> - <version position="right"/> + <menu name="Utilisateur"/> - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" - img="${project.url}/images/logos/maven-feather.png"/> - <logo href="http://maven-site.nuiton.org/jrst" name="JRst" - img="http://maven-site.nuiton.org/public/images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" - name="ReStructuredText" - img="http://maven-site.nuiton.org/public/images/restructuredtext-logo.png"/> - </poweredBy> + <menu ref="reports"/> - <body> - <links> - <item name="nuiton.org" href="http://www.nuiton.org"/> - <item name="CodeLutin" href="http://codelutin.com"/> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> - </links> + <menu ref="modules"/> - <breadcrumbs> - <item name="${project.name}" href="index.html" /> - </breadcrumbs> + <footer> - <menu ref="parent"/> + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> - <menu name="Utilisateur"/> + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> - <menu ref="reports"/> - - <menu ref="modules"/> - - <footer> - - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> - - <div id='projectMetas' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.connection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> - </div> - </footer> - - </body> + </body> </project> Modified: trunk/jaxx-widgets/src/site/rst/index.rst =================================================================== --- trunk/jaxx-widgets/src/site/rst/index.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/jaxx-widgets/src/site/rst/index.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ============ JAXX Widgets ============ Modified: trunk/jaxx-widgets/src/site/site_fr.xml =================================================================== --- trunk/jaxx-widgets/src/site/site_fr.xml 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/jaxx-widgets/src/site/site_fr.xml 2012-06-28 23:17:41 UTC (rev 2348) @@ -26,25 +26,44 @@ <project name="${project.name}"> - <bannerLeft> - <name>${project.name}</name> - <src>../jaxx.png</src> - <href>index.html</href> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + <src>${project.url}/jaxx.png</src> + <href>index.html</href> + </bannerLeft> - <body> - - <breadcrumbs> - <item name="${project.name}" href="index.html" /> - </breadcrumbs> + <body> - <menu ref="parent"/> + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> - <menu name="Utilisateur"/> + <menu ref="parent"/> - <menu ref="reports"/> + <menu name="Utilisateur"/> - <menu ref="modules"/> + <menu ref="reports"/> - </body> + <menu ref="modules"/> + + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> </project> Modified: trunk/src/site/rst/BeanValidator.rst =================================================================== --- trunk/src/site/rst/BeanValidator.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/src/site/rst/BeanValidator.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ----------------- Api de validation ----------------- Modified: trunk/src/site/rst/Core.rst =================================================================== --- trunk/src/site/rst/Core.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/src/site/rst/Core.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ++++ Core ++++ Modified: trunk/src/site/rst/I18n.rst =================================================================== --- trunk/src/site/rst/I18n.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/src/site/rst/I18n.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -36,7 +36,7 @@ L'internationalisation est présente par défaut dans JAXX et utilise la librairie `Nuiton-I18n`_ -.. _Nuiton-I18n::http://maven-site.nuiton.org/i18n/ +.. _Nuiton-I18n: http://maven-site.nuiton.org/i18n/ Configuration ============= @@ -103,7 +103,7 @@ On peut changer le titre de la JFrame depuis le fichier de traduction en changeant la valeur pour la clé myKey. -.. _documentation ad-hoc::http://maven-site.nuiton.org/i18n/ +.. _documentation ad-hoc: http://maven-site.nuiton.org/i18n/ Pourquoi ne plus utiliser l'ancien parserJaxx du plugin i18n ? Modified: trunk/src/site/rst/JAXXContext.rst =================================================================== --- trunk/src/site/rst/JAXXContext.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/src/site/rst/JAXXContext.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ----------- JAXXContext ----------- Modified: trunk/src/site/rst/JAXXFile.rst =================================================================== --- trunk/src/site/rst/JAXXFile.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/src/site/rst/JAXXFile.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ============================== Qu'est-ce qu'un fichier JAXX ? ============================== Modified: trunk/src/site/rst/NavigationModel.rst =================================================================== --- trunk/src/site/rst/NavigationModel.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/src/site/rst/NavigationModel.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,9 +22,10 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - ---------------- + +^^^^^^^^^^^^^^^ NavigationModel ---------------- +^^^^^^^^^^^^^^^ .. contents:: @@ -32,7 +33,7 @@ **WARNING : certaines parties de la documentation ne sont pas à jour...** Présentation -============ +____________ Ajout d'un modèle d'arbre de navigation. @@ -59,13 +60,13 @@ Tout les models suivants implémantent cette interface. jaxx.runtime.swing.navigation.tree.NavigationTreeModel -================================================= +====================================================== Il s'agit du modèle de l'arbre utilisé, c'est une extension d'un *javax.swing.tree.DefaultTreeModel*. jaxx.runtime.swing.navigation.treetable.NavigationTreeTableModel -====================================================== +================================================================ Il s'agit du modèle de l'arbre tableau (*org.jdesktop.swingx.JXTreeTable*), c'est une extension d'un *org.jdesktop.swingx.treetable.DefaultTreeTableModel*. @@ -79,10 +80,10 @@ du builder (*jaxx.runtime.swing.navigation.treetable.NavigationTreeTableModelBuilder*). Les builders -============ +____________ jaxx.runtime.swing.navigation.NavigationModelBuilder ----------------------------------------------------- +==================================================== Les builders sont des classes utilitaires permétant de construire le model et les rendus de l'arbre simplement. @@ -90,23 +91,23 @@ Tous les builders implémentent cette interface. jaxx.runtime.swing.navigation.tree.NavigationTreeModelBuilder --------------------------------------------------------- +============================================================= Classe utilitaire pour construire le model (ici un *jaxx.runtime.swing.navigation.tree.NavigationTreeModel*) et décorer un arbre. jaxx.runtime.swing.navigation.treetable.NavigationTreeTableModelBuilder -------------------------------------------------------------- +======================================================================= Classe utilitaire pour construire le model (ici un *jaxx.runtime.swing.navigation.treetable.NavigationTreeTableModel*) et décorer un arbre tableau. Les Handlers -============ +____________ jaxx.runtime.swing.navigation.handler.AbstractNavigationHandler ---------------------------------------------------- +=============================================================== Cette classe est une implémentation d'un model de sélection pour les arbres de navigations. @@ -116,13 +117,13 @@ (*Strategy.PER_UI_TYPE*). jaxx.runtime.swing.navigation.handler.NavigationTreeHandlerWithCardLayout ------------------------------------------------------------------ +========================================================================= Extension de *jaxx.runtime.swing.navigation.handler.AbstractNavigationHandler* pour l'utilisation de CardLayout (*jaxx.runtime.swing.CardLayout2*). jaxx.runtime.swing.navigation.handler.NavigationMultiTreeHandler --------------------------------------------------------- +================================================================ TODO ajouter la strategie de la multiselection @@ -130,13 +131,13 @@ ajouter la possibilité d'utiliser la multisélection. jaxx.runtime.swing.navigation.handler.NavigationOneClicSelectionHandler ---------------------------------------------------------------- +======================================================================= Extension de *jaxx.runtime.swing.navigation.handler.NavigationMultiTreeHandler* pour activer le simple clic lors de la multi-selection. Définition d'un noeud -===================== +_____________________ Le noeud (*jaxx.runtime.swing.navigation.tree.NavigationTreeModel.NavigationTreeNode*) est @@ -144,19 +145,19 @@ Il apporte les nouvelles propriétés suivantes : - * *navigationPath* : nom de chemin de navigation de ce noeud. +* *navigationPath* : nom de chemin de navigation de ce noeud. - * *jaxxClass* : nom qualifié de la classe d'ui associé à ce noeud (doit être obligatoirement un *JAXXObject*) +* *jaxxClass* : nom qualifié de la classe d'ui associé à ce noeud (doit être obligatoirement un *JAXXObject*) - * *jaxxActionClass* : nom qualifié de la classe d'handler d'ui associé à ce noeud (doit être obligatoirement un *JAXXAction*). +* *jaxxActionClass* : nom qualifié de la classe d'handler d'ui associé à ce noeud (doit être obligatoirement un *JAXXAction*). - * *jaxxContextEntryDef* : définition de l'entrée dans le context JAXX associé à ce noeud. +* *jaxxContextEntryDef* : définition de l'entrée dans le context JAXX associé à ce noeud. - * *jaxxContextEntryJXPath* : définition d'une expression JXPath à appliquer sur le bean associé au noeud. +* *jaxxContextEntryJXPath* : définition d'une expression JXPath à appliquer sur le bean associé au noeud. Retrouver un noeud à partir du chemin de navigation -*************************************************** +___________________________________________________ Il est possible en connaissant le chemin de navigation d'un noeud de récupérer le noeud dans l'arbre via la méthode @@ -166,7 +167,7 @@ model.findNode("chemin.de.navigation") Trouver la valeur associée dans le context JAXX à partir du chemin de navigation -******************************************************************************** +________________________________________________________________________________ Il est possible en connaissant le chemin de navigation d'un noeud de récupérer la valeur associée dans le context JAXX. @@ -253,7 +254,7 @@ **Attention : la mécanique ne fonctionne que pour un arbre à selection unique.** Algorithme -********** +__________ Voici l'algorithme utilisé lors de la sélection d'un nouveau noeud : @@ -272,7 +273,7 @@ retourner au noeud précdent. jaxx.runtime.swing.navigation.NavigationTreeSelectionAdapterWithCardLayout -************************************************************************** +========================================================================== Il s'agit d'une implantation du listener précédent qui suppose que les uis associées aux noeuds sont affichées dans un unique container en utilisant le Modified: trunk/src/site/rst/Todo.rst =================================================================== --- trunk/src/site/rst/Todo.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/src/site/rst/Todo.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ==== TODO ==== Modified: trunk/src/site/rst/contractProgramming.rst =================================================================== --- trunk/src/site/rst/contractProgramming.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/src/site/rst/contractProgramming.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ========================= Programmation par contrat ========================= Modified: trunk/src/site/rst/dataBinding.rst =================================================================== --- trunk/src/site/rst/dataBinding.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/src/site/rst/dataBinding.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ======================== Utiliser le data-binding ======================== Modified: trunk/src/site/rst/demo.rst =================================================================== --- trunk/src/site/rst/demo.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/src/site/rst/demo.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ==== Demo ==== @@ -31,7 +32,7 @@ `Demonstration de JAXX`_ ..Fonctionne seulement si site déployé -.. _Demonstration de JAXX::jaxx-demo/jnlp/launch.jnlp +.. _Demonstration de JAXX: ./jaxx-demo/jnlp/launch.jnlp Cette démonstration a été réalisée en utilisant JAXX, et vous pouvez visionner tout ou partie du code source en cliquant sur l'onglet 'Sources'. Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/src/site/rst/index.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +==== JAXX ==== Modified: trunk/src/site/rst/javaBeans.rst =================================================================== --- trunk/src/site/rst/javaBeans.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/src/site/rst/javaBeans.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ------------------------------------ Utilisation des java beans dans JAXX ------------------------------------ Modified: trunk/src/site/rst/migration.rst =================================================================== --- trunk/src/site/rst/migration.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/src/site/rst/migration.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +======================= Migration vers JAXX 2.0 ======================= Modified: trunk/src/site/rst/old-compiler-doc/BeanValidator.rst =================================================================== --- trunk/src/site/rst/old-compiler-doc/BeanValidator.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/src/site/rst/old-compiler-doc/BeanValidator.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ------------- BeanValidator ------------- Modified: trunk/src/site/rst/old-compiler-doc/I18n.rst =================================================================== --- trunk/src/site/rst/old-compiler-doc/I18n.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/src/site/rst/old-compiler-doc/I18n.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ---- I18n ---- Modified: trunk/src/site/rst/old-compiler-doc/Interface.rst =================================================================== --- trunk/src/site/rst/old-compiler-doc/Interface.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/src/site/rst/old-compiler-doc/Interface.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + --------- Interface --------- Modified: trunk/src/site/rst/old-compiler-doc/JAXXContext.rst =================================================================== --- trunk/src/site/rst/old-compiler-doc/JAXXContext.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/src/site/rst/old-compiler-doc/JAXXContext.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ----------- JAXXContext ----------- Modified: trunk/src/site/rst/old-compiler-doc/JavaBean.rst =================================================================== --- trunk/src/site/rst/old-compiler-doc/JavaBean.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/src/site/rst/old-compiler-doc/JavaBean.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + -------- JavaBean -------- Modified: trunk/src/site/rst/old-compiler-doc/NavigationTreeModel.rst =================================================================== --- trunk/src/site/rst/old-compiler-doc/NavigationTreeModel.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/src/site/rst/old-compiler-doc/NavigationTreeModel.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ------------------- NavigationTreeModel ------------------- @@ -40,7 +41,7 @@ Le développement est effectué dans le paquetage *jaxx.runtime.swing.navigation*. jaxx.runtime.swing.navigation.tree.NavigationTreeModel -================================================= +====================================================== Il s'agit du modèle de l'arbre utilisé, c'est une extension d'un *javax.swing.tree.DefaultTreeModel*. Modified: trunk/src/site/rst/presentation.rst =================================================================== --- trunk/src/site/rst/presentation.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/src/site/rst/presentation.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ============ Présentation ============ Modified: trunk/src/site/rst/scripting.rst =================================================================== --- trunk/src/site/rst/scripting.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/src/site/rst/scripting.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + =============================================== Utiliser des scripts pour améliorer l'ordinaire =============================================== @@ -65,7 +66,7 @@ le code Java, et recalculée quand ses dépendances (s'il y en a) changent. Cette utilisation des script est appelée data-binding_ -.. _data-binding::dataBinding.html +.. _data-binding: dataBinding.html Exemple:: Modified: trunk/src/site/rst/spec-validator2.rst =================================================================== --- trunk/src/site/rst/spec-validator2.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/src/site/rst/spec-validator2.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ========================================================================= Amelioration de la gestion des validateurs dans les interfaces graphiques ========================================================================= Modified: trunk/src/site/rst/tutos/config.rst =================================================================== --- trunk/src/site/rst/tutos/config.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/src/site/rst/tutos/config.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +========================== Interface de Configuration ========================== @@ -33,7 +35,7 @@ Les sources de ce tutoriel sont disponibles au `telechargement ici`_. -.. _telechargement ici::http://nuiton.org/projects/list_files/jaxx +.. _telechargement ici: http://nuiton.org/projects/list_files/jaxx Lancer ce tutoriel ------------------ Modified: trunk/src/site/rst/tutos/css.rst =================================================================== --- trunk/src/site/rst/tutos/css.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/src/site/rst/tutos/css.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +==================================== CSS - Utiliser les feuilles de style ==================================== @@ -38,7 +40,7 @@ de style en HTML). Pour approfondir le sujet, vous pouvez consulter `la documentation`_ -.. _la documentation::../useStylesheets.html +.. _la documentation: ../useStylesheets.html Enlever le style de notre fichier JAXX -------------------------------------- @@ -120,7 +122,7 @@ Les sources de ce tutoriel sont disponibles au `telechargement ici`_. -.. _telechargement ici::http://nuiton.org/projects/list_files/jaxx +.. _telechargement ici: http://nuiton.org/projects/list_files/jaxx Lancer ce tutoriel ------------------ Modified: trunk/src/site/rst/tutos/data-binding.rst =================================================================== --- trunk/src/site/rst/tutos/data-binding.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/src/site/rst/tutos/data-binding.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ============ Data-binding ============ @@ -112,7 +113,7 @@ Les sources de ce tutoriel sont disponibles au `telechargement ici`_. -.. _telechargement ici::http://nuiton.org/projects/list_files/jaxx +.. _telechargement ici: http://nuiton.org/projects/list_files/jaxx Lancer ce tutoriel ------------------ Modified: trunk/src/site/rst/tutos/helloworld.rst =================================================================== --- trunk/src/site/rst/tutos/helloworld.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/src/site/rst/tutos/helloworld.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +=========== Hello World =========== @@ -166,7 +168,7 @@ Les sources de ce tutoriel sont disponibles au `telechargement ici`_. -.. _telechargement ici::http://nuiton.org/projects/list_files/jaxx +.. _telechargement ici: http://nuiton.org/projects/list_files/jaxx Lancer ce tutoriel ------------------ Modified: trunk/src/site/rst/tutos/helloworld2.rst =================================================================== --- trunk/src/site/rst/tutos/helloworld2.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/src/site/rst/tutos/helloworld2.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +============= Hello World 2 ============= Modified: trunk/src/site/rst/useStylesheets.rst =================================================================== --- trunk/src/site/rst/useStylesheets.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/src/site/rst/useStylesheets.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + =================== Utiliser des styles =================== Modified: trunk/src/site/rst/useSwingObjects.rst =================================================================== --- trunk/src/site/rst/useSwingObjects.rst 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/src/site/rst/useSwingObjects.rst 2012-06-28 23:17:41 UTC (rev 2348) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ========================= Utiliser les objets Swing ========================= Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-06-28 22:37:50 UTC (rev 2347) +++ trunk/src/site/site_fr.xml 2012-06-28 23:17:41 UTC (rev 2348) @@ -26,17 +26,6 @@ <project name="${project.name}"> - <bannerLeft> - <name>${project.name}</name> - <src>./jaxx.png</src> - <href>index.html</href> - </bannerLeft> - - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> - <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> @@ -53,6 +42,17 @@ </fluidoSkin> </custom> + <bannerLeft> + <name>${project.name}</name> + <src>${project.url}/jaxx.png</src> + <href>index.html</href> + </bannerLeft> + + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + <publishDate position="right" format="dd/MM/yyyy"/> <version position="right"/> @@ -67,6 +67,7 @@ </poweredBy> <body> + <links> <item name="nuiton.org" href="http://www.nuiton.org"/> <item name="CodeLutin" href="http://codelutin.com"/> @@ -120,7 +121,6 @@ <item name="A faire" href="Todo.html"/> </menu> - <menu ref="reports"/> <footer> @@ -141,5 +141,6 @@ piwikId='${project.piwikId}'> </div> </footer> + </body> </project>

1 0

r2347 - trunk
by tchemit＠users.nuiton.org 28 Jun '12

28 Jun '12

Author: tchemit Date: 2012-06-29 00:37:50 +0200 (Fri, 29 Jun 2012) New Revision: 2347 Url: http://nuiton.org/repositories/revision/jaxx/2347 Log: fixes #1645 + fixes a tipo on site url Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-28 22:19:16 UTC (rev 2346) +++ trunk/pom.xml 2012-06-28 22:37:50 UTC (rev 2347) @@ -109,7 +109,7 @@  <projectId>jaxx</projectId> - <nuitonUtilsVersion>2.4.4</nuitonUtilsVersion> + <nuitonUtilsVersion>2.5</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <eugeneVersion>2.3.2</eugeneVersion> <xworkVersion>2.3.1.2</xworkVersion> @@ -134,7 +134,7 @@ <distributionManagement> <site> <id>${platform}</id> - <url>${our.site.repository}/${pojectId}</url> + <url>${our.site.repository}/${projectId}</url> </site> </distributionManagement>

1 0

r2346 - trunk
by tchemit＠users.nuiton.org 28 Jun '12

28 Jun '12

Author: tchemit Date: 2012-06-29 00:19:16 +0200 (Fri, 29 Jun 2012) New Revision: 2346 Url: http://nuiton.org/repositories/revision/jaxx/2346 Log: fixes #1962 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-28 22:18:26 UTC (rev 2345) +++ trunk/pom.xml 2012-06-28 22:19:16 UTC (rev 2346) @@ -36,7 +36,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.2</version> + <version>3.3.3</version> </parent> <artifactId>jaxx</artifactId>

1 0

r2345 - in trunk: jaxx-tutorial jaxx-tutorial-css jaxx-tutorial-databinding jaxx-tutorial-helloworld jaxx-tutorial-helloworld2 jaxx-tutorial-validation
by tchemit＠users.nuiton.org 28 Jun '12

28 Jun '12

Author: tchemit Date: 2012-06-29 00:18:26 +0200 (Fri, 29 Jun 2012) New Revision: 2345 Url: http://nuiton.org/repositories/revision/jaxx/2345 Log: fixes #2147: Can not build release application Modified: trunk/jaxx-tutorial-css/pom.xml trunk/jaxx-tutorial-databinding/pom.xml trunk/jaxx-tutorial-helloworld/pom.xml trunk/jaxx-tutorial-helloworld2/pom.xml trunk/jaxx-tutorial-validation/pom.xml trunk/jaxx-tutorial/pom.xml Modified: trunk/jaxx-tutorial/pom.xml =================================================================== --- trunk/jaxx-tutorial/pom.xml 2012-06-28 15:37:40 UTC (rev 2344) +++ trunk/jaxx-tutorial/pom.xml 2012-06-28 22:18:26 UTC (rev 2345) @@ -118,123 +118,5 @@ </plugins> </pluginManagement> </build> -  -  -  - <profiles> - -  - <profile> - <id>assembly</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - -  - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>create-assemblies</id> - <phase>verify</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - <configuration> - <attach>false</attach> - <descriptorRefs> - <descriptorRef>deps</descriptorRef> - <descriptorRef>full</descriptorRef> - </descriptorRefs> - </configuration> - </plugin> - - </plugins> - - </build> - </profile> - -  - <profile> - <id>jnlp</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> -  - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> - <executions> - <execution> - <id>get-keystore</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>package</phase> - <configuration> - <serverId>codelutin-keystore</serverId> - <privateKeyOut>keystorepath</privateKeyOut> - <passwordOut>keystorepass</passwordOut> - <usernameOut>keyalias</usernameOut> - <passphraseOut>keypass</passphraseOut> - </configuration> - </execution> - </executions> - </plugin> - -  - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-jnlp</id> - <phase>package</phase> - <goals> - <goal>jnlp-inline</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - -  - <profile> - <id>reporting</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - - <reporting> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <version>${webstartPluginVersion}</version> - </plugin> - </plugins> - </reporting> - - </profile> - - </profiles> - </project> Modified: trunk/jaxx-tutorial-css/pom.xml =================================================================== --- trunk/jaxx-tutorial-css/pom.xml 2012-06-28 15:37:40 UTC (rev 2344) +++ trunk/jaxx-tutorial-css/pom.xml 2012-06-28 22:18:26 UTC (rev 2345) @@ -107,6 +107,83 @@ </build> + <profiles> + +  + <profile> + <id>jnlp</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> +  + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <executions> + <execution> + <id>get-keystore</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore</serverId> + <privateKeyOut>keystorepath</privateKeyOut> + <passwordOut>keystorepass</passwordOut> + <usernameOut>keyalias</usernameOut> + <passphraseOut>keypass</passphraseOut> + </configuration> + </execution> + </executions> + </plugin> + +  + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-jnlp</id> + <phase>package</phase> + <goals> + <goal>jnlp-inline</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + +  + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>${webstartPluginVersion}</version> + </plugin> + </plugins> + </reporting> + + </profile> + + </profiles> +    Modified: trunk/jaxx-tutorial-databinding/pom.xml =================================================================== --- trunk/jaxx-tutorial-databinding/pom.xml 2012-06-28 15:37:40 UTC (rev 2344) +++ trunk/jaxx-tutorial-databinding/pom.xml 2012-06-28 22:18:26 UTC (rev 2345) @@ -112,6 +112,83 @@ </build> + <profiles> + +  + <profile> + <id>jnlp</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> +  + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <executions> + <execution> + <id>get-keystore</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore</serverId> + <privateKeyOut>keystorepath</privateKeyOut> + <passwordOut>keystorepass</passwordOut> + <usernameOut>keyalias</usernameOut> + <passphraseOut>keypass</passphraseOut> + </configuration> + </execution> + </executions> + </plugin> + +  + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-jnlp</id> + <phase>package</phase> + <goals> + <goal>jnlp-inline</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + +  + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>${webstartPluginVersion}</version> + </plugin> + </plugins> + </reporting> + + </profile> + + </profiles> +    Modified: trunk/jaxx-tutorial-helloworld/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld/pom.xml 2012-06-28 15:37:40 UTC (rev 2344) +++ trunk/jaxx-tutorial-helloworld/pom.xml 2012-06-28 22:18:26 UTC (rev 2345) @@ -119,10 +119,83 @@ </build> -  -  -  + <profiles> +  + <profile> + <id>jnlp</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> +  + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <executions> + <execution> + <id>get-keystore</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore</serverId> + <privateKeyOut>keystorepath</privateKeyOut> + <passwordOut>keystorepass</passwordOut> + <usernameOut>keyalias</usernameOut> + <passphraseOut>keypass</passphraseOut> + </configuration> + </execution> + </executions> + </plugin> + +  + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-jnlp</id> + <phase>package</phase> + <goals> + <goal>jnlp-inline</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + +  + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>${webstartPluginVersion}</version> + </plugin> + </plugins> + </reporting> + + </profile> + + </profiles> + <repositories>  Modified: trunk/jaxx-tutorial-helloworld2/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld2/pom.xml 2012-06-28 15:37:40 UTC (rev 2344) +++ trunk/jaxx-tutorial-helloworld2/pom.xml 2012-06-28 22:18:26 UTC (rev 2345) @@ -118,10 +118,83 @@ </build> -  -  -  + <profiles> +  + <profile> + <id>jnlp</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> +  + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <executions> + <execution> + <id>get-keystore</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore</serverId> + <privateKeyOut>keystorepath</privateKeyOut> + <passwordOut>keystorepass</passwordOut> + <usernameOut>keyalias</usernameOut> + <passphraseOut>keypass</passphraseOut> + </configuration> + </execution> + </executions> + </plugin> + +  + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-jnlp</id> + <phase>package</phase> + <goals> + <goal>jnlp-inline</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + +  + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>${webstartPluginVersion}</version> + </plugin> + </plugins> + </reporting> + + </profile> + + </profiles> + <repositories>  Modified: trunk/jaxx-tutorial-validation/pom.xml =================================================================== --- trunk/jaxx-tutorial-validation/pom.xml 2012-06-28 15:37:40 UTC (rev 2344) +++ trunk/jaxx-tutorial-validation/pom.xml 2012-06-28 22:18:26 UTC (rev 2345) @@ -250,7 +250,7 @@ <profiles>  <profile> - <id>release-jnlp-profile</id> + <id>jnlp</id> <activation> <property> <name>performRelease</name>

1 0

r2344 - in trunk: jaxx-demo jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor jaxx-demo/src/main/java/jaxx/demo/tree jaxx-demo/src/main/resources/i18n jaxx-widgets/src/main/java/jaxx/runtime/swing jaxx-widgets/src/main/java/jaxx/runtime/swing/editor
by sletellier＠users.nuiton.org 28 Jun '12

28 Jun '12

Author: sletellier Date: 2012-06-28 17:37:40 +0200 (Thu, 28 Jun 2012) New Revision: 2344 Url: http://nuiton.org/repositories/revision/jaxx/2344 Log: - fixes #2146 : Add widget to select values in list - Rename ListSelectorUI to ComboToListSelector - Refactor all implementation - Add LisToListSelector component - Add demo of them - Add guava dependency Added: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ComboToListSelector.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/GenericListModel.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx Removed: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/bean/ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx Modified: trunk/jaxx-demo/pom.xml trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2012-06-27 12:07:56 UTC (rev 2343) +++ trunk/jaxx-demo/pom.xml 2012-06-28 15:37:40 UTC (rev 2344) @@ -105,6 +105,11 @@ <artifactId>jxlayer</artifactId> </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> +  <dependency> Added: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx (rev 0) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx 2012-06-28 15:37:40 UTC (rev 2344) @@ -0,0 +1,89 @@ + +<jaxx.demo.DemoPanel> + <import> + jaxx.runtime.swing.ListSelector + com.google.common.collect.Lists + java.util.List + </import> + + <String id='addToolTip' javaBean='"Add"'/> + <String id='removeToolTip' javaBean='"Remove"'/> + + <script><![CDATA[ +void $afterCompleteSetup() { + + List<String> from = Lists.newArrayList(); + from.add("Value 1"); + from.add("Value 2"); + from.add("Value 3"); + from.add("Value 4"); + from.add("Value 5"); + List<String> to = Lists.newArrayList(); + to.add("Other"); + + comboToListSelector.init(from, to); + listToListSelector.init(from, to); +} +]]></script> + + <Table fill='both'> + <row> + <cell fill='horizontal' weightx='1'> + <JLabel text='jaxxdemo.listSelector.addToolTipLbl'/> + </cell> + <cell fill='horizontal' weightx='1'> + <JTextField id='addToolTipField' + text='{getAddToolTip()}' + onKeyReleased='setAddToolTip(addToolTipField.getText())'/> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='1'> + <JLabel text='jaxxdemo.listSelector.removeToolTipLbl'/> + </cell> + <cell fill='horizontal' weightx='1'> + <JTextField id='removeToolTipField' + text='{getRemoveToolTip()}' + onKeyReleased='setRemoveToolTip(removeToolTipField.getText())'/> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='1' columns='2'> + <ComboToListSelector id='comboToListSelector' + genericType='String' + addToolTip='{getAddToolTip()}' + removeToolTip='{getRemoveToolTip()}'/> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='1' columns='2'> + <ListToListSelector id='listToListSelector' + genericType='String' + addToolTip='{getAddToolTip()}' + removeToolTip='{getRemoveToolTip()}'/> + </cell> + </row> + </Table> +</jaxx.demo.DemoPanel> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java 2012-06-27 12:07:56 UTC (rev 2343) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java 2012-06-28 15:37:40 UTC (rev 2344) @@ -34,6 +34,7 @@ import jaxx.demo.component.jaxx.editor.ComboEditorDemo; import jaxx.demo.component.jaxx.editor.DatePickerDemo; import jaxx.demo.component.jaxx.editor.FileEditorDemo; +import jaxx.demo.component.jaxx.editor.ListSelectorDemo; import jaxx.demo.component.jaxx.editor.I18nEditorDemo; import jaxx.demo.component.jaxx.editor.NumberEditorDemo; import jaxx.demo.component.jaxx.editor.TimeEditorDemo; @@ -155,7 +156,8 @@ ComboEditorDemo.class, I18nEditorDemo.class, DatePickerDemo.class, - FileEditorDemo.class + FileEditorDemo.class, + ListSelectorDemo.class ); addMapping(n_("jaxxdemo.feature"), Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties =================================================================== --- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties 2012-06-27 12:07:56 UTC (rev 2343) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties 2012-06-28 15:37:40 UTC (rev 2344) @@ -213,6 +213,8 @@ jaxxdemo.init.closed=JAXXDemo was closed at %1$s jaxxdemo.init.context.done=Context initialized in %1$s jaxxdemo.init.ui.done=UI initialized. +jaxxdemo.listSelector.addToolTipLbl=Add button toolTip +jaxxdemo.listSelector.removeToolTipLbl=Remove button toolTip jaxxdemo.menu.file=File jaxxdemo.menu.file.locale=Languages jaxxdemo.menu.help= Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties =================================================================== --- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties 2012-06-27 12:07:56 UTC (rev 2343) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties 2012-06-28 15:37:40 UTC (rev 2344) @@ -21,7 +21,7 @@ Blue=Bleu Blue\:=bleu \: Bold=En gras -Button\ label\:=Libellé de l'action +Button\ label\:=Libell\u00E9 de l'action C=C CE=CE Cancel=Annuler @@ -35,12 +35,12 @@ Editable=Editable Email\ Address\:=Courriel Email\:=Courriel -Enabled=Activé +Enabled=Activ\u00E9 EnumEditor\ (country)\ \:=Editeur de pays EnumEditor\ (language)\ \:=Editeur de langue Fancy\ Button=Bouton 'Fancy' -First\ Name\:=Prénom -FirstName\:=Prénom \: +First\ Name\:=Pr\u00E9nom +FirstName\:=Pr\u00E9nom \: Font\ size=Taille de la police Font\ size\:\ = Fool\ me\ once= @@ -49,7 +49,7 @@ Green\:=Vert \: Greet= Help= -Inc\ (+)=Incrémenter (+) +Inc\ (+)=Incr\u00E9menter (+) Italic=Italique JAXX\ Demo= JMenu\ demo= @@ -70,26 +70,26 @@ Red\:=rouge \: Reset=Reinitialiser Show\ Background=Voir le fond -Show\ password\ dialog=Voir l'éditeur de mot de passe +Show\ password\ dialog=Voir l'\u00E9diteur de mot de passe Sign\ on=Signer Simple\ Button=Bouton simple Size\:=Taille \: Sources=Sources Spacing\:=Espacement \: -Start=Démarrer -Stop=Arrêter -Supported\ Swing\ components\:=Composants Swing supportés +Start=D\u00E9marrer +Stop=Arr\u00EAter +Supported\ Swing\ components\:=Composants Swing support\u00E9s Text2\:=Text 2 Text\:=Texte \: Total\:\ = -Underline=souligné +Underline=soulign\u00E9 Upper\ case\ text\:=Texte en majuscule Use\ the\ spinner\ to=Utiliser la jauge pour Username\:=Utilisateur \: -Vegetable=Légumes +Vegetable=L\u00E9gumes View=Vue Welcome\ to\ the\ JAXX\ framework\!=Bienvenu dans le framework JAXX -Working\ directory\:=Répertoire de travail +Working\ directory\:=R\u00E9pertoire de travail Yellow=Jaune You\ entered\:\ = Your\ name\:=Votre nom \: @@ -98,8 +98,8 @@ between\ these\ lines= button\ A=Bouton A button\ B=Bouton B -button\ C\ (full\ block)=Bouton C (blocage complêt) -button\ D\ (full\ block\ 2)=Bouton D (blocage complêt) +button\ C\ (full\ block)=Bouton C (blocage compl\u00EAt) +button\ D\ (full\ block\ 2)=Bouton D (blocage compl\u00EAt) cancel=Annuler close=Fermer close2=Fermer 2 @@ -143,12 +143,12 @@ jaxxdemo.action.configuration.tip=Modifier la configuration jaxxdemo.action.exit=Quitter jaxxdemo.action.exit.tip=Quitter JAXX Demo -jaxxdemo.action.fullscreen=Plein écran -jaxxdemo.action.fullscreen.tip=Passer en mode pleine écran +jaxxdemo.action.fullscreen=Plein \u00E9cran +jaxxdemo.action.fullscreen.tip=Passer en mode pleine \u00E9cran jaxxdemo.action.help=Aide jaxxdemo.action.help.tip=Affichier l'aide -jaxxdemo.action.locale.fr=Français -jaxxdemo.action.locale.fr.tip=Changer la langue en français +jaxxdemo.action.locale.fr=Fran\u00E7ais +jaxxdemo.action.locale.fr.tip=Changer la langue en fran\u00E7ais jaxxdemo.action.locale.uk=Anglais jaxxdemo.action.locale.uk.tip=Changer la langue en anglais jaxxdemo.action.normalscreen=Ecran normal @@ -156,10 +156,10 @@ jaxxdemo.action.remove=Supprimer jaxxdemo.action.show=Voir jaxxdemo.action.site=Site internet -jaxxdemo.action.site.tip=Accéder au site de l'application sur internet +jaxxdemo.action.site.tip=Acc\u00E9der au site de l'application sur internet jaxxdemo.common.actors=Acteurs jaxxdemo.common.age=Age -jaxxdemo.common.firstName=Prénom +jaxxdemo.common.firstName=Pr\u00E9nom jaxxdemo.common.id=Identifiant jaxxdemo.common.image=Image jaxxdemo.common.lastName=Nom @@ -167,7 +167,7 @@ jaxxdemo.common.movies=Films jaxxdemo.common.people=Acteur jaxxdemo.common.title=Titre -jaxxdemo.common.year=Année +jaxxdemo.common.year=Ann\u00E9e jaxxdemo.component.jaxx=Composants JAXX jaxxdemo.component.jaxx.editor=Editeurs jaxxdemo.component.swing=Composants Swing @@ -176,49 +176,51 @@ jaxxdemo.component.swing.form.text=Texte jaxxdemo.component.swing.layout=Layouts jaxxdemo.component.swing.menu=Menus -jaxxdemo.component.swing.window=Fenêtres -jaxxdemo.config.category.directories=Répertoires -jaxxdemo.config.category.directories.description=Répertoires de l'application +jaxxdemo.component.swing.window=Fen\u00EAtres +jaxxdemo.config.category.directories=R\u00E9pertoires +jaxxdemo.config.category.directories.description=R\u00E9pertoires de l'application jaxxdemo.config.category.other=Autre jaxxdemo.config.category.other.description=Autres options jaxxdemo.config.configFileName.description=Le nom du fichier de configuration -jaxxdemo.config.ui.demo.path=Chemin de la démo par défaut -jaxxdemo.config.ui.fontSize=La taille de la police à utiliser pour visualiser dans les sources -jaxxdemo.config.ui.fullscreen=Pour afficher l'aplication en mode pleine écran -jaxxdemo.config.ui.locale=La langue utilisée par l'application +jaxxdemo.config.ui.demo.path=Chemin de la d\u00E9mo par d\u00E9faut +jaxxdemo.config.ui.fontSize=La taille de la police \u00E0 utiliser pour visualiser dans les sources +jaxxdemo.config.ui.fullscreen=Pour afficher l'aplication en mode pleine \u00E9cran +jaxxdemo.config.ui.locale=La langue utilis\u00E9e par l'application jaxxdemo.config.ui.logLevel=Level de log jaxxdemo.config.ui.logPatternLayout=Pattern des log -jaxxdemo.datePickerEditor.dateResult=Affichage du résultat +jaxxdemo.datePickerEditor.dateResult=Affichage du r\u00E9sultat jaxxdemo.datePickerEditor.patternLayout=Pattern de date jaxxdemo.datePickerEditor.showPopupButton=Afficher le boutton pour ouvrir la popup -jaxxdemo.feature=Fonctionnalités +jaxxdemo.feature=Fonctionnalit\u00E9s jaxxdemo.feature.databinding=Data binding jaxxdemo.feature.nav=API JAXX pour les arbres jaxxdemo.feature.validation=Validation -jaxxdemo.fileEditor.acceptAllFileFilterUsed=Accèpte tout les FileFilter -jaxxdemo.fileEditor.directoryEnabled=Activer la sélection des files -jaxxdemo.fileEditor.extsDescLbl=Description des extensions (séparées par des virgules, ex \: Texte (*.txt), Images (*.png)) +jaxxdemo.fileEditor.acceptAllFileFilterUsed=Acc\u00E8pte tout les FileFilter +jaxxdemo.fileEditor.directoryEnabled=Activer la s\u00E9lection des files +jaxxdemo.fileEditor.extsDescLbl=Description des extensions (s\u00E9par\u00E9es par des virgules, ex \: Texte (*.txt), Images (*.png)) jaxxdemo.fileEditor.extsLbl=Extensions (separated by comma, ex \: txt, png) -jaxxdemo.fileEditor.fileEnabled=Activer la sélection des fichiers +jaxxdemo.fileEditor.fileEnabled=Activer la s\u00E9lection des fichiers jaxxdemo.fileEditor.titleLbl=Titre du dialog d'ouverture de fichier jaxxdemo.fun=Fun jaxxdemo.i18neditor.configuration=Configuration jaxxdemo.i18neditor.popup.title=Titre de la popup jaxxdemo.i18neditor.popupBorderText=Titre de la popup -jaxxdemo.i18neditor.selected.locale=Langue sélectionnée +jaxxdemo.i18neditor.selected.locale=Langue s\u00E9lectionn\u00E9e jaxxdemo.i18neditor.showIcon=Afficher les icones jaxxdemo.i18neditor.showPopupIcon=Afficher les icones dans la popup jaxxdemo.i18neditor.showPopupText=Afficher les textes dans la popup jaxxdemo.i18neditor.showText=Afficher le text -jaxxdemo.init.closed=JAXX Demo a été fermé à %1$s -jaxxdemo.init.context.done=Initialisation du contexte terminée en %1$s. -jaxxdemo.init.ui.done=Initialisation de l'interface graphique terminée. +jaxxdemo.init.closed=JAXX Demo a \u00E9t\u00E9 ferm\u00E9 \u00E0 %1$s +jaxxdemo.init.context.done=Initialisation du contexte termin\u00E9e en %1$s. +jaxxdemo.init.ui.done=Initialisation de l'interface graphique termin\u00E9e. +jaxxdemo.listSelector.addToolTipLbl=Add button toolTip +jaxxdemo.listSelector.removeToolTipLbl=Remove button toolTip jaxxdemo.menu.file=Fichier jaxxdemo.menu.file.locale=Langues jaxxdemo.menu.help=Aide jaxxdemo.menu.showLogs=Afficher les logs -jaxxdemo.message.config.loaded=Configuration de JAXX Demo v. %1$s chargée. -jaxxdemo.message.goto.site=Accéder au site de JAXX Demo (%1$s) +jaxxdemo.message.config.loaded=Configuration de JAXX Demo v. %1$s charg\u00E9e. +jaxxdemo.message.goto.site=Acc\u00E9der au site de JAXX Demo (%1$s) jaxxdemo.navigation.actor.title=Acteur jaxxdemo.navigation.actors.title=Acteurs jaxxdemo.navigation.movie.title=Film @@ -226,25 +228,25 @@ jaxxdemo.numbereditor.applyNumberPattern=Appliquer le pattern jaxxdemo.numbereditor.autoPopup=Affichage automatique popup jaxxdemo.numbereditor.configuration=Configuration -jaxxdemo.numbereditor.model=Résultat -jaxxdemo.numbereditor.model.float=Valeur décimale \: %1$s -jaxxdemo.numbereditor.model.int=Valeur entière \: %1$s -jaxxdemo.numbereditor.model.numberPattern=Format de l'éditeur \: %s +jaxxdemo.numbereditor.model=R\u00E9sultat +jaxxdemo.numbereditor.model.float=Valeur d\u00E9cimale \: %1$s +jaxxdemo.numbereditor.model.int=Valeur enti\u00E8re \: %1$s +jaxxdemo.numbereditor.model.numberPattern=Format de l'\u00E9diteur \: %s jaxxdemo.numbereditor.numberPattern.configuration=Pattern du nombre jaxxdemo.numbereditor.showPopupButton=Afficher le boutton de popup jaxxdemo.numbereditor.showReset=Afficher le boutton de reset -jaxxdemo.numbereditor.useFloat=Utiliser les décimales +jaxxdemo.numbereditor.useFloat=Utiliser les d\u00E9cimales jaxxdemo.numbereditor.useSign=Utiliser le signe jaxxdemo.timeeditor.editor=Editeur de temps jaxxdemo.timeeditor.label=Label -jaxxdemo.timeeditor.model=Résultat -jaxxdemo.timeeditor.value=Heure sélectionnée \: %1$tH\:%1$tM +jaxxdemo.timeeditor.model=R\u00E9sultat +jaxxdemo.timeeditor.value=Heure s\u00E9lectionn\u00E9e \: %1$tH\:%1$tM jaxxdemo.title.about=A propos de JAXX Demo... jaxxdemo.title.showLog=Logs de JAXX Demo jaxxdemo.tree.tabtitle=Arbre jaxxdemo.treeTable.tabtitle=Arbre tableau -jaxxdemo.warning.nimbus.landf=Le look and Feel Nimbus n'a pas été trouvé, il faut au moins la version 1.6u10 de java. -jaxxdemo.warning.no.ui=Aucun environnement graphique détecté +jaxxdemo.warning.nimbus.landf=Le look and Feel Nimbus n'a pas \u00E9t\u00E9 trouv\u00E9, il faut au moins la version 1.6u10 de java. +jaxxdemo.warning.no.ui=Aucun environnement graphique d\u00E9tect\u00E9 model0.f0= model0.f1= model0.file...= Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties =================================================================== --- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties 2012-06-27 12:07:56 UTC (rev 2343) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties 2012-06-28 15:37:40 UTC (rev 2344) @@ -21,7 +21,7 @@ Blue=Bleu Blue\:=bleu \: Bold=En gras -Button\ label\:=Libellé de l'action +Button\ label\:=Libell\u00E9 de l'action C=C CE=CE Cancel=Annuler @@ -35,12 +35,12 @@ Editable=Editable Email\ Address\:=Courriel Email\:=Courriel -Enabled=Activé +Enabled=Activ\u00E9 EnumEditor\ (country)\ \:=Editeur de pays EnumEditor\ (language)\ \:=Editeur de langue Fancy\ Button=Bouton 'Fancy' -First\ Name\:=Prénom -FirstName\:=Prénom \: +First\ Name\:=Pr\u00E9nom +FirstName\:=Pr\u00E9nom \: Font\ size=Taille de la police Font\ size\:\ = Fool\ me\ once= @@ -49,7 +49,7 @@ Green\:=Vert \: Greet= Help= -Inc\ (+)=Incrémenter (+) +Inc\ (+)=Incr\u00E9menter (+) Italic=Italique JAXX\ Demo= JMenu\ demo= @@ -70,26 +70,26 @@ Red\:=rouge \: Reset=Reinitialiser Show\ Background=Voir le fond -Show\ password\ dialog=Voir l'éditeur de mot de passe +Show\ password\ dialog=Voir l'\u00E9diteur de mot de passe Sign\ on=Signer Simple\ Button=Bouton simple Size\:=Taille \: Sources=Sources Spacing\:=Espacement \: -Start=Démarrer -Stop=Arrêter -Supported\ Swing\ components\:=Composants Swing supportés +Start=D\u00E9marrer +Stop=Arr\u00EAter +Supported\ Swing\ components\:=Composants Swing support\u00E9s Text2\:=Text 2 Text\:=Texte \: Total\:\ = -Underline=souligné +Underline=soulign\u00E9 Upper\ case\ text\:=Texte en majuscule Use\ the\ spinner\ to=Utiliser la jauge pour Username\:=Utilisateur \: -Vegetable=Légumes +Vegetable=L\u00E9gumes View=Vue Welcome\ to\ the\ JAXX\ framework\!=Bienvenu dans le framework JAXX -Working\ directory\:=Répertoire de travail +Working\ directory\:=R\u00E9pertoire de travail Yellow=Jaune You\ entered\:\ = Your\ name\:=Votre nom \: @@ -98,8 +98,8 @@ between\ these\ lines= button\ A=Bouton A button\ B=Bouton B -button\ C\ (full\ block)=Bouton C (blocage complêt) -button\ D\ (full\ block\ 2)=Bouton D (blocage complêt) +button\ C\ (full\ block)=Bouton C (blocage compl\u00EAt) +button\ D\ (full\ block\ 2)=Bouton D (blocage compl\u00EAt) cancel=Annuler close=Fermer close2=Fermer 2 @@ -143,12 +143,12 @@ jaxxdemo.action.configuration.tip=Modifier la configuration jaxxdemo.action.exit=Quitter jaxxdemo.action.exit.tip=Quitter JAXX Demo -jaxxdemo.action.fullscreen=Plein écran -jaxxdemo.action.fullscreen.tip=Passer en mode pleine écran +jaxxdemo.action.fullscreen=Plein \u00E9cran +jaxxdemo.action.fullscreen.tip=Passer en mode pleine \u00E9cran jaxxdemo.action.help=Aide jaxxdemo.action.help.tip=Affichier l'aide -jaxxdemo.action.locale.fr=Français -jaxxdemo.action.locale.fr.tip=Changer la langue en français +jaxxdemo.action.locale.fr=Fran\u00E7ais +jaxxdemo.action.locale.fr.tip=Changer la langue en fran\u00E7ais jaxxdemo.action.locale.uk=Anglais jaxxdemo.action.locale.uk.tip=Changer la langue en anglais jaxxdemo.action.normalscreen=Ecran normal @@ -156,10 +156,10 @@ jaxxdemo.action.remove=Supprimer jaxxdemo.action.show=Voir jaxxdemo.action.site=Site internet -jaxxdemo.action.site.tip=Accéder au site de l'application sur internet +jaxxdemo.action.site.tip=Acc\u00E9der au site de l'application sur internet jaxxdemo.common.actors=Acteurs jaxxdemo.common.age=Age -jaxxdemo.common.firstName=Prénom +jaxxdemo.common.firstName=Pr\u00E9nom jaxxdemo.common.id=Identifiant jaxxdemo.common.image=Image jaxxdemo.common.lastName=Nom @@ -167,7 +167,7 @@ jaxxdemo.common.movies=Films jaxxdemo.common.people=Acteur jaxxdemo.common.title=Titre -jaxxdemo.common.year=Année +jaxxdemo.common.year=Ann\u00E9e jaxxdemo.component.jaxx=Composants JAXX jaxxdemo.component.jaxx.editor=Editeurs jaxxdemo.component.swing=Composants Swing @@ -176,49 +176,51 @@ jaxxdemo.component.swing.form.text=Texte jaxxdemo.component.swing.layout=Layouts jaxxdemo.component.swing.menu=Menus -jaxxdemo.component.swing.window=Fenêtres -jaxxdemo.config.category.directories=Répertoires -jaxxdemo.config.category.directories.description=Répertoires de l'application +jaxxdemo.component.swing.window=Fen\u00EAtres +jaxxdemo.config.category.directories=R\u00E9pertoires +jaxxdemo.config.category.directories.description=R\u00E9pertoires de l'application jaxxdemo.config.category.other=Autre jaxxdemo.config.category.other.description=Autres options jaxxdemo.config.configFileName.description=Le nom du fichier de configuration -jaxxdemo.config.ui.demo.path=Chemin de la démo par défaut -jaxxdemo.config.ui.fontSize=La taille de la police à utiliser pour visualiser dans les sources -jaxxdemo.config.ui.fullscreen=Pour afficher l'aplication en mode pleine écran -jaxxdemo.config.ui.locale=La langue utilisée par l'application +jaxxdemo.config.ui.demo.path=Chemin de la d\u00E9mo par d\u00E9faut +jaxxdemo.config.ui.fontSize=La taille de la police \u00E0 utiliser pour visualiser dans les sources +jaxxdemo.config.ui.fullscreen=Pour afficher l'aplication en mode pleine \u00E9cran +jaxxdemo.config.ui.locale=La langue utilis\u00E9e par l'application jaxxdemo.config.ui.logLevel=Level de log jaxxdemo.config.ui.logPatternLayout=Pattern des log -jaxxdemo.datePickerEditor.dateResult=Affichage du résultat +jaxxdemo.datePickerEditor.dateResult=Affichage du r\u00E9sultat jaxxdemo.datePickerEditor.patternLayout=Pattern de date jaxxdemo.datePickerEditor.showPopupButton=Afficher le boutton pour ouvrir la popup -jaxxdemo.feature=Fonctionnalités +jaxxdemo.feature=Fonctionnalit\u00E9s jaxxdemo.feature.databinding=Data binding jaxxdemo.feature.nav=API JAXX pour les arbres jaxxdemo.feature.validation=Validation -jaxxdemo.fileEditor.acceptAllFileFilterUsed=Accèpte tout les FileFilter -jaxxdemo.fileEditor.directoryEnabled=Activer la sélection des files -jaxxdemo.fileEditor.extsDescLbl=Description des extensions (séparées par des virgules, ex \: Texte (*.txt), Images (*.png)) +jaxxdemo.fileEditor.acceptAllFileFilterUsed=Acc\u00E8pte tout les FileFilter +jaxxdemo.fileEditor.directoryEnabled=Activer la s\u00E9lection des files +jaxxdemo.fileEditor.extsDescLbl=Description des extensions (s\u00E9par\u00E9es par des virgules, ex \: Texte (*.txt), Images (*.png)) jaxxdemo.fileEditor.extsLbl=Extensions (separated by comma, ex \: txt, png) -jaxxdemo.fileEditor.fileEnabled=Activer la sélection des fichiers -jaxxdemo.fileEditor.titleLbl=Titre de la fenêtre de sélection de fichier +jaxxdemo.fileEditor.fileEnabled=Activer la s\u00E9lection des fichiers +jaxxdemo.fileEditor.titleLbl=Titre de la fen\u00EAtre de s\u00E9lection de fichier jaxxdemo.fun=Fun jaxxdemo.i18neditor.configuration=Configuration jaxxdemo.i18neditor.popup.title=Titre de la popup jaxxdemo.i18neditor.popupBorderText=Titre de la popup -jaxxdemo.i18neditor.selected.locale=Langue sélectionnée +jaxxdemo.i18neditor.selected.locale=Langue s\u00E9lectionn\u00E9e jaxxdemo.i18neditor.showIcon=Afficher les icones jaxxdemo.i18neditor.showPopupIcon=Afficher les icones dans la popup jaxxdemo.i18neditor.showPopupText=Afficher les textes dans la popup jaxxdemo.i18neditor.showText=Afficher le text -jaxxdemo.init.closed=JAXX Demo a été fermé à %1$s -jaxxdemo.init.context.done=Initialisation du contexte terminée en %1$s. -jaxxdemo.init.ui.done=Initialisation de l'interface graphique terminée. +jaxxdemo.init.closed=JAXX Demo a \u00E9t\u00E9 ferm\u00E9 \u00E0 %1$s +jaxxdemo.init.context.done=Initialisation du contexte termin\u00E9e en %1$s. +jaxxdemo.init.ui.done=Initialisation de l'interface graphique termin\u00E9e. +jaxxdemo.listSelector.addToolTipLbl=Tooltip du boutton ajouter +jaxxdemo.listSelector.removeToolTipLbl=Tooltip du boutton enlever jaxxdemo.menu.file=Fichier jaxxdemo.menu.file.locale=Langues jaxxdemo.menu.help=Aide jaxxdemo.menu.showLogs=Afficher les logs -jaxxdemo.message.config.loaded=Configuration de JAXX Demo v. %1$s chargée. -jaxxdemo.message.goto.site=Accéder au site de JAXX Demo (%1$s) +jaxxdemo.message.config.loaded=Configuration de JAXX Demo v. %1$s charg\u00E9e. +jaxxdemo.message.goto.site=Acc\u00E9der au site de JAXX Demo (%1$s) jaxxdemo.navigation.actor.title=Acteur jaxxdemo.navigation.actors.title=Acteurs jaxxdemo.navigation.movie.title=Film @@ -226,25 +228,25 @@ jaxxdemo.numbereditor.applyNumberPattern=Appliquer le pattern jaxxdemo.numbereditor.autoPopup=Affichage automatique popup jaxxdemo.numbereditor.configuration=Configuration -jaxxdemo.numbereditor.model=Résultat -jaxxdemo.numbereditor.model.float=Valeur décimale \: %1$s -jaxxdemo.numbereditor.model.int=Valeur entière \: %1$s -jaxxdemo.numbereditor.model.numberPattern=Format de l'éditeur \: %s +jaxxdemo.numbereditor.model=R\u00E9sultat +jaxxdemo.numbereditor.model.float=Valeur d\u00E9cimale \: %1$s +jaxxdemo.numbereditor.model.int=Valeur enti\u00E8re \: %1$s +jaxxdemo.numbereditor.model.numberPattern=Format de l'\u00E9diteur \: %s jaxxdemo.numbereditor.numberPattern.configuration=Pattern du nombre jaxxdemo.numbereditor.showPopupButton=Afficher le boutton de popup jaxxdemo.numbereditor.showReset=Afficher le boutton de reset -jaxxdemo.numbereditor.useFloat=Utiliser les décimales +jaxxdemo.numbereditor.useFloat=Utiliser les d\u00E9cimales jaxxdemo.numbereditor.useSign=Utiliser le signe jaxxdemo.timeeditor.editor=Editeur de temps jaxxdemo.timeeditor.label=Label -jaxxdemo.timeeditor.model=Résultat -jaxxdemo.timeeditor.value=Heure sélectionnée \: %1$tH\:%1$tM +jaxxdemo.timeeditor.model=R\u00E9sultat +jaxxdemo.timeeditor.value=Heure s\u00E9lectionn\u00E9e \: %1$tH\:%1$tM jaxxdemo.title.about=A propos de JAXX Demo... jaxxdemo.title.showLog=Logs de JAXX Demo jaxxdemo.tree.tabtitle=Arbre jaxxdemo.treeTable.tabtitle=Arbre tableau -jaxxdemo.warning.nimbus.landf=Le look and Feel Nimbus n'a pas été trouvé, il faut au moins la version 1.6u10 de java. -jaxxdemo.warning.no.ui=Aucun environnement graphique détecté +jaxxdemo.warning.nimbus.landf=Le look and Feel Nimbus n'a pas \u00E9t\u00E9 trouv\u00E9, il faut au moins la version 1.6u10 de java. +jaxxdemo.warning.no.ui=Aucun environnement graphique d\u00E9tect\u00E9 model0.f0= model0.f1= model0.file...= Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ComboToListSelector.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ComboToListSelector.jaxx (rev 0) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ComboToListSelector.jaxx 2012-06-28 15:37:40 UTC (rev 2344) @@ -0,0 +1,60 @@ + +<ListSelector genericType='B'> + <row> + <cell fill='horizontal' weightx='1' anchor="west"> + <JComboBox id='from' + model='{fromModel}' + renderer='{getRenderer()}'/> + </cell> + <cell anchor='east'> + <JToolBar id='actions' floatable='false'> + <JButton id="add" + toolTipText='{getAddToolTip()}' + actionIcon='add' + enabled='{isAddEnabled()}' + onActionPerformed='add()'/> + + <JButton id="remove" + toolTipText='{getRemoveToolTip()}' + actionIcon='remove' + enabled='{isRemoveEnabled()}' + onActionPerformed='remove()'/> + + </JToolBar> + </cell> + </row> + <row> + <cell columns='2' fill='both' weightx='1' weighty='1'> + <JScrollPane id='listPane'> + <JList id='to' + model='{toModel}' + selectionModel='{toModel}' + font-size='11' + onMouseClicked='if (event.getClickCount()==2) { remove(); }' + cellRenderer='{getRenderer()}'/> + </JScrollPane> + </cell> + </row> +</ListSelector> \ No newline at end of file Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/GenericListModel.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/GenericListModel.java (rev 0) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/GenericListModel.java 2012-06-28 15:37:40 UTC (rev 2344) @@ -0,0 +1,227 @@ +/* + * #%L + * JAXX :: Widgets + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package jaxx.runtime.swing; + +import com.google.common.collect.Lists; +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; +import java.util.List; +import javax.swing.ComboBoxModel; +import javax.swing.DefaultListModel; +import javax.swing.DefaultListSelectionModel; +import javax.swing.event.ListDataListener; + +/** + * @author sletellier <letellier(a)codelutin.com> + */ +public class GenericListModel<B> extends DefaultListSelectionModel implements ComboBoxModel { + + protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); + + public static final String PROPERTY_SELECTED_VALUE = "selectedValues"; + + protected DefaultListModel delegate = new DefaultListModel(); + + protected List<B> selectedValues; + + public GenericListModel() { + this.selectedValues = Lists.newArrayList(); + } + + public void setElements(List<B> values) { + for (B value : values) { + addElement(value); + } + } + + public List<B> getElements() { + int size = delegate.getSize(); + List<B> result = Lists.newArrayList(); + for (int i=0;i<size;i++) { + result.add((B) delegate.get(i)); + } + return result; + } + + public void addElement(int index, B valueToAdd) { + delegate.add(index, valueToAdd); + } + + public void addElement(B valueToAdd) { + delegate.addElement(valueToAdd); + } + + public void addElements(List<B> valuesToAdd) { + for (B value : valuesToAdd) { + addElement(value); + } + } + + public List<B> getSelectedValues() { + return Lists.newArrayList(selectedValues); + } + + public void removeElements(List<B> values) { + for (B value : values) { + delegate.removeElement(value); + } + unSelectItems(values); + } + + protected void unSelectItems(List<B> values) { + List<B> oldValue = Lists.newArrayList(selectedValues); + selectedValues.removeAll(values); + firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + } + + protected void unSelectItem(B value) { + List<B> oldValue = Lists.newArrayList(selectedValues); + selectedValues.remove(value); + firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + } + + public void addSelectedItem(B toSelect) { + List<B> oldValue = Lists.newArrayList(selectedValues); + selectedValues.add(toSelect); + int index = selectedValues.indexOf(toSelect); + super.addSelectionInterval(index, index); + firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + } + + public boolean hasSelectedIndex() { + return !selectedValues.isEmpty(); + } + + @Override + public void addSelectionInterval(int index0, int index1) { + List<B> oldValue = Lists.newArrayList(selectedValues); + addSelectionIntervalWithFire(index0, index1); + super.addSelectionInterval(index0, index1); + firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + } + + @Override + public void setSelectionInterval(int index0, int index1) { + List<B> oldValue = Lists.newArrayList(selectedValues); + selectedValues.clear(); + addSelectionIntervalWithFire(index0, index1); + super.setSelectionInterval(index0, index1); + firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + } + + @Override + public void removeSelectionInterval(int index0, int index1) { + List<B> oldValue = Lists.newArrayList(selectedValues); + if (index0 > index1) { + int tmp = index1; + index1 = index0; + index0 = tmp; + } + for (int i=index0;i<=index1;i++) { + selectedValues.remove(i); + } + super.removeSelectionInterval(index0, index1); + firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + } + + protected void addSelectionIntervalWithFire(int index0, int index1) { + if (index0 > index1) { + int tmp = index1; + index1 = index0; + index0 = tmp; + } + for (int i=index0;i<=index1;i++) { + B value = (B)delegate.getElementAt(i); + selectedValues.add(value); + } + } + + @Override + public void clearSelection() { + List<B> oldValue = Lists.newArrayList(selectedValues); + selectedValues.clear(); + super.clearSelection(); + firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + } + + @Override + public int getSelectionMode() { + return MULTIPLE_INTERVAL_SELECTION; + } + + @Override + public void setSelectedItem(Object anItem) { + List<B> oldValue = this.selectedValues; + selectedValues = Lists.newArrayList((B)anItem); + firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + } + + @Override + public Object getSelectedItem() { + if (selectedValues.isEmpty()) { + return null; + } + return selectedValues.get(0); + } + + @Override + public int getSize() { + return delegate.size(); + } + + @Override + public Object getElementAt(int index) { + return delegate.get(index); + } + + @Override + public void addListDataListener(ListDataListener l) { + delegate.addListDataListener(l); + } + + @Override + public void removeListDataListener(ListDataListener l) { + delegate.removeListDataListener(l); + } + + public void addPropertyChangeListener(PropertyChangeListener listener) { + pcs.addPropertyChangeListener(listener); + } + + public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { + pcs.addPropertyChangeListener(propertyName, listener); + } + + public void removePropertyChangeListener(PropertyChangeListener listener) { + pcs.removePropertyChangeListener(listener); + } + + public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { + pcs.removePropertyChangeListener(propertyName, listener); + } + + protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) { + pcs.firePropertyChange(propertyName, oldValue, newValue); + } +} \ No newline at end of file Copied: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx (from rev 2337, trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx) =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx (rev 0) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx 2012-06-28 15:37:40 UTC (rev 2344) @@ -0,0 +1,110 @@ + +<Table insets='0' genericType='B' abstract='true'> + + <import> + java.util.List + javax.swing.DefaultComboBoxModel + javax.swing.DefaultListModel + javax.swing.DefaultListCellRenderer + java.beans.PropertyChangeEvent + java.beans.PropertyChangeListener + </import> + + <String id='addToolTip' javaBean='"+"'/> + + <String id='removeToolTip' javaBean='"-"'/> + + <GenericListModel id='fromModel' + genericType='B'/> + + <Boolean id='addEnabled' javaBean='Boolean.FALSE'/> + <Boolean id='removeEnabled' javaBean='Boolean.FALSE'/> + + <GenericListModel id='toModel' + genericType='B'/> + + <ListCellRenderer id='renderer' javaBean='new DefaultListCellRenderer()'/> + + <script><![CDATA[ + +protected void $afterCompleteSetup() { + toModel.addPropertyChangeListener(GenericListModel.PROPERTY_SELECTED_VALUE, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + setRemoveEnabled(toModel.hasSelectedIndex()); + } + }); + fromModel.addPropertyChangeListener(GenericListModel.PROPERTY_SELECTED_VALUE, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + setAddEnabled(fromModel.hasSelectedIndex()); + } + }); +} + +/** + * @return the datas from. + */ +public List<B> getFromDatas() { + return fromModel.getElements(); +} + +/** + * @return the data to. + */ +public List<B> getToDatas() { + return toModel.getElements(); +} + +/** + * Initialize the component. + * + * @param from datas to set + * @param to datas to set + */ +public void init(List<B> from, List<B> to) { + fromModel.setElements(from); + toModel.setElements(to); +} + +public void add() { + moveSelect(fromModel, toModel); +} + +public void remove() { + moveSelect(toModel, fromModel); +} + +protected void moveSelect(GenericListModel<B> from, GenericListModel<B> to) { + List<B> selectedValues = from.getSelectedValues(); + from.removeElements(selectedValues); + to.addElements(selectedValues); +} + +]]> + </script> + +</Table> \ No newline at end of file Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorHandler.java 2012-06-27 12:07:56 UTC (rev 2343) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorHandler.java 2012-06-28 15:37:40 UTC (rev 2344) @@ -1,179 +0,0 @@ -/* - * #%L - * JAXX :: Widgets - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ -package jaxx.runtime.swing; - -import jaxx.runtime.SwingUtil; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import javax.swing.*; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; - -/** - * @author sletellier <letellier(a)codelutin.com> - * @since 2.2.3 - */ -public class ListSelectorHandler <B> { - - public static final Log log = LogFactory.getLog(ListSelectorHandler.class); - - protected ListSelectorUI<B> listSelector; - - public ListSelectorHandler(final ListSelectorUI<B> listSelector) { - this.listSelector = listSelector; - } - - protected JComboBox getCombo() { - return listSelector.getCombo(); - } - - protected JList getList() { - return listSelector.getList(); - } - - /** - * @return the datas from the combo box. - */ - public java.util.List<B> getComboDatas() { - java.util.List<B> datas = new java.util.ArrayList<B>(); - ComboBoxModel comboModel = getCombo().getModel(); - for (int i = 0, j = comboModel.getSize(); i < j; i++) { - B g = (B) comboModel.getElementAt(i); - datas.add(g); - } - return datas; - } - - /** - * @return the data for the list. - */ - public java.util.List<B> getListDatas() { - java.util.List<B> datas = new java.util.ArrayList<B>(); - ListModel listModel = getList().getModel(); - for (int i = 0, j = listModel.getSize(); i < j; i++) { - B g = (B) listModel.getElementAt(i); - datas.add(g); - } - return datas; - } - - /** - * Initialize the component. - * - * @param toCombo datas to set in combo - * @param toList datas to set in list - */ - public void init(java.util.List<B> toCombo, java.util.List<B> toList) { - setComboDatas(toCombo); - setListDatas(toList); - // after init, always unmodified editor - // TODO should avoid to fire a changed ? - listSelector.setModified(false); - - HidorButton hidor = listSelector.getHidor(); - hidor.addPropertyChangeListener("targetVisible", new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (log.isDebugEnabled()) { - log.debug("target visible changed <" + evt.getOldValue() + ":" + evt.getNewValue() + ">"); - } - if (!listSelector.isShowHidor() || !listSelector.isEnabled()) { - return; - } - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - log.info("invalidate " + listSelector.getParent().getName()); - listSelector.listPane.invalidate(); - } - }); - } - }); - } - - /** - * Transfert the {@code b} data from combo box to list. - * - * @param b the data to transfert - */ - protected void transfertToList(B b) { - ((DefaultListModel) getList().getModel()).addElement(b); - ((DefaultComboBoxModel) getCombo().getModel()).removeElement(b); - listSelector.setModified(true); - } - - /** - * Transfert the {@code b} data from list to combo box. - * - * @param bs the data to transfert - */ - protected void transfertToCombo(B[] bs) { - for (B b : bs) { - ((DefaultListModel) getList().getModel()).removeElement(b); - ((DefaultComboBoxModel) getCombo().getModel()).addElement(b); - } - listSelector.setModified(true); - } - - /** - * @param enabled databinding - * @return {@code true} if add button should be enabled - */ - protected boolean updateAddEnabled(boolean enabled) { - return enabled && getCombo().getModel().getSize() > 0; - } - - /** - * @param enabled databinding - * @return {@code true} if remove button should be enabled - */ - protected boolean updateRemoveEnabled(boolean enabled) { - return enabled && getList().getModel().getSize() > 0; - } - - /** - * Set the data in combo box model. - * - * @param toCombo datas to set in combo box model - */ - protected void setComboDatas(java.util.List<B> toCombo) { - SwingUtil.fillComboBox(getCombo(), toCombo, null); - //Note : there is a case when combo was selected, then come here with an empty - // combo model : no propertyChanged is fired, so add button stays enabled... - listSelector.processDataBinding("add.enabled"); - } - - /** - * Set the data in the list model. - * - * @param toList datas to set in list model - */ - protected void setListDatas(java.util.List<B> toList) { - SwingUtil.fillList(getList(), toList, null); - } -} Deleted: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx 2012-06-27 12:07:56 UTC (rev 2343) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx 2012-06-28 15:37:40 UTC (rev 2344) @@ -1,128 +0,0 @@ - -<JPanel layout='{new BorderLayout()}' genericType='B'> - - <import> - java.util.List - javax.swing.DefaultComboBoxModel - javax.swing.DefaultListModel - </import> - -  - <Boolean id='showHidor' javaBean='false'/> - - <Boolean id='modified' javaBean='false'/> - - <String id='addToListTip' javaBean='"+"'/> - - <String id='addToComboTip' javaBean='"-"'/> - - <ListCellRenderer id='renderer' javaBean='null'/> - -  - <ListSelectorHandler id='handler' genericType='B' constructorParams='this'/> - - <script><![CDATA[ - -public void setHandler(ListSelectorHandler<B> handler) { - this.handler = handler; -} - -/** - * @return the datas from the combo box. - */ -public List<B> getComboDatas() { - return handler.getComboDatas(); -} - -/** - * @return the data for the list. - */ -public List<B> getListDatas() { - return handler.getListDatas(); -} - -/** - * Initialize the component. - * - * @param toCombo datas to set in combo - * @param toList datas to set in list - */ -public void init(List<B> toCombo, List<B> toList) { - handler.init(toCombo, toList); -} -]]> - </script> - - <JScrollPane id='listPane' constraints='BorderLayout.CENTER' - columnHeaderView='{header}'> -  -  - <JPanel layout="{new BorderLayout()}" minimumSize='{getMinimumSize()}'> - <JList id='list' - constraints='BorderLayout.CENTER' - enabled='{isEnabled()}' - model='{new DefaultListModel()}' - font-size='11' - onMouseClicked='if (event.getClickCount()==2) { handler.transfertToCombo((B[]) list.getSelectedValues()); }' - cellRenderer='{getRenderer()}'/> - </JPanel> - - </JScrollPane> - - <Table id="header" insets='0' constraints='BorderLayout.SOUTH'> - <row> - <cell fill='horizontal' weightx='1' anchor="west"> - <JComboBox id='combo' enabled='{isEnabled()}' - model='{new DefaultComboBoxModel()}' - renderer='{getRenderer()}'/> - </cell> - <cell anchor='east'> - <JToolBar id='actions' floatable='false'> - <JButton id="add" - toolTipText='{getAddToListTip()}' - actionIcon='add' - enabled='{handler.updateAddEnabled(combo.isEnabled() && combo.getSelectedIndex() > -1)}' - onActionPerformed='handler.transfertToList((B) combo.getSelectedItem());'/> - - <JButton id="remove" - toolTipText='{getAddToComboTip()}' - actionIcon='remove' - enabled='{handler.updateRemoveEnabled(list.isEnabled() && list.getSelectedIndex() > -1)}' - onActionPerformed='handler.transfertToCombo((B[]) list.getSelectedValues())'/> - - <HidorButton id="hidor" - target='{list}' - visible='{isShowHidor()}' - enabled='{isEnabled()}' - hideTip='{_("listSelector.hideList")}' - showTip='{_("listSelector.showList")}' - targetVisible='{true}'/> - </JToolBar> - </cell> - </row> - </Table> - -</JPanel> Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx (rev 0) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx 2012-06-28 15:37:40 UTC (rev 2344) @@ -0,0 +1,64 @@ + +<ListSelector genericType='B'> + <import> + javax.swing.SwingConstants + </import> + + <row> + <cell fill='both' weightx='1' weighty='1'> + <JList id='from' + model='{fromModel}' + selectionModel='{fromModel}' + onMouseClicked='if (event.getClickCount()==2) { add(); }' + cellRenderer='{getRenderer()}'/> + </cell> + <cell anchor='north'> + <JToolBar id='actions' floatable='false' orientation='{SwingConstants.VERTICAL}'> + <JButton id="add" + toolTipText='{getAddToolTip()}' + actionIcon='add' + enabled='{isAddEnabled()}' + onActionPerformed='add()'/> + + <JButton id="remove" + toolTipText='{getRemoveToolTip()}' + actionIcon='remove' + enabled='{isRemoveEnabled()}' + onActionPerformed='remove()'/> + + </JToolBar> + </cell> + <cell fill='both' weightx='1' weighty='1'> + <JScrollPane id='listPane'> + <JList id='to' + model='{toModel}' + selectionModel='{toModel}' + font-size='11' + onMouseClicked='if (event.getClickCount()==2) { remove(); }' + cellRenderer='{getRenderer()}'/> + </JScrollPane> + </cell> + </row> +</ListSelector> \ No newline at end of file Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx 2012-06-27 12:07:56 UTC (rev 2343) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx 2012-06-28 15:37:40 UTC (rev 2344) @@ -64,13 +64,13 @@ ]]></script> <JTextField id='pathField' - constraints='{BorderLayout.CENTER}' + constraints='BorderLayout.CENTER' enabled='{isEnabled()}' text='{getStartPath()}' onFocusLost='setSelectedFile(new File(pathField.getText()))'/> <JButton id='boutonXslLocation' - constraints='{BorderLayout.EAST}' + constraints='BorderLayout.EAST' enabled='{isEnabled()}' actionIcon='open' onActionPerformed='handler.openLocation()'/>

1 0

r2343 - in trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing: . editor/cell
by sletellier＠users.nuiton.org 27 Jun '12

27 Jun '12

Author: sletellier Date: 2012-06-27 14:07:56 +0200 (Wed, 27 Jun 2012) New Revision: 2343 Url: http://nuiton.org/repositories/revision/jaxx/2343 Log: Fix build Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXWidgetUtil.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXWidgetUtil.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXWidgetUtil.java 2012-06-27 11:45:58 UTC (rev 2342) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXWidgetUtil.java 2012-06-27 12:07:56 UTC (rev 2343) @@ -52,7 +52,7 @@ return new FileCellEditor(); } - public static <E> NumberCellEditor<E> newNumberTableCellEditor(Class<E> type, boolean useSign) { + public static <E extends Number> NumberCellEditor<E> newNumberTableCellEditor(Class<E> type, boolean useSign) { return new NumberCellEditor<E>(type, useSign); } } Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java 2012-06-27 11:45:58 UTC (rev 2342) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java 2012-06-27 12:07:56 UTC (rev 2343) @@ -1,3 +1,26 @@ +/* + * #%L + * JAXX :: Widgets + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package jaxx.runtime.swing.editor.cell; import java.awt.Component;

1 0

r2342 - in trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing: . editor editor/cell
by sletellier＠users.nuiton.org 27 Jun '12

27 Jun '12

Author: sletellier Date: 2012-06-27 13:45:58 +0200 (Wed, 27 Jun 2012) New Revision: 2342 Url: http://nuiton.org/repositories/revision/jaxx/2342 Log: fixes #2145 : Add numberCellEditor using NumberEditor Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/DateCellEditor.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/FileCellEditor.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java Removed: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/DateCellEditor.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileCellEditor.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXWidgetUtil.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXWidgetUtil.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXWidgetUtil.java 2012-06-27 10:14:52 UTC (rev 2341) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXWidgetUtil.java 2012-06-27 11:45:58 UTC (rev 2342) @@ -26,8 +26,9 @@ import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.editor.DateCellEditor; -import jaxx.runtime.swing.editor.FileCellEditor; +import jaxx.runtime.swing.editor.cell.DateCellEditor; +import jaxx.runtime.swing.editor.cell.FileCellEditor; +import jaxx.runtime.swing.editor.cell.NumberCellEditor; import jaxx.runtime.swing.renderer.DateCellRenderer; /** @@ -50,4 +51,8 @@ public static TableCellEditor newFileTableCellEditor() { return new FileCellEditor(); } + + public static <E> NumberCellEditor<E> newNumberTableCellEditor(Class<E> type, boolean useSign) { + return new NumberCellEditor<E>(type, useSign); + } } Deleted: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/DateCellEditor.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/DateCellEditor.java 2012-06-27 10:14:52 UTC (rev 2341) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/DateCellEditor.java 2012-06-27 11:45:58 UTC (rev 2342) @@ -1,55 +0,0 @@ -/* - * #%L - * JAXX :: Widgets - * $Id:$ - * $HeadURL:$ - * %% - * Copyright (C) 2008 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ -package jaxx.runtime.swing.editor; - -import java.awt.Component; -import java.util.Date; -import javax.swing.AbstractCellEditor; -import javax.swing.JTable; -import javax.swing.table.TableCellEditor; -import jaxx.runtime.swing.JAXXDatePicker; - -/** - * @author sletellier <letellier(a)codelutin.com> - */ -public class DateCellEditor extends AbstractCellEditor - implements TableCellEditor { - - protected JAXXDatePicker datePicker; - - public DateCellEditor() { - datePicker = new JAXXDatePicker(); - } - - @Override - public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { - datePicker.setDate((Date) value); - return datePicker; - } - - @Override - public Object getCellEditorValue() { - return datePicker.getDate(); - } -} \ No newline at end of file Deleted: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileCellEditor.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileCellEditor.java 2012-06-27 10:14:52 UTC (rev 2341) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileCellEditor.java 2012-06-27 11:45:58 UTC (rev 2342) @@ -1,54 +0,0 @@ -/* - * #%L - * JAXX :: Widgets - * $Id:$ - * $HeadURL:$ - * %% - * Copyright (C) 2008 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ -package jaxx.runtime.swing.editor; - -import java.awt.Component; -import java.io.File; -import javax.swing.AbstractCellEditor; -import javax.swing.JTable; -import javax.swing.table.TableCellEditor; - -/** - * @author sletellier <letellier(a)codelutin.com> - */ -public class FileCellEditor extends AbstractCellEditor - implements TableCellEditor { - - protected FileEditor fileEditor; - - public FileCellEditor() { - fileEditor = new FileEditor(); - } - - @Override - public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { - fileEditor.setSelectedFile((File)value); - return fileEditor; - } - - @Override - public Object getCellEditorValue() { - return fileEditor.getSelectedFile(); - } -} Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java 2012-06-27 10:14:52 UTC (rev 2341) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java 2012-06-27 11:45:58 UTC (rev 2342) @@ -160,7 +160,9 @@ // Determine si c'est un float Class<?> type = editor.getModelType(); if (editor.getModelType() == null) { - type = getGetter().getReturnType(); + if (editor.getBean() != null) { + type = getGetter().getReturnType(); + } } modelType = type; if (log.isDebugEnabled()) { @@ -171,8 +173,10 @@ // Initialise le model if (editor.getModel() == null) { - Number num = (Number) getGetter().invoke(editor.getBean()); - editor.setModel(num); + if (editor.getBean() != null) { + Number num = (Number) getGetter().invoke(editor.getBean()); + editor.setModel(num); + } } /*if (editor.getResetButton().getIcon() == null) { Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/DateCellEditor.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/DateCellEditor.java (rev 0) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/DateCellEditor.java 2012-06-27 11:45:58 UTC (rev 2342) @@ -0,0 +1,55 @@ +/* + * #%L + * JAXX :: Widgets + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package jaxx.runtime.swing.editor.cell; + +import java.awt.Component; +import java.util.Date; +import javax.swing.AbstractCellEditor; +import javax.swing.JTable; +import javax.swing.table.TableCellEditor; +import jaxx.runtime.swing.JAXXDatePicker; + +/** + * @author sletellier <letellier(a)codelutin.com> + */ +public class DateCellEditor extends AbstractCellEditor + implements TableCellEditor { + + protected JAXXDatePicker datePicker; + + public DateCellEditor() { + datePicker = new JAXXDatePicker(); + } + + @Override + public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { + datePicker.setDate((Date) value); + return datePicker; + } + + @Override + public Object getCellEditorValue() { + return datePicker.getDate(); + } +} \ No newline at end of file Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/FileCellEditor.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/FileCellEditor.java (rev 0) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/FileCellEditor.java 2012-06-27 11:45:58 UTC (rev 2342) @@ -0,0 +1,55 @@ +/* + * #%L + * JAXX :: Widgets + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package jaxx.runtime.swing.editor.cell; + +import java.awt.Component; +import java.io.File; +import javax.swing.AbstractCellEditor; +import javax.swing.JTable; +import javax.swing.table.TableCellEditor; +import jaxx.runtime.swing.editor.FileEditor; + +/** + * @author sletellier <letellier(a)codelutin.com> + */ +public class FileCellEditor extends AbstractCellEditor + implements TableCellEditor { + + protected FileEditor fileEditor; + + public FileCellEditor() { + fileEditor = new FileEditor(); + } + + @Override + public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { + fileEditor.setSelectedFile((File)value); + return fileEditor; + } + + @Override + public Object getCellEditorValue() { + return fileEditor.getSelectedFile(); + } +} Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java (rev 0) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java 2012-06-27 11:45:58 UTC (rev 2342) @@ -0,0 +1,86 @@ +package jaxx.runtime.swing.editor.cell; + +import java.awt.Component; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; +import javax.swing.AbstractCellEditor; +import javax.swing.JTable; +import javax.swing.SwingConstants; +import javax.swing.SwingUtilities; +import javax.swing.event.AncestorEvent; +import javax.swing.event.AncestorListener; +import javax.swing.table.TableCellEditor; +import jaxx.runtime.swing.editor.NumberEditor; + +/** + * @author sletellier <letellier(a)codelutin.com> + */ +public class NumberCellEditor<E extends Number> extends AbstractCellEditor + implements TableCellEditor, FocusListener, AncestorListener { + + private static final long serialVersionUID = 1L; + + protected final NumberEditor numberEditor; + + /** constructor */ + public NumberCellEditor(Class<E> type, boolean useSign) { + numberEditor = new NumberEditor(); + numberEditor.getTextField().setHorizontalAlignment(SwingConstants.RIGHT); + numberEditor.getTextField().setBorder(null); + numberEditor.getTextField().addFocusListener(this); + numberEditor.getTextField().addAncestorListener(this); + + numberEditor.setModelType(type); + + numberEditor.setUseSign(useSign); + numberEditor.init(); + } + + @Override + public Component getTableCellEditorComponent(JTable table, Object value, + boolean isSelected, int row, int column) { + + // FIXME sletellier 20120105 : we dont need to set modelText + E bd = (E) value; + numberEditor.setModel(bd); + numberEditor.setModelText(String.valueOf(bd)); + return numberEditor; + } + + @Override + public E getCellEditorValue() { + return (E)numberEditor.getModel(); + } + + @Override + public void focusGained(FocusEvent e) { + SwingUtilities.invokeLater(new Runnable() { + public void run() { + numberEditor.getTextField().requestFocus(); + numberEditor.getTextField().selectAll(); + } + }); + } + + @Override + public void focusLost(FocusEvent e) { + } + + @Override + public void ancestorAdded(AncestorEvent event) { + SwingUtilities.invokeLater(new Runnable() { + public void run() { + numberEditor.getTextField().requestFocus(); + numberEditor.getTextField().selectAll(); + } + }); + } + + @Override + public void ancestorRemoved(AncestorEvent event) { + } + + @Override + public void ancestorMoved(AncestorEvent event) { + } +}

1 0