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

r1881 - trunk
by tchemit＠users.nuiton.org 14 Feb '11

14 Feb '11

Author: tchemit Date: 2011-02-14 16:48:22 +0100 (Mon, 14 Feb 2011) New Revision: 1881 Url: http://nuiton.org/repositories/revision/i18n/1881 Log: Evolution #1282: Updates to processor 1.2.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-14 15:35:46 UTC (rev 1880) +++ trunk/pom.xml 2011-02-14 15:48:22 UTC (rev 1881) @@ -187,7 +187,7 @@  <projectId>i18n</projectId> - <processorVersion>1.2</processorVersion> + <processorVersion>1.2.1</processorVersion>  <locales>fr,en</locales> Property changes on: trunk/pom.xml ___________________________________________________________________ Added: svn:eol-style + native

1 0

r1880 - in trunk: . ant-i18n-task maven-i18n-plugin nuiton-i18n
by hudson＠users.nuiton.org 14 Feb '11

14 Feb '11

Author: hudson Date: 2011-02-14 16:35:46 +0100 (Mon, 14 Feb 2011) New Revision: 1880 Url: http://nuiton.org/repositories/revision/i18n/1880 Log: pass to version 2.3.1-SNAPSHOT for little release Modified: trunk/ant-i18n-task/pom.xml trunk/maven-i18n-plugin/pom.xml trunk/nuiton-i18n/pom.xml trunk/pom.xml Modified: trunk/ant-i18n-task/pom.xml =================================================================== --- trunk/ant-i18n-task/pom.xml 2011-02-14 14:46:15 UTC (rev 1879) +++ trunk/ant-i18n-task/pom.xml 2011-02-14 15:35:46 UTC (rev 1880) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.3.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/maven-i18n-plugin/pom.xml =================================================================== --- trunk/maven-i18n-plugin/pom.xml 2011-02-14 14:46:15 UTC (rev 1879) +++ trunk/maven-i18n-plugin/pom.xml 2011-02-14 15:35:46 UTC (rev 1880) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.3.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/nuiton-i18n/pom.xml =================================================================== --- trunk/nuiton-i18n/pom.xml 2011-02-14 14:46:15 UTC (rev 1879) +++ trunk/nuiton-i18n/pom.xml 2011-02-14 15:35:46 UTC (rev 1880) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.3.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-14 14:46:15 UTC (rev 1879) +++ trunk/pom.xml 2011-02-14 15:35:46 UTC (rev 1880) @@ -37,7 +37,7 @@ </parent> <artifactId>i18n</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.3.1-SNAPSHOT</version> <modules> <module>nuiton-i18n</module>

1 0

r1879 - in trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser: . impl
by tchemit＠users.nuiton.org 14 Feb '11

14 Feb '11

Author: tchemit Date: 2011-02-14 15:46:15 +0100 (Mon, 14 Feb 2011) New Revision: 1879 Url: http://nuiton.org/repositories/revision/i18n/1879 Log: remove old commented code Evolution #1318: Try to make jsp parser more friendly Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserExecutor.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserExecutor.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserExecutor.java 2011-02-10 12:10:18 UTC (rev 1878) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserExecutor.java 2011-02-14 14:46:15 UTC (rev 1879) @@ -31,7 +31,6 @@ import org.nuiton.plugin.PluginHelper; import java.io.File; -import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.concurrent.LinkedBlockingQueue; @@ -219,7 +218,7 @@ parser.parseFile(file); - } catch (IOException e) { + } catch (Exception e) { if (getLog().isErrorEnabled()) { getLog().error("could not parse file " + file, e); } Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java 2011-02-10 12:10:18 UTC (rev 1878) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java 2011-02-14 14:46:15 UTC (rev 1879) @@ -257,12 +257,12 @@ */ private String readInputStream(InputStream in) throws IOException { StringBuilder sb = new StringBuilder(); -// byte[] buffer = new byte[BUFFER_SIZE]; - BufferedReader reader = new BufferedReader(new InputStreamReader(in, getEncoding())); + BufferedReader reader = new BufferedReader( + new InputStreamReader(in, getEncoding())); try { String line; - while ((line = reader.readLine())!=null) { + while ((line = reader.readLine()) != null) { line = line.trim(); if (line.startsWith("#")) { @@ -271,22 +271,12 @@ } sb.append(" ").append(line); } -// sb.append(PluginHelper.readAsString(reader)); } finally { reader.close(); } -// -// while (in.read(buffer, 0, BUFFER_SIZE) != -1) { -// String tmp = new String(buffer); -// sb.append(tmp); -// } -// in.close(); - // Suppression + // Suppression des espaces au début et à la fin String txt = sb.toString().trim(); - // suppression des commentaires -// txt = txt.replaceAll("#.*\n", ""); - // contruction du xpath avec des ou txt = txt.replaceAll("\\s+", " | "); @@ -379,6 +369,15 @@ public void parseFile(File file) throws IOException { File fileToProcess = prepareFile(file); + if (fileToProcess == null) { + + // this case means not to treate the file + if (verbose) { + getLog().info("Skip file " + file); + } + return; + } + try { // Recherche des clés à partir d'un xpath 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-02-10 12:10:18 UTC (rev 1878) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java 2011-02-14 14:46:15 UTC (rev 1879) @@ -25,10 +25,12 @@ package org.nuiton.i18n.plugin.parser.impl; +import org.apache.commons.lang.StringUtils; import org.nuiton.i18n.plugin.parser.I18nSourceEntry; import org.nuiton.i18n.plugin.parser.SourceEntry; import org.nuiton.io.FileUpdater; import org.nuiton.io.MirroredFileUpdater; +import org.nuiton.plugin.PluginHelper; import org.nuiton.processor.ProcessorUtil; import org.nuiton.processor.filters.DefaultFilter; import org.nuiton.processor.filters.Filter; @@ -168,13 +170,39 @@ createDirectoryIfNecessary(result.getParentFile()); JspFileProcessor processor = new JspFileProcessor(); processor.process(file, result, getEncoding()); + String resultFileContent = + PluginHelper.readAsString(result, getEncoding()); + resultFileContent = resultFileContent.trim(); + + if (StringUtils.isBlank(resultFileContent)) { + + // nothing to scan inside this file + result = null; + } else { + + if (resultFileContent.startsWith("<html") || + resultFileContent.startsWith("<HTML") || + resultFileContent.startsWith("<?xml") + ) { + + // document should be well-formed... + + } else { + // to be sure, document is well formed, add a start and end tag + resultFileContent = "<div>\n" + resultFileContent + "\n</div>"; + + PluginHelper.writeString(result, resultFileContent, getEncoding()); + } + + } + return result; } @Override public String extract(String i18nString) { String s = null; - if (!i18nString.trim().isEmpty()) { + if (!StringUtils.isEmpty(i18nString.trim())) { s = i18nString.trim(); } if (getLog().isDebugEnabled()) { @@ -214,11 +242,18 @@ "%" + ">" ); + protected ProcessorHelper.FragmentRemover remover3 = + new ProcessorHelper.FragmentRemover( + "<" + "!" + "-" + "-", + "-" + "-" + ">" + ); + public JspFileProcessor() { setInputFilter( new Filter[]{ remover1, remover2, + remover3, new JspAttributeWithTagFilter() } );

1 0

r1878 - trunk
by tchemit＠users.nuiton.org 10 Feb '11

10 Feb '11

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

1 0

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