Author: tchemit Date: 2010-04-04 11:52:09 +0200 (Sun, 04 Apr 2010) New Revision: 1738 Log: Evolution #453: Use maven-helper-plugin 1.2.3 Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractI18nBundleMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/TapestryBundleMojo.java trunk/pom.xml Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractI18nBundleMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractI18nBundleMojo.java 2010-04-03 19:36:06 UTC (rev 1737) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractI18nBundleMojo.java 2010-04-04 09:52:09 UTC (rev 1738) @@ -26,8 +26,6 @@ import java.io.File; import java.io.IOException; import java.net.URL; -import java.util.ArrayList; -import java.util.List; import java.util.Locale; /** @@ -53,7 +51,8 @@ /** * Nom de base des fichiers qui contient les localisations des bundles. * - * @parameter expression="${i18n.collectOutputName}" default-value="collect-${project.artifactId}-i18n" + * @parameter expression="${i18n.collectOutputName}" + * default-value="collect-${project.artifactId}-i18n" * @required * @since 1.0.2 */ @@ -91,20 +90,15 @@ } /** - * TODO Move this in PluginHelper. - * * @param src the source file to read * @return the url instanciated from lines of the source file. * @throws IOException if any pb while reading file + * @deprecated since 1.2.2, use the {@link PluginHelper#getLinesAsURL(File)} + * instead. */ + @Deprecated public static URL[] getLinesAsURL(File src) throws IOException { - List<URL> result = new ArrayList<URL>(); - for (String line : PluginHelper.getLines(src)) { - if (!line.isEmpty()) { - result.add(new URL(line)); - } - } - return result.toArray(new URL[result.size()]); + return PluginHelper.getLinesAsURL(src); } } Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2010-04-03 19:36:06 UTC (rev 1737) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2010-04-04 09:52:09 UTC (rev 1738) @@ -232,7 +232,7 @@ if (!file.exists()) { return I18nBundleUtil.EMPTY_URL_ARRAY; } - URL[] urls = getLinesAsURL(file); + URL[] urls = PluginHelper.getLinesAsURL(file); return urls; } } Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/TapestryBundleMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/TapestryBundleMojo.java 2010-04-03 19:36:06 UTC (rev 1737) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/TapestryBundleMojo.java 2010-04-04 09:52:09 UTC (rev 1738) @@ -197,7 +197,7 @@ if (!file.exists()) { return I18nBundleUtil.EMPTY_URL_ARRAY; } - URL[] urls = getLinesAsURL(file); + URL[] urls = PluginHelper.getLinesAsURL(file); return urls; } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-03 19:36:06 UTC (rev 1737) +++ trunk/pom.xml 2010-04-04 09:52:09 UTC (rev 1738) @@ -224,7 +224,7 @@ <projectId>i18n</projectId> <processor.version>1.0.3</processor.version> - + <helper.version>1.2.3-SNAPSHOT</helper.version> </properties> <!-- ************************************************************* -->