Author: tchemit Date: 2010-11-19 13:29:07 +0100 (Fri, 19 Nov 2010) New Revision: 1814 Url: http://nuiton.org/repositories/revision/i18n/1814 Log: Anomalie #1080: Using i18n validation parser does not work on windows os Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java 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 2010-11-19 10:22:29 UTC (rev 1813) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java 2010-11-19 12:29:07 UTC (rev 1814) @@ -46,11 +46,13 @@ import javax.xml.xpath.XPathExpression; import javax.xml.xpath.XPathFactory; import java.io.BufferedInputStream; +import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; +import java.io.InputStreamReader; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -255,17 +257,35 @@ */ private String readInputStream(InputStream in) throws IOException { StringBuilder sb = new StringBuilder(); - byte[] buffer = new byte[BUFFER_SIZE]; - while (in.read(buffer, 0, BUFFER_SIZE) != -1) { - String tmp = new String(buffer); - sb.append(tmp); +// byte[] buffer = new byte[BUFFER_SIZE]; + BufferedReader reader = new BufferedReader(new InputStreamReader(in, getEncoding())); + + try { + String line; + while ((line = reader.readLine())!=null) { + line = line.trim(); + if (line.startsWith("#")) { + + // comment line + continue; + } + sb.append(" ").append(line); + } +// sb.append(PluginHelper.readAsString(reader)); + } finally { + reader.close(); } - in.close(); +// +// while (in.read(buffer, 0, BUFFER_SIZE) != -1) { +// String tmp = new String(buffer); +// sb.append(tmp); +// } +// in.close(); // Suppression String txt = sb.toString().trim(); // suppression des commentaires - txt = txt.replaceAll("#.*\n", ""); +// txt = txt.replaceAll("#.*\n", ""); // contruction du xpath avec des ou txt = txt.replaceAll("\\s+", " | "); @@ -288,6 +308,7 @@ private final Map<String, String> namespaces2; private final boolean verbose; + /** * Fonction d'extraction de la chaine *