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() } );