Author: tchemit Date: 2010-11-08 16:09:17 +0100 (Mon, 08 Nov 2010) New Revision: 1790 Url: http://nuiton.org/repositories/revision/i18n/1790 Log: add doc + improve code Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/CollectI18nArtifactsMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/I18nArtifact.java Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/CollectI18nArtifactsMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/CollectI18nArtifactsMojo.java 2010-11-08 10:28:45 UTC (rev 1789) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/CollectI18nArtifactsMojo.java 2010-11-08 15:09:17 UTC (rev 1790) @@ -205,16 +205,7 @@ I18nArtifact i18nArtifact; for (Object o : project.getArtifacts()) { i18nArtifact = new I18nArtifact((Artifact) o); - if (i18nArtifact.detectBundles()) { - if (!silent) { - getLog().info("detected i18n artifact " + i18nArtifact); - } - dico.put(i18nArtifact.getArtifact(), i18nArtifact); - } else { - if (getLog().isDebugEnabled()) { - getLog().debug("reject artifact " + i18nArtifact); - } - } + detectBundles(i18nArtifact, null, dico); } ArtifactFilter artifactFilter @@ -233,25 +224,34 @@ // bundles alors ils doivent etre charge en dernier Artifact projectArtifact = project.getArtifact(); + + i18nArtifact = new I18nArtifact(projectArtifact, src.getParentFile()); + detectBundles(i18nArtifact, artifacts, dico); + I18nArtifact[] result = new I18nArtifact[artifacts.size()]; + int i = 0; + for (Artifact artifact : artifacts) { + result[i++] = dico.get(artifact); + } + return result; + } + + protected void detectBundles(I18nArtifact i18nArtifact, + List<Artifact> artifacts, + Map<Artifact, I18nArtifact> dico) throws IOException { if (i18nArtifact.detectBundles()) { if (!silent) { getLog().info("detected i18n artifact " + i18nArtifact); } - artifacts.add(i18nArtifact.getArtifact()); + if (artifacts != null) { + artifacts.add(i18nArtifact.getArtifact()); + } dico.put(i18nArtifact.getArtifact(), i18nArtifact); } else { if (getLog().isDebugEnabled()) { getLog().debug("reject artifact " + i18nArtifact); } } - - I18nArtifact[] result = new I18nArtifact[artifacts.size()]; - int i = 0; - for (Artifact artifact : artifacts) { - result[i++] = dico.get(artifact); - } - return result; } } Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/I18nArtifact.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/I18nArtifact.java 2010-11-08 10:28:45 UTC (rev 1789) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/I18nArtifact.java 2010-11-08 15:09:17 UTC (rev 1790) @@ -80,6 +80,13 @@ return I18nBundleUtil.getBundleEntries(l, defaultLocale, bundles); } + /** + * Detects the i18n bundles for this artifacts, says in i18n directory. + * + * @return {@code true} if artifact has some i18n bunbles, {@code false} + * otherwise. + * @throws IOException if any IO error. + */ public boolean detectBundles() throws IOException { URL[] i18nUrls = I18nBundleUtil.getURLs(url);