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

r2749 - in trunk: . jaxx-compiler jaxx-config jaxx-demo jaxx-maven-plugin jaxx-runtime jaxx-validator jaxx-widgets
by tchemit＠users.nuiton.org 12 Nov '13

12 Nov '13

Author: tchemit Date: 2013-11-12 10:12:54 +0100 (Tue, 12 Nov 2013) New Revision: 2749 Url: http://nuiton.org/projects/jaxx/repository/revisions/2749 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-config/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-maven-plugin/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-validator/pom.xml trunk/jaxx-widgets/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2013-11-12 09:12:49 UTC (rev 2748) +++ trunk/jaxx-compiler/pom.xml 2013-11-12 09:12:54 UTC (rev 2749) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.30</version> + <version>2.5.31-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-config/pom.xml =================================================================== --- trunk/jaxx-config/pom.xml 2013-11-12 09:12:49 UTC (rev 2748) +++ trunk/jaxx-config/pom.xml 2013-11-12 09:12:54 UTC (rev 2749) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.30</version> + <version>2.5.31-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2013-11-12 09:12:49 UTC (rev 2748) +++ trunk/jaxx-demo/pom.xml 2013-11-12 09:12:54 UTC (rev 2749) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.30</version> + <version>2.5.31-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2013-11-12 09:12:49 UTC (rev 2748) +++ trunk/jaxx-maven-plugin/pom.xml 2013-11-12 09:12:54 UTC (rev 2749) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.30</version> + <version>2.5.31-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2013-11-12 09:12:49 UTC (rev 2748) +++ trunk/jaxx-runtime/pom.xml 2013-11-12 09:12:54 UTC (rev 2749) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.30</version> + <version>2.5.31-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2013-11-12 09:12:49 UTC (rev 2748) +++ trunk/jaxx-validator/pom.xml 2013-11-12 09:12:54 UTC (rev 2749) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.30</version> + <version>2.5.31-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2013-11-12 09:12:49 UTC (rev 2748) +++ trunk/jaxx-widgets/pom.xml 2013-11-12 09:12:54 UTC (rev 2749) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.30</version> + <version>2.5.31-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> @@ -49,11 +49,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.30/jaxx-widgets</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk/jaxx-widgets</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.30/jaxx-widgets + scm:svn:http://svn.nuiton.org/svn/jaxx/trunk/jaxx-widgets </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/trunkjaxx-widgets/tags/jaxx…</url> + <url>http://nuiton.org/projects/jaxx/repository/show/trunkjaxx-widgets</url> </scm> <dependencies> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-11-12 09:12:49 UTC (rev 2748) +++ trunk/pom.xml 2013-11-12 09:12:54 UTC (rev 2749) @@ -34,7 +34,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.5.30</version> + <version>2.5.31-SNAPSHOT</version> <modules> <module>jaxx-runtime</module> @@ -139,11 +139,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.30</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.30 + scm:svn:http://svn.nuiton.org/svn/jaxx/trunk </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/tags/jaxx-2.5.30</url> + <url>http://nuiton.org/projects/jaxx/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r2748 - tags
by tchemit＠users.nuiton.org 12 Nov '13

12 Nov '13

Author: tchemit Date: 2013-11-12 10:12:49 +0100 (Tue, 12 Nov 2013) New Revision: 2748 Url: http://nuiton.org/projects/jaxx/repository/revisions/2748 Log: [maven-release-plugin] copy for tag jaxx-2.5.30 Added: tags/jaxx-2.5.30/

1 0

r2747 - in trunk: . jaxx-compiler jaxx-config jaxx-demo jaxx-maven-plugin jaxx-runtime jaxx-validator jaxx-widgets
by tchemit＠users.nuiton.org 12 Nov '13

12 Nov '13

Author: tchemit Date: 2013-11-12 10:12:46 +0100 (Tue, 12 Nov 2013) New Revision: 2747 Url: http://nuiton.org/projects/jaxx/repository/revisions/2747 Log: [maven-release-plugin] prepare release jaxx-2.5.30 Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-config/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-maven-plugin/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-validator/pom.xml trunk/jaxx-widgets/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2013-11-12 09:03:44 UTC (rev 2746) +++ trunk/jaxx-compiler/pom.xml 2013-11-12 09:12:46 UTC (rev 2747) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.30-SNAPSHOT</version> + <version>2.5.30</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-config/pom.xml =================================================================== --- trunk/jaxx-config/pom.xml 2013-11-12 09:03:44 UTC (rev 2746) +++ trunk/jaxx-config/pom.xml 2013-11-12 09:12:46 UTC (rev 2747) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.30-SNAPSHOT</version> + <version>2.5.30</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2013-11-12 09:03:44 UTC (rev 2746) +++ trunk/jaxx-demo/pom.xml 2013-11-12 09:12:46 UTC (rev 2747) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.30-SNAPSHOT</version> + <version>2.5.30</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2013-11-12 09:03:44 UTC (rev 2746) +++ trunk/jaxx-maven-plugin/pom.xml 2013-11-12 09:12:46 UTC (rev 2747) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.30-SNAPSHOT</version> + <version>2.5.30</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2013-11-12 09:03:44 UTC (rev 2746) +++ trunk/jaxx-runtime/pom.xml 2013-11-12 09:12:46 UTC (rev 2747) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.30-SNAPSHOT</version> + <version>2.5.30</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2013-11-12 09:03:44 UTC (rev 2746) +++ trunk/jaxx-validator/pom.xml 2013-11-12 09:12:46 UTC (rev 2747) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.30-SNAPSHOT</version> + <version>2.5.30</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2013-11-12 09:03:44 UTC (rev 2746) +++ trunk/jaxx-widgets/pom.xml 2013-11-12 09:12:46 UTC (rev 2747) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.30-SNAPSHOT</version> + <version>2.5.30</version> </parent> <groupId>org.nuiton.jaxx</groupId> @@ -49,11 +49,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk/jaxx-widgets</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.30/jaxx-widgets</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/trunk/jaxx-widgets + scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.30/jaxx-widgets </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/trunkjaxx-widgets</url> + <url>http://nuiton.org/projects/jaxx/repository/show/trunkjaxx-widgets/tags/jaxx…</url> </scm> <dependencies> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-11-12 09:03:44 UTC (rev 2746) +++ trunk/pom.xml 2013-11-12 09:12:46 UTC (rev 2747) @@ -23,9 +23,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -36,7 +34,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.5.30-SNAPSHOT</version> + <version>2.5.30</version> <modules> <module>jaxx-runtime</module> @@ -141,11 +139,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.30</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/trunk + scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.30 </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/trunk</url> + <url>http://nuiton.org/projects/jaxx/repository/show/tags/jaxx-2.5.30</url> </scm> <distributionManagement>

1 0

r2746 - trunk
by tchemit＠users.nuiton.org 12 Nov '13

12 Nov '13

Author: tchemit Date: 2013-11-12 10:03:44 +0100 (Tue, 12 Nov 2013) New Revision: 2746 Url: http://nuiton.org/projects/jaxx/repository/revisions/2746 Log: fixes #2908: improve jws launching Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-11-12 08:22:10 UTC (rev 2745) +++ trunk/pom.xml 2013-11-12 09:03:44 UTC (rev 2746) @@ -481,7 +481,7 @@ <pack200> <enabled>true</enabled> <passFiles> - <passFile></passFile> + <passFile>org/jdesktop/jxlayer/</passFile> </passFiles> </pack200> <jnlpExtensions> @@ -493,14 +493,14 @@ <include>javax.help:javahelp</include> </includes> </jnlpExtension--> - <jnlpExtension> +  </jnlpExtensions> </configuration> </plugin>

1 0

r2745 - in trunk: . jaxx-demo jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor jaxx-demo/src/main/resources jaxx-demo/src/main/resources/i18n jaxx-widgets/src/main/java/jaxx/runtime/swing/editor jaxx-widgets/src/main/resources/i18n jaxx-widgets/src/main/resources/icons
by tchemit＠users.nuiton.org 12 Nov '13

12 Nov '13

Author: tchemit Date: 2013-11-12 09:22:10 +0100 (Tue, 12 Nov 2013) New Revision: 2745 Url: http://nuiton.org/projects/jaxx/repository/revisions/2745 Log: fixes #2909: Add a reset button on FileEditor fixes #2907: Updates mavenpom to 4.3 fixes #2908: improve jws launching Added: trunk/jaxx-widgets/src/main/resources/icons/action-fileeditor-reset.png Modified: trunk/jaxx-demo/pom.xml trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/FileEditorDemo.jaxx 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-demo/src/main/resources/log4j.properties trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_en_GB.properties trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties trunk/pom.xml Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2013-10-25 15:51:24 UTC (rev 2744) +++ trunk/jaxx-demo/pom.xml 2013-11-12 08:22:10 UTC (rev 2745) @@ -293,82 +293,6 @@ <profiles> - <profile> - <id>jnlpwar-profile</id> - <dependencies> - <dependency> - <groupId>org.codehaus.mojo</groupId> - <artifactId>webstart-jnlp-servlet</artifactId> - <version>${webstartPluginVersion}</version> - </dependency> - </dependencies> - <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-download-servlet</goal> - </goals> - <configuration> - <outputDirectoryName>jnlp</outputDirectoryName> - <excludeTransitive>false</excludeTransitive> - <libPath>apps</libPath> - <outputJarVersions>true</outputJarVersions> -  - <jnlpFiles> - <jnlpFile> -  - <jarResources> - <jarResource> - <groupId>${project.groupId}</groupId> - <artifactId>jaxx-demo</artifactId> - <version>${project.version}</version> - <mainClass>${maven.jar.main.class}</mainClass> - </jarResource> - </jarResources> - </jnlpFile> - </jnlpFiles> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> -  <profile> <id>release-jnlp-profile</id> @@ -436,25 +360,14 @@ <groupId>org.codehaus.mojo</groupId> <artifactId>webstart-maven-plugin</artifactId> <version>${webstartPluginVersion}</version> + <configuration> + <siteJnlpFile>${jnlpFileName}</siteJnlpFile> + </configuration> </plugin> </plugins> </reporting> </profile> - <profile> - <id>staging-site-profile</id> - <activation> - <property> - <name>stagingSite</name> - <value>true</value> - </property> - </activation> - <properties> - <jnlp.codebase>http://maven-site.liosalfar/jaxx/jaxx-demo/jnlp - </jnlp.codebase> - </properties> - </profile> - </profiles> </project> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/FileEditorDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/FileEditorDemo.jaxx 2013-10-25 15:51:24 UTC (rev 2744) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/FileEditorDemo.jaxx 2013-11-12 08:22:10 UTC (rev 2745) @@ -32,6 +32,7 @@ <Boolean id='acceptAllFileFilterUsed' javaBean='Boolean.TRUE'/> <Boolean id='directoryEnabled' javaBean='Boolean.TRUE'/> <Boolean id='fileEnabled' javaBean='Boolean.FALSE'/> + <Boolean id='showReset' javaBean='Boolean.TRUE'/> <Table fill='both' constraints='BorderLayout.CENTER'> <row> @@ -97,11 +98,22 @@ </cell> </row> <row> + <cell fill='horizontal' weightx='1'> + <JLabel text='jaxxdemo.fileEditor.showResetLabel'/> + </cell> + <cell fill='horizontal' weightx='1'> + <JCheckBox id='showResetCheckBox' + selected='{isShowReset()}' + onActionPerformed='setShowReset(showResetCheckBox.isSelected())'/> + </cell> + </row> + <row> <cell fill='horizontal' weightx='1' columns='2'> <FileEditor id='fileChooser' title='{getTitle()}' exts='{getExts()}' directoryEnabled='{isDirectoryEnabled()}' + showReset='{isShowReset()}' fileEnabled='{isFileEnabled()}' acceptAllFileFilterUsed='{isAcceptAllFileFilterUsed()}' extsDescription='{getExtsDescription()}'/> Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties =================================================================== --- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties 2013-10-25 15:51:24 UTC (rev 2744) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties 2013-11-12 08:22:10 UTC (rev 2745) @@ -249,6 +249,7 @@ jaxxdemo.fileEditor.extsDescLbl=Extensions description (separated by comma, ex \: text (*.txt), images (*.png)) jaxxdemo.fileEditor.extsLbl=Extensions (separated by comma, ex \: txt, png) jaxxdemo.fileEditor.fileEnabled=Enable file selection +jaxxdemo.fileEditor.showResetLabel=Show Reset button jaxxdemo.fileEditor.titleLbl=Open dialog title jaxxdemo.fun=Fun jaxxdemo.i18neditor.configuration=Configuration 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 2013-10-25 15:51:24 UTC (rev 2744) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties 2013-11-12 08:22:10 UTC (rev 2745) @@ -250,6 +250,7 @@ jaxxdemo.fileEditor.extsDescLbl=Description des extensions (séparées 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.showResetLabel= jaxxdemo.fileEditor.titleLbl=Titre du dialog d'ouverture de fichier jaxxdemo.fun=Fun jaxxdemo.i18neditor.configuration=Configuration 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 2013-10-25 15:51:24 UTC (rev 2744) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties 2013-11-12 08:22:10 UTC (rev 2745) @@ -249,6 +249,7 @@ jaxxdemo.fileEditor.extsDescLbl=Description des extensions (séparées 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.showResetLabel=Voir le bouton réintialiser jaxxdemo.fileEditor.titleLbl=Titre de la fenêtre de sélection de fichier jaxxdemo.fun=Fun jaxxdemo.i18neditor.configuration=Configuration Modified: trunk/jaxx-demo/src/main/resources/log4j.properties =================================================================== --- trunk/jaxx-demo/src/main/resources/log4j.properties 2013-10-25 15:51:24 UTC (rev 2744) +++ trunk/jaxx-demo/src/main/resources/log4j.properties 2013-11-12 08:22:10 UTC (rev 2745) @@ -31,8 +31,8 @@ log4j.logger.jaxx=INFO #log4j.logger.jaxx.demo=INFO -log4j.logger.jaxx.demo.tree=DEBUG -log4j.logger.jaxx.runtime.swing.tree=DEBUG +#log4j.logger.jaxx.demo.tree=DEBUG +#log4j.logger.jaxx.runtime.swing.tree=DEBUG #log4j.logger.jaxx.demo.component.jaxx.tree=DEBUG #log4j.logger.jaxx.demo.config.DemoConfig=DEBUG #log4j.logger.jaxx.runtime.swing.editor.config=INFO 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 2013-10-25 15:51:24 UTC (rev 2744) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx 2013-11-12 08:22:10 UTC (rev 2745) @@ -47,22 +47,27 @@ <String id='extsDescription' javaBean='null'/> +  + <Boolean id='showReset' javaBean='false'/> + <script><![CDATA[ protected File selectedFile; public void setSelectedFile(File selectedFile) { this.selectedFile = selectedFile; - if (selectedFile != null) { - setStartPath(selectedFile.getAbsolutePath()); - fireActionEvent(); - } + setStartPath(selectedFile == null ? null : selectedFile.getAbsolutePath()); + fireActionEvent(); } -public void setSelectedFile(String startPath) { +public void setSelectedFilePath(String startPath) { + setSelectedFile(startPath == null ? null : new File(startPath)); +} + +/**public void setSelectedFile(String startPath) { this.selectedFile = null; setStartPath(startPath); fireActionEvent(); -} +}*/ public File getSelectedFile() { if (selectedFile == null) { @@ -79,11 +84,26 @@ ]]></script> + <JToolBar id='toolbar' + floatable='false' + borderPainted='false' + visible='{isShowReset()}' + constraints='BorderLayout.WEST'> + <JButton id='resetButton' + actionIcon='fileeditor-reset' + toolTipText='fileeditor.action.reset.tip' + focusable='false' + focusPainted='false' + enabled='{isEnabled()}' + onActionPerformed='setSelectedFile(null)'/> + </JToolBar> + + <JTextField id='pathField' constraints='BorderLayout.CENTER' enabled='{isEnabled()}' text='{getStartPath()}' - onKeyReleased='setSelectedFile(pathField.getText())'/> + onKeyReleased='setSelectedFilePath(pathField.getText())'/> <JButton id='boutonXslLocation' constraints='BorderLayout.EAST' Modified: trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_en_GB.properties =================================================================== --- trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_en_GB.properties 2013-10-25 15:51:24 UTC (rev 2744) +++ trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_en_GB.properties 2013-11-12 08:22:10 UTC (rev 2745) @@ -68,6 +68,7 @@ errorUI.action.close=Close errorUI.message=An error wad detected... errorUI.title=Error... +fileeditor.action.reset.tip=Reset fontsize.action.default.tip=Restore default font size fontsize.action.down.tip=Decrease font size fontsize.action.up.tip=Increase font size Modified: trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties =================================================================== --- trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties 2013-10-25 15:51:24 UTC (rev 2744) +++ trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties 2013-11-12 08:22:10 UTC (rev 2745) @@ -68,6 +68,7 @@ errorUI.action.close=Cerrar errorUI.message=ha habido un error \! errorUI.title=Error... +fileeditor.action.reset.tip=Reinicializar fontsize.action.default.tip=Volver al tamaño por defecto fontsize.action.down.tip=Disminuir el tamaño del origen fontsize.action.up.tip=Aumentar el tamaño de la fuente Modified: trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties =================================================================== --- trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties 2013-10-25 15:51:24 UTC (rev 2744) +++ trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties 2013-11-12 08:22:10 UTC (rev 2745) @@ -68,6 +68,7 @@ errorUI.action.close=Fermer errorUI.message=Une erreur est survenue \! errorUI.title=Erreur... +fileeditor.action.reset.tip=Réinitialiser fontsize.action.default.tip=Retour sur la taille par défaut fontsize.action.down.tip=Diminuer la taille de la police fontsize.action.up.tip=Augmenter la taille de la police Copied: trunk/jaxx-widgets/src/main/resources/icons/action-fileeditor-reset.png (from rev 2744, trunk/jaxx-widgets/src/main/resources/icons/action-numbereditor-reset.png) =================================================================== (Binary files differ) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-10-25 15:51:24 UTC (rev 2744) +++ trunk/pom.xml 2013-11-12 08:22:10 UTC (rev 2745) @@ -23,14 +23,16 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.1</version> + <version>4.3</version> </parent> <artifactId>jaxx</artifactId> @@ -128,6 +130,10 @@ <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> <site.verbose>true</site.verbose> + +  + <jnlpFileName>jaxx-demo.jnlp</jnlpFileName> +   </properties> @@ -306,7 +312,7 @@ <version>${swingXVersion}</version> <scope>compile</scope> </dependency> - + <dependency> <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-common</artifactId> @@ -443,11 +449,18 @@ <libPath>lib</libPath> <makeArchive>false</makeArchive> <verbose>false</verbose> - <canUnsign>false</canUnsign> + <updateManifestEntries> + <Application-Name>jTimer ${project.version}</Application-Name> + <Permissions>all-permissions</Permissions> + <Codebase>*</Codebase> + </updateManifestEntries> +  +  <jnlp> <mainClass>${maven.jar.main.class}</mainClass> <allPermissions>true</allPermissions> <offlineAllowed>true</offlineAllowed> + <outputFile>${jnlpFileName}</outputFile> </jnlp> <sign> <keystore>${keystorepath}</keystore> @@ -462,9 +475,15 @@ </sign> <gzip>true</gzip> <unsign>true</unsign> - <canUnsign>false</canUnsign> + <canUnsign>true</canUnsign> + <unsignAlreadySignedJars>true</unsignAlreadySignedJars>  -  + <pack200> + <enabled>true</enabled> + <passFiles> + <passFile></passFile> + </passFiles> + </pack200> <jnlpExtensions> <!--jnlpExtension> <name>sun</name>

1 0

[ANN] - JAXX 2.5.29 released
by nuiton.org Release Notification 25 Oct '13

25 Oct '13

The JAXX team is pleased to announce the jaxx-2.5.29 release! JAXX Project Documentation of the project can be found here: http://maven-site.nuiton.org/jaxx Changes ------- Changes in this version include: New features: o [ConfigUI] Improve the shortLabel of an option Issue: 2868. Thanks to Tony Chemit. Resolved by tchemit. o Validate more than one bean property with one editor Issue: 2878. Thanks to Tony Chemit. Resolved by tchemit. o Add some nice methods to select rows and columns from jtable Issue: 2874. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- No release file deployed. (all files are deployed in the maven repository) Maven artifacts --------------- Artifacts are deployed in Maven Central Repository http://repo1.maven.org/maven2/ Find us at * http://search.maven.org/#artifactdetails|org.nuiton.jaxx|jaxx-demo|2.5.29|j… Have fun! -JAXX team

1 0

r2744 - in trunk: . jaxx-compiler jaxx-config jaxx-demo jaxx-maven-plugin jaxx-runtime jaxx-validator jaxx-widgets
by maven-release＠users.nuiton.org 25 Oct '13

25 Oct '13

Author: maven-release Date: 2013-10-25 17:51:24 +0200 (Fri, 25 Oct 2013) New Revision: 2744 Url: http://nuiton.org/projects/jaxx/repository/revisions/2744 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-config/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-maven-plugin/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-validator/pom.xml trunk/jaxx-widgets/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2013-10-25 15:51:21 UTC (rev 2743) +++ trunk/jaxx-compiler/pom.xml 2013-10-25 15:51:24 UTC (rev 2744) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.29</version> + <version>2.5.30-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-config/pom.xml =================================================================== --- trunk/jaxx-config/pom.xml 2013-10-25 15:51:21 UTC (rev 2743) +++ trunk/jaxx-config/pom.xml 2013-10-25 15:51:24 UTC (rev 2744) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.29</version> + <version>2.5.30-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2013-10-25 15:51:21 UTC (rev 2743) +++ trunk/jaxx-demo/pom.xml 2013-10-25 15:51:24 UTC (rev 2744) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.29</version> + <version>2.5.30-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2013-10-25 15:51:21 UTC (rev 2743) +++ trunk/jaxx-maven-plugin/pom.xml 2013-10-25 15:51:24 UTC (rev 2744) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.29</version> + <version>2.5.30-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2013-10-25 15:51:21 UTC (rev 2743) +++ trunk/jaxx-runtime/pom.xml 2013-10-25 15:51:24 UTC (rev 2744) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.29</version> + <version>2.5.30-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2013-10-25 15:51:21 UTC (rev 2743) +++ trunk/jaxx-validator/pom.xml 2013-10-25 15:51:24 UTC (rev 2744) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.29</version> + <version>2.5.30-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2013-10-25 15:51:21 UTC (rev 2743) +++ trunk/jaxx-widgets/pom.xml 2013-10-25 15:51:24 UTC (rev 2744) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.29</version> + <version>2.5.30-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> @@ -49,11 +49,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.29/jaxx-widgets</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk/jaxx-widgets</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.29/jaxx-widgets + scm:svn:http://svn.nuiton.org/svn/jaxx/trunk/jaxx-widgets </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/trunkjaxx-widgets/tags/jaxx…</url> + <url>http://nuiton.org/projects/jaxx/repository/show/trunkjaxx-widgets</url> </scm> <dependencies> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-10-25 15:51:21 UTC (rev 2743) +++ trunk/pom.xml 2013-10-25 15:51:24 UTC (rev 2744) @@ -34,7 +34,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.5.29</version> + <version>2.5.30-SNAPSHOT</version> <modules> <module>jaxx-runtime</module> @@ -135,11 +135,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.29</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.29 + scm:svn:http://svn.nuiton.org/svn/jaxx/trunk </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/tags/jaxx-2.5.29</url> + <url>http://nuiton.org/projects/jaxx/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r2743 - tags
by maven-release＠users.nuiton.org 25 Oct '13

25 Oct '13

Author: maven-release Date: 2013-10-25 17:51:21 +0200 (Fri, 25 Oct 2013) New Revision: 2743 Url: http://nuiton.org/projects/jaxx/repository/revisions/2743 Log: [maven-release-plugin] copy for tag jaxx-2.5.29 Added: tags/jaxx-2.5.29/

1 0

r2742 - in trunk: . jaxx-compiler jaxx-config jaxx-demo jaxx-maven-plugin jaxx-runtime jaxx-validator jaxx-widgets
by maven-release＠users.nuiton.org 25 Oct '13

25 Oct '13

Author: maven-release Date: 2013-10-25 17:51:17 +0200 (Fri, 25 Oct 2013) New Revision: 2742 Url: http://nuiton.org/projects/jaxx/repository/revisions/2742 Log: [maven-release-plugin] prepare release jaxx-2.5.29 Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-config/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-maven-plugin/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-validator/pom.xml trunk/jaxx-widgets/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2013-10-24 15:54:44 UTC (rev 2741) +++ trunk/jaxx-compiler/pom.xml 2013-10-25 15:51:17 UTC (rev 2742) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.29-SNAPSHOT</version> + <version>2.5.29</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-config/pom.xml =================================================================== --- trunk/jaxx-config/pom.xml 2013-10-24 15:54:44 UTC (rev 2741) +++ trunk/jaxx-config/pom.xml 2013-10-25 15:51:17 UTC (rev 2742) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.29-SNAPSHOT</version> + <version>2.5.29</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2013-10-24 15:54:44 UTC (rev 2741) +++ trunk/jaxx-demo/pom.xml 2013-10-25 15:51:17 UTC (rev 2742) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.29-SNAPSHOT</version> + <version>2.5.29</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2013-10-24 15:54:44 UTC (rev 2741) +++ trunk/jaxx-maven-plugin/pom.xml 2013-10-25 15:51:17 UTC (rev 2742) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.29-SNAPSHOT</version> + <version>2.5.29</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2013-10-24 15:54:44 UTC (rev 2741) +++ trunk/jaxx-runtime/pom.xml 2013-10-25 15:51:17 UTC (rev 2742) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.29-SNAPSHOT</version> + <version>2.5.29</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2013-10-24 15:54:44 UTC (rev 2741) +++ trunk/jaxx-validator/pom.xml 2013-10-25 15:51:17 UTC (rev 2742) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.29-SNAPSHOT</version> + <version>2.5.29</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2013-10-24 15:54:44 UTC (rev 2741) +++ trunk/jaxx-widgets/pom.xml 2013-10-25 15:51:17 UTC (rev 2742) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.29-SNAPSHOT</version> + <version>2.5.29</version> </parent> <groupId>org.nuiton.jaxx</groupId> @@ -49,11 +49,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk/jaxx-widgets</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.29/jaxx-widgets</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/trunk/jaxx-widgets + scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.29/jaxx-widgets </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/trunkjaxx-widgets</url> + <url>http://nuiton.org/projects/jaxx/repository/show/trunkjaxx-widgets/tags/jaxx…</url> </scm> <dependencies> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-10-24 15:54:44 UTC (rev 2741) +++ trunk/pom.xml 2013-10-25 15:51:17 UTC (rev 2742) @@ -34,7 +34,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.5.29-SNAPSHOT</version> + <version>2.5.29</version> <modules> <module>jaxx-runtime</module> @@ -135,11 +135,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.29</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/trunk + scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.29 </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/trunk</url> + <url>http://nuiton.org/projects/jaxx/repository/show/tags/jaxx-2.5.29</url> </scm> <distributionManagement>

1 0

r2741 - in trunk: jaxx-compiler/src/main/java/jaxx/compiler/tags/validator jaxx-validator/src/main/java/jaxx/runtime/validator/swing jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui
by tchemit＠users.nuiton.org 24 Oct '13

24 Oct '13

Author: tchemit Date: 2013-10-24 17:54:44 +0200 (Thu, 24 Oct 2013) New Revision: 2741 Url: http://nuiton.org/projects/jaxx/repository/revisions/2741 Log: fixes #2878: Validate more than one bean property with one editor Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/ExcludeFieldValidatorHandler.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/FieldValidatorHandler.java trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableRenderer.java trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/AbstractBeanValidatorUI.java trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/IconValidationUI.java trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/ImageValidationUI.java trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/TranslucentValidationUI.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java 2013-10-17 15:49:11 UTC (rev 2740) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java 2013-10-24 15:54:44 UTC (rev 2741) @@ -25,9 +25,7 @@ package jaxx.compiler.tags.validator; -import com.google.common.base.Joiner; import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.Lists; import com.google.common.collect.Multimap; import jaxx.compiler.CompiledObject; import jaxx.compiler.CompilerException; @@ -35,16 +33,12 @@ import jaxx.compiler.beans.JAXXBeanInfo; import jaxx.compiler.beans.JAXXPropertyDescriptor; import jaxx.compiler.binding.DataBindingHelper; -import jaxx.compiler.java.JavaField; -import jaxx.compiler.java.JavaFile; import jaxx.compiler.reflect.ClassDescriptor; import jaxx.compiler.reflect.ClassDescriptorHelper; import jaxx.compiler.tags.DefaultObjectHandler; import jaxx.compiler.types.TypeManager; -import jaxx.runtime.JAXXValidator; import jaxx.runtime.validator.swing.SwingValidator; import jaxx.runtime.validator.swing.SwingValidatorUtil; -import jaxx.runtime.validator.swing.meta.ValidatorField; import jaxx.runtime.validator.swing.ui.AbstractBeanValidatorUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/ExcludeFieldValidatorHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/ExcludeFieldValidatorHandler.java 2013-10-17 15:49:11 UTC (rev 2740) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/ExcludeFieldValidatorHandler.java 2013-10-24 15:54:44 UTC (rev 2741) @@ -41,8 +41,11 @@ public class ExcludeFieldValidatorHandler implements TagHandler { public static final String TAG = "excludeField"; + public static final String NAME_ATTRIBUTE = "name"; + public static final String COMPONENT_ATTRIBUTE = "component"; + /** Logger */ static private Log log = LogFactory.getLog(ExcludeFieldValidatorHandler.class); Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/FieldValidatorHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/FieldValidatorHandler.java 2013-10-17 15:49:11 UTC (rev 2740) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/FieldValidatorHandler.java 2013-10-24 15:54:44 UTC (rev 2741) @@ -86,8 +86,8 @@ return; } name = name.trim(); - - String component = tag.getAttribute(COMPONENT_ATTRIBUTE); + + String component = tag.getAttribute(COMPONENT_ATTRIBUTE); if (StringUtils.isEmpty(component)) { // try to use the name as component if (!compiler.checkReference(tag, name, false, name)) { Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java 2013-10-17 15:49:11 UTC (rev 2740) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java 2013-10-24 15:54:44 UTC (rev 2741) @@ -25,6 +25,8 @@ package jaxx.runtime.validator.swing; import com.google.common.base.Preconditions; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Multimap; import jaxx.runtime.validator.swing.ui.AbstractBeanValidatorUI; import jaxx.runtime.validator.swing.ui.IconValidationUI; import org.apache.commons.logging.Log; @@ -40,6 +42,7 @@ import java.awt.Container; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; +import java.util.Collection; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; @@ -358,22 +361,77 @@ // use the default one uiClass = DEFAULT_UI_CLASS; } + + // compute reverse map of fieldRepresentation : a same editor can + // reference more than one field + Multimap<JComponent, String> fieldsByEditor = + ArrayListMultimap.create(); for (Entry<String, JComponent> entry : fieldRepresentation.entrySet()) { + fieldsByEditor.put(entry.getValue(), entry.getKey()); + } + + for (JComponent editor : fieldsByEditor.keySet()) { + Collection<String> fields = fieldsByEditor.get(editor); try { setMessageRepresentation( - entry.getKey(), - null, - entry.getValue(), + editor, + fields, uiClass ); } catch (Exception e) { throw new RuntimeException(e); } } + +// for (Entry<String, JComponent> entry : +// fieldRepresentation.entrySet()) { +// try { +// setMessageRepresentation( +// entry.getKey(), +// null, +// entry.getValue(), +// uiClass +// ); +// } catch (Exception e) { +// throw new RuntimeException(e); +// } +// } } protected void setMessageRepresentation( + JComponent c, + Collection<String> fieldnames, + Class<? extends AbstractBeanValidatorUI> uiClass) + throws InvocationTargetException, + IllegalAccessException, + InstantiationException, + NoSuchMethodException { + + Preconditions.checkNotNull(c, "No editor"); + + // ajout du jxlayer sous ce composant + Container container = c.getParent(); + if (container instanceof JXLayer<?>) { + JXLayer jx = (JXLayer<?>) container; + Object oldUI = jx.getUI(); + if (oldUI != null && oldUI instanceof AbstractBeanValidatorUI) { + + // supression de l'ancien layer + removeSimpleBeanValidatorListener((AbstractBeanValidatorUI) oldUI); + } + Constructor<? extends AbstractBeanValidatorUI> cons = + uiClass.getConstructor(Collection.class); + AbstractBeanValidatorUI ui = cons.newInstance(fieldnames); + +// ui.setEnabled(true); + addSimpleBeanValidatorListener(ui); + jx.setUI(ui); + } + } + + @Deprecated + protected void setMessageRepresentation( String fieldname, JComponent old, JComponent c, Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableRenderer.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableRenderer.java 2013-10-17 15:49:11 UTC (rev 2740) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableRenderer.java 2013-10-24 15:54:44 UTC (rev 2741) @@ -67,10 +67,10 @@ String text = null; String toolTipText = null; - column = table.convertColumnIndexToModel(column); - if (table.getRowSorter() != null) { - row = table.getRowSorter().convertRowIndexToModel(row); - } +// column = table.convertColumnIndexToModel(column); +// if (table.getRowSorter() != null) { +// row = table.getRowSorter().convertRowIndexToModel(row); +// } switch (column) { case 0: Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java 2013-10-17 15:49:11 UTC (rev 2740) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java 2013-10-24 15:54:44 UTC (rev 2741) @@ -24,6 +24,8 @@ */ package jaxx.runtime.validator.swing; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Multimap; import jaxx.runtime.JAXXObject; import jaxx.runtime.JAXXValidator; import jaxx.runtime.SwingUtil; @@ -55,7 +57,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.EnumMap; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -229,7 +230,7 @@ */ public static void detectValidatorFields(JAXXValidator ui) { - Map<JComponent, ValidatorField> editors = getValidatorEditors(ui); + Multimap<JComponent, ValidatorField> editors = getValidatorEditors(ui); try { @@ -237,7 +238,7 @@ SwingValidator<?> validator = ui.getValidator(validatorId); for (Map.Entry<JComponent, ValidatorField> entry : - editors.entrySet()) { + editors.entries()) { ValidatorField fieldAnnotation = entry.getValue(); JComponent editor = entry.getKey(); if (!validatorId.equals(fieldAnnotation.validatorId())) { @@ -446,7 +447,7 @@ /** * @param list the validator list ui * @return the validator list mouse listener, or <code>null</code> if not - * found + * found * @see SwingValidatorMessageListMouseListener */ public static SwingValidatorMessageListMouseListener getErrorListMouseListener(JList list) { @@ -463,7 +464,7 @@ /** * @param table the validator table ui * @return the validator table mouse listener, or <code>null</code> if not - * found + * found * @see SwingValidatorMessageTableMouseListener */ public static SwingValidatorMessageTableMouseListener getErrorTableMouseListener(JTable table) { @@ -480,7 +481,7 @@ /** * @param table the validator table ui * @return the validator table mouse listener, or <code>null</code> if not - * found + * found * @see SwingValidatorMessageTableMouseListener */ public static SwingValidatorMessageTableMouseListener getListErrorTableMouseListener(JTable table) { @@ -667,12 +668,10 @@ } } - protected static Map<JComponent, ValidatorField> getValidatorEditors(JAXXValidator ui) { + protected static Multimap<JComponent, ValidatorField> getValidatorEditors(JAXXValidator ui) { + Multimap<JComponent, ValidatorField> editors = ArrayListMultimap.create(); - Map<JComponent, ValidatorField> editors = new HashMap<JComponent, ValidatorField>(); - - Map<Field, ValidatorField> validatorFields = null; Map<Method, ValidatorField> validatorMethods = null; try { Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/AbstractBeanValidatorUI.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/AbstractBeanValidatorUI.java 2013-10-17 15:49:11 UTC (rev 2740) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/AbstractBeanValidatorUI.java 2013-10-24 15:54:44 UTC (rev 2741) @@ -24,14 +24,19 @@ */ package jaxx.runtime.validator.swing.ui; +import com.google.common.collect.Ordering; +import com.google.common.collect.Sets; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.jxlayer.plaf.AbstractLayerUI; import org.nuiton.validator.NuitonValidatorScope; +import org.nuiton.validator.bean.simple.SimpleBeanValidator; import org.nuiton.validator.bean.simple.SimpleBeanValidatorEvent; import org.nuiton.validator.bean.simple.SimpleBeanValidatorListener; import javax.swing.JComponent; +import java.util.Collection; +import java.util.Set; /** * Abstract renderer @@ -54,12 +59,16 @@ protected NuitonValidatorScope scope; /** Field name in validator. */ - protected final String field; + protected final Set<String> fields; - public AbstractBeanValidatorUI(String field) { - this.field = field; + protected AbstractBeanValidatorUI(String field) { + this(Sets.newHashSet(field)); + } + + protected AbstractBeanValidatorUI(Collection<String> fields) { + this.fields = Sets.newHashSet(fields); if (log.isDebugEnabled()) { - log.debug("install " + this + "<field:" + field + ">"); + log.debug("install " + this + "<fields:" + this.fields + ">"); } } @@ -69,15 +78,29 @@ @Override public void onFieldChanged(SimpleBeanValidatorEvent event) { - if (field.equals(event.getField())) { + if (fields.contains(event.getField())) { - scope = event.getSource().getHighestScope(field); + scope = getHighestScope(event); if (log.isDebugEnabled()) { - log.debug("set new scope : " + scope + " to field " + field); + log.debug("set new scope : " + scope + " to field " + fields); } // ask to repaint the layer setDirty(true); } } + protected NuitonValidatorScope getHighestScope(SimpleBeanValidatorEvent event) { + SimpleBeanValidator<?> source = event.getSource(); + Set<NuitonValidatorScope> scopes = Sets.newHashSet(); + for (String field : fields) { + NuitonValidatorScope scope = source.getHighestScope(field); + if (scope != null) { + scopes.add(scope); + } + } + NuitonValidatorScope result = scopes.isEmpty() ? null : Ordering.natural().max(scopes); + return result; + } + + } Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/IconValidationUI.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/IconValidationUI.java 2013-10-17 15:49:11 UTC (rev 2740) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/IconValidationUI.java 2013-10-24 15:54:44 UTC (rev 2741) @@ -24,6 +24,7 @@ */ package jaxx.runtime.validator.swing.ui; +import com.google.common.collect.Sets; import jaxx.runtime.validator.swing.SwingValidatorUtil; import org.jdesktop.jxlayer.JXLayer; import org.nuiton.validator.NuitonValidatorScope; @@ -34,7 +35,9 @@ import java.awt.Graphics2D; import java.awt.RenderingHints; import java.awt.image.BufferedImage; +import java.util.Collection; import java.util.EnumMap; +import java.util.Set; /** @@ -52,7 +55,11 @@ protected EnumMap<NuitonValidatorScope, BufferedImage> icons; public IconValidationUI(String field) { - super(field); + this(Sets.newHashSet(field)); + } + + public IconValidationUI(Collection<String> fields) { + super(fields); icons = new EnumMap<NuitonValidatorScope, BufferedImage>(NuitonValidatorScope.class); for (NuitonValidatorScope scope : NuitonValidatorScope.values()) { Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/ImageValidationUI.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/ImageValidationUI.java 2013-10-17 15:49:11 UTC (rev 2740) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/ImageValidationUI.java 2013-10-24 15:54:44 UTC (rev 2741) @@ -24,6 +24,7 @@ */ package jaxx.runtime.validator.swing.ui; +import com.google.common.collect.Sets; import jaxx.runtime.validator.swing.SwingValidatorUtil; import org.jdesktop.jxlayer.JXLayer; import org.nuiton.validator.NuitonValidatorScope; @@ -34,7 +35,9 @@ import java.awt.Graphics2D; import java.awt.RenderingHints; import java.awt.image.BufferedImage; +import java.util.Collection; import java.util.EnumMap; +import java.util.Set; /** @@ -49,8 +52,12 @@ protected EnumMap<NuitonValidatorScope, BufferedImage> icons; - public ImageValidationUI(String field) { - super(field); + public ImageValidationUI(String fields) { + this(Sets.newHashSet(fields)); + } + + public ImageValidationUI(Collection<String> fields) { + super(fields); icons = new EnumMap<NuitonValidatorScope, BufferedImage>(NuitonValidatorScope.class); for (NuitonValidatorScope scope : NuitonValidatorScope.values()) { Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/TranslucentValidationUI.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/TranslucentValidationUI.java 2013-10-17 15:49:11 UTC (rev 2740) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/TranslucentValidationUI.java 2013-10-24 15:54:44 UTC (rev 2741) @@ -34,6 +34,8 @@ import java.awt.Graphics2D; import java.awt.Insets; import java.awt.Rectangle; +import java.util.Collection; +import java.util.Set; /** * An implementation of {@link AbstractBeanValidatorUI} which paints a @@ -50,6 +52,10 @@ super(field); } + public TranslucentValidationUI(Collection<String> fields) { + super(fields); + } + @Override protected void paintLayer(Graphics2D g2, JXLayer<? extends JComponent> l) { // paints the layer as is

1 0