Author: bpoussin Date: 2008-08-06 13:14:05 +0000 (Wed, 06 Aug 2008) New Revision: 987 Modified: trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/AbstractI18nParser.java trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/SourceEntry.java trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJava.java trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJaxx.java trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserSwixat.java Log: Ajout de la possibilite d'exclure des fichiers. Util pour swixat ou context.xml n'a pas besoin d'etre parse Modified: trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/AbstractI18nParser.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/AbstractI18nParser.java 2008-08-06 10:51:35 UTC (rev 986) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/AbstractI18nParser.java 2008-08-06 13:14:05 UTC (rev 987) @@ -53,6 +53,9 @@ /** @return the default includes to add to directory scanner */ protected abstract String[] getDefaultIncludes(); + /** @return the default excludes to add to directory scanner */ + protected abstract String[] getDefaultExcludes(); + /** @return the default src directory to use in directory scanner */ protected abstract File getDefaultBasedir(); @@ -188,7 +191,7 @@ } protected String[] getFilesForEntry(SourceEntry entry) { - return entry.getIncludedFiles(getDefaultBasedir(), getDefaultIncludes()); + return entry.getIncludedFiles(getDefaultBasedir(), getDefaultIncludes(), getDefaultExcludes()); } protected void addDefaultEntry() { Modified: trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/SourceEntry.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/SourceEntry.java 2008-08-06 10:51:35 UTC (rev 986) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/SourceEntry.java 2008-08-06 13:14:05 UTC (rev 987) @@ -106,7 +106,7 @@ return excludes != null && excludes.length > 0; } - public String[] getIncludedFiles(File defaultBasedir, String[] defaultIncludes) { + public String[] getIncludedFiles(File defaultBasedir, String[] defaultIncludes, String[] defaultExcludes) { // normalized entry if (!hasSrc()) { setBasedir(defaultBasedir); @@ -114,6 +114,9 @@ if (!hasIncludes()) { setIncludes(defaultIncludes); } + if (!hasExcludes()) { + setExcludes(defaultExcludes); + } // init directory scanner DirectoryScanner ds = new DirectoryScanner(); ds.setBasedir(getBasedir()); @@ -140,10 +143,10 @@ return sb.toString(); } - public String[] getIncludedFiles(File basedir, String[] defaultIncludes, URLClassLoader loader, List<String> annotationClass, Log log) { + public String[] getIncludedFiles(File basedir, String[] defaultIncludes, String[] defaultExcludes, URLClassLoader loader, List<String> annotationClass, Log log) { List<String> result = new ArrayList<String>(); - for (String s : getIncludedFiles(basedir, defaultIncludes)) { + for (String s : getIncludedFiles(basedir, defaultIncludes, defaultExcludes)) { if (filterByAnnotation(s, loader, annotationClass, log)) { result.add(s); } Modified: trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJava.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJava.java 2008-08-06 10:51:35 UTC (rev 986) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJava.java 2008-08-06 13:14:05 UTC (rev 987) @@ -67,23 +67,32 @@ //protected List<String> annotationClass; + @Override protected String[] getDefaultIncludes() { return new String[]{defaultIncludes}; } + @Override + protected String[] getDefaultExcludes() { + return new String[]{}; + } + @Override protected File getDefaultBasedir() { return defaultBasedir; } + @Override protected String getKeyModifierStart() { return "_\\(\\s*\""; } + @Override protected String getKeyModifierEnd() { return "\"\\s*(\\)|,|\\+|$)"; } + @Override protected String getOutGetter() { return "java.getter"; } @@ -99,6 +108,7 @@ filter = new I18nFilter(); } + @Override protected boolean isFileUptodate(File basedir, File file1, String file) { String clazzFile = file.substring(0, file.length() - 4) + "class"; File clazz = new File(cp + File.separator + clazzFile); @@ -111,6 +121,7 @@ * @see org.codelutin.i18n.plugin.core.Parser#parseFile(java.io.File) */ + @Override public void parseFile(File srcFile) { try { @@ -129,6 +140,7 @@ * (non-Javadoc) * @see org.codelutin.i18n.plugin.core.Parser#parseLine(java.io.File, java.lang.String) */ + @Override public void parseLine(File srcFile, String line) { String keysSet = filter.parse(line); Modified: trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJaxx.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJaxx.java 2008-08-06 10:51:35 UTC (rev 986) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJaxx.java 2008-08-06 13:14:05 UTC (rev 987) @@ -42,30 +42,42 @@ */ protected String rulesJaxx; + @Override protected String[] getDefaultIncludes() { return new String[]{defaultIncludes}; } + @Override + protected String[] getDefaultExcludes() { + return new String[]{}; + } + + @Override protected boolean isFileUptodate(File basedir, File file1, String file) { return false; } + @Override protected String getOutGetter() { return "jaxx.getter"; } + @Override protected String getKeyModifierStart() { return "=\\s*[\"\']"; } + @Override protected String getKeyModifierEnd() { return "[\"\']"; } + @Override protected String getFileRules() { return rulesJaxx; } + @Override protected String getCoreFileRules() { return "jaxx.rules"; } @@ -78,6 +90,7 @@ * (non-Javadoc) * @see org.codelutin.i18n.plugin.extension.XmlParser#extract(java.lang.String) */ + @Override public String extract(String i18nString) { return i18nString.length() == 0 ? null : i18nString; } Modified: trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserSwixat.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserSwixat.java 2008-08-06 10:51:35 UTC (rev 986) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserSwixat.java 2008-08-06 13:14:05 UTC (rev 987) @@ -31,42 +31,60 @@ public class ParserSwixat extends ParserXml { /** - * @description Source entries (src+includes+excludes) . + * @description Source entries (src+includes) . * @parameter expression="${i18n.defaultIncludes}" default-value="**\\/*.xml" */ protected String defaultIncludes; /** + * @description Source entries (src+excludes) . + * @parameter expression="${i18n.defaultIncludes}" default-value="**\\/context.xml" + */ + protected String defaultExcludes; + + /** * @description R�gles xml. * @parameter expression="${i18n.rulesSwixat}" default-value="swixat.rules" */ protected String rulesSwixat; + @Override protected String[] getDefaultIncludes() { return new String[]{defaultIncludes}; } + @Override + protected String[] getDefaultExcludes() { + return new String[]{defaultExcludes}; + } + + @Override protected boolean isFileUptodate(File basedir, File file1, String file) { return false; } + @Override protected String getKeyModifierStart() { return "=\\s*[\"\']"; } + @Override protected String getKeyModifierEnd() { return "[\"\']"; } + @Override protected String getOutGetter() { return "swixat.getter"; } + @Override protected String getFileRules() { return rulesSwixat; } + @Override protected String getCoreFileRules() { return "swixat.rules"; } @@ -75,6 +93,7 @@ * (non-Javadoc) * @see org.codelutin.i18n.plugin.extension.XmlParser#extract(java.lang.String) */ + @Override public String extract(String i18nString) { return i18nString; }