January 2011 - Processor-commits - mailman.cloud.codelutin.com

r375 - in trunk/nuiton-processor/src: main/java/org/nuiton/processor main/java/org/nuiton/processor/filters test/java/org/nuiton/processor
by tchemit＠users.nuiton.org Jan. 31, 2011

Jan. 31, 2011

Author: tchemit Date: 2011-01-31 09:11:58 +0100 (Mon, 31 Jan 2011) New Revision: 375 Url: http://nuiton.org/repositories/revision/processor/375 Log: Evolution #1274: Remove deprecated api Removed: trunk/nuiton-processor/src/main/java/org/nuiton/processor/I18nExtractor.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/LicenseProcessor.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/I18nFilter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LicenseFilter.java trunk/nuiton-processor/src/test/java/org/nuiton/processor/CommonTest.java trunk/nuiton-processor/src/test/java/org/nuiton/processor/LicenseProcessorTest.java Deleted: trunk/nuiton-processor/src/main/java/org/nuiton/processor/I18nExtractor.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/I18nExtractor.java 2011-01-27 08:54:00 UTC (rev 374) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/I18nExtractor.java 2011-01-31 08:11:58 UTC (rev 375) @@ -1,190 +0,0 @@ -/* - * #%L - * Nuiton Processor :: Api - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2002 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - - -/* * - * I18nExtractor.java - * - * Created: Aug 16, 2004 - * - * @author Cédric Pineau <pineau(a)codelutin.com> - * @version $Revision$ - * - * Last update : $Date$ - * by : */ - -package org.nuiton.processor; - -import org.nuiton.processor.filters.I18nFilter; - -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.LineNumberReader; -import java.io.OutputStreamWriter; -import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; - -/** - * @deprecated since 1.1, will not be replaced in this project, but you can find - * it in I18n project. Will be remove soon. - */ -@Deprecated -public class I18nExtractor { - - protected I18nFilter filter = new I18nFilter(); - - protected Map<String, List<String>> store = - new HashMap<String, List<String>>(); - - /** - * Process input file to target. - * - * @param srcFiles source files - * @param outputFile target file - * @param encoding encoding used to read and write files - * @throws IOException if any io problems - * @since 1.0.4 - */ - public void extract(File[] srcFiles, File outputFile, String encoding) throws IOException { - PrintWriter writer = new PrintWriter( - new BufferedWriter( - new OutputStreamWriter( - new FileOutputStream(outputFile), encoding))); - try { - for (File srcFile : srcFiles) { - processFile(srcFile, encoding); - } - - for (Object o : store.keySet()) { - String i18nString = (String) o; - List<?> locations = store.get(i18nString); - for (Object location1 : locations) { - String location = (String) location1; - writer.println("# " + location); - } - writer.println(i18nString + "="); - } - } finally { - writer.close(); - } - } - - /** - * @param srcFiles source files - * @param outputFile target file - * @throws IOException if any io problems - * @deprecated since 1.0.4, prefer use the {@link #extract(File[], File, String)} - */ - @Deprecated - public void extract(File[] srcFiles, File outputFile) throws IOException { - extract(srcFiles, outputFile, "UTF-8"); -// PrintWriter writer = new PrintWriter( -// new BufferedWriter( -// new OutputStreamWriter( -// new FileOutputStream(outputFile), "UTF-8"))); -// try { -// for (File srcFile : srcFiles) { -// processFile(srcFile); -// } -// -// for (Object o : store.keySet()) { -// String i18nString = (String) o; -// List<?> locations = store.get(i18nString); -// for (Object location1 : locations) { -// String location = (String) location1; -// writer.println("# " + location); -// } -// writer.println(i18nString + "="); -// } -// } finally { -// writer.close(); -// } - } - - protected void processFile(File srcFile, String encoding) throws IOException { - LineNumberReader lnr = new LineNumberReader( - new InputStreamReader(new FileInputStream(srcFile), encoding)); - try { - while (lnr.ready()) { - String line = lnr.readLine(); - int lineNumber = lnr.getLineNumber(); - processLine(line, srcFile, lineNumber); - } - } finally { - lnr.close(); - } - } - - protected void processLine(String line, File srcFile, int lineNumber) { - String i18nStringsSet = filter.parse(line); - if (I18nFilter.EMPTY_STRING.equals(i18nStringsSet)) { - // Found a set of i18n Strings, split it. - String[] i18nStrings = i18nStringsSet.split("="); - for (String i18nString : i18nStrings) { - List<String> locations = store.get(i18nString); - if (locations == null) { - locations = new ArrayList<String>(); - store.put(i18nString, locations); - } - locations.add(srcFile.getPath() + "(" + lineNumber + ")"); - } - } - } - - public static void main(String[] args) { - Logger logger = Logger.getLogger("org.nuiton.processor.I18nExtractor."); - - if (args.length < 2) { - logger.log(Level.SEVERE, - "Please give at least sources and destination file"); - System.exit(0); - } else if (args.length > 2) { - File[] sources = new File[args.length - 1]; - for (int i = 0; i < args.length - 1; i++) { - sources[i] = new File(args[i]); - } - File destination = new File(args[args.length - 1]); - try { - String encoding = ProcessorUtil.DEFAULT_ENCODING; - logger.log(Level.INFO, "Will use system encoding " + encoding); - new I18nExtractor().extract(sources, destination, encoding); - } catch (IOException eee) { - - logger.log(Level.SEVERE, - "Error during i18n extraction : " + eee, eee); - } - } - - } -} Deleted: trunk/nuiton-processor/src/main/java/org/nuiton/processor/LicenseProcessor.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/LicenseProcessor.java 2011-01-27 08:54:00 UTC (rev 374) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/LicenseProcessor.java 2011-01-31 08:11:58 UTC (rev 375) @@ -1,81 +0,0 @@ -/* - * #%L - * Nuiton Processor :: Api - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2002 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package org.nuiton.processor; - -import org.nuiton.processor.filters.LicenseFilter; - -import java.io.File; -import java.io.IOException; - -/** - * This class is a processor of source header. - * - * @author tchemit <chemit(a)codelutin.com> - * @see LicenseFilter - * @deprecated since 1.1, will not be replaced in this project, but you can find - * it in maven-license-plugin project. Will be remove soon. - */ -@Deprecated -public class LicenseProcessor extends Processor { - - protected LicenseFilter licenseFilter; - - public LicenseProcessor(String header) { - licenseFilter = new LicenseFilter(header); - setInputFilter(licenseFilter); - } - - public LicenseFilter getLicenceFilter() { - return licenseFilter; - } - - /** - * Process input file to target. - * - * @param filein source file - * @param fileout target file - * @param encoding encoding used to read and write files - * @throws IOException if any io problems - * @since 1.0.4 - */ - public void process(File filein, File fileout, String encoding) throws IOException { - ProcessorUtil.doProcess(this, filein, fileout, encoding); - } - - /** - * Process input file to target. - * - * @param filein source file - * @param fileout target file - * @throws IOException if any io problems - * @deprecated since 1.0.4, prefer use the method {@link #process(File, File, String)} - */ - @Deprecated - public void process(File filein, File fileout) throws IOException { - process(filein, fileout, ProcessorUtil.DEFAULT_ENCODING); - } -} - Deleted: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/I18nFilter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/I18nFilter.java 2011-01-27 08:54:00 UTC (rev 374) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/I18nFilter.java 2011-01-31 08:11:58 UTC (rev 375) @@ -1,164 +0,0 @@ -/* - * #%L - * Nuiton Processor :: Api - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2002 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - - -/******************************************************************************* - * I18nFilter.java - * - * Created: Sun Sep 1 2002 - * - * @author <poussin(a)codelutin.com> Copyright Code Lutin - * - * @version $Revision$ - * - * Mise a jour: $Date$ par : */ - -package org.nuiton.processor.filters; - -import java.util.regex.Matcher; -import java.util.regex.Pattern; - - -/** - * @deprecated since 1.1, will not be replaced in this project, but you can find - * it in I18n project. Will be remove soon. - */ -@Deprecated -public class I18nFilter extends DefaultFilter { // I18nFilter - - private String header = "_\$\\s*\""; - private String footer = "\"\\s*(\$|,|\\+|$)"; - - private Pattern headerPattern = Pattern.compile(getHeader()); - - private Pattern footerPattern = Pattern.compile(getFooter()); - - private Matcher matcher; - - protected void setFooter(String footer) { - this.footer = footer; - } - - protected void setHeader(String header) { - this.header = header; - } - - @Override - protected String getHeader() { - return header; - } - - @Override - protected String getFooter() { - return footer; - } - - @Override - public int getMatchIndexFor(String input, String sequence) { - int index = NOT_FOUND; - - setMatcher(null); - if (sequence.equals(getHeader())) { - setMatcher(getHeaderPattern().matcher(input)); - } else if (sequence.equals(getFooter())){ - setMatcher(getFooterPattern().matcher(input)); - } - if (getMatcher() != null) { - try { - getMatcher().find(); - index = getMatcher().start(); - } catch (RuntimeException e) {} - } - - return index; - } - - @Override - public int getMatchLengthFor(String sequence) { - int length = NOT_FOUND; - - try { - length = getMatcher().end()-getMatcher().start(); - } catch (RuntimeException e) {} - - return length; - } - - /** - * methode appele lorsqu'on a la chaine entiere entre le header et le - * footer. - * - * @param ch - * la chaine trouve - * @return ce qu'il faut ecrire dans le fichier de sortie - */ - @Override - protected String performInFilter(String ch) { - return ch.replaceAll("\"\\s*\\+\\s*\"","") + "="; - } - - @Override - public String performHeaderFooterFilter(String ch) { - return ch.substring(ch.indexOf('"')+1, ch.lastIndexOf('"')); - } - - /** - * methode appele lorsqu'on a la chaine entiere a l'exterieur du - * header/footer - * - * @param ch - * la chaine trouve - * @return ce qu'il faut ecrire dans le fichier de sortie - */ - @Override - protected String performOutFilter(String ch) { - return EMPTY_STRING; - } - - /** - * @return Returns the footerPattern. - */ - protected Pattern getFooterPattern() { - return footerPattern; - } - /** - * @return Returns the headerPattern. - */ - protected Pattern getHeaderPattern() { - return headerPattern; - } - /** - * @return Returns the matcher. - */ - protected Matcher getMatcher() { - return matcher; - } - /** - * @param matcher The matcher to set. - */ - protected void setMatcher(Matcher matcher) { - this.matcher = matcher; - } -} // I18nFilter Deleted: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LicenseFilter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LicenseFilter.java 2011-01-27 08:54:00 UTC (rev 374) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LicenseFilter.java 2011-01-31 08:11:58 UTC (rev 375) @@ -1,131 +0,0 @@ -/* - * #%L - * Nuiton Processor :: Api - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2002 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package org.nuiton.processor.filters; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * Un filtre pour remplacer la license d'un fichier source java. - * <p/> - * fixme : il faut ne pas autoriser le process de fichier java qui ne sont pas - * valide selon le header - footer... - * - * @author tchemit <chemit(a)codelutin.com> - * - * @deprecated since 1.1, will not be replaced in this project, but you can find - * it in maven-license-plugin project. Will be remove soon. - */ -@Deprecated -public class LicenseFilter extends DefaultFilter { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private final Log log = LogFactory.getLog(LicenseFilter.class); - - public static final String HEADER = "*" + "#" + "#" + "%"; - - public static final String FOOTER = "#" + "#" + "%" + "*"; - - /** - * la licence a insere dans le header du fichier source. Ce header est - * formatte en commentaire (chaque ligne commence par un ' * ', sauf pour - * la premiere et derniere ligne). - */ - protected String licenseHeader; - - /** flag pour indiquer si la licence a ete trouvee entre le header et - * le footer */ - protected boolean touched; - - /** flag pour indiquer si on a rencontree le header du filtre */ - protected boolean detectHeader; - - public LicenseFilter(String licenseHeader) { - this.licenseHeader = " " + licenseHeader + " "; - } - - @Override - protected String performInFilter(String ch) { - if (log.isDebugEnabled()) { - log.debug(ch); - } - if (touched) { - // on autorise pas deux process de la licence dans un fichier java - throw new IllegalStateException("Can only have one license " + - "processor open tag " + HEADER); - } - if (getMatchIndexFor(ch, HEADER) == NOT_FOUND) { - // on est bien dans la license, on peut effectuer le changement - touched = true; - return HEADER + licenseHeader + FOOTER; - } - // ce cas arrive lorsque l'on a parcouru tout le fichier avec detection - // de la balise header mais sans balise footer - // et on arrive dans cette methode dans le flush du filter - return ch; - } - - @Override - protected String performOutFilter(String ch) { - if (log.isDebugEnabled()) { - log.debug(ch); - } - return ch; - } - - @Override - protected String getHeader() { - return HEADER; - } - - @Override - protected String getFooter() { - return FOOTER; - } - - @Override - protected void changeState(State newState) { - super.changeState(newState); - if (newState == State.SEARCH_FOOTER) { - // on a decouvert un header - detectHeader = true; - } - } - - public boolean wasTouched() { - return touched; - } - - public boolean isDetectHeader() { - return detectHeader; - } - - public void reset() { - touched = false; - detectHeader = false; - state = State.SEARCH_HEADER; - } -} Deleted: trunk/nuiton-processor/src/test/java/org/nuiton/processor/CommonTest.java =================================================================== --- trunk/nuiton-processor/src/test/java/org/nuiton/processor/CommonTest.java 2011-01-27 08:54:00 UTC (rev 374) +++ trunk/nuiton-processor/src/test/java/org/nuiton/processor/CommonTest.java 2011-01-31 08:11:58 UTC (rev 375) @@ -1,118 +0,0 @@ -/* - * #%L - * Nuiton Processor :: Api - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2002 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ - -package org.nuiton.processor; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.codehaus.plexus.util.IOUtil; -import org.junit.Assert; - -/** - * - * @author fdesbois - * @deprecated since 1.1, Please do not make a framework from one test... Will be removed soon and not replaced, - */ -@Deprecated -public abstract class CommonTest { - - protected static File basedir; - protected static File testdir; - - static private final Log log = LogFactory.getLog(CommonTest.class); - - //@BeforeClass - public static void initClass() throws Exception { - basedir = getBasedir(); - testdir = getFile(basedir, "target", "test-classes", "org", "nuiton", - "processor", "result"); - boolean b = testdir.exists() || testdir.mkdirs(); - if (!b) { - throw new IOException("Could not create directory : "+testdir); - } - } - - protected void checkPattern(String pattern, - boolean required, - File f, - String encoding) throws IOException { - - if (log.isDebugEnabled()) { - log.debug("check generated file " + f); - } - - Assert.assertTrue("generated file " + f + " was not found...", - f.exists() - ); - - String content = readAsString(f, encoding); - - String errorMessage = required ? "could not find the pattern : " : - "should not have found pattern :"; - Assert.assertEquals(errorMessage + pattern + " in file " + f, - required, content.contains(pattern)); - } - - public static String readAsString(File file, - String encoding) throws IOException { - FileInputStream inf = new FileInputStream(file); - BufferedReader in = - new BufferedReader(new InputStreamReader(inf, encoding)); - try { - return IOUtil.toString(in); - } finally { - in.close(); - } - } - - public static File getFile(File base, String... paths) { - StringBuilder buffer = new StringBuilder(); - for (String path : paths) { - buffer.append(File.separator).append(path); - } - File f = new File(base, buffer.substring(1)); - return f; - } - - public static File getBasedir() { - String basedirPath = System.getProperty("basedir"); - - if (basedirPath == null) { - basedirPath = new File("").getAbsolutePath(); - } - - return new File(basedirPath); - } -} Deleted: trunk/nuiton-processor/src/test/java/org/nuiton/processor/LicenseProcessorTest.java =================================================================== --- trunk/nuiton-processor/src/test/java/org/nuiton/processor/LicenseProcessorTest.java 2011-01-27 08:54:00 UTC (rev 374) +++ trunk/nuiton-processor/src/test/java/org/nuiton/processor/LicenseProcessorTest.java 2011-01-31 08:11:58 UTC (rev 375) @@ -1,158 +0,0 @@ -/* - * #%L - * Nuiton Processor :: Api - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2002 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package org.nuiton.processor; - - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.codehaus.plexus.util.IOUtil; -import org.junit.BeforeClass; - -import org.junit.Assert; -import org.junit.Test; - -/** - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.0.1 - * @deprecated since 1.1, will not be replaced in this project, but you can find - * it in maven-license-plugin project. Will be remove soon. - */ -@Deprecated -public class LicenseProcessorTest { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private final Log log = LogFactory.getLog(LicenseProcessorTest.class); - static File basedir; - static File testdir; - - public static final String UTF_8 = "utf-8"; - - @BeforeClass - public static void initClass() throws Exception { - basedir = getBasedir(); - testdir = getFile(basedir, "target", - "test-classes", - "org", "nuiton", "processor", "result"); - boolean b = testdir.exists() || testdir.mkdirs(); - if (!b) { - throw new IOException("Could not create directory : "+testdir); - } - } - - @Test - public void testProcessor() throws IOException { - - File in = getFile(basedir, "target", - "test-classes", "org", "nuiton", - "processor", "LicenseProcessorTest.java2"); - File out = getFile(testdir, in.getName()); - LicenseProcessor processor = new LicenseProcessor("my license"); - processor.process(in, out, UTF_8); - String content = readAsString(out, UTF_8); - if (log.isDebugEnabled()) { - log.debug("output : " + out); - log.debug(content); - } - checkPattern("// MUST BE THERE!", true, out); - checkPattern("my license", false, out); - } - - @Test - public void testProcessor2() throws IOException { - - File in = getFile(basedir, "target", "test-classes", "org", "nuiton", - "processor", "LicenseProcessorTest_1.java2"); - File out = new File(testdir, in.getName()); - LicenseProcessor processor = new LicenseProcessor("my license"); - processor.process(in, out,UTF_8); - String content = readAsString(out, UTF_8); - if (log.isDebugEnabled()) { - log.debug("output : " + out); - log.debug(content); - } - checkPattern("// MUST BE THERE!", true, out); - checkPattern("my license", true, out); - } - - protected void checkPattern(String pattern, - boolean required, - File f) throws IOException { - - if (log.isDebugEnabled()) { - log.debug("check generated file " + f); - } - - Assert.assertTrue("generated file " + f + " was not found...", - f.exists() - ); - String content = readAsString(f, UTF_8); - - String errorMessage = required ? - "could not find the pattern : " : - "should not have found pattern :"; - Assert.assertEquals(errorMessage + pattern + " in file " + f, - required, - content.contains(pattern) - ); - } - - static public String readAsString(File file, - String encoding) throws IOException { - FileInputStream inf = new FileInputStream(file); - BufferedReader in = - new BufferedReader(new InputStreamReader(inf, encoding)); - try { - return IOUtil.toString(in); - } finally { - in.close(); - } - } - - public static File getFile(File base, String... paths) { - StringBuilder buffer = new StringBuilder(); - for (String path : paths) { - buffer.append(File.separator).append(path); - } - File f = new File(base, buffer.substring(1)); - return f; - } - - public static File getBasedir() { - String basedirPath = System.getProperty("basedir"); - - if (basedirPath == null) { - basedirPath = new File("").getAbsolutePath(); - } - - return new File(basedirPath); - } -}

1 0

r374 - trunk
by tchemit＠users.nuiton.org Jan. 27, 2011

Jan. 27, 2011

Author: tchemit Date: 2011-01-27 09:54:00 +0100 (Thu, 27 Jan 2011) New Revision: 374 Url: http://nuiton.org/repositories/revision/processor/374 Log: Update mavenpom4redmineAndCentral to 2.4.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-23 17:31:08 UTC (rev 373) +++ trunk/pom.xml 2011-01-27 08:54:00 UTC (rev 374) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.3</version> </parent> <artifactId>processor</artifactId>

1 0

r373 - trunk
by tchemit＠users.nuiton.org Jan. 23, 2011

Jan. 23, 2011

Author: tchemit Date: 2011-01-23 18:31:08 +0100 (Sun, 23 Jan 2011) New Revision: 373 Url: http://nuiton.org/repositories/revision/processor/373 Log: Updates to mavenpom 2.4.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-21 10:30:54 UTC (rev 372) +++ trunk/pom.xml 2011-01-23 17:31:08 UTC (rev 373) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.1</version> + <version>2.4.2-SNAPSHOT</version> </parent> <artifactId>processor</artifactId>

1 0

r372 - in trunk: . ant-processor-task maven-processor-plugin nuiton-processor
by tchemit＠users.nuiton.org Jan. 21, 2011

Jan. 21, 2011

Author: tchemit Date: 2011-01-21 11:30:54 +0100 (Fri, 21 Jan 2011) New Revision: 372 Url: http://nuiton.org/repositories/revision/processor/372 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/ant-processor-task/pom.xml trunk/maven-processor-plugin/pom.xml trunk/nuiton-processor/pom.xml trunk/pom.xml Modified: trunk/ant-processor-task/pom.xml =================================================================== --- trunk/ant-processor-task/pom.xml 2011-01-21 10:30:52 UTC (rev 371) +++ trunk/ant-processor-task/pom.xml 2011-01-21 10:30:54 UTC (rev 372) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.1</version> + <version>1.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/maven-processor-plugin/pom.xml =================================================================== --- trunk/maven-processor-plugin/pom.xml 2011-01-21 10:30:52 UTC (rev 371) +++ trunk/maven-processor-plugin/pom.xml 2011-01-21 10:30:54 UTC (rev 372) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.1</version> + <version>1.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/nuiton-processor/pom.xml =================================================================== --- trunk/nuiton-processor/pom.xml 2011-01-21 10:30:52 UTC (rev 371) +++ trunk/nuiton-processor/pom.xml 2011-01-21 10:30:54 UTC (rev 372) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.1</version> + <version>1.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-21 10:30:52 UTC (rev 371) +++ trunk/pom.xml 2011-01-21 10:30:54 UTC (rev 372) @@ -37,7 +37,7 @@ </parent> <artifactId>processor</artifactId> - <version>1.1</version> + <version>1.2-SNAPSHOT</version> <modules> <module>nuiton-processor</module> @@ -255,11 +255,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/processor/tags/processor-1.1</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/processor/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/processor/tags/processor-1.1 + scm:svn:http://svn.nuiton.org/svn/processor/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/processor/tags/processor-1.1</url> + <url>http://www.nuiton.org/repositories/browse/processor/trunk</url> </scm> <build>

1 0

r371 - tags
by tchemit＠users.nuiton.org Jan. 21, 2011

Jan. 21, 2011

Author: tchemit Date: 2011-01-21 11:30:52 +0100 (Fri, 21 Jan 2011) New Revision: 371 Url: http://nuiton.org/repositories/revision/processor/371 Log: [maven-release-plugin] copy for tag processor-1.1 Added: tags/processor-1.1/

1 0

r370 - in trunk: . ant-processor-task maven-processor-plugin nuiton-processor
by tchemit＠users.nuiton.org Jan. 21, 2011

Jan. 21, 2011

Author: tchemit Date: 2011-01-21 11:30:50 +0100 (Fri, 21 Jan 2011) New Revision: 370 Url: http://nuiton.org/repositories/revision/processor/370 Log: [maven-release-plugin] prepare release processor-1.1 Modified: trunk/ant-processor-task/pom.xml trunk/maven-processor-plugin/pom.xml trunk/nuiton-processor/pom.xml trunk/pom.xml Modified: trunk/ant-processor-task/pom.xml =================================================================== --- trunk/ant-processor-task/pom.xml 2011-01-20 07:31:34 UTC (rev 369) +++ trunk/ant-processor-task/pom.xml 2011-01-21 10:30:50 UTC (rev 370) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/maven-processor-plugin/pom.xml =================================================================== --- trunk/maven-processor-plugin/pom.xml 2011-01-20 07:31:34 UTC (rev 369) +++ trunk/maven-processor-plugin/pom.xml 2011-01-21 10:30:50 UTC (rev 370) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/nuiton-processor/pom.xml =================================================================== --- trunk/nuiton-processor/pom.xml 2011-01-20 07:31:34 UTC (rev 369) +++ trunk/nuiton-processor/pom.xml 2011-01-21 10:30:50 UTC (rev 370) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-20 07:31:34 UTC (rev 369) +++ trunk/pom.xml 2011-01-21 10:30:50 UTC (rev 370) @@ -37,7 +37,7 @@ </parent> <artifactId>processor</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> <modules> <module>nuiton-processor</module> @@ -255,11 +255,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/processor/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/processor/tags/processor-1.1</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/processor/trunk + scm:svn:http://svn.nuiton.org/svn/processor/tags/processor-1.1 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/processor/trunk</url> + <url>http://www.nuiton.org/repositories/browse/processor/tags/processor-1.1</url> </scm> <build>

1 0

r369 - trunk/nuiton-processor/src/main/java/org/nuiton/processor
by tchemit＠users.nuiton.org Jan. 20, 2011

Jan. 20, 2011

Author: tchemit Date: 2011-01-20 08:31:34 +0100 (Thu, 20 Jan 2011) New Revision: 369 Url: http://nuiton.org/repositories/revision/processor/369 Log: Evolution #1212: Add usefull methods in ProcessorUtil Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorUtil.java Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorUtil.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorUtil.java 2011-01-20 07:24:57 UTC (rev 368) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorUtil.java 2011-01-20 07:31:34 UTC (rev 369) @@ -27,6 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.processor.filters.DefaultFilter; import org.nuiton.processor.filters.Filter; import java.io.File; @@ -245,4 +246,106 @@ doProcess(processor, in, out, DEFAULT_ENCODING); } + /** + * To extract all content inside the header and footer. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.1 + */ + public static class FragmentExtractor extends DefaultFilter { + + /** Logger. */ + static protected final Log log = + LogFactory.getLog(FragmentExtractor.class); + + protected String header; + + protected String footer; + + protected boolean verbose; + + public FragmentExtractor(String header, String footer) { + this.header = header; + this.footer = footer; + } + + public void setVerbose(boolean verbose) { + this.verbose = verbose; + } + + @Override + protected String performInFilter(String ch) { + if (verbose || log.isInfoEnabled()) { + log.info("Detected key " + ch); + } + return ch + "\n"; + } + + @Override + protected String performOutFilter(String ch) { + return EMPTY_STRING; + } + + @Override + protected String getHeader() { + return header; + } + + @Override + protected String getFooter() { + return footer; + } + } + + /** + * To remove all content inside the header and footer. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.1 + */ + public static class FragmentRemover extends DefaultFilter { + + /** Logger. */ + static private final Log log = + LogFactory.getLog(FragmentRemover.class); + + protected String header; + + protected String footer; + + protected boolean verbose; + + public FragmentRemover(String header, String footer) { + this.header = header; + this.footer = footer; + } + + public void setVerbose(boolean verbose) { + this.verbose = verbose; + } + + @Override + protected String performInFilter(String ch) { + if (verbose || log.isInfoEnabled()) { + log.info("Will remove " + ch); + } + return EMPTY_STRING; + } + + @Override + protected String performOutFilter(String ch) { + return ch; + } + + @Override + protected String getHeader() { + return header; + } + + @Override + protected String getFooter() { + return footer; + } + } + }

1 0

r368 - in trunk/nuiton-processor/src: main/java/org/nuiton/processor main/java/org/nuiton/processor/filters test/java/org/nuiton/processor test/java/org/nuiton/processor/filters
by tchemit＠users.nuiton.org Jan. 20, 2011

Jan. 20, 2011

Author: tchemit Date: 2011-01-20 08:24:57 +0100 (Thu, 20 Jan 2011) New Revision: 368 Url: http://nuiton.org/repositories/revision/processor/368 Log: Evolution #1211: Deprecates some classes moved in I18n or m-license-plugin project Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/I18nExtractor.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/LicenseProcessor.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/I18nFilter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LicenseFilter.java trunk/nuiton-processor/src/test/java/org/nuiton/processor/CommonTest.java trunk/nuiton-processor/src/test/java/org/nuiton/processor/LicenseProcessorTest.java trunk/nuiton-processor/src/test/java/org/nuiton/processor/filters/StringFilterTest.java Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/I18nExtractor.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/I18nExtractor.java 2011-01-20 07:24:37 UTC (rev 367) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/I18nExtractor.java 2011-01-20 07:24:57 UTC (rev 368) @@ -56,8 +56,10 @@ import java.util.logging.Logger; /** - * + * @deprecated since 1.1, will not be replaced in this project, but you can find + * it in I18n project. Will be remove soon. */ +@Deprecated public class I18nExtractor { protected I18nFilter filter = new I18nFilter(); Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/LicenseProcessor.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/LicenseProcessor.java 2011-01-20 07:24:37 UTC (rev 367) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/LicenseProcessor.java 2011-01-20 07:24:57 UTC (rev 368) @@ -35,7 +35,10 @@ * * @author tchemit <chemit(a)codelutin.com> * @see LicenseFilter + * @deprecated since 1.1, will not be replaced in this project, but you can find + * it in maven-license-plugin project. Will be remove soon. */ +@Deprecated public class LicenseProcessor extends Processor { protected LicenseFilter licenseFilter; Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/I18nFilter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/I18nFilter.java 2011-01-20 07:24:37 UTC (rev 367) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/I18nFilter.java 2011-01-20 07:24:57 UTC (rev 368) @@ -41,6 +41,11 @@ import java.util.regex.Pattern; +/** + * @deprecated since 1.1, will not be replaced in this project, but you can find + * it in I18n project. Will be remove soon. + */ +@Deprecated public class I18nFilter extends DefaultFilter { // I18nFilter private String header = "_\\(\\s*\""; Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LicenseFilter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LicenseFilter.java 2011-01-20 07:24:37 UTC (rev 367) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LicenseFilter.java 2011-01-20 07:24:57 UTC (rev 368) @@ -35,7 +35,11 @@ * valide selon le header - footer... * * @author tchemit <chemit(a)codelutin.com> + * + * @deprecated since 1.1, will not be replaced in this project, but you can find + * it in maven-license-plugin project. Will be remove soon. */ +@Deprecated public class LicenseFilter extends DefaultFilter { /** to use log facility, just put in your code: log.info(\"...\"); */ Modified: trunk/nuiton-processor/src/test/java/org/nuiton/processor/CommonTest.java =================================================================== --- trunk/nuiton-processor/src/test/java/org/nuiton/processor/CommonTest.java 2011-01-20 07:24:37 UTC (rev 367) +++ trunk/nuiton-processor/src/test/java/org/nuiton/processor/CommonTest.java 2011-01-20 07:24:57 UTC (rev 368) @@ -43,7 +43,9 @@ /** * * @author fdesbois + * @deprecated since 1.1, Please do not make a framework from one test... Will be removed soon and not replaced, */ +@Deprecated public abstract class CommonTest { protected static File basedir; Modified: trunk/nuiton-processor/src/test/java/org/nuiton/processor/LicenseProcessorTest.java =================================================================== --- trunk/nuiton-processor/src/test/java/org/nuiton/processor/LicenseProcessorTest.java 2011-01-20 07:24:37 UTC (rev 367) +++ trunk/nuiton-processor/src/test/java/org/nuiton/processor/LicenseProcessorTest.java 2011-01-20 07:24:57 UTC (rev 368) @@ -43,7 +43,10 @@ * * @author tchemit <chemit(a)codelutin.com> * @since 1.0.1 + * @deprecated since 1.1, will not be replaced in this project, but you can find + * it in maven-license-plugin project. Will be remove soon. */ +@Deprecated public class LicenseProcessorTest { /** to use log facility, just put in your code: log.info(\"...\"); */ Modified: trunk/nuiton-processor/src/test/java/org/nuiton/processor/filters/StringFilterTest.java =================================================================== --- trunk/nuiton-processor/src/test/java/org/nuiton/processor/filters/StringFilterTest.java 2011-01-20 07:24:37 UTC (rev 367) +++ trunk/nuiton-processor/src/test/java/org/nuiton/processor/filters/StringFilterTest.java 2011-01-20 07:24:57 UTC (rev 368) @@ -27,24 +27,37 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.codehaus.plexus.util.IOUtil; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import org.nuiton.processor.CommonTest; import org.nuiton.processor.Processor; import org.nuiton.processor.ProcessorUtil; +import java.io.BufferedReader; import java.io.File; +import java.io.FileInputStream; import java.io.IOException; +import java.io.InputStreamReader; import java.net.URL; /** @author fdesbois */ -public class StringFilterTest extends CommonTest { +public class StringFilterTest { static private final Log log = LogFactory.getLog(StringFilterTest.class); + protected static File basedir; + protected static File testdir; + @BeforeClass public static void initClass() throws Exception { - CommonTest.initClass(); + basedir = getBasedir(); + testdir = getFile(basedir, "target", "test-classes", "org", "nuiton", + "processor", "result"); + boolean b = testdir.exists() || testdir.mkdirs(); + if (!b) { + throw new IOException("Could not create directory : "+testdir); + } } @Test @@ -83,4 +96,56 @@ String content = readAsString(out, encoding); return content; } + + static public String readAsString(File file, + String encoding) throws IOException { + FileInputStream inf = new FileInputStream(file); + BufferedReader in = + new BufferedReader(new InputStreamReader(inf, encoding)); + try { + return IOUtil.toString(in); + } finally { + in.close(); + } + } + + public static File getFile(File base, String... paths) { + StringBuilder buffer = new StringBuilder(); + for (String path : paths) { + buffer.append(File.separator).append(path); + } + File f = new File(base, buffer.substring(1)); + return f; + } + + public static File getBasedir() { + String basedirPath = System.getProperty("basedir"); + + if (basedirPath == null) { + basedirPath = new File("").getAbsolutePath(); + } + + return new File(basedirPath); + } + + protected void checkPattern(String pattern, + boolean required, + File f, + String encoding) throws IOException { + + if (log.isDebugEnabled()) { + log.debug("check generated file " + f); + } + + Assert.assertTrue("generated file " + f + " was not found...", + f.exists() + ); + + String content = readAsString(f, encoding); + + String errorMessage = required ? "could not find the pattern : " : + "should not have found pattern :"; + Assert.assertEquals(errorMessage + pattern + " in file " + f, + required, content.contains(pattern)); + } }

1 0

r367 - trunk/nuiton-processor/src/main/java/org/nuiton/processor
by tchemit＠users.nuiton.org Jan. 20, 2011

Jan. 20, 2011

Author: tchemit Date: 2011-01-20 08:24:37 +0100 (Thu, 20 Jan 2011) New Revision: 367 Url: http://nuiton.org/repositories/revision/processor/367 Log: Evolution #1212: Add usefull methods in ProcessorUtil Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorUtil.java Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorUtil.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorUtil.java 2011-01-04 17:18:10 UTC (rev 366) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorUtil.java 2011-01-20 07:24:37 UTC (rev 367) @@ -33,7 +33,9 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; import java.io.InputStreamReader; +import java.io.OutputStream; import java.io.OutputStreamWriter; /** @@ -128,6 +130,7 @@ * @since 1.0.3 * @deprecated since 1.0.4, prefer use the {@link #doProcess(Processor, String, String, String)}. */ + @Deprecated public static void doProcess(Processor processor, String in, String out) throws IOException { doProcess(processor, new File(in), new File(out), DEFAULT_ENCODING); @@ -167,8 +170,65 @@ } } + /** + * Launch the process of the given {@code processor} to the given streams. + * + * @param processor the processor to launch + * @param in the input file + * @param out the output file + * @param encoding encoding to use to read and write files. + * @throws IOException if any problems while processing file + * @since 1.1 + */ + public static void doProcess(Processor processor, + InputStream in, + OutputStream out, + String encoding) throws IOException { + InputStreamReader input = new InputStreamReader(in, encoding); + try { + OutputStreamWriter output = new OutputStreamWriter(out, encoding); + try { + processor.process(input, output); + } catch (IOException eee) { + if (log.isErrorEnabled()) { + log.error( + "Error while processing file " + in + " to " + out + + " with processor " + processor, eee); + } + throw eee; + } finally { + output.close(); + } + } finally { + input.close(); + } + } /** + * Launch the process of the given {@code processor} to the given readers. + * + * @param processor the processor to launch + * @param in the input file + * @param out the output file + * @throws IOException if any problems while processing file + * @since 1.1 + */ + public static void doProcess(Processor processor, + InputStreamReader in, + OutputStreamWriter out) throws IOException { + try { + processor.process(in, out); + } catch (IOException eee) { + if (log.isErrorEnabled()) { + log.error( + "Error while processing file " + in + " to " + out + + " with processor " + processor, eee); + } + throw eee; + } + } + + /** * Launch the process of the given {@code processor} to the given files using * the system default encoding. *

1 0

r366 - in trunk/nuiton-processor: . src/main/java/org/nuiton/processor src/main/java/org/nuiton/processor/filters
by bpoussin＠users.nuiton.org Jan. 4, 2011

Jan. 4, 2011

Author: bpoussin Date: 2011-01-04 18:18:10 +0100 (Tue, 04 Jan 2011) New Revision: 366 Url: http://nuiton.org/repositories/revision/processor/366 Log: Evolution #1197: It will be useful, if we can know the current line number in Filter Modified: trunk/nuiton-processor/pom.xml trunk/nuiton-processor/src/main/java/org/nuiton/processor/Processor.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorReader.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/Filter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/NoActionFilter.java Modified: trunk/nuiton-processor/pom.xml =================================================================== --- trunk/nuiton-processor/pom.xml 2010-11-21 14:30:50 UTC (rev 365) +++ trunk/nuiton-processor/pom.xml 2011-01-04 17:18:10 UTC (rev 366) @@ -90,6 +90,17 @@  <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + </plugins> <testResources> <testResource> <directory>src/test/resources</directory> Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/Processor.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/Processor.java 2010-11-21 14:30:50 UTC (rev 365) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/Processor.java 2011-01-04 17:18:10 UTC (rev 366) @@ -37,10 +37,16 @@ * par : */ package org.nuiton.processor; -import org.nuiton.processor.filters.*; -import java.io.*; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.IOException; +import java.io.LineNumberReader; +import java.io.Reader; +import java.io.Writer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.processor.filters.Filter; +import org.nuiton.processor.filters.NoActionFilter; /** * This class is a generic sources processor given @@ -76,7 +82,7 @@ } protected BufferedReader getReader(Reader externalInput) { - BufferedReader result = new BufferedReader(externalInput); + LineNumberReader result = new LineNumberReader(externalInput); for (Filter anInputFilter : inputFilter) { result = new ProcessorReader(result, anInputFilter); } Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorReader.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorReader.java 2010-11-21 14:30:50 UTC (rev 365) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorReader.java 2011-01-04 17:18:10 UTC (rev 366) @@ -37,20 +37,20 @@ * par : */ package org.nuiton.processor; -import java.io.BufferedReader; import java.io.IOException; +import java.io.LineNumberReader; import java.io.StringReader; import org.nuiton.processor.filters.Filter; /** - * TODO doc. + * ProcessorReader is used in conjonction with filter to change source data * * @author poussin */ -public class ProcessorReader extends BufferedReader { +public class ProcessorReader extends LineNumberReader { - protected BufferedReader input; + protected LineNumberReader input; protected Filter filter; protected String lineSeparator; @@ -58,17 +58,41 @@ super(new StringReader("")); } - public ProcessorReader(BufferedReader input, Filter filter) { + /** + * Override to send call to input + * @return + */ + @Override + public int getLineNumber() { + return input.getLineNumber(); + } + + /** + * Override to send call to input + */ + @Override + public void setLineNumber(int lineNumber) { + input.setLineNumber(lineNumber); + } + + public ProcessorReader(LineNumberReader input, Filter filter) { this(); setInput(input); - this.filter = filter; + setFilter(filter); lineSeparator = System.getProperty("line.separator"); } - public void setInput(BufferedReader input) { + public void setInput(LineNumberReader input) { this.input = input; } + public void setFilter(Filter filter) { + this.filter = filter; + if (filter != null) { + filter.setReader(this); + } + } + @Override public boolean markSupported() { return false; Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java 2010-11-21 14:30:50 UTC (rev 365) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java 2011-01-04 17:18:10 UTC (rev 366) @@ -35,13 +35,15 @@ * Mise a jour: $Date$ par : */ package org.nuiton.processor.filters; +import java.io.LineNumberReader; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; /** - * A common astract filter. + * A common astract filter. This classe offer getLineNumber method to know + * line number currently read from source reader. * - * Implements the methods : + * You must implements the methods : * <ul> * <li>{@link #getHeader()}</li> * <li>{@link #getFooter()}</li> @@ -58,6 +60,8 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private final Log log = LogFactory.getLog(DefaultFilter.class); + protected LineNumberReader reader = null; + /** * le buffer interne pour conserve ce qui n'a pas encore été écrit */ @@ -102,6 +106,23 @@ abstract protected String getFooter(); @Override + public void setReader(LineNumberReader reader) { + this.reader = reader; + } + + /** + * Return line currently read in source reader + * @return line number or -1 if no reader available + */ + public int getLineNumber() { + int result = -1; + if (reader != null) { + result = reader.getLineNumber(); + } + return result; + } + + @Override public String parse(String input) { int matchingIndex; Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/Filter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/Filter.java 2010-11-21 14:30:50 UTC (rev 365) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/Filter.java 2011-01-04 17:18:10 UTC (rev 366) @@ -37,8 +37,11 @@ * par : */ package org.nuiton.processor.filters; +import java.io.LineNumberReader; + /** - * TODO doc + * Filter use to change data in reader. Filter instance must be used in only + * one ProcessorReader in same time * * @author poussin */ @@ -47,6 +50,12 @@ String EMPTY_STRING = ""; /** + * set reader used with this filter + * @param reader + */ + void setReader(LineNumberReader reader); + + /** * * @param input la chaine de caractère à processer * @return la chaine processée Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/NoActionFilter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/NoActionFilter.java 2010-11-21 14:30:50 UTC (rev 365) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/NoActionFilter.java 2011-01-04 17:18:10 UTC (rev 366) @@ -37,6 +37,8 @@ * par : */ package org.nuiton.processor.filters; +import java.io.LineNumberReader; + /** * This filter does nothing on input. * @@ -44,6 +46,10 @@ public class NoActionFilter implements Filter { @Override + public void setReader(LineNumberReader reader) { + } + + @Override public String parse(String input) { return input; }

1 0