- I18n-commits - mailman.cloud.codelutin.com

r1877 - trunk
by tchemit＠users.nuiton.org 09 Feb '11

09 Feb '11

Author: tchemit Date: 2011-02-09 09:14:18 +0100 (Wed, 09 Feb 2011) New Revision: 1877 Url: http://nuiton.org/repositories/revision/i18n/1877 Log: Update mavenpom4redmineAndCentral to 2.4.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-03 11:28:03 UTC (rev 1876) +++ trunk/pom.xml 2011-02-09 08:14:18 UTC (rev 1877) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.3</version> + <version>2.4.4</version> </parent> <artifactId>i18n</artifactId>

1 0

r1876 - trunk
by tchemit＠users.nuiton.org 03 Feb '11

03 Feb '11

Author: tchemit Date: 2011-02-03 12:28:03 +0100 (Thu, 03 Feb 2011) New Revision: 1876 Url: http://nuiton.org/repositories/revision/i18n/1876 Log: Evolution #1282: Updates to processor 1.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-31 13:31:24 UTC (rev 1875) +++ trunk/pom.xml 2011-02-03 11:28:03 UTC (rev 1876) @@ -187,7 +187,7 @@  <projectId>i18n</projectId> - <processorVersion>1.1</processorVersion> + <processorVersion>1.2</processorVersion>  <locales>fr,en</locales>

1 0

r1875 - in trunk: maven-i18n-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl src/site/apt src/site/en/apt
by tchemit＠users.nuiton.org 31 Jan '11

31 Jan '11

Author: tchemit Date: 2011-01-31 14:31:24 +0100 (Mon, 31 Jan 2011) New Revision: 1875 Url: http://nuiton.org/repositories/revision/i18n/1875 Log: update docs + others from tag 2.3 Modified: trunk/maven-i18n-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java trunk/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/JavaFileParserTest.java trunk/src/site/apt/index.apt trunk/src/site/en/apt/index.apt Modified: trunk/maven-i18n-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java =================================================================== --- trunk/maven-i18n-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java 2011-01-31 13:09:57 UTC (rev 1874) +++ trunk/maven-i18n-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java 2011-01-31 13:31:24 UTC (rev 1875) @@ -1,23 +1,23 @@ /* * #%L * I18n :: Maven Plugin - * + * * * $Id$ * $HeadURL$ * %% * Copyright (C) 2007 - 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 + * 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 + * + * 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% Modified: trunk/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/JavaFileParserTest.java =================================================================== --- trunk/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/JavaFileParserTest.java 2011-01-31 13:09:57 UTC (rev 1874) +++ trunk/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/JavaFileParserTest.java 2011-01-31 13:31:24 UTC (rev 1875) @@ -1,3 +1,27 @@ +/* + * #%L + * I18n :: Maven Plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2011 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 org.nuiton.i18n.plugin.parser.impl; import org.apache.maven.plugin.logging.SystemStreamLog; Property changes on: trunk/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/JavaFileParserTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2011-01-31 13:09:57 UTC (rev 1874) +++ trunk/src/site/apt/index.apt 2011-01-31 13:31:24 UTC (rev 1875) @@ -1,23 +1,23 @@ ~~~ ~~ #%L ~~ I18n -~~ +~~ ~~ $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 +~~ 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 +~~ +~~ 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% @@ -32,7 +32,7 @@ utile. De nombreux autre avantages existent à utiliser Nuiton I18n : - Extraction des clés de traduction - + - Integration au process de build au travers de Maven ou Ant Petit exemple qui démontre la simplicité d'utilisation de Nuiton I18n : @@ -51,6 +51,32 @@ - {{{./ant-i18n-task/index.html}I18n Ant task}} (ce module a été désactivé depuis la version 2.0) +Quoi de neuf dans la version 2.3 + + La version 2.3 améliore de façon considérable les temps de détection des clefs + i18n pour les fichiers java (mojo <<parserJava>>). + + Voir {{{http://nuiton.org/issues/show/1275}Evolution #1275: Improve parserJava performance}}. + + On passe à des temps très raisonnable (en dessous de 5 millisecondes par + fichier!) comme montré ci-dessous : + +-------------------------------------------------------------------------------- +mvn package -Pnotests -Di18n.strictMode -DnuitonI18nVersion=2.2 + +[INFO] --- maven-i18n-plugin:2.2:parserJava (default) @ observe-business --- +[INFO] Parsing is done. [treated file(s) : 76/187](total time:19.852s) ( ~ 106.158ms / file) +[INFO] --- maven-i18n-plugin:2.2:parserJava (scan-sources) @ observe-swing --- +[INFO] Parsing is done. [treated file(s) : 151/206](total time:38.732s) ( ~ 188.021ms / file) + +mvn package -Pnotests -Di18n.strictMode -DnuitonI18nVersion=2.3-SNAPSHOT + +[INFO] --- maven-i18n-plugin:2.3-SNAPSHOT:parserJava (default) @ observe-business --- +[INFO] Parsing is done. [treated file(s) : 76/187](total time:640.602ms) ( ~ 3.426ms / file) +[INFO] --- maven-i18n-plugin:2.3-SNAPSHOT:parserJava (scan-sources) @ observe-swing --- +[INFO] Parsing is done. [treated file(s) : 151/206](total time:450.823ms) ( ~ 2.188ms / file) +-------------------------------------------------------------------------------- + Quoi de neuf dans la version 2.2 La version 2.2 supprimer juste des deux méthodes dépréciées en <2.1> : @@ -114,7 +140,7 @@ ----------------------------------------------------------------------------- Et maintenant c'est : - + ----------------------------------------------------------------------------- malib_fr_FR.properties ----------------------------------------------------------------------------- @@ -133,7 +159,7 @@ * Ajout d'un parseur JSP Un nouveau parseur JSP a été introduit pour pouvoir intégrer le système de - détection I18n dans des développement web (struts par exemple). + détection I18n dans des développement web (struts par exemple). Jettez un oeil aux tutoriaux pour voir comment enrichir votre application avec Nuiton I18n. @@ -157,10 +183,7 @@ profile nommé <<ant-task-profile>>. Donc pour construire le projet I18n avec ce module il suffit de lancer : - + ----------------------------------------------------------------------------- -mvn install -Pant-task-profile +mvn install -Pextra-modules ----------------------------------------------------------------------------- - - - Modified: trunk/src/site/en/apt/index.apt =================================================================== --- trunk/src/site/en/apt/index.apt 2011-01-31 13:09:57 UTC (rev 1874) +++ trunk/src/site/en/apt/index.apt 2011-01-31 13:31:24 UTC (rev 1875) @@ -1,23 +1,23 @@ ~~~ ~~ #%L ~~ I18n -~~ +~~ ~~ $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 +~~ 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 +~~ +~~ 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% @@ -51,7 +51,32 @@ - {{{./maven-i18n-plugin/index.html}I18n Maven Plugin}} +What's new in 2.3 version + Version 2.3 improves a lot performance on detection of java file i18n keys + (mojo <<parserJava>>). + + See {{{http://nuiton.org/issues/show/1275}Evolution #1275: Improve parserJava performance}}. + + We are now having some nice times (under 5 millisecondes for a file!) as + shown below : + +-------------------------------------------------------------------------------- +mvn package -Pnotests -Di18n.strictMode -DnuitonI18nVersion=2.2 + +[INFO] --- maven-i18n-plugin:2.2:parserJava (default) @ observe-business --- +[INFO] Parsing is done. [treated file(s) : 76/187](total time:19.852s) ( ~ 106.158ms / file) +[INFO] --- maven-i18n-plugin:2.2:parserJava (scan-sources) @ observe-swing --- +[INFO] Parsing is done. [treated file(s) : 151/206](total time:38.732s) ( ~ 188.021ms / file) + +mvn package -Pnotests -Di18n.strictMode -DnuitonI18nVersion=2.3-SNAPSHOT + +[INFO] --- maven-i18n-plugin:2.3-SNAPSHOT:parserJava (default) @ observe-business --- +[INFO] Parsing is done. [treated file(s) : 76/187](total time:640.602ms) ( ~ 3.426ms / file) +[INFO] --- maven-i18n-plugin:2.3-SNAPSHOT:parserJava (scan-sources) @ observe-swing --- +[INFO] Parsing is done. [treated file(s) : 151/206](total time:450.823ms) ( ~ 2.188ms / file) +-------------------------------------------------------------------------------- + What's new in 2.2 version Version 2.2 just suppress the two depreciated methods in 2.1 version : @@ -158,7 +183,5 @@ So to build the I18n project with this module, you just have to launch : ----------------------------------------------------------------------------- -mvn install -Pant-task-profile +mvn install -Pextra-modules ----------------------------------------------------------------------------- - -

1 0

r1874 - in tags/i18n-2.3: . src/site/apt src/site/en/apt
by tchemit＠users.nuiton.org 31 Jan '11

31 Jan '11

Author: tchemit Date: 2011-01-31 14:09:57 +0100 (Mon, 31 Jan 2011) New Revision: 1874 Url: http://nuiton.org/repositories/revision/i18n/1874 Log: fix scm + doc Modified: tags/i18n-2.3/pom.xml tags/i18n-2.3/src/site/apt/index.apt tags/i18n-2.3/src/site/en/apt/index.apt Modified: tags/i18n-2.3/pom.xml =================================================================== --- tags/i18n-2.3/pom.xml 2011-01-31 13:07:02 UTC (rev 1873) +++ tags/i18n-2.3/pom.xml 2011-01-31 13:09:57 UTC (rev 1874) @@ -200,11 +200,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/i18n/tags/i18n-2.2</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/i18n/tags/i18n-2.3</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/i18n/tags/i18n-2.2 + scm:svn:http://svn.nuiton.org/svn/i18n/tags/i18n-2.3 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/i18n/tags/i18n-2.2</url> + <url>http://www.nuiton.org/repositories/browse/i18n/tags/i18n-2.3</url> </scm> <profiles> Modified: tags/i18n-2.3/src/site/apt/index.apt =================================================================== --- tags/i18n-2.3/src/site/apt/index.apt 2011-01-31 13:07:02 UTC (rev 1873) +++ tags/i18n-2.3/src/site/apt/index.apt 2011-01-31 13:09:57 UTC (rev 1874) @@ -58,8 +58,8 @@ Voir {{{http://nuiton.org/issues/show/1275}Evolution #1275: Improve parserJava performance}}. - On passe à des temps très raisonnable (en de dessous de 5 millisecondes par - fichier!) montré ci-dessous : + On passe à des temps très raisonnable (en dessous de 5 millisecondes par + fichier!) comme montré ci-dessous : -------------------------------------------------------------------------------- mvn package -Pnotests -Di18n.strictMode -DnuitonI18nVersion=2.2 Modified: tags/i18n-2.3/src/site/en/apt/index.apt =================================================================== --- tags/i18n-2.3/src/site/en/apt/index.apt 2011-01-31 13:07:02 UTC (rev 1873) +++ tags/i18n-2.3/src/site/en/apt/index.apt 2011-01-31 13:09:57 UTC (rev 1874) @@ -53,10 +53,10 @@ What's new in 2.3 version - Version 2.3 improves a lot performance on dectection of java file i18n keys + Version 2.3 improves a lot performance on detection of java file i18n keys (mojo <<parserJava>>). - Voir {{{http://nuiton.org/issues/show/1275}Evolution #1275: Improve parserJava performance}}. + See {{{http://nuiton.org/issues/show/1275}Evolution #1275: Improve parserJava performance}}. We are now having some nice times (under 5 millisecondes for a file!) as shown below :

1 0

r1873 - in tags/i18n-2.3: . ant-i18n-task maven-i18n-plugin nuiton-i18n src/site/apt src/site/en/apt
by tchemit＠users.nuiton.org 31 Jan '11

31 Jan '11

Author: tchemit Date: 2011-01-31 14:07:02 +0100 (Mon, 31 Jan 2011) New Revision: 1873 Url: http://nuiton.org/repositories/revision/i18n/1873 Log: Update documentation [maven-release-plugin] prepare release i18n-2.3 Modified: tags/i18n-2.3/ant-i18n-task/pom.xml tags/i18n-2.3/maven-i18n-plugin/pom.xml tags/i18n-2.3/nuiton-i18n/pom.xml tags/i18n-2.3/pom.xml tags/i18n-2.3/src/site/apt/index.apt tags/i18n-2.3/src/site/en/apt/index.apt Modified: tags/i18n-2.3/ant-i18n-task/pom.xml =================================================================== --- tags/i18n-2.3/ant-i18n-task/pom.xml 2011-01-31 12:51:13 UTC (rev 1872) +++ tags/i18n-2.3/ant-i18n-task/pom.xml 2011-01-31 13:07:02 UTC (rev 1873) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: tags/i18n-2.3/maven-i18n-plugin/pom.xml =================================================================== --- tags/i18n-2.3/maven-i18n-plugin/pom.xml 2011-01-31 12:51:13 UTC (rev 1872) +++ tags/i18n-2.3/maven-i18n-plugin/pom.xml 2011-01-31 13:07:02 UTC (rev 1873) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: tags/i18n-2.3/nuiton-i18n/pom.xml =================================================================== --- tags/i18n-2.3/nuiton-i18n/pom.xml 2011-01-31 12:51:13 UTC (rev 1872) +++ tags/i18n-2.3/nuiton-i18n/pom.xml 2011-01-31 13:07:02 UTC (rev 1873) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: tags/i18n-2.3/pom.xml =================================================================== --- tags/i18n-2.3/pom.xml 2011-01-31 12:51:13 UTC (rev 1872) +++ tags/i18n-2.3/pom.xml 2011-01-31 13:07:02 UTC (rev 1873) @@ -33,11 +33,11 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.2</version> + <version>2.4.3</version> </parent> <artifactId>i18n</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> <modules> <module>nuiton-i18n</module> Modified: tags/i18n-2.3/src/site/apt/index.apt =================================================================== --- tags/i18n-2.3/src/site/apt/index.apt 2011-01-31 12:51:13 UTC (rev 1872) +++ tags/i18n-2.3/src/site/apt/index.apt 2011-01-31 13:07:02 UTC (rev 1873) @@ -51,6 +51,32 @@ - {{{./ant-i18n-task/index.html}I18n Ant task}} (ce module a été désactivé depuis la version 2.0) +Quoi de neuf dans la version 2.3 + + La version 2.3 améliore de façon considérable les temps de détection des clefs + i18n pour les fichiers java (mojo <<parserJava>>). + + Voir {{{http://nuiton.org/issues/show/1275}Evolution #1275: Improve parserJava performance}}. + + On passe à des temps très raisonnable (en de dessous de 5 millisecondes par + fichier!) montré ci-dessous : + +-------------------------------------------------------------------------------- +mvn package -Pnotests -Di18n.strictMode -DnuitonI18nVersion=2.2 + +[INFO] --- maven-i18n-plugin:2.2:parserJava (default) @ observe-business --- +[INFO] Parsing is done. [treated file(s) : 76/187](total time:19.852s) ( ~ 106.158ms / file) +[INFO] --- maven-i18n-plugin:2.2:parserJava (scan-sources) @ observe-swing --- +[INFO] Parsing is done. [treated file(s) : 151/206](total time:38.732s) ( ~ 188.021ms / file) + +mvn package -Pnotests -Di18n.strictMode -DnuitonI18nVersion=2.3-SNAPSHOT + +[INFO] --- maven-i18n-plugin:2.3-SNAPSHOT:parserJava (default) @ observe-business --- +[INFO] Parsing is done. [treated file(s) : 76/187](total time:640.602ms) ( ~ 3.426ms / file) +[INFO] --- maven-i18n-plugin:2.3-SNAPSHOT:parserJava (scan-sources) @ observe-swing --- +[INFO] Parsing is done. [treated file(s) : 151/206](total time:450.823ms) ( ~ 2.188ms / file) +-------------------------------------------------------------------------------- + Quoi de neuf dans la version 2.2 La version 2.2 supprimer juste des deux méthodes dépréciées en <2.1> : @@ -159,8 +185,5 @@ Donc pour construire le projet I18n avec ce module il suffit de lancer : ----------------------------------------------------------------------------- -mvn install -Pant-task-profile +mvn install -Pextra-modules ----------------------------------------------------------------------------- - - - Modified: tags/i18n-2.3/src/site/en/apt/index.apt =================================================================== --- tags/i18n-2.3/src/site/en/apt/index.apt 2011-01-31 12:51:13 UTC (rev 1872) +++ tags/i18n-2.3/src/site/en/apt/index.apt 2011-01-31 13:07:02 UTC (rev 1873) @@ -51,7 +51,32 @@ - {{{./maven-i18n-plugin/index.html}I18n Maven Plugin}} +What's new in 2.3 version + Version 2.3 improves a lot performance on dectection of java file i18n keys + (mojo <<parserJava>>). + + Voir {{{http://nuiton.org/issues/show/1275}Evolution #1275: Improve parserJava performance}}. + + We are now having some nice times (under 5 millisecondes for a file!) as + shown below : + +-------------------------------------------------------------------------------- +mvn package -Pnotests -Di18n.strictMode -DnuitonI18nVersion=2.2 + +[INFO] --- maven-i18n-plugin:2.2:parserJava (default) @ observe-business --- +[INFO] Parsing is done. [treated file(s) : 76/187](total time:19.852s) ( ~ 106.158ms / file) +[INFO] --- maven-i18n-plugin:2.2:parserJava (scan-sources) @ observe-swing --- +[INFO] Parsing is done. [treated file(s) : 151/206](total time:38.732s) ( ~ 188.021ms / file) + +mvn package -Pnotests -Di18n.strictMode -DnuitonI18nVersion=2.3-SNAPSHOT + +[INFO] --- maven-i18n-plugin:2.3-SNAPSHOT:parserJava (default) @ observe-business --- +[INFO] Parsing is done. [treated file(s) : 76/187](total time:640.602ms) ( ~ 3.426ms / file) +[INFO] --- maven-i18n-plugin:2.3-SNAPSHOT:parserJava (scan-sources) @ observe-swing --- +[INFO] Parsing is done. [treated file(s) : 151/206](total time:450.823ms) ( ~ 2.188ms / file) +-------------------------------------------------------------------------------- + What's new in 2.2 version Version 2.2 just suppress the two depreciated methods in 2.1 version : @@ -158,7 +183,5 @@ So to build the I18n project with this module, you just have to launch : ----------------------------------------------------------------------------- -mvn install -Pant-task-profile +mvn install -Pextra-modules ----------------------------------------------------------------------------- - -

1 0

r1872 - in trunk/maven-i18n-plugin: . src src/it/ano-672 src/it/ano-672/src/main/java src/it/ano-672/src/main/resources/i18n src/it/ano-672/src/test/java/org/nuiton/i18n src/main/java/org/nuiton/i18n/plugin/parser/impl src/test src/test/java src/test/java/org src/test/java/org/nuiton src/test/java/org/nuiton/i18n src/test/java/org/nuiton/i18n/plugin src/test/java/org/nuiton/i18n/plugin/parser src/test/java/org/nuiton/i18n/plugin/parser/impl
by tchemit＠users.nuiton.org 31 Jan '11

31 Jan '11

Author: tchemit Date: 2011-01-31 13:51:13 +0100 (Mon, 31 Jan 2011) New Revision: 1872 Url: http://nuiton.org/repositories/revision/i18n/1872 Log: Evolution #1275: Improve parserJava performance (from the tag 2.3) Improve it ano-672 (from the tag 2.3) Added: trunk/maven-i18n-plugin/src/test/ trunk/maven-i18n-plugin/src/test/java/ trunk/maven-i18n-plugin/src/test/java/org/ trunk/maven-i18n-plugin/src/test/java/org/nuiton/ trunk/maven-i18n-plugin/src/test/java/org/nuiton/i18n/ trunk/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/ trunk/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/parser/ trunk/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/ trunk/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/JavaFileParserTest.java Removed: trunk/maven-i18n-plugin/src/it/ano-672/src/main/java/org/ Modified: trunk/maven-i18n-plugin/pom.xml trunk/maven-i18n-plugin/src/it/ano-672/pom.xml trunk/maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n/ano-672_en_GB.properties trunk/maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n/ano-672_fr_FR.properties trunk/maven-i18n-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java Modified: trunk/maven-i18n-plugin/pom.xml =================================================================== --- trunk/maven-i18n-plugin/pom.xml 2011-01-31 12:49:25 UTC (rev 1871) +++ trunk/maven-i18n-plugin/pom.xml 2011-01-31 12:51:13 UTC (rev 1872) @@ -105,6 +105,11 @@ <artifactId>log4j</artifactId> <scope>runtime</scope> </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> </dependencies> Modified: trunk/maven-i18n-plugin/src/it/ano-672/pom.xml =================================================================== --- trunk/maven-i18n-plugin/src/it/ano-672/pom.xml 2011-01-31 12:49:25 UTC (rev 1871) +++ trunk/maven-i18n-plugin/src/it/ano-672/pom.xml 2011-01-31 12:51:13 UTC (rev 1872) @@ -95,7 +95,6 @@ <executions> <execution> <goals> - <goal>parserJava</goal> <goal>gen</goal> <goal>bundle</goal> </goals> Modified: trunk/maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n/ano-672_en_GB.properties =================================================================== --- trunk/maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n/ano-672_en_GB.properties 2011-01-31 12:49:25 UTC (rev 1871) +++ trunk/maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n/ano-672_en_GB.properties 2011-01-31 12:51:13 UTC (rev 1872) @@ -1 +1 @@ -javaGetter.key1=Hello \ No newline at end of file +say.hello=Hello \ No newline at end of file Modified: trunk/maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n/ano-672_fr_FR.properties =================================================================== --- trunk/maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n/ano-672_fr_FR.properties 2011-01-31 12:49:25 UTC (rev 1871) +++ trunk/maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n/ano-672_fr_FR.properties 2011-01-31 12:51:13 UTC (rev 1872) @@ -1 +1 @@ -javaGetter.key1=Salut \ No newline at end of file +say.hello=Salut \ No newline at end of file Modified: trunk/maven-i18n-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java =================================================================== --- trunk/maven-i18n-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java 2011-01-31 12:49:25 UTC (rev 1871) +++ trunk/maven-i18n-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java 2011-01-31 12:51:13 UTC (rev 1872) @@ -1,30 +1,32 @@ /* * #%L * I18n :: Maven Plugin - * + * * $Id$ * $HeadURL$ * %% * Copyright (C) 2007 - 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 + * 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 + * + * 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 org.nuiton.i18n; +import org.junit.After; import org.junit.Assert; +import org.junit.Before; import org.junit.Test; import org.nuiton.i18n.init.DefaultI18nInitializer; @@ -32,20 +34,53 @@ public class I18nTest { + public static final String I18n_KEY = "say.hello"; + + public static final String FRENCH_HELLO = "Salut"; + + public static final String ENGLISH_HELLO = "Hello"; + + @Before + public void setup() { + + I18n.init(new DefaultI18nInitializer("ano-672-i18n"), null); + } + + @After + public void after() { + I18n.close(); + } + @Test - public void testI18n() { + public void _() { - I18n.init(new DefaultI18nInitializer("ano-672-i18n"), Locale.FRANCE); + String expected, actual; - String expected = "Salut"; - String actual = I18n._("javaGetter.key1"); + I18n.setDefaultLocale(Locale.FRANCE); + + expected = FRENCH_HELLO; + actual = I18n._(I18n_KEY); Assert.assertEquals(expected, actual); I18n.setDefaultLocale(Locale.ENGLISH); - expected = "Hello"; - actual = I18n._("javaGetter.key1"); + expected = ENGLISH_HELLO; + actual = I18n._(I18n_KEY); Assert.assertEquals(expected, actual); + } + @Test + public void l_() { + + String expected, actual; + + expected = FRENCH_HELLO; + actual = I18n.l_(Locale.FRANCE, I18n_KEY); + Assert.assertEquals(expected, actual); + + expected = ENGLISH_HELLO; + actual = I18n.l_(Locale.UK, I18n_KEY); + Assert.assertEquals(expected, actual); + } } Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java 2011-01-31 12:49:25 UTC (rev 1871) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java 2011-01-31 12:51:13 UTC (rev 1872) @@ -35,7 +35,6 @@ import org.nuiton.io.FileUpdater; import org.nuiton.io.FileUpdaterHelper; import org.nuiton.io.SortedProperties; -import org.nuiton.processor.filters.DefaultFilter; import java.io.File; import java.io.FileInputStream; @@ -118,16 +117,25 @@ protected static class JavaFileParser extends AbstractFileParser { - protected final I18nFilter filter; + /** + * Pattern used to detect i18n keys. + * + * @since 2.3 + */ + protected final Pattern i18nPattern = + Pattern.compile("(?:^_\\(\\s*\\\"|[^l]_\\(\\s*\\\"|l_\\([^,]+\\s*,\\s*\\\")(.*?)\""); public JavaFileParser(Log log, String encoding, SortedProperties oldParser, boolean showTouchedFiles) { super(log, encoding, oldParser, showTouchedFiles); - filter = new I18nFilter(log); } + public Pattern getI18nPattern() { + return i18nPattern; + } + @Override public void parseFile(File file) throws IOException { String line = null; @@ -152,155 +160,21 @@ @Override public void parseLine(File file, String line) throws IOException { - String keysSet = filter.parse(line); + Matcher matcher = i18nPattern.matcher(line); - if (keysSet.equals(I18nFilter.EMPTY_STRING)) { - // no key detected on this line - return; - } + while (matcher.find()) { - // one key found in file, so file is marked as touched - setTouched(true); - // Found a set of i18n Strings, split it. - String[] keys = keysSet.split("="); - for (String key : keys) { + String key = matcher.group(1); if (getLog().isDebugEnabled()) { getLog().debug(file.getName() + " detected key = " + key); } + // one key found in file, so file is marked as touched + setTouched(true); + + // register key registerKey(key); } } } - /** - * Pour filtrer les clefs i18n dans un fichier java. - * - * @since 2.1 - */ - public static class I18nFilter extends DefaultFilter { - - /** Instance logger */ - private final Log log; - - // private String header = "_\$\\s*\""; - private String header = "^_\\(\\s*\\\"|[^l]_\\(\\s*\\\"|l_\\([^,]+\\s*,\\s*\\\""; - - private String footer = "\"\\s*(\$|,|\\+|$)"; - - private Pattern headerPattern = Pattern.compile(getHeader()); - - private Pattern footerPattern = Pattern.compile(getFooter()); - - private Matcher matcher; - - public I18nFilter(Log log) { - this.log = log; - } - - protected void setFooter(String footer) { - this.footer = footer; - } - - protected void setHeader(String header) { - this.header = header; - } - - @Override - protected String getHeader() { - return header; - } - - @Override - protected String getFooter() { - return footer; - } - - @Override - public int getMatchIndexFor(String input, String sequence) { - int index = NOT_FOUND; - - setMatcher(null); - if (sequence.equals(getHeader())) { - setMatcher(getHeaderPattern().matcher(input)); - } else if (sequence.equals(getFooter())) { - setMatcher(getFooterPattern().matcher(input)); - } - if (getMatcher() != null) { - try { - getMatcher().find(); - index = getMatcher().start(); - } catch (RuntimeException e) { - if (log.isDebugEnabled()) { - log.debug("Could not match with " + getMatcher() + " input " + input); - } - } - } - - return index; - } - - @Override - public int getMatchLengthFor(String sequence) { - int length = NOT_FOUND; - - try { - length = getMatcher().end() - getMatcher().start(); - } catch (RuntimeException e) { - if (log.isDebugEnabled()) { - log.debug("Could not match with " + getMatcher() + " input " + sequence); - } - } - - return length; - } - - /** - * methode appele lorsqu'on a la chaine entiere entre le header et le - * footer. - * - * @param ch la chaine trouve - * @return ce qu'il faut ecrire dans le fichier de sortie - */ - @Override - protected String performInFilter(String ch) { - return ch.replaceAll("\"\\s*\\+\\s*\"", "") + "="; - } - - @Override - public String performHeaderFooterFilter(String ch) { - return ch.substring(ch.indexOf('"') + 1, ch.lastIndexOf('"')); - } - - /** - * methode appele lorsqu'on a la chaine entiere a l'exterieur du - * header/footer - * - * @param ch la chaine trouve - * @return ce qu'il faut ecrire dans le fichier de sortie - */ - @Override - protected String performOutFilter(String ch) { - return EMPTY_STRING; - } - - /** @return Returns the footerPattern. */ - protected Pattern getFooterPattern() { - return footerPattern; - } - - /** @return Returns the headerPattern. */ - protected Pattern getHeaderPattern() { - return headerPattern; - } - - /** @return Returns the matcher. */ - protected Matcher getMatcher() { - return matcher; - } - - /** @param matcher The matcher to set. */ - protected void setMatcher(Matcher matcher) { - this.matcher = matcher; - } - } } Added: trunk/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/JavaFileParserTest.java =================================================================== --- trunk/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/JavaFileParserTest.java (rev 0) +++ trunk/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/JavaFileParserTest.java 2011-01-31 12:51:13 UTC (rev 1872) @@ -0,0 +1,128 @@ +package org.nuiton.i18n.plugin.parser.impl; + +import org.apache.maven.plugin.logging.SystemStreamLog; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.nuiton.io.SortedProperties; + +import java.io.File; +import java.io.IOException; +import java.util.HashSet; +import java.util.Set; + +/** + * Tests the class {@link ParserJavaMojo.JavaFileParser} + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.3 + */ +public class JavaFileParserTest { + + + public static final String ENCODING = "utf-8"; + + protected static final SystemStreamLog log = new SystemStreamLog(); + + protected ParserJavaMojo.JavaFileParser parser; + + protected SortedProperties oldParser; + + protected Set<String> detectedKeys; + + @Before + public void setUp() throws Exception { + oldParser = new SortedProperties(ENCODING); + + + parser = new ParserJavaMojo.JavaFileParser( + log, + ENCODING, + oldParser, + false) { + @Override + protected void registerKey(String key) { + detectedKeys.add(key); + } + }; + detectedKeys = new HashSet<String>(); + } + + @After + public void tearDown() throws Exception { + detectedKeys.clear(); + detectedKeys = null; + parser = null; + } + + @Test + public void getKeys() throws IOException { + + File file = new File("getKeys"); + String line; + + line = "_(\"myKey\");"; + parseLine(file, line, "myKey"); + + line = "_(\"MyKey\" "; + parseLine(file, line, "MyKey"); + + line = " blabla _(\"myKey2\");"; + parseLine(file, line, "myKey2"); + + line = " blabla \n somewhere else..." + + "_(\"myKey3\");"; + parseLine(file, line, "myKey3"); + } + + @Test + public void getKeys2() throws IOException { + + String line; + File file = new File("getKeys2"); + + line = "n_(\"myKey\");"; + parseLine(file, line, "myKey"); + + line = "n_(\"MyKey\" "; + parseLine(file, line, "MyKey"); + + line = " blabla n_(\"myKey2\");"; + parseLine(file, line, "myKey2"); + + line = " blabla \n somewhere else..." + + "n_(\"myKey3\");"; + parseLine(file, line, "myKey3"); + } + + @Test + public void getKeys3() throws IOException { + + String line; + File file = new File("getKeys3"); + + line = "l_(Locale.UK, \"myKey\");"; + parseLine(file, line, "myKey"); + + line = "l_( Locale.UK , \"MyKey\""; + parseLine(file, line, "MyKey"); + + line = " blabla l_(Locale.UK, \"myKey2\");"; + parseLine(file, line, "myKey2"); + + line = " blabla \n somewhere else..." + + "l_(Locale.UK, \"myKey3\");"; + parseLine(file, line, "myKey3"); + } + + protected void parseLine(File f, String line, String... expectedKeys) throws IOException { + parser.parseLine(f, line); + for (String expectedKey : expectedKeys) { + + Assert.assertTrue("Key " + expectedKey + + " was expected from line " + line, + detectedKeys.contains(expectedKey)); + } + } +} Property changes on: trunk/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/JavaFileParserTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native

1 0

31 Jan '11

Author: tchemit Date: 2011-01-31 13:49:25 +0100 (Mon, 31 Jan 2011) New Revision: 1871 Url: http://nuiton.org/repositories/revision/i18n/1871 Log: Evolution #1275: Improve parserJava performance Improve it ano-672 Added: tags/i18n-2.3/maven-i18n-plugin/src/test/ tags/i18n-2.3/maven-i18n-plugin/src/test/java/ tags/i18n-2.3/maven-i18n-plugin/src/test/java/org/ tags/i18n-2.3/maven-i18n-plugin/src/test/java/org/nuiton/ tags/i18n-2.3/maven-i18n-plugin/src/test/java/org/nuiton/i18n/ tags/i18n-2.3/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/ tags/i18n-2.3/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/parser/ tags/i18n-2.3/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/ tags/i18n-2.3/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/JavaFileParserTest.java Removed: tags/i18n-2.3/maven-i18n-plugin/src/it/ano-672/src/main/java/org/ Modified: tags/i18n-2.3/ant-i18n-task/pom.xml tags/i18n-2.3/maven-i18n-plugin/pom.xml tags/i18n-2.3/maven-i18n-plugin/src/it/ano-672/pom.xml tags/i18n-2.3/maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n/ano-672_en_GB.properties tags/i18n-2.3/maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n/ano-672_fr_FR.properties tags/i18n-2.3/maven-i18n-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java tags/i18n-2.3/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java tags/i18n-2.3/nuiton-i18n/pom.xml tags/i18n-2.3/pom.xml Modified: tags/i18n-2.3/ant-i18n-task/pom.xml =================================================================== --- tags/i18n-2.3/ant-i18n-task/pom.xml 2011-01-31 12:29:28 UTC (rev 1870) +++ tags/i18n-2.3/ant-i18n-task/pom.xml 2011-01-31 12:49:25 UTC (rev 1871) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.2</version> + <version>2.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: tags/i18n-2.3/maven-i18n-plugin/pom.xml =================================================================== --- tags/i18n-2.3/maven-i18n-plugin/pom.xml 2011-01-31 12:29:28 UTC (rev 1870) +++ tags/i18n-2.3/maven-i18n-plugin/pom.xml 2011-01-31 12:49:25 UTC (rev 1871) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.2</version> + <version>2.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> @@ -106,6 +106,11 @@ <scope>runtime</scope> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + </dependencies>  Modified: tags/i18n-2.3/maven-i18n-plugin/src/it/ano-672/pom.xml =================================================================== --- tags/i18n-2.3/maven-i18n-plugin/src/it/ano-672/pom.xml 2011-01-31 12:29:28 UTC (rev 1870) +++ tags/i18n-2.3/maven-i18n-plugin/src/it/ano-672/pom.xml 2011-01-31 12:49:25 UTC (rev 1871) @@ -58,7 +58,6 @@ <i18n.bundles>fr_FR,en_GB</i18n.bundles> </properties> - <dependencies> <dependency> @@ -66,7 +65,7 @@ <artifactId>nuiton-i18n</artifactId> <version>@pom.version@</version> </dependency> - + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -95,11 +94,10 @@ <executions> <execution> <goals> - <goal>parserJava</goal> <goal>gen</goal> <goal>bundle</goal> </goals> - </execution> + </execution> </executions> </plugin> </plugins> Modified: tags/i18n-2.3/maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n/ano-672_en_GB.properties =================================================================== --- tags/i18n-2.3/maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n/ano-672_en_GB.properties 2011-01-31 12:29:28 UTC (rev 1870) +++ tags/i18n-2.3/maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n/ano-672_en_GB.properties 2011-01-31 12:49:25 UTC (rev 1871) @@ -1 +1 @@ -javaGetter.key1=Hello \ No newline at end of file +say.hello=Hello \ No newline at end of file Modified: tags/i18n-2.3/maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n/ano-672_fr_FR.properties =================================================================== --- tags/i18n-2.3/maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n/ano-672_fr_FR.properties 2011-01-31 12:29:28 UTC (rev 1870) +++ tags/i18n-2.3/maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n/ano-672_fr_FR.properties 2011-01-31 12:49:25 UTC (rev 1871) @@ -1 +1 @@ -javaGetter.key1=Salut \ No newline at end of file +say.hello=Salut \ No newline at end of file Modified: tags/i18n-2.3/maven-i18n-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java =================================================================== --- tags/i18n-2.3/maven-i18n-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java 2011-01-31 12:29:28 UTC (rev 1870) +++ tags/i18n-2.3/maven-i18n-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java 2011-01-31 12:49:25 UTC (rev 1871) @@ -1,7 +1,7 @@ /* * #%L * I18n :: Maven Plugin - * + * * * $Id$ * $HeadURL$ * %% @@ -24,7 +24,9 @@ */ package org.nuiton.i18n; +import org.junit.After; import org.junit.Assert; +import org.junit.Before; import org.junit.Test; import org.nuiton.i18n.init.DefaultI18nInitializer; @@ -32,21 +34,52 @@ public class I18nTest { + public static final String I18n_KEY = "say.hello"; + + public static final String FRENCH_HELLO = "Salut"; + + public static final String ENGLISH_HELLO = "Hello"; + + @Before + public void setup() { + I18n.init(new DefaultI18nInitializer("ano-672-i18n"), null); + } + + @After + public void after() { + I18n.close(); + } + @Test - public void testI18n() { + public void _() { - I18n.setInitializer(new DefaultI18nInitializer("ano-672-i18n")); - I18n.init(Locale.FRANCE); + String expected, actual; - String expected = "Salut"; - String actual = I18n._("javaGetter.key1"); + I18n.setDefaultLocale(Locale.FRANCE); + + expected = FRENCH_HELLO; + actual = I18n._(I18n_KEY); Assert.assertEquals(expected, actual); - I18n.init(Locale.ENGLISH); + I18n.setDefaultLocale(Locale.ENGLISH); - expected = "Hello"; - actual = I18n._("javaGetter.key1"); + expected = ENGLISH_HELLO; + actual = I18n._(I18n_KEY); Assert.assertEquals(expected, actual); + } + @Test + public void l_() { + + String expected, actual; + + expected = FRENCH_HELLO; + actual = I18n.l_(Locale.FRANCE, I18n_KEY); + Assert.assertEquals(expected, actual); + + expected = ENGLISH_HELLO; + actual = I18n.l_(Locale.UK, I18n_KEY); + Assert.assertEquals(expected, actual); + } } Modified: tags/i18n-2.3/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java =================================================================== --- tags/i18n-2.3/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java 2011-01-31 12:29:28 UTC (rev 1870) +++ tags/i18n-2.3/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java 2011-01-31 12:49:25 UTC (rev 1871) @@ -35,7 +35,6 @@ import org.nuiton.io.FileUpdater; import org.nuiton.io.FileUpdaterHelper; import org.nuiton.io.SortedProperties; -import org.nuiton.processor.filters.DefaultFilter; import java.io.File; import java.io.FileInputStream; @@ -130,16 +129,25 @@ protected static class JavaFileParser extends AbstractFileParser { - protected final I18nFilter filter; + /** + * Pattern used to detect i18n keys. + * + * @since 2.3 + */ + protected final Pattern i18nPattern = + Pattern.compile("(?:^_\\(\\s*\\\"|[^l]_\\(\\s*\\\"|l_\\([^,]+\\s*,\\s*\\\")(.*?)\""); public JavaFileParser(Log log, String encoding, SortedProperties oldParser, boolean showTouchedFiles) { super(log, encoding, oldParser, showTouchedFiles); - filter = new I18nFilter(log); } + public Pattern getI18nPattern() { + return i18nPattern; + } + @Override public void parseFile(File file) throws IOException { String line = null; @@ -164,155 +172,20 @@ @Override public void parseLine(File file, String line) throws IOException { - String keysSet = filter.parse(line); + Matcher matcher = i18nPattern.matcher(line); - if (keysSet.equals(I18nFilter.EMPTY_STRING)) { - // no key detected on this line - return; - } + while (matcher.find()) { - // one key found in file, so file is marked as touched - setTouched(true); - // Found a set of i18n Strings, split it. - String[] keys = keysSet.split("="); - for (String key : keys) { + String key = matcher.group(1); if (getLog().isDebugEnabled()) { getLog().debug(file.getName() + " detected key = " + key); } + // one key found in file, so file is marked as touched + setTouched(true); + + // register key registerKey(key); } } } - - /** - * Pour filtrer les clefs i18n dans un fichier java. - * - * @since 2.1 - */ - public static class I18nFilter extends DefaultFilter { - - /** Instance logger */ - private final Log log; - - // private String header = "_\$\\s*\""; - private String header = "^_\\(\\s*\\\"|[^l]_\\(\\s*\\\"|l_\\([^,]+\\s*,\\s*\\\""; - - private String footer = "\"\\s*(\$|,|\\+|$)"; - - private Pattern headerPattern = Pattern.compile(getHeader()); - - private Pattern footerPattern = Pattern.compile(getFooter()); - - private Matcher matcher; - - public I18nFilter(Log log) { - this.log = log; - } - - protected void setFooter(String footer) { - this.footer = footer; - } - - protected void setHeader(String header) { - this.header = header; - } - - @Override - protected String getHeader() { - return header; - } - - @Override - protected String getFooter() { - return footer; - } - - @Override - public int getMatchIndexFor(String input, String sequence) { - int index = NOT_FOUND; - - setMatcher(null); - if (sequence.equals(getHeader())) { - setMatcher(getHeaderPattern().matcher(input)); - } else if (sequence.equals(getFooter())) { - setMatcher(getFooterPattern().matcher(input)); - } - if (getMatcher() != null) { - try { - getMatcher().find(); - index = getMatcher().start(); - } catch (RuntimeException e) { - if (log.isDebugEnabled()) { - log.debug("Could not match with " + getMatcher() + " input " + input); - } - } - } - - return index; - } - - @Override - public int getMatchLengthFor(String sequence) { - int length = NOT_FOUND; - - try { - length = getMatcher().end() - getMatcher().start(); - } catch (RuntimeException e) { - if (log.isDebugEnabled()) { - log.debug("Could not match with " + getMatcher() + " input " + sequence); - } - } - - return length; - } - - /** - * methode appele lorsqu'on a la chaine entiere entre le header et le - * footer. - * - * @param ch la chaine trouve - * @return ce qu'il faut ecrire dans le fichier de sortie - */ - @Override - protected String performInFilter(String ch) { - return ch.replaceAll("\"\\s*\\+\\s*\"", "") + "="; - } - - @Override - public String performHeaderFooterFilter(String ch) { - return ch.substring(ch.indexOf('"') + 1, ch.lastIndexOf('"')); - } - - /** - * methode appele lorsqu'on a la chaine entiere a l'exterieur du - * header/footer - * - * @param ch la chaine trouve - * @return ce qu'il faut ecrire dans le fichier de sortie - */ - @Override - protected String performOutFilter(String ch) { - return EMPTY_STRING; - } - - /** @return Returns the footerPattern. */ - protected Pattern getFooterPattern() { - return footerPattern; - } - - /** @return Returns the headerPattern. */ - protected Pattern getHeaderPattern() { - return headerPattern; - } - - /** @return Returns the matcher. */ - protected Matcher getMatcher() { - return matcher; - } - - /** @param matcher The matcher to set. */ - protected void setMatcher(Matcher matcher) { - this.matcher = matcher; - } - } } Added: tags/i18n-2.3/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/JavaFileParserTest.java =================================================================== --- tags/i18n-2.3/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/JavaFileParserTest.java (rev 0) +++ tags/i18n-2.3/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/JavaFileParserTest.java 2011-01-31 12:49:25 UTC (rev 1871) @@ -0,0 +1,151 @@ +/* + * #%L + * I18n :: Maven Plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2011 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 org.nuiton.i18n.plugin.parser.impl; + +import org.apache.maven.plugin.logging.SystemStreamLog; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.nuiton.io.SortedProperties; + +import java.io.File; +import java.io.IOException; +import java.util.HashSet; +import java.util.Set; + +/** + * Tests the class {@link ParserJavaMojo.JavaFileParser} + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.3 + */ +public class JavaFileParserTest { + + public static final String ENCODING = "utf-8"; + + protected static final SystemStreamLog log = new SystemStreamLog(); + + protected ParserJavaMojo.JavaFileParser parser; + + protected SortedProperties oldParser; + + protected Set<String> detectedKeys; + + @Before + public void setUp() throws Exception { + oldParser = new SortedProperties(ENCODING); + + + parser = new ParserJavaMojo.JavaFileParser( + log, + ENCODING, + oldParser, + false) { + @Override + protected void registerKey(String key) { + detectedKeys.add(key); + } + }; + detectedKeys = new HashSet<String>(); + } + + @After + public void tearDown() throws Exception { + detectedKeys.clear(); + detectedKeys = null; + parser = null; + } + + @Test + public void getKeys() throws IOException { + + File file = new File("getKeys"); + String line; + + line = "_(\"myKey\");"; + parseLine(file, line, "myKey"); + + line = "_(\"MyKey\" "; + parseLine(file, line, "MyKey"); + + line = " blabla _(\"myKey2\");"; + parseLine(file, line, "myKey2"); + + line = " blabla \n somewhere else..." + + "_(\"myKey3\");"; + parseLine(file, line, "myKey3"); + } + + @Test + public void getKeys2() throws IOException { + + String line; + File file = new File("getKeys2"); + + line = "n_(\"myKey\");"; + parseLine(file, line, "myKey"); + + line = "n_(\"MyKey\" "; + parseLine(file, line, "MyKey"); + + line = " blabla n_(\"myKey2\");"; + parseLine(file, line, "myKey2"); + + line = " blabla \n somewhere else..." + + "n_(\"myKey3\");"; + parseLine(file, line, "myKey3"); + } + + @Test + public void getKeys3() throws IOException { + + String line; + File file = new File("getKeys3"); + + line = "l_(Locale.UK, \"myKey\");"; + parseLine(file, line, "myKey"); + + line = "l_( Locale.UK , \"MyKey\""; + parseLine(file, line, "MyKey"); + + line = " blabla l_(Locale.UK, \"myKey2\");"; + parseLine(file, line, "myKey2"); + + line = " blabla \n somewhere else..." + + "l_(Locale.UK, \"myKey3\");"; + parseLine(file, line, "myKey3"); + } + + protected void parseLine(File f, String line, String... expectedKeys) throws IOException { + parser.parseLine(f, line); + for (String expectedKey : expectedKeys) { + + Assert.assertTrue("Key " + expectedKey + + " was expected from line " + line, + detectedKeys.contains(expectedKey)); + } + } +} Property changes on: tags/i18n-2.3/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/JavaFileParserTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: tags/i18n-2.3/nuiton-i18n/pom.xml =================================================================== --- tags/i18n-2.3/nuiton-i18n/pom.xml 2011-01-31 12:29:28 UTC (rev 1870) +++ tags/i18n-2.3/nuiton-i18n/pom.xml 2011-01-31 12:49:25 UTC (rev 1871) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.2</version> + <version>2.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: tags/i18n-2.3/pom.xml =================================================================== --- tags/i18n-2.3/pom.xml 2011-01-31 12:29:28 UTC (rev 1870) +++ tags/i18n-2.3/pom.xml 2011-01-31 12:49:25 UTC (rev 1871) @@ -37,7 +37,7 @@ </parent> <artifactId>i18n</artifactId> - <version>2.2</version> + <version>2.3-SNAPSHOT</version> <modules> <module>nuiton-i18n</module>

1 0

r1870 - tags
by tchemit＠users.nuiton.org 31 Jan '11

31 Jan '11

Author: tchemit Date: 2011-01-31 13:29:28 +0100 (Mon, 31 Jan 2011) New Revision: 1870 Url: http://nuiton.org/repositories/revision/i18n/1870 Log: preapre tag for release 2.3 Added: tags/i18n-2.3/

1 0

r1869 - trunk/maven-i18n-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n
by tchemit＠users.nuiton.org 31 Jan '11

31 Jan '11

Author: tchemit Date: 2011-01-31 10:21:57 +0100 (Mon, 31 Jan 2011) New Revision: 1869 Url: http://nuiton.org/repositories/revision/i18n/1869 Log: Evolution #1241: Remove all the deprecated api from version 2.1 Modified: trunk/maven-i18n-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java Modified: trunk/maven-i18n-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java =================================================================== --- trunk/maven-i18n-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java 2011-01-31 08:01:45 UTC (rev 1868) +++ trunk/maven-i18n-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java 2011-01-31 09:21:57 UTC (rev 1869) @@ -35,14 +35,13 @@ @Test public void testI18n() { - I18n.setInitializer(new DefaultI18nInitializer("ano-672-i18n")); - I18n.init(Locale.FRANCE); + I18n.init(new DefaultI18nInitializer("ano-672-i18n"), Locale.FRANCE); String expected = "Salut"; String actual = I18n._("javaGetter.key1"); Assert.assertEquals(expected, actual); - I18n.init(Locale.ENGLISH); + I18n.setDefaultLocale(Locale.ENGLISH); expected = "Hello"; actual = I18n._("javaGetter.key1");

1 0

r1868 - in trunk: maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl nuiton-i18n/src/main/java/org/nuiton/i18n
by tchemit＠users.nuiton.org 31 Jan '11

31 Jan '11

Author: tchemit Date: 2011-01-31 09:01:45 +0100 (Mon, 31 Jan 2011) New Revision: 1868 Url: http://nuiton.org/repositories/revision/i18n/1868 Log: Evolution #1241: Remove all the deprecated api from version 2.1 Removed: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/KeysModifier.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserEvent.java Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserGWTJavaMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserTapestryMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java 2011-01-27 08:53:24 UTC (rev 1867) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java 2011-01-31 08:01:45 UTC (rev 1868) @@ -44,22 +44,6 @@ /** @return the outGetter to use for the instance (java.getter,...) */ protected abstract String getOutGetter(); - /** - * @return the starting regex expression to catch keys in key modifier - * @deprecated since 1.2, no more used, incompatible with multi-threading - * parsing - */ - @Deprecated - protected abstract String getKeyModifierStart(); - - /** - * @return the ending regex expression to catch keys in key modifier - * @deprecated since 1.2, no more used, incompatible with multi-threading - * parsing - */ - @Deprecated - protected abstract String getKeyModifierEnd(); - /** @return the default includes to add to directory scanner */ protected abstract String[] getDefaultIncludes(); @@ -89,21 +73,6 @@ protected File cp; /** - * To activate the modification of keys - * - * Note : By default not active, since it requires to have UI available - * and this is not acceptable for server build. - * - * Note : At the moment the fully fonctionnality is no more available - * and will be recode in a separated goal (one day...) - * - * @parameter expression="${i18n.keysModifier}" default-value="false" - * @deprecated since 1.2, will no more used - */ - @Deprecated - protected boolean keysModifier; - - /** * To treate default entry offered by the mojo. * * @parameter expression="${i18n.treateDefaultEntry}" default-value="true" @@ -209,11 +178,7 @@ @Override protected void doAction() throws Exception { - if (keysModifier) { - getLog().warn("\n" + - "\nWarning : keysModifier is deprecated and has no more effect." + - "\n"); - } + if (!silent && strictMode) { getLog().info("config - strictMode is on (all files will be" + " parsed)."); Deleted: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/KeysModifier.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/KeysModifier.java 2011-01-27 08:53:24 UTC (rev 1867) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/KeysModifier.java 2011-01-31 08:01:45 UTC (rev 1868) @@ -1,246 +0,0 @@ -/* - * #%L - * I18n :: Maven Plugin - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2007 - 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 org.nuiton.i18n.plugin.parser; - -import org.nuiton.plugin.PluginHelper; - -import javax.swing.JButton; -import javax.swing.JCheckBox; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JTextField; -import java.awt.Container; -import java.awt.GridLayout; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -/** - * IHM permettant de modifier les clés de traduction en direct dans les fichiers - * parsés et les fichiers de propriétés. - * - * @author julien - * @deprecated since 1.2, no more used actually, since we are using - * multi-thread parsing which is not compatible with a sequential - * parsing. - */ -@Deprecated -public class KeysModifier extends JFrame implements ParserEvent { - - private static final long serialVersionUID = 1L; - - // Modification des clés dans le fichier - - protected List<String> newKeys; - - protected boolean needModifiedFile; - - protected String patternLeft; - - protected String patternRight; - - protected String encoding; - - // Interface - - protected JLabel name = new JLabel(); - - protected JLabel path = new JLabel(); - - protected JTextField key = new JTextField(); - - protected JTextField pattern = new JTextField(".*"); - - protected JCheckBox onlyNewKey = new JCheckBox(); - - protected JButton next = new JButton("Next >>"); - - private static KeysModifier keysModifier; - - /** - * Récupération d'une instance de l'interface - * - * @param patternLeft left pattern - * @param patternRight right pattern - * @param encoding encoding - * @return the shared instance with new config - */ - public static KeysModifier getInstance(String patternLeft, - String patternRight, - String encoding) { - if (keysModifier == null) { - keysModifier = new KeysModifier(); - } - - - keysModifier.encoding = encoding; - keysModifier.patternLeft = patternLeft; - keysModifier.patternRight = patternRight; - - return keysModifier; - } - - /** Contructeur de l'interface */ - private KeysModifier() { - setLayout(new GridLayout(9, 2, 10, 10)); - - Container pane = getContentPane(); - pane.add(new JLabel("--- File information ---")); - pane.add(new JLabel()); - - pane.add(new JLabel("Name :")); - pane.add(name); - - pane.add(new JLabel("Path : ")); - pane.add(path); - - pane.add(new JLabel("--- Files language ---")); - pane.add(new JLabel()); - - pane.add(new JLabel("Key :")); - pane.add(key); - - pane.add(new JLabel("--- Filters ---")); - pane.add(new JLabel()); - - pane.add(new JLabel("Pattern :")); - pane.add(pattern); - - pane.add(new JLabel("Only new key :")); - pane.add(onlyNewKey); - - pane.add(new JLabel()); - pane.add(next); - - next.addActionListener(new EventNextKey()); - addWindowListener(new EventWindows()); - - setTitle("Keys modifier"); - setSize(800, 400); -// pack(); - setVisible(true); - } - - @Override - public void eventChangeFile(File file) { - name.setText(file.getName()); - path.setText(file.getPath()); - key.setText(""); - repaint(); - - newKeys = new ArrayList<String>(); - needModifiedFile = false; - } - - @Override - public void eventNextFile(File file) { - if (needModifiedFile) { - String content; - int region = 0; - - try { - content = PluginHelper.readAsString(file, encoding); - } catch (IOException e) { - throw new ParserException(e); - } - - for (Iterator<String> iterator = newKeys.iterator(); - iterator.hasNext();) { - String oldKey = iterator.next(); - String realKey = iterator.next(); - Pattern p = Pattern.compile('(' + patternLeft + - ")(" + Pattern.quote(oldKey) + - ")(" + patternRight + ')'); - Matcher matcher = p.matcher(content); - matcher.region(region, content.length()); - matcher.find(); - region = matcher.start(); - content = matcher.replaceFirst("$1" + realKey + "$3"); - } - - try { - PluginHelper.writeString(file, content, encoding); - } catch (IOException e) { - throw new ParserException(e); - } - } - } - - @Override - public synchronized void eventChangeKey(String keyI18n, boolean newKey) { - key.setText(keyI18n); - newKeys.add(key.getText()); - repaint(); - if (isVisible() && - keyI18n.matches(pattern.getText()) && - (!onlyNewKey.isSelected() || newKey)) { - try { - wait(); - } catch (InterruptedException e) { - throw new ParserException(e); - } - } - } - - @Override - public String eventGetRealKey() { - newKeys.add(key.getText()); - needModifiedFile |= !newKeys.get(newKeys.size() - 1).equals( - newKeys.get(newKeys.size() - 2)); - return key.getText(); - } - - /** Action sur le boutton pour passer a la cle suivante */ - class EventNextKey implements ActionListener { - @Override - public void actionPerformed(ActionEvent e) { - eventNextKey(); - } - } - - /** Action sur la fermeture de la frame */ - class EventWindows extends WindowAdapter { - - @Override - public void windowClosing(WindowEvent e) { - setVisible(false); - eventNextKey(); - } - } - - /** Permet de passer à la clé suivante */ - public synchronized void eventNextKey() { - notifyAll(); - } -} Deleted: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserEvent.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserEvent.java 2011-01-27 08:53:24 UTC (rev 1867) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserEvent.java 2011-01-31 08:01:45 UTC (rev 1868) @@ -1,70 +0,0 @@ -/* - * #%L - * I18n :: Maven Plugin - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2007 - 2010 CodeLutin, Tony Chemit - * %% - * 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 org.nuiton.i18n.plugin.parser; - -import java.io.File; - -/** - * Permet d'ajouter des évènements sur les parsers - * - * @author julien - * @deprecated since 1.2, no more used actually, since we are using - * multi-thread parsing which is not compatible with a sequential - * parsing. - */ -@Deprecated -public interface ParserEvent { - - /** - * Méthode appelée quand on change de fichier parsé - * - * @param file le nouveau fichier a parser - */ - void eventChangeFile(File file); - - /** - * Méthode appelée après le parsing du fichier - * - * @param file le prochain fichier a parser - */ - void eventNextFile(File file); - - /** - * Méthode appelée quand on change de clé - * - * @param keyI18n la clef i18n - * @param newKey la nouvelle clef i18n - */ - void eventChangeKey(String keyI18n, boolean newKey); - - /** - * Méthode appelée pour récupérer la nouvelle valeur de clé - * - * @return la nouvelle clé - */ - String eventGetRealKey(); - -} Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserGWTJavaMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserGWTJavaMojo.java 2011-01-27 08:53:24 UTC (rev 1867) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserGWTJavaMojo.java 2011-01-31 08:01:45 UTC (rev 1868) @@ -135,18 +135,6 @@ } @Override - @Deprecated - protected String getKeyModifierStart() { - return "_\$\\s*\""; - } - - @Override - @Deprecated - protected String getKeyModifierEnd() { - return "\"\\s*(\$|,|\\+|$)"; - } - - @Override protected String getOutGetter() { return outputGetter; } Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java 2011-01-27 08:53:24 UTC (rev 1867) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java 2011-01-31 08:01:45 UTC (rev 1868) @@ -102,18 +102,6 @@ } @Override - @Deprecated - protected String getKeyModifierStart() { - return "_\$\\s*\""; - } - - @Override - @Deprecated - protected String getKeyModifierEnd() { - return "\"\\s*(\$|,|\\+|$)"; - } - - @Override protected String getOutGetter() { return outputGetter; } Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java 2011-01-27 08:53:24 UTC (rev 1867) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java 2011-01-31 08:01:45 UTC (rev 1868) @@ -186,19 +186,6 @@ }; } - - @Override - @Deprecated - protected String getKeyModifierStart() { - return "=\\s*[\"\']"; - } - - @Override - @Deprecated - protected String getKeyModifierEnd() { - return "[\"\']"; - } - /** * To transform jsp files to valid xml files. * Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserTapestryMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserTapestryMojo.java 2011-01-27 08:53:24 UTC (rev 1867) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserTapestryMojo.java 2011-01-31 08:01:45 UTC (rev 1868) @@ -133,18 +133,6 @@ } @Override - @Deprecated - protected String getKeyModifierStart() { - return "_\$\\s*\""; - } - - @Override - @Deprecated - protected String getKeyModifierEnd() { - return "\"\\s*(\$|,|\\+|$)"; - } - - @Override protected String getOutGetter() { return outputGetter; } Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java 2011-01-27 08:53:24 UTC (rev 1867) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java 2011-01-31 08:01:45 UTC (rev 1868) @@ -217,16 +217,4 @@ } }; } - - @Override - @Deprecated - protected String getKeyModifierStart() { - return "=\\s*[\"\']"; - } - - @Override - @Deprecated - protected String getKeyModifierEnd() { - return "[\"\']"; - } } Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java 2011-01-27 08:53:24 UTC (rev 1867) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java 2011-01-31 08:01:45 UTC (rev 1868) @@ -135,16 +135,6 @@ } @Override - protected String getKeyModifierStart() { - return null; - } - - @Override - protected String getKeyModifierEnd() { - return null; - } - - @Override public FileUpdater newFileUpdater(SourceEntry entry) { return new MirroredFileUpdater("", "", entry.getBasedir(), cp) { Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java 2011-01-27 08:53:24 UTC (rev 1867) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java 2011-01-31 08:01:45 UTC (rev 1868) @@ -57,22 +57,6 @@ /** Logger */ private static final Log log = LogFactory.getLog(I18n.class); - /** @deprecated since 2.1, will be removed in version 3.0 */ - @Deprecated - public static final String ISO_8859_1_ENCONDING = "ISO-8859-1"; - - /** @deprecated since 2.1, will be removed in version 3.0 */ - @Deprecated - public static final String UTF_8_ENCONDING = "UTF-8"; - - /** @deprecated since 2.1, will be removed in version 3.0 */ - @Deprecated - public static final String DEFAULT_ENCODING = ISO_8859_1_ENCONDING; - - /** @deprecated since 2.1, will be removed in version 3.0 */ - @Deprecated - public static final Locale DEFAULT_LOCALE = Locale.UK; - /** * I18n initializer, * @@ -89,25 +73,7 @@ /** Filtre a appliquer avant de retourner les chaines */ protected static I18nFilter filter; - private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0]; - /** - * Sets the initializer to use to init the I18n system. - * - * You must inovke this method before any invocation of methods {@code - * init(XXX)}. - * - * @param initializer the initializer to set. - * @see DefaultI18nInitializer - * @deprecated since 2.1, will be removed in version 3.0, use instead the - * method {@link I18n#init(I18nInitializer, Locale)}. - */ - @Deprecated - public static void setInitializer(I18nInitializer initializer) { - I18n.initializer = initializer; - } - - /** * Change le filtre des chaines traduites * * @param filter l'objet filtre a utiliser @@ -156,57 +122,6 @@ initStore(initializer, locale); } - /** - * Initialize I18n with default initializer and default locale of the system. - * - * We recommand not to use any longer this method. - * - * @deprecated since 2.1, will be removed in version 3.0, prefer use the - * {@link #init(I18nInitializer, Locale)} instead. - */ - @Deprecated - public static void init() { - if (log.isWarnEnabled()) { - log.warn("Using deprecated init method."); - } - init(null, (Locale) null); - } - - /** - * Initialize I18n with default initializer and given locale. - * - * We recommand not to use any longer this method. - * - * @param language une chaine representant la langue à utiliser fr, en, ... - * @param country une chaine representant le pays à utiliser FR, GB, ... - * @deprecated since 2.1, will be removed in version 3.0, prefer use the - * {@link #init(I18nInitializer, Locale)} instead. - */ - @Deprecated - public static void init(String language, String country) { - if (log.isWarnEnabled()) { - log.warn("Using deprecated init method."); - } - init(null, I18nUtil.newLocale(language, country)); - } - - /** - * Initialize I18n with default initializer and given {@code locale}. - * - * We recommand not to use any longer this method. - * - * @param locale language to use - * @deprecated since 2.1, will be removed in version 3.0, prefer use the - * {@link #init(I18nInitializer, Locale)} instead. - */ - @Deprecated - public static void init(Locale locale) { - if (log.isWarnEnabled()) { - log.warn("Using deprecated init method."); - } - init(null, locale); - } - public static void reload() { checkInit(); @@ -384,21 +299,6 @@ } /** - * Get the i18n initializer. - * - * If no one was specified, then use the {@link ClassPathI18nInitializer}. - * - * @return the i81n initializer to used to init system - * @deprecated since 2.1, will be removed in version 3.0, the initializer - * will no more be saved in this class but directly in the - * {@link I18nStore}. - */ - @Deprecated - public static I18nInitializer getInitializer() { - return initializer; - } - - /** * Get the i18n store. * * If store is not init, then instanciate it. @@ -514,13 +414,14 @@ protected static I18nInitializer getDefaultInitializer() { - I18nInitializer initializer; + I18nInitializer initializer = new ClassPathI18nInitializer(); - // will be removed in version 3.0 - if (I18n.initializer != null) { - initializer = I18n.initializer; - } else { - initializer = new ClassPathI18nInitializer(); + if (log.isWarnEnabled()) { + log.warn("\n\nI18n was not initialized! will init it with " + + "default initializer and default locale, it might " + + "not translate anything fro you...\nPlease use the " + + "method I18n.init(I18nInitializer, Locale) before " + + "any calling to a translation...\n\n"); } return initializer; } @@ -537,15 +438,7 @@ if (store == null) { - if (log.isWarnEnabled()) { - - log.warn("\n\nI18n was not initialized! will init it with " + - "default initializer and default locale, it might " + - "not translate anything fro you...\nPlease use the " + - "method I18n.init(I18nInitializer, Locale) before " + - "any calling to a translation...\n\n"); - } - init(null, (Locale) null); + init(null, null); } }

1 0